Index: head/Makefile.inc1
===================================================================
--- head/Makefile.inc1	(revision 276550)
+++ head/Makefile.inc1	(revision 276551)
@@ -1,2153 +1,2135 @@
 #
 # $FreeBSD$
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
 #	-DNO_CLEAN do not clean at all
 #	-DDB_FROM_SRC use the user/group databases in src/etc instead of
 #	    the system database when installing.
 #	-DNO_SHARE do not go into share subdir
 #	-DKERNFAST define NO_KERNEL{CONFIG,CLEAN,DEPEND,OBJ}
 #	-DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
 #	-DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel
 #	-DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel
 #	-DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel
 #	-DNO_PORTSUPDATE do not update ports in ${MAKE} update
 #	-DNO_ROOT install without using root privilege
 #	-DNO_DOCUPDATE do not update doc in ${MAKE} update
 #	-DWITHOUT_CTF do not run the DTrace CTF conversion tools on built objects
 #	LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
 #	LOCAL_ITOOLS="list of tools" to add additional tools to the ITOOLS list
 #	LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target
 #	LOCAL_MTREE="list of mtree files" to process to allow local directories
 #	    to be created before files are installed
 #	LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools
 #	    list
 #	METALOG="path to metadata log" to write permission and ownership
 #	    when NO_ROOT is set.  (default: ${DESTDIR}/METALOG)
 #	TARGET="machine" to crossbuild world for a different machine type
 #	TARGET_ARCH= may be required when a TARGET supports multiple endians
 #	BUILDENV_SHELL= shell to launch for the buildenv target (def:/bin/sh)
 #	WORLD_FLAGS= additional flags to pass to make(1) during buildworld
 #	KERNEL_FLAGS= additional flags to pass to make(1) during buildkernel
 
 #
 # The intended user-driven targets are:
 # buildworld  - rebuild *everything*, including glue to help do upgrades
 # installworld- install everything built by "buildworld"
 # doxygen     - build API documentation of the kernel
 # update      - convenient way to update your source tree (eg: svn/svnup)
 #
 # Standard targets (not defined here) are documented in the makefiles in
 # /usr/share/mk.  These include:
 #		obj depend all install clean cleandepend cleanobj
 
 .if !defined(TARGET) || !defined(TARGET_ARCH)
 .error "Both TARGET and TARGET_ARCH must be defined."
 .endif
 
 .include "share/mk/src.opts.mk"
 .include <bsd.arch.inc.mk>
 .include <bsd.compiler.mk>
 
 # We must do share/info early so that installation of info `dir'
 # entries works correctly.  Do it first since it is less likely to
 # grow dependencies on include and lib than vice versa.
 #
 # We must do lib/ and libexec/ before bin/, because if installworld
 # installs a new /bin/sh, the 'make' command will *immediately*
 # use that new version.  And the new (dynamically-linked) /bin/sh
 # will expect to find appropriate libraries in /lib and /libexec.
 #
 SRCDIR?=	${.CURDIR}
 .if defined(SUBDIR_OVERRIDE)
 SUBDIR=	${SUBDIR_OVERRIDE}
 .else
 SUBDIR=	share/info lib libexec
 SUBDIR+=bin
 .if ${MK_GAMES} != "no"
 SUBDIR+=games
 .endif
 .if ${MK_CDDL} != "no"
 SUBDIR+=cddl
 .endif
 SUBDIR+=gnu include
 .if ${MK_KERBEROS} != "no"
 SUBDIR+=kerberos5
 .endif
 .if ${MK_RESCUE} != "no"
 SUBDIR+=rescue
 .endif
 SUBDIR+=sbin
 .if ${MK_CRYPT} != "no"
 SUBDIR+=secure
 .endif
 .if !defined(NO_SHARE)
 SUBDIR+=share
 .endif
 SUBDIR+=sys usr.bin usr.sbin
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests
 .endif
 .if ${MK_OFED} != "no"
 SUBDIR+=contrib/ofed
 .endif
 #
 # We must do etc/ last for install/distribute to work.
 #
 SUBDIR+=etc
 
 # Local directories are last, since it is nice to at least get the base
 # system rebuilt before you do them.
 .for _DIR in ${LOCAL_DIRS}
 .if exists(${.CURDIR}/${_DIR}/Makefile)
 SUBDIR+=	${_DIR}
 .endif
 .endfor
 # Add LOCAL_LIB_DIRS, but only if they will not be picked up as a SUBDIR
 # of a LOCAL_DIRS directory.  This allows LOCAL_DIRS=foo and
 # LOCAL_LIB_DIRS=foo/lib to behave as expected.
 .for _DIR in ${LOCAL_DIRS:M*/} ${LOCAL_DIRS:N*/:S|$|/|}
 _REDUNDENT_LIB_DIRS+=    ${LOCAL_LIB_DIRS:M${_DIR}*}
 .endfor
 .for _DIR in ${LOCAL_LIB_DIRS}
 .if empty(_REDUNDENT_LIB_DIRS:M${_DIR}) && exists(${.CURDIR}/${_DIR}/Makefile)
 SUBDIR+=	${_DIR}
 .else
 .warning ${_DIR} not added to SUBDIR list.  See UPDATING 20141121.
 .endif
 .endfor
 .endif
 
 .if defined(NOCLEAN)
 NO_CLEAN=	${NOCLEAN}
 .endif
 .if defined(NO_CLEANDIR)
 CLEANDIR=	clean cleandepend
 .else
 CLEANDIR=	cleandir
 .endif
 
 LOCAL_TOOL_DIRS?=
 
 BUILDENV_SHELL?=/bin/sh
 
 SVN?=		/usr/local/bin/svn
 SVNFLAGS?=	-r HEAD
 
 MAKEOBJDIRPREFIX?=	/usr/obj
 .if !defined(OSRELDATE)
 .if exists(/usr/include/osreldate.h)
 OSRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
 		/usr/include/osreldate.h
 .else
 OSRELDATE=	0
 .endif
 .endif
 
 .if !defined(VERSION)
 REVISION!=	${MAKE} -C ${SRCDIR}/release -V REVISION
 BRANCH!=	${MAKE} -C ${SRCDIR}/release -V BRANCH
 SRCRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
 		${SRCDIR}/sys/sys/param.h
 VERSION=	FreeBSD ${REVISION}-${BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE}
 .endif
 
 KNOWN_ARCHES?=	amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64
 .if ${TARGET} == ${TARGET_ARCH}
 _t=		${TARGET}
 .else
 _t=		${TARGET_ARCH}/${TARGET}
 .endif
 .for _t in ${_t}
 .if empty(KNOWN_ARCHES:M${_t})
 .error Unknown target ${TARGET_ARCH}:${TARGET}.
 .endif
 .endfor
 
 .if ${TARGET} == ${MACHINE}
 TARGET_CPUTYPE?=${CPUTYPE}
 .else
 TARGET_CPUTYPE?=
 .endif
 
 .if !empty(TARGET_CPUTYPE)
 _TARGET_CPUTYPE=${TARGET_CPUTYPE}
 .else
 _TARGET_CPUTYPE=dummy
 .endif
 _CPUTYPE!=	MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \
 		-f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE
 .if ${_CPUTYPE} != ${_TARGET_CPUTYPE}
 .error CPUTYPE global should be set with ?=.
 .endif
 .if make(buildworld)
 BUILD_ARCH!=	uname -p
 .if ${MACHINE_ARCH} != ${BUILD_ARCH}
 .error To cross-build, set TARGET_ARCH.
 .endif
 .endif
 .if ${MACHINE} == ${TARGET} && ${MACHINE_ARCH} == ${TARGET_ARCH} && !defined(CROSS_BUILD_TESTING)
 OBJTREE=	${MAKEOBJDIRPREFIX}
 .else
 OBJTREE=	${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
 .endif
 WORLDTMP=	${OBJTREE}${.CURDIR}/tmp
 # /usr/games added for fortune which depend on strfile
 BPATH=		${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin
 XPATH=		${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
 STRICTTMPPATH=	${BPATH}:${XPATH}
 TMPPATH=	${STRICTTMPPATH}:${PATH}
 
 #
 # Avoid running mktemp(1) unless actually needed.
 # It may not be functional, e.g., due to new ABI
 # when in the middle of installing over this system.
 #
 .if make(distributeworld) || make(installworld)
 INSTALLTMP!=	/usr/bin/mktemp -d -u -t install
 .endif
 
 #
 # Building a world goes through the following stages
 #
 # 1. legacy stage [BMAKE]
 #	This stage is responsible for creating compatibility
 #	shims that are needed by the bootstrap-tools,
 #	build-tools and cross-tools stages.
 # 1. bootstrap-tools stage [BMAKE]
 #	This stage is responsible for creating programs that
 #	are needed for backward compatibility reasons. They
 #	are not built as cross-tools.
 # 2. build-tools stage [TMAKE]
 #	This stage is responsible for creating the object
 #	tree and building any tools that are needed during
 #	the build process.
 # 3. cross-tools stage [XMAKE]
 #	This stage is responsible for creating any tools that
 #	are needed for cross-builds. A cross-compiler is one
 #	of them.
 # 4. world stage [WMAKE]
 #	This stage actually builds the world.
 # 5. install stage (optional) [IMAKE]
 #	This stage installs a previously built world.
 #
 
 BOOTSTRAPPING?=	0
 
 # Common environment for world related stages
 CROSSENV=	MAKEOBJDIRPREFIX=${OBJTREE} \
 		MACHINE_ARCH=${TARGET_ARCH} \
 		MACHINE=${TARGET} \
 		CPUTYPE=${TARGET_CPUTYPE}
 .if ${MK_GROFF} != "no"
 CROSSENV+=	GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \
 		GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \
 		GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac
 .endif
 .if defined(TARGET_CFLAGS)
 CROSSENV+=	${TARGET_CFLAGS}
 .endif
 
 # bootstrap-tools stage
 BMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${BPATH}:${PATH} \
 		WORLDTMP=${WORLDTMP} \
 		VERSION="${VERSION}" \
 		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
 BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
-		MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \
+		MK_HTML=no NO_LINT=yes MK_MAN=no \
 		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
 		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 		MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
 		MK_LLDB=no MK_TESTS=no
 
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		-DNO_LINT \
 		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 		MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
 		MK_LLDB=no MK_TESTS=no
 
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		MK_GDB=no MK_TESTS=no
 
 # kernel-tools stage
 KTMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${BPATH}:${PATH} \
 		WORLDTMP=${WORLDTMP} \
 		VERSION="${VERSION}"
 KTMAKE=		TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \
 		${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
-		MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
+		MK_HTML=no -DNO_LINT MK_MAN=no \
 		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
 		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no
 
 # world stage
 WMAKEENV=	${CROSSENV} \
 		_SHLIBDIRPREFIX=${WORLDTMP} \
 		_LDSCRIPTROOT= \
 		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH}
 
 # make hierarchy
 HMAKE=		PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE:Q}
 .if defined(NO_ROOT)
 HMAKE+=		PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT
 .endif
 
 .if ${MK_CDDL} == "no"
 WMAKEENV+=	MK_CTF=no
 .endif
 
 .if defined(CROSS_TOOLCHAIN)
 LOCALBASE?=	/usr/local
 .include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk"
 .endif
 .if defined(CROSS_TOOLCHAIN_PREFIX)
 CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
 CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
 .endif
 XCOMPILERS=	CC CXX CPP
 .for COMPILER in ${XCOMPILERS}
 .if defined(CROSS_COMPILER_PREFIX)
 X${COMPILER}?=	${CROSS_COMPILER_PREFIX}${${COMPILER}}
 .else
 X${COMPILER}?=	${${COMPILER}}
 .endif
 .endfor
 XBINUTILS=	AS AR LD NM OBJCOPY OBJDUMP RANLIB SIZE STRINGS
 .for BINUTIL in ${XBINUTILS}
 .if defined(CROSS_BINUTILS_PREFIX)
 X${BINUTIL}?=	${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
 .else
 X${BINUTIL}?=	${${BINUTIL}}
 .endif
 .endfor
 WMAKEENV+=	CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCFLAGS} ${XCXXFLAGS}" \
 		DEPFLAGS="${DEPFLAGS}" \
 		CPP="${XCPP} ${XCFLAGS}" \
 		AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
 		OBJDUMP=${XOBJDUMP} OBJCOPY="${XOBJCOPY}" \
 		RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \
 		SIZE="${XSIZE}"
 
 .if ${XCC:M/*}
 XFLAGS=		--sysroot=${WORLDTMP}
 .if defined(CROSS_BINUTILS_PREFIX)
 # In the case of xdev-build tools, CROSS_BINUTILS_PREFIX won't be a
 # directory, but the compiler will look in the right place for it's
 # tools so we don't need to tell it where to look.
 .if exists(${CROSS_BINUTILS_PREFIX})
 XFLAGS+=	-B${CROSS_BINUTILS_PREFIX}
 .endif
 .else
 XFLAGS+=	-B${WORLDTMP}/usr/bin
 .endif
 .if ${TARGET} == "arm"
 .if ${TARGET_ARCH:M*hf*} != ""
 TARGET_ABI=	gnueabihf
 .else
 TARGET_ABI=	gnueabi
 .endif
 .endif
 .if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
 XCFLAGS+=	-isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib
 XCXXFLAGS+=	-I${WORLDTMP}/usr/include/c++/v1 -std=gnu++11 -L${WORLDTMP}/../lib/libc++
 DEPFLAGS+=	-I${WORLDTMP}/usr/include/c++/v1
 .else
 TARGET_ABI?=	unknown
 TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
 XCFLAGS+=	-target ${TARGET_TRIPLE}
 .endif
 .endif
 
 WMAKE=		${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 # 32 bit world
 LIB32_OBJTREE=	${OBJTREE}${.CURDIR}/world32
 LIB32TMP=	${OBJTREE}${.CURDIR}/lib32
 
 .if ${TARGET_ARCH} == "amd64"
 .if empty(TARGET_CPUTYPE)
 LIB32CPUFLAGS=	-march=i686 -mmmx -msse -msse2
 .else
 LIB32CPUFLAGS=	-march=${TARGET_CPUTYPE}
 .endif
 LIB32WMAKEENV=	MACHINE=i386 MACHINE_ARCH=i386 \
 		MACHINE_CPU="i686 mmx sse sse2"
 LIB32WMAKEFLAGS=	\
 		AS="${AS} --32" \
 		LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32"
 
 .elif ${TARGET_ARCH} == "powerpc64"
 .if empty(TARGET_CPUTYPE)
 LIB32CPUFLAGS=	-mcpu=powerpc
 .else
 LIB32CPUFLAGS=	-mcpu=${TARGET_CPUTYPE}
 .endif
 LIB32WMAKEENV=	MACHINE=powerpc MACHINE_ARCH=powerpc
 LIB32WMAKEFLAGS=	\
 		LD="${LD} -m elf32ppc_fbsd"
 .endif
 
 
 LIB32FLAGS=	-m32 ${LIB32CPUFLAGS} -DCOMPAT_32BIT \
 		-isystem ${LIB32TMP}/usr/include/ \
 		-L${LIB32TMP}/usr/lib32 \
 		-B${LIB32TMP}/usr/lib32
 .if ${XCC:M/*}
 LIB32FLAGS+=		--sysroot=${WORLDTMP}
 .endif
 
 # Yes, the flags are redundant.
 LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${LIB32_OBJTREE} \
 		_SHLIBDIRPREFIX=${LIB32TMP} \
 		_LDSCRIPTROOT=${LIB32TMP} \
 		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH} \
 		LIBDIR=/usr/lib32 \
 		SHLIBDIR=/usr/lib32 \
 		LIBPRIVATEDIR=/usr/lib32/private \
 		DTRACE="${DTRACE} -32"
 LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAGS}" \
 		CXX="${XCXX} ${LIB32FLAGS}" \
 		DESTDIR=${LIB32TMP} \
 		-DCOMPAT_32BIT \
 		-DLIBRARIES_ONLY \
 		-DNO_CPU_CFLAGS \
 		MK_CTF=no \
 		-DNO_LINT \
 		MK_TESTS=no
 
 LIB32WMAKE=	${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
-		MK_MAN=no MK_INFO=no MK_HTML=no
+		MK_MAN=no MK_HTML=no
 LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} \
 		MK_TOOLCHAIN=no ${IMAKE_INSTALL}
 .endif
 
 IMAKEENV=	${CROSSENV:N_LDSCRIPTROOT=*}
 IMAKE=		${IMAKEENV} ${MAKE} -f Makefile.inc1 \
 		${IMAKE_INSTALL} ${IMAKE_MTREE}
 .if empty(.MAKEFLAGS:M-n)
 IMAKEENV+=	PATH=${STRICTTMPPATH}:${INSTALLTMP} \
 		LD_LIBRARY_PATH=${INSTALLTMP} \
 		PATH_LOCALE=${INSTALLTMP}/locale
 IMAKE+=		__MAKE_SHELL=${INSTALLTMP}/sh
 .else
 IMAKEENV+=	PATH=${TMPPATH}:${INSTALLTMP}
 .endif
 .if defined(DB_FROM_SRC)
 INSTALLFLAGS+=	-N ${.CURDIR}/etc
 MTREEFLAGS+=	-N ${.CURDIR}/etc
 .endif
 _INSTALL_DDIR=	${DESTDIR}/${DISTDIR}
 INSTALL_DDIR=	${_INSTALL_DDIR:S://:/:g:C:/$::}
 .if defined(NO_ROOT)
 METALOG?=	${DESTDIR}/${DISTDIR}/METALOG
 IMAKE+=		-DNO_ROOT METALOG=${METALOG}
 INSTALLFLAGS+=	-U -M ${METALOG} -D ${INSTALL_DDIR}
 MTREEFLAGS+=	-W
 .endif
 .if defined(DB_FROM_SRC) || defined(NO_ROOT)
 IMAKE_INSTALL=	INSTALL="install ${INSTALLFLAGS}"
 IMAKE_MTREE=	MTREE_CMD="mtree ${MTREEFLAGS}"
 .endif
 
 # kernel stage
 KMAKEENV=	${WMAKEENV}
 KMAKE=		${KMAKEENV} ${MAKE} ${.MAKEFLAGS} ${KERNEL_FLAGS} KERNEL=${INSTKERNNAME}
 
 #
 # buildworld
 #
 # Attempt to rebuild the entire system, with reasonable chance of
 # success, regardless of how old your existing system is.
 #
 _worldtmp:
 .if ${.CURDIR:C/[^,]//g} != ""
 #	The m4 build of sendmail files doesn't like it if ',' is used
 #	anywhere in the path of it's files.
 	@echo
 	@echo "*** Error: path to source tree contains a comma ','"
 	@echo
 	false
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Rebuilding the temporary build tree"
 	@echo "--------------------------------------------------------------"
 .if !defined(NO_CLEAN)
 	rm -rf ${WORLDTMP}
 .if defined(LIB32TMP)
 	rm -rf ${LIB32TMP}
 .endif
 .else
 	rm -rf ${WORLDTMP}/legacy/usr/include
 #	XXX - These three can depend on any header file.
 	rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c
 	rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/kdump_subr.c
 	rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
 .endif
 .for _dir in \
     lib usr legacy/bin legacy/usr
 	mkdir -p ${WORLDTMP}/${_dir}
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${WORLDTMP}/legacy/usr >/dev/null
 .if ${MK_GROFF} != "no"
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.groff.dist \
 	    -p ${WORLDTMP}/legacy/usr >/dev/null
 .endif
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${WORLDTMP}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${WORLDTMP}/usr/include >/dev/null
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
 .if ${MK_DEBUG_FILES} != "no"
 	# We could instead disable debug files for these build stages
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${WORLDTMP}/legacy/usr/lib >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${WORLDTMP}/usr/lib >/dev/null
 .endif
 .if ${MK_TESTS} != "no"
 	mkdir -p ${WORLDTMP}${TESTSBASE}
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
 	    -p ${WORLDTMP}${TESTSBASE} >/dev/null
 .endif
 .for _mtree in ${LOCAL_MTREE}
 	mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
 .endfor
 _legacy:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 1.1: legacy release compatibility shims"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${BMAKE} legacy
 _bootstrap-tools:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 1.2: bootstrap tools"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${BMAKE} bootstrap-tools
 _cleanobj:
 .if !defined(NO_CLEAN)
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.1: cleaning up the object tree"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/}
 .if defined(LIB32TMP)
 	${_+_}cd ${.CURDIR}; ${LIB32WMAKE} -f Makefile.inc1 ${CLEANDIR:S/^/par-/}
 .endif
 .endif
 _obj:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.2: rebuilding the object tree"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} par-obj
 _build-tools:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.3: build tools"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${TMAKE} build-tools
 _cross-tools:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 3: cross tools"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${XMAKE} cross-tools
 	${_+_}cd ${.CURDIR}; ${XMAKE} kernel-tools
 _includes:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4.1: building includes"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} SHARED=symlinks par-includes
 _libraries:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4.2: building libraries"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; \
-	    ${WMAKE} -DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
+	    ${WMAKE} -DNO_FSCHG MK_HTML=no -DNO_LINT MK_MAN=no \
 	    MK_PROFILE=no MK_TESTS=no MK_TESTS_SUPPORT=${MK_TESTS} libraries
 _depend:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4.3: make dependencies"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} par-depend
 everything:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4.4: building everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} par-all
 .if defined(LIB32TMP)
 build32:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 5.1: building 32 bit shim libraries"
 	@echo "--------------------------------------------------------------"
 	mkdir -p ${LIB32TMP}/usr/include
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${LIB32TMP}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${LIB32TMP}/usr/include >/dev/null
 .if ${MK_DEBUG_FILES} != "no"
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${LIB32TMP}/usr/lib >/dev/null
 .endif
 	mkdir -p ${WORLDTMP}
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
 .for _t in obj includes
 	cd ${.CURDIR}/include; ${LIB32WMAKE} DIRPRFX=include/ ${_t}
 	cd ${.CURDIR}/lib; ${LIB32WMAKE} DIRPRFX=lib/ ${_t}
 .if ${MK_CDDL} != "no"
 	cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} DIRPRFX=cddl/lib/ ${_t}
 .endif
 	cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} DIRPRFX=gnu/lib/ ${_t}
 .if ${MK_CRYPT} != "no"
 	cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} DIRPRFX=secure/lib/ ${_t}
 .endif
 .if ${MK_KERBEROS} != "no"
 	cd ${.CURDIR}/kerberos5/lib; ${LIB32WMAKE} DIRPRFX=kerberos5/lib ${_t}
 .endif
 .endfor
 .for _dir in usr.bin/lex/lib
 	cd ${.CURDIR}/${_dir}; ${LIB32WMAKE} DIRPRFX=${_dir}/ obj
 .endfor
 .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
 	cd ${.CURDIR}/${_dir}; \
 	    WORLDTMP=${WORLDTMP} \
 	    MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
 	    MAKEOBJDIRPREFIX=${LIB32_OBJTREE} ${MAKE} SSP_CFLAGS= DESTDIR= \
 	    DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 	    build-tools
 .endfor
 	cd ${.CURDIR}; \
 	    ${LIB32WMAKE} -f Makefile.inc1 libraries
 .for _t in obj depend all
 	cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32WMAKE} \
 	    DIRPRFX=libexec/rtld-elf/ ${_t}
 	cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32WMAKE} \
 	    DIRPRFX=usr.bin/ldd ${_t}
 .endfor
 
 distribute32 install32:
 	cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
 .if ${MK_CDDL} != "no"
 	cd ${.CURDIR}/cddl/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
 .endif
 	cd ${.CURDIR}/gnu/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
 .if ${MK_CRYPT} != "no"
 	cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
 .endif
 .if ${MK_KERBEROS} != "no"
 	cd ${.CURDIR}/kerberos5/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
 .endif
 	cd ${.CURDIR}/libexec/rtld-elf; \
 	    PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//}
 	cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32IMAKE} ${.TARGET:S/32$//}
 .endif
 
 WMAKE_TGTS=
 .if !defined(SUBDIR_OVERRIDE)
 WMAKE_TGTS+=	_worldtmp _legacy _bootstrap-tools
 .endif
 WMAKE_TGTS+=	_cleanobj _obj _build-tools
 .if !defined(SUBDIR_OVERRIDE)
 WMAKE_TGTS+=	_cross-tools
 .endif
 WMAKE_TGTS+=	_includes _libraries _depend everything
 .if defined(LIB32TMP) && ${MK_LIB32} != "no"
 WMAKE_TGTS+=	build32
 .endif
 
 buildworld: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue
 .ORDER: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue
 
 buildworld_prologue:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> World build started on `LC_ALL=C date`"
 	@echo "--------------------------------------------------------------"
 
 buildworld_epilogue:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> World build completed on `LC_ALL=C date`"
 	@echo "--------------------------------------------------------------"
 
 #
 # We need to have this as a target because the indirection between Makefile
 # and Makefile.inc1 causes the correct PATH to be used, rather than a
 # modification of the current environment's PATH.  In addition, we need
 # to quote multiword values.
 #
 buildenvvars:
 	@echo ${WMAKEENV:Q}
 
 .if ${.TARGETS:Mbuildenv}
 .if ${.MAKEFLAGS:M-j}
 .error The buildenv target is incompatible with -j
 .endif
 .endif
 buildenv:
 	@echo Entering world for ${TARGET_ARCH}:${TARGET}
 	@cd ${.CURDIR} && env ${WMAKEENV} ${BUILDENV_SHELL} || true
 
 TOOLCHAIN_TGTS=	${WMAKE_TGTS:N_depend:Neverything:Nbuild32}
 toolchain: ${TOOLCHAIN_TGTS}
 kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries}
 
 #
 # installcheck
 #
 # Checks to be sure system is ready for installworld/installkernel.
 #
 installcheck: _installcheck_world _installcheck_kernel
 _installcheck_world:
 _installcheck_kernel:
 
 #
 # Require DESTDIR to be set if installing for a different architecture or
 # using the user/group database in the source tree.
 #
 .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} || \
     defined(DB_FROM_SRC)
 .if !make(distributeworld)
 _installcheck_world: __installcheck_DESTDIR
 _installcheck_kernel: __installcheck_DESTDIR
 __installcheck_DESTDIR:
 .if !defined(DESTDIR) || empty(DESTDIR)
 	@echo "ERROR: Please set DESTDIR!"; \
 	false
 .endif
 .endif
 .endif
 
 .if !defined(DB_FROM_SRC)
 #
 # Check for missing UIDs/GIDs.
 #
 CHECK_UIDS=	auditdistd
 CHECK_GIDS=	audit
 .if ${MK_SENDMAIL} != "no"
 CHECK_UIDS+=	smmsp
 CHECK_GIDS+=	smmsp
 .endif
 .if ${MK_PF} != "no"
 CHECK_UIDS+=	proxy
 CHECK_GIDS+=	proxy authpf
 .endif
 .if ${MK_UNBOUND} != "no"
 CHECK_UIDS+=	unbound
 CHECK_GIDS+=	unbound
 .endif
 _installcheck_world: __installcheck_UGID
 __installcheck_UGID:
 .for uid in ${CHECK_UIDS}
 	@if ! `id -u ${uid} >/dev/null 2>&1`; then \
 		echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \
 		false; \
 	fi
 .endfor
 .for gid in ${CHECK_GIDS}
 	@if ! `find / -prune -group ${gid} >/dev/null 2>&1`; then \
 		echo "ERROR: Required ${gid} group is missing, see /usr/src/UPDATING."; \
 		false; \
 	fi
 .endfor
 .endif
 
 #
 # Required install tools to be saved in a scratch dir for safety.
 #
-.if ${MK_INFO} != "no"
-_install-info=	install-info
-.endif
 .if ${MK_ZONEINFO} != "no"
 _zoneinfo=	zic tzsetup
 .endif
 
 ITOOLS=	[ awk cap_mkdb cat chflags chmod chown \
 	date echo egrep find grep id install ${_install-info} \
 	ln lockf make mkdir mtree mv pwd_mkdb \
 	rm sed services_mkdb sh strip sysctl test true uname wc ${_zoneinfo} \
 	${LOCAL_ITOOLS}
 
 # Needed for share/man
 .if ${MK_MAN} != "no"
 ITOOLS+=makewhatis
 .endif
 
 #
 # distributeworld
 #
 # Distributes everything compiled by a `buildworld'.
 #
 # installworld
 #
 # Installs everything compiled by a 'buildworld'.
 #
 
 # Non-base distributions produced by the base system
 EXTRA_DISTRIBUTIONS=	doc
 .if ${MK_GAMES} != "no"
 EXTRA_DISTRIBUTIONS+=	games
 .endif
 .if defined(LIB32TMP) && ${MK_LIB32} != "no"
 EXTRA_DISTRIBUTIONS+=	lib32
 .endif
 .if ${MK_TESTS} != "no"
 EXTRA_DISTRIBUTIONS+=	tests
 .endif
 
 DEBUG_DISTRIBUTIONS=
 .if ${MK_DEBUG_FILES} != "no"
 DEBUG_DISTRIBUTIONS+=	base ${EXTRA_DISTRIBUTIONS:S,doc,,}
 .endif
 
 MTREE_MAGIC?=	mtree 2.0
 
 distributeworld installworld: _installcheck_world
 	mkdir -p ${INSTALLTMP}
 	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \
 			echo $$progpath; \
 		else \
 			echo "Required tool $$prog not found in PATH." >&2; \
 			exit 1; \
 		fi; \
 	    done); \
 	libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \
 	    while read line; do \
 		set -- $$line; \
 		if [ "$$2 $$3" != "not found" ]; then \
 			echo $$2; \
 		else \
 			echo "Required library $$1 not found." >&2; \
 			exit 1; \
 		fi; \
 	    done); \
 	cp $$libs $$progs ${INSTALLTMP}
 	cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
 .if defined(NO_ROOT)
 	echo "#${MTREE_MAGIC}" > ${METALOG}
 .endif
 .if make(distributeworld)
 .for dist in ${EXTRA_DISTRIBUTIONS}
 	-mkdir ${DESTDIR}/${DISTDIR}/${dist}
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist} >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null
 .if ${MK_DEBUG_FILES} != "no"
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null
 .endif
 .if ${MK_TESTS} != "no" && ${dist} == "tests"
 	-mkdir -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE}
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE} >/dev/null
 .endif
 .if defined(NO_ROOT)
 	${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \
 	    sed -e 's#^\./#./${dist}/#' >> ${METALOG}
 	${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.usr.dist | \
 	    sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG}
 	${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.include.dist | \
 	    sed -e 's#^\./#./${dist}/usr/include/#' >> ${METALOG}
 .endif
 .endfor
 	-mkdir ${DESTDIR}/${DISTDIR}/base
 	cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
 	    METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \
 	    DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \
 	    LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs
 .endif
 	${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
 	    ${IMAKEENV} rm -rf ${INSTALLTMP}
 .if make(distributeworld)
 .for dist in ${EXTRA_DISTRIBUTIONS}
 	find ${DESTDIR}/${DISTDIR}/${dist} -mindepth 1 -empty -delete
 .endfor
 .if defined(NO_ROOT)
 .for dist in base ${EXTRA_DISTRIBUTIONS}
 	@# For each file that exists in this dist, print the corresponding
 	@# line from the METALOG.  This relies on the fact that
 	@# a line containing only the filename will sort immediatly before
 	@# the relevant mtree line.
 	cd ${DESTDIR}/${DISTDIR}; \
 	find ./${dist} | sort -u ${METALOG} - | \
 	awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \
 	${DESTDIR}/${DISTDIR}/${dist}.meta
 .endfor
 .for dist in ${DEBUG_DISTRIBUTIONS}
 	@# For each file that exists in this dist, print the corresponding
 	@# line from the METALOG.  This relies on the fact that
 	@# a line containing only the filename will sort immediatly before
 	@# the relevant mtree line.
 	cd ${DESTDIR}/${DISTDIR}; \
 	find ./${dist}/usr/lib/debug | sort -u ${METALOG} - | \
 	awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \
 	${DESTDIR}/${DISTDIR}/${dist}.debug.meta
 .endfor
 .endif
 .endif
 
 packageworld:
 .for dist in base ${EXTRA_DISTRIBUTIONS}
 .if defined(NO_ROOT)
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \
 	    --exclude usr/lib/debug \
 	    @${DESTDIR}/${DISTDIR}/${dist}.meta
 .else
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \
 	    --exclude usr/lib/debug .
 .endif
 .endfor
 
 .for dist in ${DEBUG_DISTRIBUTIONS}
 . if defined(NO_ROOT)
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \
 	    @${DESTDIR}/${DISTDIR}/${dist}.debug.meta
 . else
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \
 	    usr/lib/debug
 . endif
 .endfor
 
 #
 # reinstall
 #
 # If you have a build server, you can NFS mount the source and obj directories
 # and do a 'make reinstall' on the *client* to install new binaries from the
 # most recent server build.
 #
 reinstall: .MAKE
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Making hierarchy"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \
 	    LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Installing everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
 .if defined(LIB32TMP) && ${MK_LIB32} != "no"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
 .endif
 
 redistribute: .MAKE
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Distributing everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute
 .if defined(LIB32TMP) && ${MK_LIB32} != "no"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 \
 	    DISTRIBUTION=lib32
 .endif
 
 distrib-dirs distribution: .MAKE
 	cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
 	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
 
 #
 # buildkernel and installkernel
 #
 # Which kernels to build and/or install is specified by setting
 # KERNCONF. If not defined a GENERIC kernel is built/installed.
 # Only the existing (depending TARGET) config files are used
 # for building kernels and only the first of these is designated
 # as the one being installed.
 #
 # Note that we have to use TARGET instead of TARGET_ARCH when
 # we're in kernel-land. Since only TARGET_ARCH is (expected) to
 # be set to cross-build, we have to make sure TARGET is set
 # properly.
 
 .if defined(KERNFAST)
 NO_KERNELCLEAN=	t
 NO_KERNELCONFIG=	t
 NO_KERNELDEPEND=	t
 NO_KERNELOBJ=		t
 # Shortcut for KERNCONF=Blah -DKERNFAST is now KERNFAST=Blah
 .if !defined(KERNCONF) && ${KERNFAST} != "1"
 KERNCONF=${KERNFAST}
 .endif
 .endif
 .if ${TARGET_ARCH} == "powerpc64"
 KERNCONF?=	GENERIC64
 .else
 KERNCONF?=	GENERIC
 .endif
 INSTKERNNAME?=	kernel
 
 KERNSRCDIR?=	${.CURDIR}/sys
 KRNLCONFDIR=	${KERNSRCDIR}/${TARGET}/conf
 KRNLOBJDIR=	${OBJTREE}${KERNSRCDIR}
 KERNCONFDIR?=	${KRNLCONFDIR}
 
 BUILDKERNELS=
 INSTALLKERNEL=
 .for _kernel in ${KERNCONF}
 .if exists(${KERNCONFDIR}/${_kernel})
 BUILDKERNELS+=	${_kernel}
 .if empty(INSTALLKERNEL)
 INSTALLKERNEL= ${_kernel}
 .endif
 .endif
 .endfor
 
 buildkernel ${WMAKE_TGTS} ${.ALLTARGETS:M_*}: .MAKE
 
 #
 # buildkernel
 #
 # Builds all kernels defined by BUILDKERNELS.
 #
 buildkernel:
 .if empty(BUILDKERNELS)
 	@echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; \
 	false
 .endif
 	@echo
 .for _kernel in ${BUILDKERNELS}
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Kernel build for ${_kernel} started on `LC_ALL=C date`"
 	@echo "--------------------------------------------------------------"
 	@echo "===> ${_kernel}"
 	mkdir -p ${KRNLOBJDIR}
 .if !defined(NO_KERNELCONFIG)
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 1: configuring the kernel"
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLCONFDIR}; \
 		PATH=${TMPPATH} \
 		    config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \
 			-I '${KERNCONFDIR}' '${KERNCONFDIR}/${_kernel}'
 .endif
 .if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN)
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.1: cleaning up the object tree"
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} ${CLEANDIR}
 .endif
 .if !defined(NO_KERNELOBJ)
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.2: rebuilding the object tree"
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} obj
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.3: build tools"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${KTMAKE} kernel-tools
 .if !defined(NO_KERNELDEPEND)
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 3.1: making dependencies"
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} depend -DNO_MODULES_OBJ
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 3.2: building everything"
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} all -DNO_MODULES_OBJ
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`"
 	@echo "--------------------------------------------------------------"
 .endfor
 
 #
 # installkernel, etc.
 #
 # Install the kernel defined by INSTALLKERNEL
 #
 installkernel installkernel.debug \
 reinstallkernel reinstallkernel.debug: _installcheck_kernel
 .if empty(INSTALLKERNEL)
 	@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
 	false
 .endif
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Installing kernel ${INSTALLKERNEL}"
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
 	    ${CROSSENV} PATH=${TMPPATH} \
 	    ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
 
 distributekernel distributekernel.debug:
 .if empty(INSTALLKERNEL)
 	@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
 	false
 .endif
 	mkdir -p ${DESTDIR}/${DISTDIR}
 .if defined(NO_ROOT)
 	echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.premeta
 .endif
 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
 	    ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.premeta/} \
 	    ${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \
 	    DESTDIR=${INSTALL_DDIR}/kernel \
 	    ${.TARGET:S/distributekernel/install/}
 .if defined(NO_ROOT)
 	sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
 	    ${DESTDIR}/${DISTDIR}/kernel.meta
 .endif
 .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
 .if defined(NO_ROOT)
 	echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
 .endif
 	cd ${KRNLOBJDIR}/${_kernel}; \
 	    ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.${_kernel}.premeta/} \
 	    ${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} \
 	    KERNEL=${INSTKERNNAME}.${_kernel} \
 	    DESTDIR=${INSTALL_DDIR}/kernel.${_kernel} \
 	    ${.TARGET:S/distributekernel/install/}
 .if defined(NO_ROOT)
 	sed -e 's|^./kernel|.|' \
 	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta > \
 	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
 .endif
 .endfor
 
 packagekernel:
 .if defined(NO_ROOT)
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz \
 	    @${DESTDIR}/${DISTDIR}/kernel.meta
 .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz \
 	    @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
 .endfor
 .else
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz .
 .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz .
 .endfor
 .endif
 
 #
 # doxygen
 #
 # Build the API documentation with doxygen
 #
 doxygen:
 	@if [ ! -x `/usr/bin/which doxygen` ]; then \
 		echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \
 		exit 1; \
 	fi
 	cd ${.CURDIR}/tools/kerneldoc/subsys && ${MAKE} obj all
 
 #
 # update
 #
 # Update the source tree(s), by running svn/svnup to update to the
 # latest copy.
 #
 update:
 .if (defined(CVS_UPDATE) || defined(SUP_UPDATE)) && !defined(SVN_UPDATE)
 	@echo "--------------------------------------------------------------"
 	@echo "CVS_UPDATE and SUP_UPDATE are no longer supported."
 	@echo "Please see: https://wiki.freebsd.org/CvsIsDeprecated"
 	@echo "--------------------------------------------------------------"
 	@exit 1
 .endif
 .if defined(SVN_UPDATE)
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Updating ${.CURDIR} using Subversion"
 	@echo "--------------------------------------------------------------"
 	@(cd ${.CURDIR} && ${SVN} update ${SVNFLAGS})
 .endif
 
 #
 # ------------------------------------------------------------------------
 #
 # From here onwards are utility targets used by the 'make world' and
 # related targets.  If your 'world' breaks, you may like to try to fix
 # the problem and manually run the following targets to attempt to
 # complete the build.  Beware, this is *not* guaranteed to work, you
 # need to have a pretty good grip on the current state of the system
 # to attempt to manually finish it.  If in doubt, 'make world' again.
 #
 
 #
 # legacy: Build compatibility shims for the next three targets
 #
 legacy:
 .if ${BOOTSTRAPPING} < 800107 && ${BOOTSTRAPPING} != 0
 	@echo "ERROR: Source upgrades from versions prior to 8.0 not supported."; \
 	false
 .endif
 .for _tool in tools/build
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \
 	    cd ${.CURDIR}/${_tool} && \
 	    ${MAKE} DIRPRFX=${_tool}/ obj && \
 	    ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes && \
 	    ${MAKE} DIRPRFX=${_tool}/ depend && \
 	    ${MAKE} DIRPRFX=${_tool}/ all && \
 	    ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
 .endfor
 
 #
 # bootstrap-tools: Build tools needed for compatibility
 #
 .if ${MK_GAMES} != "no"
 _strfile=	games/fortune/strfile
 .endif
 
 .if ${MK_CXX} != "no"
 _gperf=		gnu/usr.bin/gperf
 .endif
 
 .if ${MK_GROFF} != "no"
 _groff=		gnu/usr.bin/groff
 .endif
 
 .if ${MK_VT} != "no"
 _vtfontcvt=	usr.bin/vtfontcvt
 .endif
 
 .if ${BOOTSTRAPPING} < 900002
 _sed=		usr.bin/sed
 .endif
 
 .if ${BOOTSTRAPPING} < 1000002
 _m4=		lib/libohash \
 		usr.bin/m4
 .endif
 
 .if ${BOOTSTRAPPING} < 1000013
 _yacc=		lib/liby \
 		usr.bin/yacc
 .endif
 
 .if ${BOOTSTRAPPING} < 1000014
 _crunch=	usr.sbin/crunch
 .endif
 
 .if ${BOOTSTRAPPING} < 1000026
 _nmtree=	lib/libnetbsd \
 		usr.sbin/nmtree
 .endif
 
 .if ${BOOTSTRAPPING} < 1000027
 _cat=		bin/cat
 .endif
 
 .if ${BOOTSTRAPPING} < 1000033
 _lex=		usr.bin/lex
 .endif
 
 .if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041
 _awk=		usr.bin/awk
 .endif
 
 .if ${MK_BSNMP} != "no"
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
 
 # We need to build tblgen when we're building clang either as
 # the bootstrap compiler, or as the part of the normal build.
 .if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no"
 _clang_tblgen= \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtablegen \
 	usr.bin/clang/tblgen \
 	usr.bin/clang/clang-tblgen
 .endif
 
 # dtrace tools are required for older bootstrap env and cross-build
 # pre libdwarf
 .if ${MK_CDDL} != "no" && (${BOOTSTRAPPING} < 1100006 \
       || (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH}))
 _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
     lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
 .endif
 
 # Default to building the GPL DTC, but build the BSDL one if users explicitly
 # request it.
 _dtc= usr.bin/dtc
 .if ${MK_GPL_DTC} != "no"
 _dtc= gnu/usr.bin/dtc
 .endif
 
 .if ${MK_KERBEROS} != "no"
 _kerberos5_bootstrap_tools= \
 	kerberos5/tools/make-roken \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libvers \
 	kerberos5/tools/asn1_compile \
 	kerberos5/tools/slc \
 	usr.bin/compile_et
 .endif
 
 #	Please document (add comment) why something is in 'bootstrap-tools'.
 #	Try to bound the building of the bootstrap-tool to just the
 #	FreeBSD versions that need the tool built at this stage of the build.
 bootstrap-tools: .MAKE
 .for _tool in \
     ${_clang_tblgen} \
     ${_kerberos5_bootstrap_tools} \
     ${_dtrace_tools} \
     ${_strfile} \
     ${_gperf} \
     ${_groff} \
     ${_dtc} \
     ${_awk} \
     ${_cat} \
     usr.bin/lorder \
     usr.bin/makewhatis \
     usr.bin/rpcgen \
     ${_sed} \
     ${_yacc} \
     ${_m4} \
     ${_lex} \
     lib/libmd \
     usr.bin/xinstall \
     ${_gensnmptree} \
     usr.sbin/config \
     ${_crunch} \
     ${_nmtree} \
     ${_vtfontcvt}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool} && \
 		${MAKE} DIRPRFX=${_tool}/ obj && \
 		${MAKE} DIRPRFX=${_tool}/ depend && \
 		${MAKE} DIRPRFX=${_tool}/ all && \
 		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
 .endfor
 
 #
 # build-tools: Build special purpose build tools
 #
 .if !defined(NO_SHARE)
 _share=	share/syscons/scrnmaps
 .endif
 
 .if ${MK_GCC} != "no"
 _gcc_tools= gnu/usr.bin/cc/cc_tools
 .endif
 
-.if ${MK_INFO} != "no"
-_texinfo=	gnu/usr.bin/texinfo/libtxi \
-		gnu/usr.bin/texinfo/makeinfo
-.endif
-
 .if ${MK_RESCUE} != "no"
 _rescue= rescue/rescue
 .endif
 
 build-tools: .MAKE
 .for _tool in \
     bin/csh \
     bin/sh \
     ${_rescue} \
     ${LOCAL_TOOL_DIRS} \
     lib/ncurses/ncurses \
     lib/ncurses/ncursesw \
     ${_share} \
     usr.bin/awk \
     lib/libmagic \
     usr.bin/mkesdb_static \
     usr.bin/mkcsmapper_static \
     usr.bin/vi/catalog
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \
 		cd ${.CURDIR}/${_tool} && \
 		${MAKE} DIRPRFX=${_tool}/ obj && \
 		${MAKE} DIRPRFX=${_tool}/ build-tools
 .endfor
 .for _tool in \
     ${_gcc_tools}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \
 		cd ${.CURDIR}/${_tool} && \
 		${MAKE} DIRPRFX=${_tool}/ obj && \
 		${MAKE} DIRPRFX=${_tool}/ depend && \
 		${MAKE} DIRPRFX=${_tool}/ all
 .endfor
-.for _tool in \
-    ${_texinfo}
-	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
-		cd ${.CURDIR}/${_tool} && \
-		${MAKE} DIRPRFX=${_tool}/ obj && \
-		${MAKE} DIRPRFX=${_tool}/ depend && \
-		${MAKE} DIRPRFX=${_tool}/ all && \
-		${MAKE} DIRPRFX=${_tool}/ install DESTDIR=${WORLDTMP}
-.endfor
 
-
 #
 # kernel-tools: Build kernel-building tools
 #
 kernel-tools: .MAKE
 	mkdir -p ${MAKEOBJDIRPREFIX}/usr
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${MAKEOBJDIRPREFIX}/usr >/dev/null
 
 #
 # cross-tools: Build cross-building tools
 #
 .if ${TARGET_ARCH} != ${MACHINE_ARCH}
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 _btxld=		usr.sbin/btxld
 .endif
 .endif
 .if ${TARGET_ARCH} != ${MACHINE_ARCH}
 .if ${MK_RESCUE} != "no" || defined(RELEASEDIR)
 _crunchide=	usr.sbin/crunch/crunchide
 .endif
 .if ${TARGET_ARCH} == "i386" && defined(RELEASEDIR)
 _kgzip=		usr.sbin/kgzip
 .endif
 .endif
 
 # If we're given an XAS, don't build binutils.
 .if ${XAS:M/*} == ""
 .if ${MK_BINUTILS_BOOTSTRAP} != "no"
 _binutils=	gnu/usr.bin/binutils
 .endif
 .if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
 _elftctools=	lib/libelftc \
 		usr.bin/addr2line \
 		usr.bin/elfcopy \
 		usr.bin/nm \
 		usr.bin/size \
 		usr.bin/strings
 .endif
 .endif
 
 # If an full path to an external cross compiler is given, don't build
 # a cross compiler.
 .if ${XCC:M/*} == "" && ${MK_CROSS_COMPILER} != "no"
 .if ${MK_CLANG_BOOTSTRAP} != "no"
 _clang=		usr.bin/clang
 _clang_libs=	lib/clang
 .endif
 .if ${MK_GCC_BOOTSTRAP} != "no"
 _cc=		gnu/usr.bin/cc
 .endif
 .endif
 
 cross-tools: .MAKE
 .for _tool in \
     ${_clang_libs} \
     ${_clang} \
     ${_binutils} \
     ${_elftctools} \
     ${_cc} \
     usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \
     ${_btxld} \
     ${_crunchide} \
     ${_kgzip} \
     sys/boot/usb/tools
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool} && \
 		${MAKE} DIRPRFX=${_tool}/ obj && \
 		${MAKE} DIRPRFX=${_tool}/ depend && \
 		${MAKE} DIRPRFX=${_tool}/ all && \
 		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
 .endfor
 
 NXBENV=		MAKEOBJDIRPREFIX=${OBJTREE}/nxb \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		VERSION="${VERSION}"
 NXBMAKE=	${NXBENV} ${MAKE} \
 		TBLGEN=${OBJTREE}/nxb-bin/usr/bin/tblgen \
 		CLANG_TBLGEN=${OBJTREE}/nxb-bin/usr/bin/clang-tblgen \
 		MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \
 		MK_GDB=no MK_TESTS=no \
 		SSP_CFLAGS= \
-		MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \
+		MK_HTML=no NO_LINT=yes MK_MAN=no \
 		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
 		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 		MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
 		MK_LLDB=no
 
 native-xtools: .MAKE
 	mkdir -p ${OBJTREE}/nxb-bin/bin
 	mkdir -p ${OBJTREE}/nxb-bin/sbin
 	mkdir -p ${OBJTREE}/nxb-bin/usr
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${OBJTREE}/nxb-bin/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${OBJTREE}/nxb-bin/usr/include >/dev/null
 .for _tool in \
     bin/cat \
     bin/chmod \
     bin/cp \
     bin/csh \
     bin/echo \
     bin/expr \
     bin/hostname \
     bin/ln \
     bin/ls \
     bin/mkdir \
     bin/mv \
     bin/ps \
     bin/realpath \
     bin/rm \
     bin/rmdir \
     bin/sh \
     bin/sleep \
     ${_clang_tblgen} \
     usr.bin/ar \
     ${_binutils} \
     ${_elftctools} \
     ${_cc} \
     ${_gcc_tools} \
     ${_clang_libs} \
     ${_clang} \
     sbin/md5 \
     sbin/sysctl \
     gnu/usr.bin/diff \
     usr.bin/awk \
     usr.bin/basename \
     usr.bin/bmake \
     usr.bin/bzip2 \
     usr.bin/cmp \
     usr.bin/dirname \
     usr.bin/env \
     usr.bin/fetch \
     usr.bin/find \
     usr.bin/grep \
     usr.bin/gzip \
     usr.bin/id \
     usr.bin/lex \
     usr.bin/lorder \
     usr.bin/mktemp \
     usr.bin/mt \
     usr.bin/patch \
     usr.bin/sed \
     usr.bin/sort \
     usr.bin/tar \
     usr.bin/touch \
     usr.bin/tr \
     usr.bin/true \
     usr.bin/uniq \
     usr.bin/unzip \
     usr.bin/xargs \
     usr.bin/xinstall \
     usr.bin/xz \
     usr.bin/yacc \
     usr.sbin/chown
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool} && \
 		${NXBMAKE} DIRPRFX=${_tool}/ obj && \
 		${NXBMAKE} DIRPRFX=${_tool}/ depend && \
 		${NXBMAKE} DIRPRFX=${_tool}/ all && \
 		${NXBMAKE} DIRPRFX=${_tool}/ DESTDIR=${OBJTREE}/nxb-bin install
 .endfor
 
 #
 # hierarchy - ensure that all the needed directories are present
 #
 hierarchy hier: .MAKE
 	cd ${.CURDIR}/etc && ${HMAKE} distrib-dirs
 
 #
 # libraries - build all libraries, and install them under ${DESTDIR}.
 #
 # The list of libraries with dependents (${_prebuild_libs}) and their
 # interdependencies (__L) are built automatically by the
 # ${.CURDIR}/tools/make_libdeps.sh script.
 #
 libraries: .MAKE
 	cd ${.CURDIR} && \
 	    ${MAKE} -f Makefile.inc1 _prereq_libs && \
 	    ${MAKE} -f Makefile.inc1 _startup_libs && \
 	    ${MAKE} -f Makefile.inc1 _prebuild_libs && \
 	    ${MAKE} -f Makefile.inc1 _generic_libs
 
 #
 # static libgcc.a prerequisite for shared libc
 #
 _prereq_libs= gnu/lib/libssp/libssp_nonshared gnu/lib/libgcc lib/libcompiler_rt
 
 # These dependencies are not automatically generated:
 #
 # gnu/lib/csu, gnu/lib/libgcc, lib/csu and lib/libc must be built before
 # all shared libraries for ELF.
 #
 _startup_libs=	gnu/lib/csu
 .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf)
 _startup_libs+=	lib/csu/${MACHINE_ARCH}-elf
 .elif exists(${.CURDIR}/lib/csu/${MACHINE_ARCH})
 _startup_libs+=	lib/csu/${MACHINE_ARCH}
 .else
 _startup_libs+=	lib/csu/${MACHINE_CPUARCH}
 .endif
 _startup_libs+=	gnu/lib/libgcc
 _startup_libs+=	lib/libcompiler_rt
 _startup_libs+=	lib/libc
 _startup_libs+=	lib/libc_nonshared
 .if ${MK_LIBCPLUSPLUS} != "no"
 _startup_libs+=	lib/libcxxrt
 .endif
 
 gnu/lib/libgcc__L: lib/libc__L
 gnu/lib/libgcc__L: lib/libc_nonshared__L
 .if ${MK_LIBCPLUSPLUS} != "no"
 lib/libcxxrt__L: gnu/lib/libgcc__L
 .endif
 
 _prebuild_libs=	${_kerberos5_lib_libasn1} \
 		${_kerberos5_lib_libhdb} \
 		${_kerberos5_lib_libheimbase} \
 		${_kerberos5_lib_libheimntlm} \
 		${_kerberos5_lib_libheimsqlite} \
 		${_kerberos5_lib_libheimipcc} \
 		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
 		${_kerberos5_lib_libroken} \
 		${_kerberos5_lib_libwind} \
 		lib/libbz2 ${_libcom_err} lib/libcrypt \
 		lib/libelf lib/libexpat \
 		lib/libfigpar \
 		${_lib_libgssapi} \
 		lib/libkiconv lib/libkvm lib/liblzma lib/libmd lib/libnv \
 		${_lib_libcapsicum} \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
 		lib/libopie lib/libpam ${_lib_libthr} \
 		lib/libradius lib/libsbuf lib/libtacplus \
 		lib/libgeom \
 		${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
 		${_cddl_lib_libuutil} \
 		${_cddl_lib_libavl} \
 		${_cddl_lib_libzfs_core} \
 		${_cddl_lib_libctf} \
 		lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_lib_libldns} \
 		${_secure_lib_libssh} ${_secure_lib_libssl} \
 		gnu/lib/libdialog
 .if ${MK_GNUCXX} != "no"
 _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++
 gnu/lib/libstdc++__L: lib/msun__L
 gnu/lib/libsupc++__L: gnu/lib/libstdc++__L
 .endif
 
 lib/libgeom__L: lib/libexpat__L
 
 .if ${MK_LIBTHR} != "no"
 _lib_libthr=	lib/libthr
 .endif
 
 .if ${MK_OFED} != "no"
 _ofed_lib=	contrib/ofed/usr.lib/
 .endif
 
 .if ${MK_CASPER} != "no"
 _lib_libcapsicum=lib/libcapsicum
 .endif
 
 lib/libcapsicum__L: lib/libnv__L
 lib/libpjdlog__L: lib/libutil__L
 
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
 .for _DIR in ${LOCAL_LIB_DIRS}
 .if exists(${.CURDIR}/${_DIR}/Makefile)
 _generic_libs+= ${_DIR}
 .endif
 .endfor
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L
 
 .if ${MK_CDDL} != "no"
 _cddl_lib_libumem= cddl/lib/libumem
 _cddl_lib_libnvpair= cddl/lib/libnvpair
 _cddl_lib_libavl= cddl/lib/libavl
 _cddl_lib_libuutil= cddl/lib/libuutil
 _cddl_lib_libzfs_core= cddl/lib/libzfs_core
 _cddl_lib_libctf= cddl/lib/libctf
 _cddl_lib= cddl/lib
 cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L
 cddl/lib/libzfs__L: lib/libgeom__L
 cddl/lib/libctf__L: lib/libz__L
 .endif
 
 .if ${MK_CRYPT} != "no"
 .if ${MK_OPENSSL} != "no"
 _secure_lib_libcrypto= secure/lib/libcrypto
 _secure_lib_libssl= secure/lib/libssl
 lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
 .if ${MK_LDNS} != "no"
 _lib_libldns= lib/libldns
 lib/libldns__L: secure/lib/libcrypto__L
 .endif
 .if ${MK_OPENSSH} != "no"
 _secure_lib_libssh= secure/lib/libssh
 secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
 .if ${MK_LDNS} != "no"
 secure/lib/libssh__L: lib/libldns__L
 .endif
 .if ${MK_KERBEROS_SUPPORT} != "no"
 secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
     kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
     lib/libmd__L kerberos5/lib/libroken__L
 .endif
 .endif
 .endif
 _secure_lib=	secure/lib
 .endif
 
 .if ${MK_KERBEROS} != "no"
 kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L
 kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
     kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L \
     kerberos5/lib/libwind__L kerberos5/lib/libheimsqlite__L 
 kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L \
     kerberos5/lib/libroken__L lib/libcom_err__L
 kerberos5/lib/libhx509__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
     secure/lib/libcrypto__L kerberos5/lib/libroken__L kerberos5/lib/libwind__L
 kerberos5/lib/libkrb5__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
     lib/libcrypt__L secure/lib/libcrypto__L kerberos5/lib/libhx509__L \
     kerberos5/lib/libroken__L kerberos5/lib/libwind__L \
     kerberos5/lib/libheimbase__L kerberos5/lib/libheimipcc__L
 kerberos5/lib/libroken__L: lib/libcrypt__L
 kerberos5/lib/libwind__L: kerberos5/lib/libroken__L lib/libcom_err__L
 kerberos5/lib/libheimbase__L: lib/libthr__L
 kerberos5/lib/libheimipcc__L: kerberos5/lib/libroken__L kerberos5/lib/libheimbase__L lib/libthr__L
 kerberos5/lib/libheimsqlite__L: lib/libthr__L
 .endif
 
 .if ${MK_GSSAPI} != "no"
 _lib_libgssapi=	lib/libgssapi
 .endif
 
 .if ${MK_KERBEROS} != "no"
 _kerberos5_lib=	kerberos5/lib
 _kerberos5_lib_libasn1= kerberos5/lib/libasn1
 _kerberos5_lib_libhdb= kerberos5/lib/libhdb
 _kerberos5_lib_libheimbase= kerberos5/lib/libheimbase
 _kerberos5_lib_libkrb5= kerberos5/lib/libkrb5
 _kerberos5_lib_libhx509= kerberos5/lib/libhx509
 _kerberos5_lib_libroken= kerberos5/lib/libroken
 _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm
 _kerberos5_lib_libheimsqlite= kerberos5/lib/libheimsqlite
 _kerberos5_lib_libheimipcc= kerberos5/lib/libheimipcc
 _kerberos5_lib_libwind= kerberos5/lib/libwind
 _libcom_err= lib/libcom_err
 .endif
 
 .if ${MK_NIS} != "no"
 _lib_libypclnt=	lib/libypclnt
 .endif
 
 .if ${MK_OPENSSL} == "no"
 lib/libradius__L: lib/libmd__L
 .endif
 
 gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L
 
 .for _lib in ${_prereq_libs}
 ${_lib}__PL: .PHONY .MAKE
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_lib} && \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj && \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend && \
 		${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \
 		    DIRPRFX=${_lib}/ all && \
 		${MAKE} MK_TESTS=no MK_PROFILE=no -DNO_PIC \
 		    DIRPRFX=${_lib}/ install
 .endif
 .endfor
 
 .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
 ${_lib}__L: .PHONY .MAKE
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_lib} && \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ obj && \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ depend && \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ all && \
 		${MAKE} MK_TESTS=no DIRPRFX=${_lib}/ install
 .endif
 .endfor
 
 # libpam is special: we need to build static PAM modules before
 # static PAM library, and dynamic PAM library before dynamic PAM
 # modules.
 lib/libpam__L: .PHONY .MAKE
 	${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
 		cd ${.CURDIR}/lib/libpam && \
 		${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ obj && \
 		${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ depend && \
 		${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ \
 		    -D_NO_LIBPAM_SO_YET all && \
 		${MAKE} MK_TESTS=no DIRPRFX=lib/libpam/ \
 		    -D_NO_LIBPAM_SO_YET install
 
 _prereq_libs: ${_prereq_libs:S/$/__PL/}
 _startup_libs: ${_startup_libs:S/$/__L/}
 _prebuild_libs: ${_prebuild_libs:S/$/__L/}
 _generic_libs: ${_generic_libs:S/$/__L/}
 
 .for __target in all clean cleandepend cleandir depend includes obj
 .for entry in ${SUBDIR}
 ${entry}.${__target}__D: .PHONY .MAKE
 	${_+_}@set -e; if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \
 		${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE_ARCH} (${__target})"; \
 		edir=${entry}.${MACHINE_ARCH}; \
 		cd ${.CURDIR}/$${edir}; \
 	else \
 		${ECHODIR} "===> ${DIRPRFX}${entry} (${__target})"; \
 		edir=${entry}; \
 		cd ${.CURDIR}/$${edir}; \
 	fi; \
 	${MAKE} ${__target} DIRPRFX=${DIRPRFX}$${edir}/
 .endfor
 par-${__target}: ${SUBDIR:S/$/.${__target}__D/}
 .endfor
 
 .include <bsd.subdir.mk>
 
 .if make(check-old) || make(check-old-dirs) || \
     make(check-old-files) || make(check-old-libs) || \
     make(delete-old) || make(delete-old-dirs) || \
     make(delete-old-files) || make(delete-old-libs)
 
 #
 # check for / delete old files section
 #
 
 .include "ObsoleteFiles.inc"
 
 OLD_LIBS_MESSAGE="Please be sure no application still uses those libraries, \
 else you can not start such an application. Consult UPDATING for more \
 information regarding how to cope with the removal/revision bump of a \
 specific library."
 
 .if !defined(BATCH_DELETE_OLD_FILES)
 RM_I=-i
 .else
 RM_I=-v
 .endif
 
 delete-old-files:
 	@echo ">>> Removing old files (only deletes safe to delete libs)"
 # Ask for every old file if the user really wants to remove it.
 # It's annoying, but better safe than sorry.
 # NB: We cannot pass the list of OLD_FILES as a parameter because the
 # argument list will get too long. Using .for/.endfor make "loops" will make
 # the Makefile parser segfault.
 	@exec 3<&0; \
 	cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \
 	while read file; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
 			chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \
 			rm ${RM_I} "${DESTDIR}/$${file}" <&3; \
 		fi; \
 	done
 # Remove catpages without corresponding manpages.
 	@exec 3<&0; \
 	find ${DESTDIR}/usr/share/man/cat* ! -type d | \
 	sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \
 	while read catpage; do \
 		read manpage; \
 		if [ ! -e "$${manpage}" ]; then \
 			rm ${RM_I} $${catpage} <&3; \
 	        fi; \
 	done
 	@echo ">>> Old files removed"
 
 check-old-files:
 	@echo ">>> Checking for old files"
 	@cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \
 	while read file; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
 		 	echo "${DESTDIR}/$${file}"; \
 		fi; \
 	done
 # Check for catpages without corresponding manpages.
 	@find ${DESTDIR}/usr/share/man/cat* ! -type d | \
 	sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \
 	while read catpage; do \
 		read manpage; \
 		if [ ! -e "$${manpage}" ]; then \
 			echo $${catpage}; \
 	        fi; \
 	done
 
 delete-old-libs:
 	@echo ">>> Removing old libraries"
 	@echo "${OLD_LIBS_MESSAGE}" | fmt
 	@exec 3<&0; \
 	cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_LIBS | xargs -n1 | \
 	while read file; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
 			chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \
 			rm ${RM_I} "${DESTDIR}/$${file}" <&3; \
 		fi; \
 		for ext in debug symbols; do \
 		  if ! [ -e "${DESTDIR}/$${file}" ] && [ -f \
 		      "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \
 			  rm ${RM_I} "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" \
 			      <&3; \
 		  fi; \
 		done; \
 	done
 	@echo ">>> Old libraries removed"
 
 check-old-libs:
 	@echo ">>> Checking for old libraries"
 	@cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_LIBS | xargs -n1 | \
 	while read file; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
 			echo "${DESTDIR}/$${file}"; \
 		fi; \
 		for ext in debug symbols; do \
 		  if [ -f "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \
 			  echo "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}"; \
 		  fi; \
 		done; \
 	done
 
 delete-old-dirs:
 	@echo ">>> Removing old directories"
 	@cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_DIRS | xargs -n1 | sort -r | \
 	while read dir; do \
 		if [ -d "${DESTDIR}/$${dir}" ]; then \
 			rmdir -v "${DESTDIR}/$${dir}" || true; \
 		elif [ -L "${DESTDIR}/$${dir}" ]; then \
 			echo "${DESTDIR}/$${dir} is a link, please remove everything manually."; \
 		fi; \
 	done
 	@echo ">>> Old directories removed"
 
 check-old-dirs:
 	@echo ">>> Checking for old directories"
 	@cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_DIRS | xargs -n1 | \
 	while read dir; do \
 		if [ -d "${DESTDIR}/$${dir}" ]; then \
 			echo "${DESTDIR}/$${dir}"; \
 		elif [ -L "${DESTDIR}/$${dir}" ]; then \
 			echo "${DESTDIR}/$${dir} is a link, please remove everything manually."; \
 		fi; \
 	done
 
 delete-old: delete-old-files delete-old-dirs
 	@echo "To remove old libraries run '${MAKE} delete-old-libs'."
 
 check-old: check-old-files check-old-libs check-old-dirs
 	@echo "To remove old files and directories run '${MAKE} delete-old'."
 	@echo "To remove old libraries run '${MAKE} delete-old-libs'."
 
 .endif
 
 #
 # showconfig - show build configuration.
 #
 showconfig:
 	@(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1; \
 	  ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1) 2>&1 | grep ^MK_ | sort -u
 
 .if !empty(KRNLOBJDIR) && !empty(KERNCONF)
 DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/
 
 .if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
 .if exists(${KERNCONFDIR}/${KERNCONF})
 FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/ {print $$2}' \
 	'${KERNCONFDIR}/${KERNCONF}' ; echo
 .endif
 .endif
 
 .endif
 
 .if !defined(DTBOUTPUTPATH) || !exists(${DTBOUTPUTPATH})
 DTBOUTPUTPATH= ${.CURDIR}
 .endif
 
 #
 # Build 'standalone' Device Tree Blob
 #
 builddtb:
 	@PATH=${TMPPATH} MACHINE=${TARGET} \
 	${.CURDIR}/sys/tools/fdt/make_dtb.sh ${.CURDIR}/sys \
 	    "${FDT_DTS_FILE}" ${DTBOUTPUTPATH}
 
 ###############
 
 .if defined(TARGET) && defined(TARGET_ARCH)
 
 .if ${TARGET} == ${MACHINE} && ${TARGET_ARCH} == ${MACHINE_ARCH}
 XDEV_CPUTYPE?=${CPUTYPE}
 .else
 XDEV_CPUTYPE?=${TARGET_CPUTYPE}
 .endif
 
-NOFUN=-DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT \
+NOFUN=-DNO_FSCHG MK_HTML=no -DNO_LINT \
 	MK_MAN=no MK_NLS=no MK_PROFILE=no \
 	MK_KERBEROS=no MK_RESCUE=no MK_TESTS=no MK_WARNS=no \
 	TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 	CPUTYPE=${XDEV_CPUTYPE}
 
 XDDIR=${TARGET_ARCH}-freebsd
 XDTP?=/usr/${XDDIR}
 .if ${XDTP:N/*}
 .error XDTP variable should be an absolute path
 .endif
 
 CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \
 	INSTALL="sh ${.CURDIR}/tools/install.sh"
 CDENV= ${CDBENV} \
 	_SHLIBDIRPREFIX=${XDDESTDIR} \
 	TOOLS_PREFIX=${XDTP}
 CD2CFLAGS=-isystem ${XDDESTDIR}/usr/include -L${XDDESTDIR}/usr/lib \
 	--sysroot=${XDDESTDIR}/ -B${XDDESTDIR}/usr/libexec \
 	-B${XDDESTDIR}/usr/bin -B${XDDESTDIR}/usr/lib
 CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CXX="${CXX} ${CD2CFLAGS}" \
 	CPP="${CPP} ${CD2CFLAGS}" \
 	MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}
 
 CDTMP=	${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp
 CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
 CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN}
 XDDESTDIR=${DESTDIR}/${XDTP}
 .if !defined(OSREL)
 OSREL!= uname -r | sed -e 's/[-(].*//'
 .endif
 
 .ORDER: xdev-build xdev-install xdev-links
 xdev: xdev-build xdev-install
 
 .ORDER: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools
 xdev-build: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools
 
 _xb-worldtmp:
 	mkdir -p ${CDTMP}/usr
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${CDTMP}/usr >/dev/null
 
 _xb-bootstrap-tools:
 .for _tool in \
     ${_clang_tblgen} \
     ${_gperf}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 	cd ${.CURDIR}/${_tool} && \
 	${CDMAKE} DIRPRFX=${_tool}/ obj && \
 	${CDMAKE} DIRPRFX=${_tool}/ depend && \
 	${CDMAKE} DIRPRFX=${_tool}/ all && \
 	${CDMAKE} DIRPRFX=${_tool}/ DESTDIR=${CDTMP} install
 .endfor
 
 _xb-build-tools:
 	${_+_}@cd ${.CURDIR}; \
 	${CDBENV} ${MAKE} -f Makefile.inc1 ${NOFUN} build-tools
 
 _xb-cross-tools:
 .for _tool in \
     ${_binutils} \
     ${_elftctools} \
     usr.bin/ar \
     ${_clang_libs} \
     ${_clang} \
     ${_cc}
 	${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \
 	cd ${.CURDIR}/${_tool} && \
 	${CDMAKE} DIRPRFX=${_tool}/ obj && \
 	${CDMAKE} DIRPRFX=${_tool}/ depend && \
 	${CDMAKE} DIRPRFX=${_tool}/ all
 .endfor
 
 _xi-mtree:
 	${_+_}@${ECHODIR} "mtree populating ${XDDESTDIR}"
 	mkdir -p ${XDDESTDIR}
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \
 	    -p ${XDDESTDIR} >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${XDDESTDIR}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${XDDESTDIR}/usr/include >/dev/null
 .if ${MK_TESTS} != "no"
 	mkdir -p ${XDDESTDIR}${TESTSBASE}
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
 	    -p ${XDDESTDIR}${TESTSBASE} >/dev/null
 .endif
 
 .ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries
 xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries
 
 _xi-cross-tools:
 	@echo "_xi-cross-tools"
 .for _tool in \
     ${_binutils} \
     ${_elftctools} \
     usr.bin/ar \
     ${_clang_libs} \
     ${_clang} \
     ${_cc}
 	${_+_}@${ECHODIR} "===> xdev ${_tool} (install)"; \
 	cd ${.CURDIR}/${_tool}; \
 	${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${XDDESTDIR}
 .endfor
 
 _xi-includes:
 	${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 par-includes \
 		DESTDIR=${XDDESTDIR}
 
 _xi-libraries:
 	${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries \
 		DESTDIR=${XDDESTDIR}
 
 xdev-links:
 	${_+_}cd ${XDDESTDIR}/usr/bin; \
 	mkdir -p ../../../../usr/bin; \
 		for i in *; do \
 			ln -sf ../../${XDTP}/usr/bin/$$i \
 			    ../../../../usr/bin/${XDDIR}-$$i; \
 			ln -sf ../../${XDTP}/usr/bin/$$i \
 			    ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \
 		done
 .else
 xdev xdev-build xdev-install xdev-links:
 	@echo "*** Error: Both TARGET and TARGET_ARCH must be defined for \"${.TARGET}\" target"
 .endif
Index: head/ObsoleteFiles.inc
===================================================================
--- head/ObsoleteFiles.inc	(revision 276550)
+++ head/ObsoleteFiles.inc	(revision 276551)
@@ -1,6716 +1,6748 @@
 #
 # $FreeBSD$
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
 # removed entries first (with the date as a comment). Dynamic libraries are
 # special cased (OLD_LIBS). Static libraries or the generic links to
 # the dynamic libraries (lib*.so) should (if you don't know why to make an
 # exception, make this a "must") be viewed as normal files (OLD_FILES).
 #
 # In case of a complete directory hierarchy the sorting is in depth first
 # order.
 #
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 # Before you commit changes to this file please check if any entries in
 # tools/build/mk/OptionalObsoleteFiles.inc can be removed. The following
 # command tells which files are listed more than once regardless of some
 # architecture specific conditionals, so you can not blindly trust the
 # output:
 # ( grep '+=' /usr/src/ObsoleteFiles.inc | sort -u ; \
 # grep '+=' /usr/src/tools/build/mk/OptionalObsoleteFiles.inc | sort -u) | \
 # sort | uniq -d
 #
 # To find regular duplicates not dependant on optional components, you can
 # also use something that will not give you false positives, e.g.:
 # for t in `make -V TARGETS universe`; do
 #   __MAKE_CONF=/dev/null make -f Makefile.inc1 TARGET=$t \
 #   -V OLD_FILES -V OLD_LIBS -V OLD_DIRS check-old | \
 #   xargs -n1 | sort | uniq -d;
 # done
 #
 # For optional components, you can use the following to see if some entries
 # in OptionalObsoleteFiles.inc have been obsoleted by ObsoleteFiles.inc
 # for o in tools/build/options/WITH*; do
 #   __MAKE_CONF=/dev/null make -f Makefile.inc1 -D${o##*/} \
 #   -V OLD_FILES -V OLD_LIBS -V OLD_DIRS check-old | \
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20150103: removal of texinfo
+OLD_FILES+=usr/bin/info
+OLD_FILES+=usr/bin/infokey
+OLD_FILES+=usr/bin/install-info
+OLD_FILES+=usr/bin/makeinfo
+OLD_FILES+=usr/bin/texindex
+OLD_FILES+=usr/share/info/am-utils.info.gz
+OLD_FILES+=usr/share/info/as-utils.info.gz
+OLD_FILES+=usr/share/info/binutils.info.gz
+OLD_FILES+=usr/share/info/com_err.info.gz
+OLD_FILES+=usr/share/info/diff.info.gz
+OLD_FILES+=usr/share/info/gdb.info.gz
+OLD_FILES+=usr/share/info/gdbint.info.gz
+OLD_FILES+=usr/share/info/gperf.info.gz
+OLD_FILES+=usr/share/info/grep.info.gz
+OLD_FILES+=usr/share/info/groff.info.gz
+OLD_FILES+=usr/share/info/heimdal.info.gz
+OLD_FILES+=usr/share/info/history.info.gz
+OLD_FILES+=usr/share/info/info-stnd.info.gz
+OLD_FILES+=usr/share/info/info.info.gz
+OLD_FILES+=usr/share/info/ld.info.gz
+OLD_FILES+=usr/share/info/regex.info.gz
+OLD_FILES+=usr/share/info/rluserman.info.gz
+OLD_FILES+=usr/share/info/stabs.info.gz
+OLD_FILES+=usr/share/info/texinfo.info.gz
+OLD_FILES+=usr/share/man/man1/info.1.gz
+OLD_FILES+=usr/share/man/man1/infokey.1.gz
+OLD_FILES+=usr/share/man/man1/install-info.1.gz
+OLD_FILES+=usr/share/man/man1/makeinfo.1.gz
+OLD_FILES+=usr/share/man/man1/texindex.1.gz
+OLD_FILES+=usr/share/man/man5/info.5.gz
+OLD_FILES+=usr/share/man/man5/texinfo.5.gz
 # 20141231: new clang import which bumps version from 3.4.1 to 3.5.0.
 OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.4.1/altivec.h
 OLD_FILES+=usr/include/clang/3.4.1/ammintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/arm_neon.h
 OLD_FILES+=usr/include/clang/3.4.1/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/avxintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/cpuid.h
 OLD_FILES+=usr/include/clang/3.4.1/emmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/immintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.4.1/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.4.1/mmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/module.map
 OLD_FILES+=usr/include/clang/3.4.1/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/shaintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/smmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/tbmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/x86intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.4.1
 # 20141226: Remove gpib/ieee488
 OLD_FILES+=usr/include/dev/ieee488/ibfoo_int.h
 OLD_FILES+=usr/include/dev/ieee488/tnt4882.h
 OLD_FILES+=usr/include/dev/ieee488/ugpib.h
 OLD_FILES+=usr/include/dev/ieee488/upd7210.h
 OLD_DIRS+=usr/include/dev/ieee488
 OLD_FILES+=usr/include/gpib/gpib.h
 OLD_DIRS+=usr/include/gpib
 OLD_FILES+=usr/lib/libgpib.a
 OLD_FILES+=usr/lib/libgpib_p.a
 OLD_FILES+=usr/lib/libgpib.so
 OLD_LIBS+=usr/lib/libgpib.so.3
 OLD_FILES+=usr/lib/libgpib_p.a
 OLD_FILES+=share/man/man4/pcii.4.gz
 OLD_FILES+=share/man/man4/gpib.4.gz
 OLD_FILES+=share/man/man4/tnt4882.4.gz
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libgpib.a
 OLD_FILES+=usr/lib32/libgpib_p.a
 OLD_FILES+=usr/lib32/libgpib.so
 OLD_LIBS+=usr/lib32/libgpib.so.3
 .endif
 
 # 20141224: libxo moved to /lib
 OLD_LIBS+=usr/lib/libxo.so.0
 # 20141223: remove in6_gif.h, in_gif.h and if_stf.h
 OLD_FILES+=usr/include/net/if_stf.h
 OLD_FILES+=usr/include/netinet/in_gif.h
 OLD_FILES+=usr/include/netinet6/in6_gif.h
 # 20141202: update to mandoc CVS 20141201
 OLD_FILES+=usr.bin/preconv
 OLD_FILES+=share/man/man1/preconv.1.gz
 # 20141129: mrouted rc.d scripts removed from base
 OLD_FILES+=etc/rc.d/mrouted
 # 20141126: convert sbin/mdconfig/tests to ATF format tests
 OLD_FILES+=usr/tests/sbin/mdconfig/legacy_test
 OLD_FILES+=usr/tests/sbin/mdconfig/mdconfig.test
 OLD_FILES+=usr/tests/sbin/mdconfig/run.pl
 # 20141126: remove xform_ipip decapsulation fallback
 OLD_FILES+=usr/include/netipsec/ipip_var.h
 # 20141109: faith/faithd removal
 OLD_FILES+=etc/rc.d/faith
 OLD_FILES+=usr/share/man/man4/faith.4.gz
 OLD_FILES+=usr/share/man/man4/if_faith.4.gz
 OLD_FILES+=usr/sbin/faithd
 OLD_FILES+=usr/share/man/man8/faithd.8.gz
 # 20141107: overhaul if_gre(4)
 OLD_FILES+=usr/include/netinet/ip_gre.h
 # 20141102: postrandom obsoleted by new /dev/random code
 OLD_FILES+=etc/rc.d/postrandom
 # 20141031: initrandom obsoleted by new /dev/random code
 OLD_FILES+=etc/rc.d/initrandom
 # 20141028: debug files accidentally installed as directory name
 OLD_FILES+=usr/lib/debug/usr/lib/i18n
 OLD_FILES+=usr/lib/debug/usr/lib/private
 OLD_FILES+=usr/lib/debug/usr/lib32/i18n
 OLD_FILES+=usr/lib/debug/usr/lib32/private
 # 20141015: OpenSSL 1.0.1j import
 OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz
 # 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed
 OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz
 OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz
 # 20140917: hv_kvpd rc.d script removed in favor of devd configuration
 OLD_FILES+=etc/rc.d/hv_kvpd
 # 20140917: libnv was accidentally being installed to /usr/lib instead of /lib
 OLD_LIBS+=usr/lib/libnv.so.0
 # 20140829: rc.d/kerberos removed
 OLD_FILES+=etc/rc.d/kerberos
 # 20140814: libopie version bump
 OLD_LIBS+=usr/lib/libopie.so.7
 OLD_LIBS+=usr/lib32/libopie.so.7
 # 20140811: otp-sha renamed to otp-sha1
 OLD_FILES+=usr/bin/otp-sha
 OLD_FILES+=usr/share/man/man1/otp-sha.1.gz
 # 20140807: Remove private lib files that should not be installed.
 OLD_FILES+=usr/lib/private/libatf-c.a
 OLD_FILES+=usr/lib/private/libatf-c.so
 OLD_FILES+=usr/lib/private/libatf-c_p.a
 OLD_FILES+=usr/lib/private/libatf-c++.a
 OLD_FILES+=usr/lib/private/libatf-c++.so
 OLD_FILES+=usr/lib/private/libatf-c++_p.a
 OLD_FILES+=usr/lib/private/libbsdstat.a
 OLD_FILES+=usr/lib/private/libbsdstat.so
 OLD_FILES+=usr/lib/private/libbsdstat_p.a
 OLD_FILES+=usr/lib/private/libheimipcc.a
 OLD_FILES+=usr/lib/private/libheimipcc.so
 OLD_FILES+=usr/lib/private/libheimipcc_p.a
 OLD_FILES+=usr/lib/private/libheimipcs.a
 OLD_FILES+=usr/lib/private/libheimipcs.so
 OLD_FILES+=usr/lib/private/libheimipcs_p.a
 OLD_FILES+=usr/lib/private/libldns.a
 OLD_FILES+=usr/lib/private/libldns.so
 OLD_FILES+=usr/lib/private/libldns_p.a
 OLD_FILES+=usr/lib/private/libssh.a
 OLD_FILES+=usr/lib/private/libssh.so
 OLD_FILES+=usr/lib/private/libssh.p.a
 OLD_FILES+=usr/lib/private/libunbound.a
 OLD_FILES+=usr/lib/private/libunbound.so
 OLD_FILES+=usr/lib/private/libunbound_p.a
 OLD_FILES+=usr/lib/private/libucl.a
 OLD_FILES+=usr/lib/private/libucl.so
 OLD_FILES+=usr/lib/private/libucl_p.a
 # 20140803: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/pmap_change_wiring.9.gz
 # 20140728: libsbuf restored to old version.
 OLD_LIBS+=lib/libsbuf.so.7
 # 20140728: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/VOP_GETVOBJECT.9.gz
 OLD_FILES+=usr/share/man/man9/VOP_CREATEVOBJECT.9.gz
 OLD_FILES+=usr/share/man/man9/VOP_DESTROYVOBJECT.9.gz
 # 20140723: renamed to PCBGROUP.9
 OLD_FILES+=usr/share/man/man9/PCBGROUPS.9.gz
 # 20140718: Remove obsolete man pages
 OLD_FILES+=usr/share/man/man9/zero_copy.9.gz
 OLD_FILES+=usr/share/man/man9/zero_copy_sockets.9.gz
 # 20140718: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/pmap_page_protect.9.gz
 # 20140717: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/pmap_clear_reference.9.gz
 # 20140716: Remove an incorrectly named man page
 OLD_FILES+=usr/share/man/man9/pmap_ts_modified.9.gz
 # 20140712: Removal of bsd.dtrace.mk
 OLD_FILES+=usr/share/mk/bsd.dtrace.mk
 # 20140705: turn libreadline into an internal lib
 OLD_LIBS+=lib/libreadline.so.8
 OLD_FILES+=usr/lib/libreadline.a
 OLD_FILES+=usr/lib/libreadline_p.a
 OLD_FILES+=usr/lib/libreadline.so
 OLD_FILES+=usr/lib/libhistory.a
 OLD_FILES+=usr/lib/libhistory_p.a
 OLD_FILES+=usr/lib/libhistory.so
 OLD_LIBS+=usr/lib/libhistory.so.8
 OLD_FILES+=usr/include/readline/chardefs.h
 OLD_FILES+=usr/include/readline/history.h
 OLD_FILES+=usr/include/readline/keymaps.h
 OLD_FILES+=usr/include/readline/readline.h
 OLD_FILES+=usr/include/readline/tilde.h
 OLD_FILES+=usr/include/readline/rlconf.h
 OLD_FILES+=usr/include/readline/rlstdc.h
 OLD_FILES+=usr/include/readline/rltypedefs.h
 OLD_FILES+=usr/include/readline/rltypedefs.h
 OLD_DIRS+=usr/include/readline
 OLD_FILES+=usr/share/info/readline.info.gz
 OLD_FILES+=usr/share/man/man3/readline.3.gz
 # 20140625: csup removal
 OLD_FILES+=usr/bin/csup
 OLD_FILES+=usr/bin/cpasswd
 OLD_FILES+=usr/share/man/man1/csup.1.gz
 OLD_FILES+=usr/share/man/man1/cpasswd.1.gz
 OLD_FILES+=usr/share/examples/cvsup/README
 OLD_FILES+=usr/share/examples/cvsup/cvs-supfile
 OLD_FILES+=usr/share/examples/cvsup/stable-supfile
 OLD_FILES+=usr/share/examples/cvsup/standard-supfile
 OLD_DIRS+=usr/share/examples/cvsup
 # 20140614: send-pr removal
 OLD_FILES+=usr/bin/sendbug
 OLD_FILES+=usr/share/info/send-pr.info.gz
 OLD_FILES+=usr/share/man/man1/send-pr.1.gz
 OLD_FILES+=usr/share/man/man1/sendbug.1.gz
 OLD_FILES+=etc/gnats/freefall
 OLD_DIRS+=etc/gnats
 # 20140512: new clang import which bumps version from 3.4 to 3.4.1.
 OLD_FILES+=usr/include/clang/3.4/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.4/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.4/altivec.h
 OLD_FILES+=usr/include/clang/3.4/ammintrin.h
 OLD_FILES+=usr/include/clang/3.4/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.4/avxintrin.h
 OLD_FILES+=usr/include/clang/3.4/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.4/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.4/cpuid.h
 OLD_FILES+=usr/include/clang/3.4/emmintrin.h
 OLD_FILES+=usr/include/clang/3.4/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.4/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.4/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.4/immintrin.h
 OLD_FILES+=usr/include/clang/3.4/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.4/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.4/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.4/mmintrin.h
 OLD_FILES+=usr/include/clang/3.4/module.map
 OLD_FILES+=usr/include/clang/3.4/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.4/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.4/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.4/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.4/shaintrin.h
 OLD_FILES+=usr/include/clang/3.4/smmintrin.h
 OLD_FILES+=usr/include/clang/3.4/tbmintrin.h
 OLD_FILES+=usr/include/clang/3.4/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/x86intrin.h
 OLD_FILES+=usr/include/clang/3.4/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/xopintrin.h
 OLD_FILES+=usr/include/clang/3.4/arm_neon.h
 OLD_FILES+=usr/include/clang/3.4/module.map
 OLD_DIRS+=usr/include/clang/3.4
 # 20140505: Bogusly installing src.opts.mk
 OLD_FILES+=usr/share/mk/src.opts.mk
 # 20140505: Reject PR kern/187551
 OLD_DIRS+=usr/tests/sbin/ifconfig
 OLD_FILES+=usr/tests/sbin/ifconfig/Kyuafile
 OLD_FILES+=usr/tests/sbin/ifconfig/fibs_test
 # 20140502: Removal of lindev(4)
 OLD_FILES+=usr/share/man/man4/lindev.4.gz
 # 20140314: AppleTalk
 OLD_DIRS+=usr/include/netatalk
 OLD_FILES+=usr/include/netatalk/aarp.h
 OLD_FILES+=usr/include/netatalk/at.h
 OLD_FILES+=usr/include/netatalk/at_extern.h
 OLD_FILES+=usr/include/netatalk/at_var.h
 OLD_FILES+=usr/include/netatalk/ddp.h
 OLD_FILES+=usr/include/netatalk/ddp_pcb.h
 OLD_FILES+=usr/include/netatalk/ddp_var.h
 OLD_FILES+=usr/include/netatalk/endian.h
 OLD_FILES+=usr/include/netatalk/phase2.h
 # 20140314: Remove IPX/SPX
 OLD_LIBS+=lib/libipx.so.5
 OLD_FILES+=usr/include/netipx/ipx.h
 OLD_FILES+=usr/include/netipx/ipx_if.h
 OLD_FILES+=usr/include/netipx/ipx_pcb.h
 OLD_FILES+=usr/include/netipx/ipx_var.h
 OLD_FILES+=usr/include/netipx/spx.h
 OLD_FILES+=usr/include/netipx/spx_debug.h
 OLD_FILES+=usr/include/netipx/spx_timer.h
 OLD_FILES+=usr/include/netipx/spx_var.h
 OLD_DIRS+=usr/include/netipx
 OLD_FILES+=usr/lib/libipx.a
 OLD_FILES+=usr/lib/libipx.so
 OLD_FILES+=usr/lib/libipx_p.a
 OLD_FILES+=usr/lib32/libipx.a
 OLD_FILES+=usr/lib32/libipx.so
 OLD_LIBS+=usr/lib32/libipx.so.5
 OLD_FILES+=usr/lib32/libipx_p.a
 OLD_FILES+=usr/sbin/IPXrouted
 OLD_FILES+=usr/share/man/man3/ipx.3.gz
 OLD_FILES+=usr/share/man/man3/ipx_addr.3.gz
 OLD_FILES+=usr/share/man/man3/ipx_ntoa.3.gz
 OLD_FILES+=usr/share/man/man4/ef.4.gz
 OLD_FILES+=usr/share/man/man4/if_ef.4.gz
 OLD_FILES+=usr/share/man/man8/IPXrouted.8.gz
 # 20140314: bsdconfig usermgmt rewrite
 OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/userinput
 # 20140307: bsdconfig groupmgmt rewrite
 OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/groupinput
 # 20140223: Remove libyaml
 OLD_FILES+=usr/lib/private/libyaml.a
 OLD_FILES+=usr/lib/private/libyaml.so
 OLD_FILES+=usr/lib/private/libyaml.so.1
 OLD_FILES+=usr/lib/private/libyaml_p.a
 # 20140216: new clang import which bumps version from 3.3 to 3.4.
 OLD_FILES+=usr/bin/llvm-prof
 OLD_FILES+=usr/bin/llvm-ranlib
 OLD_FILES+=usr/include/clang/3.3/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.3/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.3/altivec.h
 OLD_FILES+=usr/include/clang/3.3/ammintrin.h
 OLD_FILES+=usr/include/clang/3.3/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.3/avxintrin.h
 OLD_FILES+=usr/include/clang/3.3/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.3/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.3/cpuid.h
 OLD_FILES+=usr/include/clang/3.3/emmintrin.h
 OLD_FILES+=usr/include/clang/3.3/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.3/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.3/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.3/immintrin.h
 OLD_FILES+=usr/include/clang/3.3/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.3/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.3/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.3/mmintrin.h
 OLD_FILES+=usr/include/clang/3.3/module.map
 OLD_FILES+=usr/include/clang/3.3/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.3/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.3/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.3/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.3/smmintrin.h
 OLD_FILES+=usr/include/clang/3.3/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/x86intrin.h
 OLD_FILES+=usr/include/clang/3.3/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/xopintrin.h
 OLD_FILES+=usr/share/man/man1/llvm-prof.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-ranlib.1.gz
 OLD_DIRS+=usr/include/clang/3.3
 # 20140216: nve(4) removed
 OLD_FILES+=usr/share/man/man4/if_nve.4.gz
 OLD_FILES+=usr/share/man/man4/nve.4.gz
 # 20140205: Open Firmware device moved
 OLD_FILES+=usr/include/dev/ofw/ofw_nexus.h
 # 20140128: libelf and libdwarf import
 OLD_LIBS+=usr/lib/libelf.so.1
 OLD_LIBS+=usr/lib32/libelf.so.1
 OLD_LIBS+=usr/lib/libdwarf.so.3
 OLD_LIBS+=usr/lib32/libdwarf.so.3
 # 20140123: apicvar header moved to x86
 OLD_FILES+=usr/include/machine/apicvar.h
 # 20131215: libcam version bumped
 OLD_LIBS+=lib/libcam.so.6 usr/lib32/libcam.so.6
 # 20131202: libcapsicum and libcasper moved to /lib/
 OLD_LIBS+=usr/lib/libcapsicum.so.0
 OLD_LIBS+=usr/lib/libcasper.so.0
 # 20131109: extattr(2) mlinks fixed
 OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz
 OLD_FILES+=usr/share/man/man2/extattr_get_list.2.gz
 # 20131107: example files removed
 OLD_FILES+=usr/share/examples/libusb20/aux.c
 OLD_FILES+=usr/share/examples/libusb20/aux.h
 # 20131105: tzdata 2013h import
 OLD_FILES+=usr/share/zoneinfo/America/Shiprock
 OLD_FILES+=usr/share/zoneinfo/Antarctica/South_Pole
 # 20131103: WITH_LIBICONV_COMPAT removal
 OLD_FILES+=usr/include/_libiconv_compat.h
 OLD_FILES+=usr/lib/libiconv.a
 OLD_FILES+=usr/lib/libiconv.so
 OLD_FILES+=usr/lib/libiconv.so.3
 OLD_FILES+=usr/lib/libiconv_p.a
 OLD_FILES+=usr/lib32/libiconv.a
 OLD_FILES+=usr/lib32/libiconv.so
 OLD_FILES+=usr/lib32/libiconv.so.3
 OLD_FILES+=usr/lib32/libiconv_p.a
 # 20131103: removal of utxrm(8), use 'utx rm' instead.
 OLD_FILES+=usr/sbin/utxrm
 OLD_FILES+=usr/share/man/man8/utxrm.8.gz
 # 20131031: pkg_install has been removed
 OLD_FILES+=etc/periodic/daily/220.backup-pkgdb
 OLD_FILES+=etc/periodic/daily/490.status-pkg-changes
 OLD_FILES+=etc/periodic/security/460.chkportsum
 OLD_FILES+=etc/periodic/weekly/400.status-pkg
 OLD_FILES+=usr/sbin/pkg_add
 OLD_FILES+=usr/sbin/pkg_create
 OLD_FILES+=usr/sbin/pkg_delete
 OLD_FILES+=usr/sbin/pkg_info
 OLD_FILES+=usr/sbin/pkg_updating
 OLD_FILES+=usr/sbin/pkg_version
 OLD_FILES+=usr/share/man/man1/pkg_add.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_create.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_delete.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_info.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_updating.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_version.1.gz
 # 20131030: /etc/keys moved to /usr/share/keys
 OLD_DIRS+=etc/keys
 OLD_DIRS+=etc/keys/pkg
 OLD_DIRS+=etc/keys/pkg/revoked
 OLD_DIRS+=etc/keys/pkg/trusted
 OLD_FILES+=etc/keys/pkg/trusted/pkg.freebsd.org.2013102301
 # 20131028: ng_fec(4) removed
 OLD_FILES+=usr/include/netgraph/ng_fec.h
 OLD_FILES+=usr/share/man/man4/ng_fec.4.gz
 # 20131027: header moved
 OLD_FILES+=usr/include/net/pf_mtag.h
 # 20131023: remove never used iscsi directory
 OLD_DIRS+=usr/share/examples/iscsi
 # 20131021: isf(4) removed
 OLD_FILES+=usr/sbin/isfctl
 OLD_FILES+=usr/share/man/man4/isf.4.gz
 OLD_FILES+=usr/share/man/man8/isfctl.8.gz
 # 20131014: libbsdyml becomes private
 OLD_FILES+=usr/lib/libbsdyml.a
 OLD_FILES+=usr/lib/libbsdyml.so
 OLD_LIBS+=usr/lib/libbsdyml.so.0
 OLD_FILES+=usr/lib/libbsdyml_p.a
 OLD_FILES+=usr/lib32/libbsdyml.a
 OLD_FILES+=usr/lib32/libbsdyml.so
 OLD_LIBS+=usr/lib32/libbsdyml.so.0
 OLD_FILES+=usr/lib32/libbsdyml_p.a
 OLD_FILES+=usr/share/man/man3/libbsdyml.3.gz
 OLD_FILES+=usr/include/bsdyml.h
 # 20131013: Removal of the ATF tools
 OLD_FILES+=etc/atf/FreeBSD.conf
 OLD_FILES+=etc/atf/atf-run.hooks
 OLD_FILES+=etc/atf/common.conf
 OLD_FILES+=usr/bin/atf-config
 OLD_FILES+=usr/bin/atf-report
 OLD_FILES+=usr/bin/atf-run
 OLD_FILES+=usr/bin/atf-version
 OLD_FILES+=usr/share/atf/atf-run.hooks
 OLD_FILES+=usr/share/examples/atf/atf-run.hooks
 OLD_FILES+=usr/share/examples/atf/tests-results.css
 OLD_FILES+=usr/share/man/man1/atf-config.1.gz
 OLD_FILES+=usr/share/man/man1/atf-report.1.gz
 OLD_FILES+=usr/share/man/man1/atf-run.1.gz
 OLD_FILES+=usr/share/man/man1/atf-version.1.gz
 OLD_FILES+=usr/share/man/man5/atf-formats.5.gz
 OLD_FILES+=usr/share/xml/atf/tests-results.dtd
 OLD_FILES+=usr/share/xsl/atf/tests-results.xsl
 # 20131009: freebsd-version moved from /libexec to /bin
 OLD_FILES+=libexec/freebsd-version
 # 20131001: ar and ranlib from binutils not used
 OLD_FILES+=usr/bin/gnu-ar
 OLD_FILES+=usr/bin/gnu-ranlib
 OLD_FILES+=usr/share/man/man1/gnu-ar.1.gz
 OLD_FILES+=usr/share/man/man1/gnu-ranlib.1.gz
 # 20130930: BIND removed from base
 OLD_FILES+=etc/mtree/BIND.chroot.dist
 OLD_FILES+=etc/namedb
 OLD_FILES+=etc/periodic/daily/470.status-named
 OLD_FILES+=usr/bin/dig
 OLD_FILES+=usr/bin/nslookup
 OLD_FILES+=usr/bin/nsupdate
 OLD_DIRS+=usr/include/lwres
 OLD_FILES+=usr/include/lwres/context.h
 OLD_FILES+=usr/include/lwres/int.h
 OLD_FILES+=usr/include/lwres/ipv6.h
 OLD_FILES+=usr/include/lwres/lang.h
 OLD_FILES+=usr/include/lwres/list.h
 OLD_FILES+=usr/include/lwres/lwbuffer.h
 OLD_FILES+=usr/include/lwres/lwpacket.h
 OLD_FILES+=usr/include/lwres/lwres.h
 OLD_FILES+=usr/include/lwres/net.h
 OLD_FILES+=usr/include/lwres/netdb.h
 OLD_FILES+=usr/include/lwres/platform.h
 OLD_FILES+=usr/include/lwres/result.h
 OLD_FILES+=usr/include/lwres/version.h
 OLD_FILES+=usr/lib/liblwres.a
 OLD_FILES+=usr/lib/liblwres.so
 OLD_LIBS+=usr/lib/liblwres.so.90
 OLD_FILES+=usr/lib/liblwres_p.a
 OLD_FILES+=usr/sbin/arpaname
 OLD_FILES+=usr/sbin/ddns-confgen
 OLD_FILES+=usr/sbin/dnssec-dsfromkey
 OLD_FILES+=usr/sbin/dnssec-keyfromlabel
 OLD_FILES+=usr/sbin/dnssec-keygen
 OLD_FILES+=usr/sbin/dnssec-revoke
 OLD_FILES+=usr/sbin/dnssec-settime
 OLD_FILES+=usr/sbin/dnssec-signzone
 OLD_FILES+=usr/sbin/dnssec-verify
 OLD_FILES+=usr/sbin/genrandom
 OLD_FILES+=usr/sbin/isc-hmac-fixup
 OLD_FILES+=usr/sbin/lwresd
 OLD_FILES+=usr/sbin/named
 OLD_FILES+=usr/sbin/named-checkconf
 OLD_FILES+=usr/sbin/named-checkzone
 OLD_FILES+=usr/sbin/named-compilezone
 OLD_FILES+=usr/sbin/named-journalprint
 OLD_FILES+=usr/sbin/named.reconfig
 OLD_FILES+=usr/sbin/named.reload
 OLD_FILES+=usr/sbin/nsec3hash
 OLD_FILES+=usr/sbin/rndc
 OLD_FILES+=usr/sbin/rndc-confgen
 OLD_DIRS+=usr/share/doc/bind9
 OLD_FILES+=usr/share/doc/bind9/CHANGES
 OLD_FILES+=usr/share/doc/bind9/COPYRIGHT
 OLD_FILES+=usr/share/doc/bind9/FAQ
 OLD_FILES+=usr/share/doc/bind9/HISTORY
 OLD_FILES+=usr/share/doc/bind9/README
 OLD_DIRS+=usr/share/doc/bind9/arm
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch01.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch02.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch03.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch04.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch05.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch06.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch07.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch08.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch09.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch10.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.pdf
 OLD_FILES+=usr/share/doc/bind9/arm/man.arpaname.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.ddns-confgen.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dig.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-dsfromkey.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keyfromlabel.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keygen.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-revoke.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-settime.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-signzone.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-verify.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.genrandom.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.host.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.isc-hmac-fixup.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkconf.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkzone.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named-journalprint.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.nsec3hash.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.nsupdate.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.rndc-confgen.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.conf.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.html
 OLD_DIRS+=usr/share/doc/bind9/misc
 OLD_FILES+=usr/share/doc/bind9/misc/dnssec
 OLD_FILES+=usr/share/doc/bind9/misc/format-options.pl
 OLD_FILES+=usr/share/doc/bind9/misc/ipv6
 OLD_FILES+=usr/share/doc/bind9/misc/migration
 OLD_FILES+=usr/share/doc/bind9/misc/migration-4to9
 OLD_FILES+=usr/share/doc/bind9/misc/options
 OLD_FILES+=usr/share/doc/bind9/misc/rfc-compliance
 OLD_FILES+=usr/share/doc/bind9/misc/roadmap
 OLD_FILES+=usr/share/doc/bind9/misc/sdb
 OLD_FILES+=usr/share/doc/bind9/misc/sort-options.pl
 OLD_FILES+=usr/share/man/man1/arpaname.1.gz
 OLD_FILES+=usr/share/man/man1/dig.1.gz
 OLD_FILES+=usr/share/man/man1/nslookup.1.gz
 OLD_FILES+=usr/share/man/man1/nsupdate.1.gz
 OLD_FILES+=usr/share/man/man3/lwres.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_addr_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_add.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_back.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_clear.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_first.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_forward.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getmem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint16.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint32.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint8.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_init.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_invalidate.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putmem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint16.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint32.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint8.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_subtract.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_clear.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_get.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_init.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_print.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_config.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_allocmem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_create.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_freemem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_initserial.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_nextserial.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_sendrecv.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_endhostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_endhostent_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_freeaddrinfo.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_freehostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabn.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gai_strerror.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getaddrinfo.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getaddrsbyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyname2.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyname_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostent_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getipnode.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getipnodebyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getipnodebyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getnamebyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getnameinfo.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getrrsetbyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnba.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_herror.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_hstrerror.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_inetntop.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_lwpacket_parseheader.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_lwpacket_renderheader.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_net_ntop.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noop.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_nooprequest_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_nooprequest_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_nooprequest_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noopresponse_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noopresponse_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noopresponse_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_packet.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_resutil.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_sethostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_sethostent_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_string_parse.3.gz
 OLD_FILES+=usr/share/man/man5/named.conf.5.gz
 OLD_FILES+=usr/share/man/man5/rndc.conf.5.gz
 OLD_FILES+=usr/share/man/man8/ddns-confgen.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-dsfromkey.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-keyfromlabel.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-keygen.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-revoke.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-settime.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-signzone.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-verify.8.gz
 OLD_FILES+=usr/share/man/man8/genrandom.8.gz
 OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz
 OLD_FILES+=usr/share/man/man8/lwresd.8.gz
 OLD_FILES+=usr/share/man/man8/named-checkconf.8.gz
 OLD_FILES+=usr/share/man/man8/named-checkzone.8.gz
 OLD_FILES+=usr/share/man/man8/named-compilezone.8.gz
 OLD_FILES+=usr/share/man/man8/named-journalprint.8.gz
 OLD_FILES+=usr/share/man/man8/named.8.gz
 OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz
 OLD_FILES+=usr/share/man/man8/named.reload.8.gz
 OLD_FILES+=usr/share/man/man8/nsec3hash.8.gz
 OLD_FILES+=usr/share/man/man8/rndc-confgen.8.gz
 OLD_FILES+=usr/share/man/man8/rndc.8.gz
 OLD_DIRS+=var/named/dev
 OLD_DIRS+=var/named/etc
 OLD_DIRS+=var/named/etc/namedb
 OLD_FILES+=var/named/etc/namedb/PROTO.localhost-v6.rev
 OLD_FILES+=var/named/etc/namedb/PROTO.localhost.rev
 OLD_DIRS+=var/named/etc/namedb/dynamic
 OLD_FILES+=var/named/etc/namedb/make-localhost
 OLD_DIRS+=var/named/etc/namedb/master
 OLD_FILES+=var/named/etc/namedb/master/empty.db
 OLD_FILES+=var/named/etc/namedb/master/localhost-forward.db
 OLD_FILES+=var/named/etc/namedb/master/localhost-reverse.db
 #OLD_FILES+=var/named/etc/namedb/named.conf	# intentionally left out
 OLD_FILES+=var/named/etc/namedb/named.root
 OLD_DIRS+=var/named/etc/namedb/slave
 OLD_DIRS+=var/named/var
 OLD_DIRS+=var/named/var/dump
 OLD_DIRS+=var/named/var/log
 OLD_DIRS+=var/named/var/run
 OLD_DIRS+=var/named/var/run/named
 OLD_DIRS+=var/named/var/stats
 OLD_DIRS+=var/run/named
 # 20130923: example moved
 OLD_FILES+=usr/share/examples/bsdconfig/browse_packages.sh
 # 20130908: libssh becomes private
 OLD_FILES+=usr/lib/libssh.a
 OLD_FILES+=usr/lib/libssh.so
 OLD_LIBS+=usr/lib/libssh.so.5
 OLD_FILES+=usr/lib/libssh_p.a
 OLD_FILES+=usr/lib32/libssh.a
 OLD_FILES+=usr/lib32/libssh.so
 OLD_LIBS+=usr/lib32/libssh.so.5
 OLD_FILES+=usr/lib32/libssh_p.a
 # 20130903: gnupatch is no more
 OLD_FILES+=usr/bin/gnupatch
 OLD_FILES+=usr/share/man/man1/gnupatch.1.gz
 # 20130829: bsdpatch is patch unconditionally
 OLD_FILES+=usr/bin/bsdpatch
 OLD_FILES+=usr/share/man/man1/bsdpatch.1.gz
 # 20130822: bind 9.9.3-P2 import
 OLD_LIBS+=usr/lib/liblwres.so.80
 # 20130814: vm_page_busy(9)
 OLD_FILES+=usr/share/man/man9/vm_page_flash.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_io.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_io_finish.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_io_start.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_wakeup.9.gz
 # 20130710: libkvm version bump 
 OLD_LIBS+=lib/libkvm.so.5
 OLD_LIBS+=usr/lib32/libkvm.so.5
 # 20130623: dialog update from 1.1 to 1.2
 OLD_LIBS+=usr/lib/libdialog.so.7
 OLD_LIBS+=usr/lib32/libdialog.so.7
 # 20130616: vfs_mount.9 removed
 OLD_FILES+=usr/share/man/man9/vfs_mount.9.gz
 # 20130614: remove CVS from base
 OLD_FILES+=usr/bin/cvs
 OLD_FILES+=usr/bin/cvsbug
 OLD_FILES+=usr/share/doc/psd/28.cvs/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/28.cvs/paper.ps.gz
 OLD_DIRS+=usr/share/doc/psd/28.cvs
 OLD_FILES+=usr/share/examples/cvs/contrib/README
 OLD_FILES+=usr/share/examples/cvs/contrib/clmerge
 OLD_FILES+=usr/share/examples/cvs/contrib/cln_hist
 OLD_FILES+=usr/share/examples/cvs/contrib/commit_prep
 OLD_FILES+=usr/share/examples/cvs/contrib/cvs2vendor
 OLD_FILES+=usr/share/examples/cvs/contrib/cvs_acls
 OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck
 OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck.man
 OLD_FILES+=usr/share/examples/cvs/contrib/cvshelp.man
 OLD_FILES+=usr/share/examples/cvs/contrib/descend.man
 OLD_FILES+=usr/share/examples/cvs/contrib/easy-import
 OLD_FILES+=usr/share/examples/cvs/contrib/intro.doc
 OLD_FILES+=usr/share/examples/cvs/contrib/log
 OLD_FILES+=usr/share/examples/cvs/contrib/log_accum
 OLD_FILES+=usr/share/examples/cvs/contrib/mfpipe
 OLD_FILES+=usr/share/examples/cvs/contrib/rcs-to-cvs
 OLD_FILES+=usr/share/examples/cvs/contrib/rcs2log
 OLD_FILES+=usr/share/examples/cvs/contrib/rcslock
 OLD_FILES+=usr/share/examples/cvs/contrib/sccs2rcs
 OLD_DIRS+=usr/share/examples/cvs/contrib
 OLD_DIRS+=usr/share/examples/cvs
 OLD_FILES+=usr/share/info/cvs.info.gz
 OLD_FILES+=usr/share/info/cvsclient.info.gz
 OLD_FILES+=usr/share/man/man1/cvs.1.gz
 OLD_FILES+=usr/share/man/man5/cvs.5.gz
 OLD_FILES+=usr/share/man/man8/cvsbug.8.gz
 # 20130607: WITH_DEBUG_FILES added
 OLD_FILES+=lib/libufs.so.6.symbols
 OLD_FILES+=usr/lib32/libufs.so.6.symbols
 # 20130417: nfs fha moved from nfsserver to nfs
 OLD_FILES+=usr/include/nfsserver/nfs_fha.h
 # 20130411: new clang import which bumps version from 3.2 to 3.3.
 OLD_FILES+=usr/include/clang/3.2/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.2/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.2/altivec.h
 OLD_FILES+=usr/include/clang/3.2/ammintrin.h
 OLD_FILES+=usr/include/clang/3.2/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.2/avxintrin.h
 OLD_FILES+=usr/include/clang/3.2/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.2/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.2/cpuid.h
 OLD_FILES+=usr/include/clang/3.2/emmintrin.h
 OLD_FILES+=usr/include/clang/3.2/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.2/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.2/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.2/immintrin.h
 OLD_FILES+=usr/include/clang/3.2/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.2/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.2/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.2/mmintrin.h
 OLD_FILES+=usr/include/clang/3.2/module.map
 OLD_FILES+=usr/include/clang/3.2/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.2/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.2/smmintrin.h
 OLD_FILES+=usr/include/clang/3.2/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/x86intrin.h
 OLD_FILES+=usr/include/clang/3.2/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.2
 # 20130404: legacy ATA stack removed
 OLD_FILES+=etc/periodic/daily/405.status-ata-raid
 OLD_FILES+=rescue/atacontrol
 OLD_FILES+=sbin/atacontrol
 OLD_FILES+=usr/share/man/man8/atacontrol.8.gz
 OLD_FILES+=usr/share/man/man4/atapicam.4.gz
 OLD_FILES+=usr/share/man/man4/ataraid.4.gz
 OLD_FILES+=usr/sbin/burncd
 OLD_FILES+=usr/share/man/man8/burncd.8.gz
 # 20130316: vinum.4 removed
 OLD_FILES+=usr/share/man/man4/vinum.4.gz
 # 20130312: fortunes-o removed
 OLD_FILES+=usr/share/games/fortune/fortunes-o
 OLD_FILES+=usr/share/games/fortune/fortunes-o.dat
 # 20130311: Ports are no more available via cvsup
 OLD_FILES+=usr/share/examples/cvsup/ports-supfile
 OLD_FILES+=usr/share/examples/cvsup/refuse
 OLD_FILES+=usr/share/examples/cvsup/refuse.README
 # 20130309: NWFS and NCP supports removed
 OLD_FILES+=usr/bin/ncplist
 OLD_FILES+=usr/bin/ncplogin
 OLD_FILES+=usr/bin/ncplogout
 OLD_FILES+=usr/include/fs/nwfs/nwfs.h
 OLD_FILES+=usr/include/fs/nwfs/nwfs_mount.h
 OLD_FILES+=usr/include/fs/nwfs/nwfs_node.h
 OLD_FILES+=usr/include/fs/nwfs/nwfs_subr.h
 OLD_DIRS+=usr/include/fs/nwfs
 OLD_FILES+=usr/include/netncp/ncp.h
 OLD_FILES+=usr/include/netncp/ncp_cfg.h
 OLD_FILES+=usr/include/netncp/ncp_conn.h
 OLD_FILES+=usr/include/netncp/ncp_file.h
 OLD_FILES+=usr/include/netncp/ncp_lib.h
 OLD_FILES+=usr/include/netncp/ncp_ncp.h
 OLD_FILES+=usr/include/netncp/ncp_nls.h
 OLD_FILES+=usr/include/netncp/ncp_rcfile.h
 OLD_FILES+=usr/include/netncp/ncp_rq.h
 OLD_FILES+=usr/include/netncp/ncp_sock.h
 OLD_FILES+=usr/include/netncp/ncp_subr.h
 OLD_FILES+=usr/include/netncp/ncp_user.h
 OLD_FILES+=usr/include/netncp/ncpio.h
 OLD_FILES+=usr/include/netncp/nwerror.h
 OLD_DIRS+=usr/include/netncp
 OLD_FILES+=usr/lib/libncp.a
 OLD_FILES+=usr/lib/libncp.so
 OLD_LIBS+=usr/lib/libncp.so.4
 OLD_FILES+=usr/lib/libncp_p.a
 OLD_FILES+=usr/lib32/libncp.a
 OLD_FILES+=usr/lib32/libncp.so
 OLD_LIBS+=usr/lib32/libncp.so.4
 OLD_FILES+=usr/lib32/libncp_p.a
 OLD_FILES+=usr/sbin/mount_nwfs
 OLD_FILES+=usr/share/examples/nwclient/dot.nwfsrc
 OLD_FILES+=usr/share/examples/nwclient/nwfs.sh.sample
 OLD_DIRS+=usr/share/examples/nwclient
 OLD_FILES+=usr/share/man/man1/ncplist.1.gz
 OLD_FILES+=usr/share/man/man1/ncplogin.1.gz
 OLD_FILES+=usr/share/man/man1/ncplogout.1.gz
 OLD_FILES+=usr/share/man/man8/mount_nwfs.8.gz
 # 20130302: NTFS support removed
 OLD_FILES+=rescue/mount_ntfs
 OLD_FILES+=sbin/mount_ntfs
 OLD_FILES+=usr/include/fs/ntfs/ntfs.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_compr.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_ihash.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_inode.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_subr.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_vfsops.h
 OLD_FILES+=usr/include/fs/ntfs/ntfsmount.h
 OLD_DIRS+=usr/include/fs/ntfs
 OLD_FILES+=usr/share/man/man8/mount_ntfs.8.gz
 # 20130302: PORTALFS support removed
 OLD_FILES+=usr/include/fs/portalfs/portal.h
 OLD_DIRS+=usr/include/fs/portalfs
 OLD_FILES+=usr/sbin/mount_portalfs
 OLD_FILES+=usr/share/examples/portal/README
 OLD_FILES+=usr/share/examples/portal/portal.conf
 OLD_DIRS+=usr/share/examples/portal
 OLD_FILES+=usr/share/man/man8/mount_portalfs.8.gz
 # 20130302: CODAFS support removed
 OLD_FILES+=usr/share/man/man4/coda.4.gz
 # 20130302: XFS support removed
 OLD_FILES+=usr/share/man/man5/xfs.5.gz
 # 20130302: Capsicum overhaul
 OLD_FILES+=usr/share/man/man2/cap_getrights.2.gz
 OLD_FILES+=usr/share/man/man2/cap_new.2.gz
 # 20130213: OpenSSL 1.0.1e import
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_verifyrecover.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_verifyrecover_init.3.gz
 # 20130116: removed long unused directories for .1aout section manpages
 OLD_FILES+=usr/share/man/en.ISO8859-1/man1aout
 OLD_FILES+=usr/share/man/en.UTF-8/man1aout
 OLD_DIRS+=usr/share/man/man1aout
 OLD_DIRS+=usr/share/man/cat1aout
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat1aout
 OLD_DIRS+=usr/share/man/en.UTF-8/cat1aout
 # 20130110: bsd.compat.mk removed
 OLD_FILES+=usr/share/mk/bsd.compat.mk
 # 20130103: gnats-supfile removed
 OLD_FILES+=usr/share/examples/cvsup/gnats-supfile
 # 20121230: libdisk removed
 OLD_FILES+=usr/share/man/man3/libdisk.3.gz usr/include/libdisk.h
 OLD_FILES+=usr/lib/libdisk.a usr/lib32/libdisk.a
 # 20121230: remove wrongly created directories for auditdistd
 OLD_DIRS+=var/dist
 OLD_DIRS+=var/remote
 # 20121114: zpool-features manual page moved from section 5 to 7
 OLD_FILES+=usr/share/man/man5/zpool-features.5.gz
 # 20121022: remove harp, hfa and idt man page
 OLD_FILES+=usr/share/man/man4/harp.4.gz
 OLD_FILES+=usr/share/man/man4/hfa.4.gz
 OLD_FILES+=usr/share/man/man4/idt.4.gz
 OLD_FILES+=usr/share/man/man4/if_idt.4.gz
 # 20121022: VFS_LOCK_GIANT elimination
 OLD_FILES+=usr/share/man/man9/VFS_LOCK_GIANT.9.gz
 OLD_FILES+=usr/share/man/man9/VFS_UNLOCK_GIANT.9.gz
 # 20121004: remove incomplete unwind.h
 OLD_FILES+=usr/include/clang/3.2/unwind.h
 # 20120910: NetBSD compat shims removed
 OLD_FILES+=usr/include/cam/scsi/scsi_low_pisa.h
 OLD_FILES+=usr/include/sys/device_port.h
 # 20120909: doc and www supfiles removed
 OLD_FILES+=usr/share/examples/cvsup/doc-supfile
 OLD_FILES+=usr/share/examples/cvsup/www-supfile
 # 20120908: pf cleanup
 OLD_FILES+=usr/include/net/if_pflow.h
 # 20120816: new clang import which bumps version from 3.1 to 3.2
 OLD_FILES+=usr/bin/llvm-ld
 OLD_FILES+=usr/bin/llvm-stub
 OLD_FILES+=usr/include/clang/3.1/altivec.h
 OLD_FILES+=usr/include/clang/3.1/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.1/avxintrin.h
 OLD_FILES+=usr/include/clang/3.1/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.1/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.1/cpuid.h
 OLD_FILES+=usr/include/clang/3.1/emmintrin.h
 OLD_FILES+=usr/include/clang/3.1/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.1/immintrin.h
 OLD_FILES+=usr/include/clang/3.1/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.1/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.1/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.1/mmintrin.h
 OLD_FILES+=usr/include/clang/3.1/module.map
 OLD_FILES+=usr/include/clang/3.1/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.1/smmintrin.h
 OLD_FILES+=usr/include/clang/3.1/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/unwind.h
 OLD_FILES+=usr/include/clang/3.1/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/x86intrin.h
 OLD_FILES+=usr/include/clang/3.1/xmmintrin.h
 OLD_DIRS+=usr/include/clang/3.1
 OLD_FILES+=usr/share/man/man1/llvm-ld.1.gz
 # 20120712: OpenSSL 1.0.1c import
 OLD_LIBS+=lib/libcrypto.so.6
 OLD_LIBS+=usr/lib/libssl.so.6
 OLD_LIBS+=usr/lib32/libcrypto.so.6
 OLD_LIBS+=usr/lib32/libssl.so.6
 OLD_FILES+=usr/include/openssl/aes_locl.h
 OLD_FILES+=usr/include/openssl/bio_lcl.h
 OLD_FILES+=usr/include/openssl/e_os.h
 OLD_FILES+=usr/include/openssl/fips.h
 OLD_FILES+=usr/include/openssl/fips_rand.h
 OLD_FILES+=usr/include/openssl/md2.h
 OLD_FILES+=usr/include/openssl/pq_compat.h
 OLD_FILES+=usr/include/openssl/store.h
 OLD_FILES+=usr/include/openssl/tmdiff.h
 OLD_FILES+=usr/include/openssl/ui_locl.h
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_id_callback.3.gz
 # 20120621: remove old man page
 OLD_FILES+=usr/share/man/man8/vnconfig.8.gz
 # 20120619: TOE support updated
 OLD_FILES+=usr/include/netinet/toedev.h
 # 20120613: auth.conf removed
 OLD_FILES+=etc/auth.conf
 OLD_FILES+=usr/share/examples/etc/auth.conf
 OLD_FILES+=usr/share/man/man3/auth.3.gz
 OLD_FILES+=usr/share/man/man3/auth_getval.3.gz
 OLD_FILES+=usr/share/man/man5/auth.conf.5.gz
 # 20120530: kde pam lives now in ports
 OLD_FILES+=etc/pam.d/kde
 # 20120521: byacc import
 OLD_FILES+=usr/bin/yyfix
 OLD_FILES+=usr/share/man/man1/yyfix.1.gz
 # 20120505: new clang import installed a redundant internal header
 OLD_FILES+=usr/include/clang/3.1/stdalign.h
 # 20120428: MD2 removed from libmd
 OLD_LIBS+=lib/libmd.so.5
 OLD_FILES+=usr/include/md2.h
 OLD_LIBS+=usr/lib32/libmd.so.5
 OLD_FILES+=usr/share/man/man3/MD2Data.3.gz
 OLD_FILES+=usr/share/man/man3/MD2End.3.gz
 OLD_FILES+=usr/share/man/man3/MD2File.3.gz
 OLD_FILES+=usr/share/man/man3/MD2FileChunk.3.gz
 OLD_FILES+=usr/share/man/man3/MD2Final.3.gz
 OLD_FILES+=usr/share/man/man3/MD2Init.3.gz
 OLD_FILES+=usr/share/man/man3/MD2Update.3.gz
 OLD_FILES+=usr/share/man/man3/md2.3.gz
 # 20120425: libusb version bump (r234684)
 OLD_LIBS+=usr/lib/libusb.so.2
 OLD_LIBS+=usr/lib32/libusb.so.2
 OLD_FILES+=usr/share/man/man3/libsub_get_active_config_descriptor.3.gz
 # 20120415: new clang import which bumps version from 3.0 to 3.1
 OLD_FILES+=usr/include/clang/3.0/altivec.h
 OLD_FILES+=usr/include/clang/3.0/avxintrin.h
 OLD_FILES+=usr/include/clang/3.0/emmintrin.h
 OLD_FILES+=usr/include/clang/3.0/immintrin.h
 OLD_FILES+=usr/include/clang/3.0/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.0/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.0/mmintrin.h
 OLD_FILES+=usr/include/clang/3.0/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/smmintrin.h
 OLD_FILES+=usr/include/clang/3.0/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/x86intrin.h
 OLD_FILES+=usr/include/clang/3.0/xmmintrin.h
 OLD_DIRS+=usr/include/clang/3.0
 # 20120412: BIND 9.8.1 release notes removed
 OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.pdf
 OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.txt
 OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.html
 OLD_FILES+=usr/share/doc/bind9/release-notes.css
 # 20120330: legacy(4) moved to x86
 OLD_FILES+=usr/include/machine/legacyvar.h
 # 20120324: MPI headers updated
 OLD_FILES+=usr/include/dev/mpt/mpilib/mpi_inb.h
 # 20120322: hwpmc_mips24k.h removed
 OLD_FILES+=usr/include/dev/hwpmc/hwpmc_mips24k.h
 # 20120322: Update heimdal to 1.5.1.
 OLD_FILES+=usr/include/krb5-v4compat.h \
 	usr/include/krb_err.h \
 	usr/include/hdb-private.h \
         usr/share/man/man3/krb5_addresses.3.gz \
         usr/share/man/man3/krb5_cc_cursor.3.gz \
         usr/share/man/man3/krb5_cc_ops.3.gz \
         usr/share/man/man3/krb5_config.3.gz \
         usr/share/man/man3/krb5_config_get_int_default.3.gz \
         usr/share/man/man3/krb5_context.3.gz \
         usr/share/man/man3/krb5_data.3.gz \
         usr/share/man/man3/krb5_err.3.gz \
         usr/share/man/man3/krb5_errx.3.gz \
         usr/share/man/man3/krb5_keyblock.3.gz \
         usr/share/man/man3/krb5_keytab_entry.3.gz \
         usr/share/man/man3/krb5_kt_cursor.3.gz \
         usr/share/man/man3/krb5_kt_ops.3.gz \
         usr/share/man/man3/krb5_set_warn_dest.3.gz \
         usr/share/man/man3/krb5_verr.3.gz \
         usr/share/man/man3/krb5_verrx.3.gz \
         usr/share/man/man3/krb5_vwarnx.3.gz \
         usr/share/man/man3/krb5_warn.3.gz \
         usr/share/man/man3/krb5_warnx.3.gz
 OLD_LIBS+=usr/lib/libasn1.so.10 \
 	usr/lib/libhdb.so.10 \
 	usr/lib/libheimntlm.so.10 \
 	usr/lib/libhx509.so.10 \
 	usr/lib/libkadm5clnt.so.10 \
 	usr/lib/libkadm5srv.so.10 \
 	usr/lib/libkafs5.so.10 \
 	usr/lib/libkrb5.so.10 \
 	usr/lib/libroken.so.10 \
 	usr/lib32/libasn1.so.10 \
 	usr/lib32/libhdb.so.10 \
 	usr/lib32/libheimntlm.so.10 \
 	usr/lib32/libhx509.so.10 \
 	usr/lib32/libkadm5clnt.so.10 \
 	usr/lib32/libkadm5srv.so.10 \
 	usr/lib32/libkafs5.so.10 \
 	usr/lib32/libkrb5.so.10 \
 	usr/lib32/libroken.so.10
 # 20120309: Remove fifofs header files.
 OLD_FILES+=usr/include/fs/fifofs/fifo.h
 OLD_DIRS+=usr/include/fs/fifofs
 # 20120304: xlocale cleanup
 OLD_FILES+=usr/include/_xlocale_ctype.h
 # 20120225: libarchive 3.0.3
 OLD_FILES+=usr/share/man/man3/archive_read_data_into_buffer.3.gz \
 	usr/share/man/man3/archive_read_support_compression_all.3.gz \
 	usr/share/man/man3/archive_read_support_compression_bzip2.3.gz \
 	usr/share/man/man3/archive_read_support_compression_compress.3.gz \
 	usr/share/man/man3/archive_read_support_compression_gzip.3.gz \
 	usr/share/man/man3/archive_read_support_compression_lzma.3.gz \
 	usr/share/man/man3/archive_read_support_compression_none.3.gz \
 	usr/share/man/man3/archive_read_support_compression_program.3.gz \
 	usr/share/man/man3/archive_read_support_compression_program_signature.3.gz \
 	usr/share/man/man3/archive_read_support_compression_xz.3.gz \
 	usr/share/man/man3/archive_write_set_callbacks.3.gz \
 	usr/share/man/man3/archive_write_set_compression_bzip2.3.gz \
 	usr/share/man/man3/archive_write_set_compression_compress.3.gz \
 	usr/share/man/man3/archive_write_set_compression_gzip.3.gz \
 	usr/share/man/man3/archive_write_set_compression_none.3.gz \
 	usr/share/man/man3/archive_write_set_compression_program.3.gz
 OLD_LIBS+=usr/lib/libarchive.so.5
 OLD_LIBS+=usr/lib32/libarchive.so.5
 # 20120113: removal of wtmpcvt(1)
 OLD_FILES+=usr/bin/wtmpcvt
 OLD_FILES+=usr/share/man/man1/wtmpcvt.1.gz
 # 20111214: eventtimers(7) moved to eventtimers(4)
 OLD_FILES+=usr/share/man/man7/eventtimers.7.gz
 # 20111125: amd(4) removed
 OLD_FILES+=usr/share/man/man4/amd.4.gz
 # 20111125: libodialog removed
 OLD_FILES+=usr/lib/libodialog.a
 OLD_FILES+=usr/lib/libodialog.so
 OLD_LIBS+=usr/lib/libodialog.so.7
 OLD_FILES+=usr/lib/libodialog_p.a
 OLD_FILES+=usr/lib32/libodialog.a
 OLD_FILES+=usr/lib32/libodialog.so
 OLD_LIBS+=usr/lib32/libodialog.so.7
 OLD_FILES+=usr/lib32/libodialog_p.a
 # 20110930: sysinstall removed
 OLD_FILES+=usr/sbin/sysinstall
 OLD_FILES+=usr/share/man/man8/sysinstall.8.gz
 OLD_FILES+=usr/lib/libftpio.a
 OLD_FILES+=usr/lib/libftpio.so
 OLD_LIBS+=usr/lib/libftpio.so.8
 OLD_FILES+=usr/lib/libftpio_p.a
 OLD_FILES+=usr/lib32/libftpio.a
 OLD_FILES+=usr/lib32/libftpio.so
 OLD_LIBS+=usr/lib32/libftpio.so.8
 OLD_FILES+=usr/lib32/libftpio_p.a
 OLD_FILES+=usr/include/ftpio.h
 OLD_FILES+=usr/share/man/man3/ftpio.3.gz
 # 20110915: rename congestion control manpages
 OLD_FILES+=usr/share/man/man4/cc.4.gz
 OLD_FILES+=usr/share/man/man9/cc.9.gz
 # 20110831: atomic page flags operations
 OLD_FILES+=usr/share/man/man9/vm_page_flag.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_flag_clear.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_flag_set.9.gz
 # 20110828: library version bump for 9.0
 OLD_LIBS+=lib/libcam.so.5
 OLD_LIBS+=lib/libpcap.so.7
 OLD_LIBS+=lib/libufs.so.5
 OLD_LIBS+=usr/lib/libbsnmp.so.5
 OLD_LIBS+=usr/lib/libdwarf.so.2
 OLD_LIBS+=usr/lib/libopie.so.6
 OLD_LIBS+=usr/lib/librtld_db.so.1
 OLD_LIBS+=usr/lib/libtacplus.so.4
 OLD_LIBS+=usr/lib32/libcam.so.5
 OLD_LIBS+=usr/lib32/libpcap.so.7
 OLD_LIBS+=usr/lib32/libufs.so.5
 OLD_LIBS+=usr/lib32/libbsnmp.so.5
 OLD_LIBS+=usr/lib32/libdwarf.so.2
 OLD_LIBS+=usr/lib32/libopie.so.6
 OLD_LIBS+=usr/lib32/librtld_db.so.1
 OLD_LIBS+=usr/lib32/libtacplus.so.4
 # 20110817: no more acd.4, ad.4, afd.4 and ast.4
 OLD_FILES+=usr/share/man/man4/acd.4.gz
 OLD_FILES+=usr/share/man/man4/ad.4.gz
 OLD_FILES+=usr/share/man/man4/afd.4.gz
 OLD_FILES+=usr/share/man/man4/ast.4.gz
 # 20110718: no longer useful in the age of rc.d
 OLD_FILES+=usr/sbin/named.reconfig
 OLD_FILES+=usr/sbin/named.reload
 OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz
 OLD_FILES+=usr/share/man/man8/named.reload.8.gz
 # 20110716: bind 9.8.0 import
 OLD_LIBS+=usr/lib/liblwres.so.50
 OLD_FILES+=usr/share/doc/bind9/KNOWN-DEFECTS
 OLD_FILES+=usr/share/doc/bind9/NSEC3-NOTES
 OLD_FILES+=usr/share/doc/bind9/README.idnkit
 OLD_FILES+=usr/share/doc/bind9/README.pkcs11
 # 20110709: vm_map_clean.9 -> vm_map_sync.9
 OLD_FILES+=usr/share/man/man9/vm_map_clean.9.gz
 # 20110709: Catch up with removal of these functions.
 OLD_FILES+=usr/share/man/man9/vm_page_copy.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_protect.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_zero_fill.9.gz
 # 20110707: script no longer needed by /etc/rc.d/nfsd
 OLD_FILES+=etc/rc.d/nfsserver
 # 20110705: files moved so both NFS clients can share them
 OLD_FILES+=usr/include/nfsclient/krpc.h
 OLD_FILES+=usr/include/nfsclient/nfsdiskless.h
 # 20110705: the switch of default NFS client to the new one
 OLD_FILES+=sbin/mount_newnfs
 OLD_FILES+=usr/share/man/man8/mount_newnfs.8.gz
 OLD_FILES+=usr/include/nfsclient/nfs_kdtrace.h
 # 20110628: calendar.msk removed
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.msk
 # 20110517: libpkg removed
 OLD_FILES+=usr/include/pkg.h
 OLD_FILES+=usr/lib/libpkg.a
 OLD_FILES+=usr/lib/libpkg.so
 OLD_LIBS+=usr/lib/libpkg.so.0
 OLD_FILES+=usr/lib/libpkg_p.a
 OLD_FILES+=usr/lib32/libpkg.a
 OLD_FILES+=usr/lib32/libpkg.so
 OLD_LIBS+=usr/lib32/libpkg.so.0
 OLD_FILES+=usr/lib32/libpkg_p.a
 # 20110517: libsbuf version bump
 OLD_LIBS+=lib/libsbuf.so.5
 OLD_LIBS+=usr/lib32/libsbuf.so.5
 # 20110502: new clang import which bumps version from 2.9 to 3.0
 OLD_FILES+=usr/include/clang/2.9/emmintrin.h
 OLD_FILES+=usr/include/clang/2.9/mm_malloc.h
 OLD_FILES+=usr/include/clang/2.9/mmintrin.h
 OLD_FILES+=usr/include/clang/2.9/pmmintrin.h
 OLD_FILES+=usr/include/clang/2.9/tmmintrin.h
 OLD_FILES+=usr/include/clang/2.9/xmmintrin.h
 OLD_DIRS+=usr/include/clang/2.9
 # 20110417: removal of Objective-C support
 OLD_FILES+=usr/include/objc/encoding.h
 OLD_FILES+=usr/include/objc/hash.h
 OLD_FILES+=usr/include/objc/NXConstStr.h
 OLD_FILES+=usr/include/objc/objc-api.h
 OLD_FILES+=usr/include/objc/objc-decls.h
 OLD_FILES+=usr/include/objc/objc-list.h
 OLD_FILES+=usr/include/objc/objc.h
 OLD_FILES+=usr/include/objc/Object.h
 OLD_FILES+=usr/include/objc/Protocol.h
 OLD_FILES+=usr/include/objc/runtime.h
 OLD_FILES+=usr/include/objc/sarray.h
 OLD_FILES+=usr/include/objc/thr.h
 OLD_FILES+=usr/include/objc/typedstream.h
 OLD_FILES+=usr/lib/libobjc.a
 OLD_FILES+=usr/lib/libobjc.so
 OLD_FILES+=usr/lib/libobjc_p.a
 OLD_FILES+=usr/libexec/cc1obj
 OLD_LIBS+=usr/lib/libobjc.so.4
 OLD_DIRS+=usr/include/objc
 OLD_FILES+=usr/lib32/libobjc.a
 OLD_FILES+=usr/lib32/libobjc.so
 OLD_FILES+=usr/lib32/libobjc_p.a
 OLD_LIBS+=usr/lib32/libobjc.so.4
 # 20110331: firmware.img created at build time
 OLD_FILES+=usr/share/examples/kld/firmware/fwimage/firmware.img
 # 20110224: sticky.8 -> sticky.7
 OLD_FILES+=usr/share/man/man8/sticky.8.gz
 # 20110220: new clang import which bumps version from 2.8 to 2.9
 OLD_FILES+=usr/include/clang/2.8/emmintrin.h
 OLD_FILES+=usr/include/clang/2.8/mm_malloc.h
 OLD_FILES+=usr/include/clang/2.8/mmintrin.h
 OLD_FILES+=usr/include/clang/2.8/pmmintrin.h
 OLD_FILES+=usr/include/clang/2.8/tmmintrin.h
 OLD_FILES+=usr/include/clang/2.8/xmmintrin.h
 OLD_DIRS+=usr/include/clang/2.8
 # 20110119: netinet/sctp_cc_functions.h removed
 OLD_FILES+=usr/include/netinet/sctp_cc_functions.h
 # 20110119: Remove SYSCTL_*X* sysctl additions.
 OLD_FILES+=usr/share/man/man9/SYSCTL_XINT.9.gz \
     usr/share/man/man9/SYSCTL_XLONG.9.gz
 
 # 20110112: Update dialog to new version, rename old libdialog to libodialog,
 #     removing associated man pages and header files.
 OLD_FILES+=usr/share/man/man3/draw_shadow.3.gz \
     usr/share/man/man3/draw_box.3.gz usr/share/man/man3/line_edit.3.gz \
     usr/share/man/man3/strheight.3.gz usr/share/man/man3/strwidth.3.gz \
     usr/share/man/man3/dialog_create_rc.3.gz \
     usr/share/man/man3/dialog_yesno.3.gz usr/share/man/man3/dialog_noyes.3.gz \
     usr/share/man/man3/dialog_prgbox.3.gz \
     usr/share/man/man3/dialog_textbox.3.gz usr/share/man/man3/dialog_menu.3.gz \
     usr/share/man/man3/dialog_checklist.3.gz \
     usr/share/man/man3/dialog_radiolist.3.gz \
     usr/share/man/man3/dialog_inputbox.3.gz \
     usr/share/man/man3/dialog_clear_norefresh.3.gz \
     usr/share/man/man3/dialog_clear.3.gz usr/share/man/man3/dialog_update.3.gz \
     usr/share/man/man3/dialog_fselect.3.gz \
     usr/share/man/man3/dialog_notify.3.gz \
     usr/share/man/man3/dialog_mesgbox.3.gz \
     usr/share/man/man3/dialog_gauge.3.gz usr/share/man/man3/init_dialog.3.gz \
     usr/share/man/man3/end_dialog.3.gz usr/share/man/man3/use_helpfile.3.gz \
     usr/share/man/man3/use_helpline.3.gz usr/share/man/man3/get_helpline.3.gz \
     usr/share/man/man3/restore_helpline.3.gz \
     usr/share/man/man3/dialog_msgbox.3.gz \
     usr/share/man/man3/dialog_ftree.3.gz usr/share/man/man3/dialog_tree.3.gz \
     usr/share/examples/dialog/README usr/share/examples/dialog/checklist \
     usr/share/examples/dialog/ftreebox usr/share/examples/dialog/infobox \
     usr/share/examples/dialog/inputbox usr/share/examples/dialog/menubox \
     usr/share/examples/dialog/msgbox usr/share/examples/dialog/prgbox \
     usr/share/examples/dialog/radiolist usr/share/examples/dialog/textbox \
     usr/share/examples/dialog/treebox usr/share/examples/dialog/yesno \
     usr/share/examples/libdialog/Makefile usr/share/examples/libdialog/check1.c\
     usr/share/examples/libdialog/check2.c usr/share/examples/libdialog/check3.c\
     usr/share/examples/libdialog/dselect.c \
     usr/share/examples/libdialog/fselect.c \
     usr/share/examples/libdialog/ftree1.c \
     usr/share/examples/libdialog/ftree1.test \
     usr/share/examples/libdialog/ftree2.c \
     usr/share/examples/libdialog/ftree2.test \
     usr/share/examples/libdialog/gauge.c usr/share/examples/libdialog/input1.c \
     usr/share/examples/libdialog/input2.c usr/share/examples/libdialog/menu1.c \
     usr/share/examples/libdialog/menu2.c usr/share/examples/libdialog/menu3.c \
     usr/share/examples/libdialog/msg.c usr/share/examples/libdialog/prgbox.c \
     usr/share/examples/libdialog/radio1.c usr/share/examples/libdialog/radio2.c\
     usr/share/examples/libdialog/radio3.c usr/share/examples/libdialog/text.c \
     usr/share/examples/libdialog/tree.c usr/share/examples/libdialog/yesno.c
 OLD_DIRS+=usr/share/examples/libdialog usr/share/examples/dialog
 # 20101114: Remove long-obsolete MAKEDEV.8
 OLD_FILES+=usr/share/man/man8/MAKEDEV.8.gz
 # 20101112: vgonel(9) has gone to private API a while ago
 OLD_FILES+=usr/share/man/man9/vgonel.9.gz
 # 20101112: removed gasp.info
 OLD_FILES+=usr/share/info/gasp.info.gz
 # 20101109: machine/mutex.h removed
 OLD_FILES+=usr/include/machine/mutex.h
 # 20101109: headers moved from machine/ to x86/
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/mptable.h
 .endif
 # 20101101: headers moved from machine/ to x86/
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/apicreg.h
 OLD_FILES+=usr/include/machine/mca.h
 .endif
 # 20101020: catch up with vm_page_sleep_if_busy rename
 OLD_FILES+=usr/share/man/man9/vm_page_sleep_busy.9.gz
 # 20101018: taskqueue(9) updates
 OLD_FILES+=usr/share/man/man9/taskqueue_find.9.gz
 # 20101011: removed subblock.h from liblzma
 OLD_FILES+=usr/include/lzma/subblock.h
 # 20101002: removed manpath.config
 OLD_FILES+=etc/manpath.config
 OLD_FILES+=usr/share/examples/etc/manpath.config
 # 20100910: renamed sbuf_overflowed to sbuf_error
 OLD_FILES+=usr/share/man/man9/sbuf_overflowed.9.gz
 # 20100815: retired last traces of chooseproc(9)
 OLD_FILES+=usr/share/man/man9/chooseproc.9.gz
 # 20100806: removal of unused libcompat routines
 OLD_FILES+=usr/share/man/man3/ascftime.3.gz
 OLD_FILES+=usr/share/man/man3/cfree.3.gz
 OLD_FILES+=usr/share/man/man3/cftime.3.gz
 OLD_FILES+=usr/share/man/man3/getpw.3.gz
 # 20100801: tzdata2010k import
 OLD_FILES+=usr/share/zoneinfo/Pacific/Ponape
 OLD_FILES+=usr/share/zoneinfo/Pacific/Truk
 # 20100725: acpi_aiboost(4) removal.
 OLD_FILES+=usr/share/man/man4/acpi_aiboost.4.gz
 # 20100724: nfsclient/nfs_lock.h moved to nfs/nfs_lock.h
 OLD_FILES+=usr/include/nfsclient/nfs_lock.h
 # 20100720: new clang import which bumps version from 2.0 to 2.8
 OLD_FILES+=usr/include/clang/2.0/emmintrin.h
 OLD_FILES+=usr/include/clang/2.0/mm_malloc.h
 OLD_FILES+=usr/include/clang/2.0/mmintrin.h
 OLD_FILES+=usr/include/clang/2.0/pmmintrin.h
 OLD_FILES+=usr/include/clang/2.0/tmmintrin.h
 OLD_FILES+=usr/include/clang/2.0/xmmintrin.h
 OLD_DIRS+=usr/include/clang/2.0
 # 20100706: removed pc-sysinstall's detect-vmware.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-vmware.sh
 # 20100701: [powerpc] removed <machine/intr.h>
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/machine/intr.h
 .endif
 # 20100514: library version bump for versioned symbols for liblzma
 OLD_LIBS+=usr/lib/liblzma.so.0
 OLD_LIBS+=usr/lib32/liblzma.so.0
 # 20100511: move GCC-specific headers to /usr/include/gcc
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/emmintrin.h
 OLD_FILES+=usr/include/mm_malloc.h
 OLD_FILES+=usr/include/pmmintrin.h
 OLD_FILES+=usr/include/xmmintrin.h
 .endif
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/mmintrin.h
 .endif
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/altivec.h
 OLD_FILES+=usr/include/ppc-asm.h
 OLD_FILES+=usr/include/spe.h
 .endif
 # 20100416: [mips] removed <machine/psl.h>
 .if ${TARGET_ARCH} == "mips"
 OLD_FILES+=usr/include/machine/psl.h
 .endif
 # 20100415: [mips] removed unused headers
 .if ${TARGET_ARCH} == "mips"
 OLD_FILES+=usr/include/machine/archtype.h
 OLD_FILES+=usr/include/machine/segments.h
 OLD_FILES+=usr/include/machine/rm7000.h
 OLD_FILES+=usr/include/machine/defs.h
 OLD_FILES+=usr/include/machine/queue.h
 .endif
 # 20100326: gcpio removal
 OLD_FILES+=usr/bin/gcpio
 OLD_FILES+=usr/share/info/cpio.info.gz
 OLD_FILES+=usr/share/man/man1/gcpio.1.gz
 # 20100322: libz update
 OLD_LIBS+=lib/libz.so.5
 OLD_LIBS+=usr/lib32/libz.so.5
 # 20100314: removal of regexp.h
 OLD_FILES+=usr/include/regexp.h
 OLD_FILES+=usr/share/man/man3/regexp.3.gz
 OLD_FILES+=usr/share/man/man3/regsub.3.gz
 # 20100303: actual removal of utmp.h
 OLD_FILES+=usr/include/utmp.h
 # 20100208: man pages moved
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/i386/alpm.4.gz
 OLD_FILES+=usr/share/man/man4/i386/amdpm.4.gz
 OLD_FILES+=usr/share/man/man4/i386/mcd.4.gz
 OLD_FILES+=usr/share/man/man4/i386/padlock.4.gz
 OLD_FILES+=usr/share/man/man4/i386/pcf.4.gz
 OLD_FILES+=usr/share/man/man4/i386/scd.4.gz
 OLD_FILES+=usr/share/man/man4/i386/viapm.4.gz
 .endif
 # 20100122: move BSDL bc/dc USD documents to /usr/share/doc/usd
 OLD_FILES+=usr/share/doc/papers/bc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/dc.ascii.gz
 # 20100120: replacing GNU bc/dc with BSDL versions
 OLD_FILES+=usr/share/examples/bc/ckbook.b
 OLD_FILES+=usr/share/examples/bc/pi.b
 OLD_FILES+=usr/share/examples/bc/primes.b
 OLD_FILES+=usr/share/examples/bc/twins.b
 OLD_FILES+=usr/share/info/dc.info.gz
 OLD_DIRS+=usr/share/examples/bc
 # 20100114: removal of ttyslot(3)
 OLD_FILES+=usr/share/man/man3/ttyslot.3.gz
 # 20100113: remove utmp.h, replace it by utmpx.h
 OLD_FILES+=usr/share/man/man3/login.3.gz
 OLD_FILES+=usr/share/man/man3/logout.3.gz
 OLD_FILES+=usr/share/man/man3/logwtmp.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_endutxent.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_getutxent.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_getutxline.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_getutxuser.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_pututxline.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_setutxent.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_setutxfile.3.gz
 OLD_FILES+=usr/share/man/man5/lastlog.5.gz
 OLD_FILES+=usr/share/man/man5/utmp.5.gz
 OLD_FILES+=usr/share/man/man5/wtmp.5.gz
 OLD_LIBS+=lib/libutil.so.8
 OLD_LIBS+=usr/lib32/libutil.so.8
 # 20100105: new userland semaphore implementation
 OLD_FILES+=usr/include/sys/semaphore.h
 # 20100103: ntptrace(8) removed
 OLD_FILES+=usr/sbin/ntptrace
 OLD_FILES+=usr/share/man/man8/ntptrace.8.gz
 # 20091229: remove no longer relevant examples
 OLD_FILES+=usr/share/examples/pppd/auth-down.sample
 OLD_FILES+=usr/share/examples/pppd/auth-up.sample
 OLD_FILES+=usr/share/examples/pppd/chap-secrets.sample
 OLD_FILES+=usr/share/examples/pppd/chat.sh.sample
 OLD_FILES+=usr/share/examples/pppd/ip-down.sample
 OLD_FILES+=usr/share/examples/pppd/ip-up.sample
 OLD_FILES+=usr/share/examples/pppd/options.sample
 OLD_FILES+=usr/share/examples/pppd/pap-secrets.sample
 OLD_FILES+=usr/share/examples/pppd/ppp.deny.sample
 OLD_FILES+=usr/share/examples/pppd/ppp.shells.sample
 OLD_DIRS+=usr/share/examples/pppd
 OLD_FILES+=usr/share/examples/slattach/unit-command.sh
 OLD_DIRS+=usr/share/examples/slattach
 OLD_FILES+=usr/share/examples/sliplogin/slip.hosts
 OLD_FILES+=usr/share/examples/sliplogin/slip.login
 OLD_FILES+=usr/share/examples/sliplogin/slip.logout
 OLD_FILES+=usr/share/examples/sliplogin/slip.slparms
 OLD_DIRS+=usr/share/examples/sliplogin
 OLD_FILES+=usr/share/examples/startslip/sldown.sh
 OLD_FILES+=usr/share/examples/startslip/slip.sh
 OLD_FILES+=usr/share/examples/startslip/slup.sh
 OLD_DIRS+=usr/share/examples/startslip
 # 20091202: unify rc.firewall and rc.firewall6.
 OLD_FILES+=etc/rc.d/ip6fw
 OLD_FILES+=etc/rc.firewall6
 OLD_FILES+=usr/share/examples/etc/rc.firewall6
 # 20091117: removal of rc.early(8) link
 OLD_FILES+=usr/share/man/man8/rc.early.8.gz
 # 20091117: usr/share/zoneinfo/GMT link removed
 OLD_FILES+=usr/share/zoneinfo/GMT
 # 20091027: pselect.3 implemented as syscall
 OLD_FILES+=usr/share/man/man3/pselect.3.gz
 # 20091005: fusword.9 and susword.9 removed
 OLD_FILES+=usr/share/man/man9/fusword.9.gz
 OLD_FILES+=usr/share/man/man9/susword.9.gz
 # 20090909: vesa and dpms promoted to be i386/amd64 common
 OLD_FILES+=usr/include/machine/pc/vesa.h
 OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz
 # 20090904: remove lukemftpd
 OLD_FILES+=usr/libexec/lukemftpd
 OLD_FILES+=usr/share/man/man5/ftpd.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ftpusers.5.gz
 OLD_FILES+=usr/share/man/man8/lukemftpd.8.gz
 # 20090902: BSD.{x11,x11-4}.dist are dead and BSD.local.dist lives in ports/
 OLD_FILES+=etc/mtree/BSD.local.dist
 OLD_FILES+=etc/mtree/BSD.x11.dist
 OLD_FILES+=etc/mtree/BSD.x11-4.dist
 # 20090812: net80211 documentation overhaul
 OLD_FILES+=usr/share/man/man9/ieee80211_add_rates.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_add_xrates.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_alloc_node.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_begin_scan.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_cfgget.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_cfgset.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_chan2ieee.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_chan2mode.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_create_ibss.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_crypto_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_crypto_detach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_decap.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_dump_pkt.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_dup_bss.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_encap.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_end_scan.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_find_node.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_fix_rate.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_free_allnodes.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_ieee2mhz.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_ioctl.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_lookup_node.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media2rate.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media_change.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media_init.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media_status.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_mhz2ieee.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_next_scan.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_node_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_node_detach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_node_lateattach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_print_essid.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_proto_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_proto_detach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_rate2media.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_recv_mgmt.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_send_mgmt.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_setmode.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_timeout_nodes.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_watchdog.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_wep_crypt.9.gz
 # 20090801: vimage.h removed in favour of vnet.h
 OLD_FILES+=usr/include/sys/vimage.h
 # 20101208: libbsnmp was moved to usr/lib
 OLD_LIBS+=lib/libbsnmp.so.5
 # 20090719: library version bump for 8.0
 OLD_LIBS+=lib/libalias.so.6
 OLD_LIBS+=lib/libavl.so.1
 OLD_LIBS+=lib/libbegemot.so.3
 OLD_LIBS+=lib/libbsdxml.so.3
 OLD_LIBS+=lib/libbsnmp.so.4
 OLD_LIBS+=lib/libcam.so.4
 OLD_LIBS+=lib/libcrypt.so.4
 OLD_LIBS+=lib/libcrypto.so.5
 OLD_LIBS+=lib/libctf.so.1
 OLD_LIBS+=lib/libdevstat.so.6
 OLD_LIBS+=lib/libdtrace.so.1
 OLD_LIBS+=lib/libedit.so.6
 OLD_LIBS+=lib/libgeom.so.4
 OLD_LIBS+=lib/libipsec.so.3
 OLD_LIBS+=lib/libipx.so.4
 OLD_LIBS+=lib/libkiconv.so.3
 OLD_LIBS+=lib/libkvm.so.4
 OLD_LIBS+=lib/libmd.so.4
 OLD_LIBS+=lib/libncurses.so.7
 OLD_LIBS+=lib/libncursesw.so.7
 OLD_LIBS+=lib/libnvpair.so.1
 OLD_LIBS+=lib/libpcap.so.6
 OLD_LIBS+=lib/libreadline.so.7
 OLD_LIBS+=lib/libsbuf.so.4
 OLD_LIBS+=lib/libufs.so.4
 OLD_LIBS+=lib/libumem.so.1
 OLD_LIBS+=lib/libutil.so.7
 OLD_LIBS+=lib/libuutil.so.1
 OLD_LIBS+=lib/libz.so.4
 OLD_LIBS+=lib/libzfs.so.1
 OLD_LIBS+=lib/libzpool.so.1
 OLD_LIBS+=usr/lib/libarchive.so.4
 OLD_LIBS+=usr/lib/libauditd.so.4
 OLD_LIBS+=usr/lib/libbluetooth.so.3
 OLD_LIBS+=usr/lib/libbsm.so.2
 OLD_LIBS+=usr/lib/libbz2.so.3
 OLD_LIBS+=usr/lib/libcalendar.so.4
 OLD_LIBS+=usr/lib/libcom_err.so.4
 OLD_LIBS+=usr/lib/libdevinfo.so.4
 OLD_LIBS+=usr/lib/libdialog.so.6
 OLD_LIBS+=usr/lib/libdwarf.so.1
 OLD_LIBS+=usr/lib/libfetch.so.5
 OLD_LIBS+=usr/lib/libform.so.4
 OLD_LIBS+=usr/lib/libformw.so.4
 OLD_LIBS+=usr/lib/libftpio.so.7
 OLD_LIBS+=usr/lib/libgnuregex.so.4
 OLD_LIBS+=usr/lib/libgpib.so.2
 OLD_LIBS+=usr/lib/libhistory.so.7
 OLD_LIBS+=usr/lib/libmagic.so.3
 OLD_LIBS+=usr/lib/libmemstat.so.2
 OLD_LIBS+=usr/lib/libmenu.so.4
 OLD_LIBS+=usr/lib/libmenuw.so.4
 OLD_LIBS+=usr/lib/libmilter.so.4
 OLD_LIBS+=usr/lib/libncp.so.3
 OLD_LIBS+=usr/lib/libnetgraph.so.3
 OLD_LIBS+=usr/lib/libngatm.so.3
 OLD_LIBS+=usr/lib/libobjc.so.3
 OLD_LIBS+=usr/lib/libopie.so.5
 OLD_LIBS+=usr/lib/libpam.so.4
 OLD_LIBS+=usr/lib/libpanel.so.4
 OLD_LIBS+=usr/lib/libpanelw.so.4
 OLD_LIBS+=usr/lib/libpmc.so.4
 OLD_LIBS+=usr/lib/libproc.so.1
 OLD_LIBS+=usr/lib/libproc.so.2
 OLD_LIBS+=usr/lib/libradius.so.3
 OLD_LIBS+=usr/lib/librpcsvc.so.4
 OLD_LIBS+=usr/lib/libsdp.so.3
 OLD_LIBS+=usr/lib/libsmb.so.3
 OLD_LIBS+=usr/lib/libssh.so.4
 OLD_LIBS+=usr/lib/libssl.so.5
 OLD_LIBS+=usr/lib/libtacplus.so.3
 OLD_LIBS+=usr/lib/libugidfw.so.3
 OLD_LIBS+=usr/lib/libusb.so.1
 OLD_LIBS+=usr/lib/libusbhid.so.3
 OLD_LIBS+=usr/lib/libvgl.so.5
 OLD_LIBS+=usr/lib/libwrap.so.5
 OLD_LIBS+=usr/lib/libypclnt.so.3
 OLD_LIBS+=usr/lib/pam_chroot.so.4
 OLD_LIBS+=usr/lib/pam_deny.so.4
 OLD_LIBS+=usr/lib/pam_echo.so.4
 OLD_LIBS+=usr/lib/pam_exec.so.4
 OLD_LIBS+=usr/lib/pam_ftpusers.so.4
 OLD_LIBS+=usr/lib/pam_group.so.4
 OLD_LIBS+=usr/lib/pam_guest.so.4
 OLD_LIBS+=usr/lib/pam_krb5.so.4
 OLD_LIBS+=usr/lib/pam_ksu.so.4
 OLD_LIBS+=usr/lib/pam_lastlog.so.4
 OLD_LIBS+=usr/lib/pam_login_access.so.4
 OLD_LIBS+=usr/lib/pam_nologin.so.4
 OLD_LIBS+=usr/lib/pam_opie.so.4
 OLD_LIBS+=usr/lib/pam_opieaccess.so.4
 OLD_LIBS+=usr/lib/pam_passwdqc.so.4
 OLD_LIBS+=usr/lib/pam_permit.so.4
 OLD_LIBS+=usr/lib/pam_radius.so.4
 OLD_LIBS+=usr/lib/pam_rhosts.so.4
 OLD_LIBS+=usr/lib/pam_rootok.so.4
 OLD_LIBS+=usr/lib/pam_securetty.so.4
 OLD_LIBS+=usr/lib/pam_self.so.4
 OLD_LIBS+=usr/lib/pam_ssh.so.4
 OLD_LIBS+=usr/lib/pam_tacplus.so.4
 OLD_LIBS+=usr/lib/pam_unix.so.4
 OLD_LIBS+=usr/lib/snmp_atm.so.5
 OLD_LIBS+=usr/lib/snmp_bridge.so.5
 OLD_LIBS+=usr/lib/snmp_hostres.so.5
 OLD_LIBS+=usr/lib/snmp_mibII.so.5
 OLD_LIBS+=usr/lib/snmp_netgraph.so.5
 OLD_LIBS+=usr/lib/snmp_pf.so.5
 OLD_LIBS+=usr/lib32/libalias.so.6
 OLD_LIBS+=usr/lib32/libarchive.so.4
 OLD_LIBS+=usr/lib32/libauditd.so.4
 OLD_LIBS+=usr/lib32/libavl.so.1
 OLD_LIBS+=usr/lib32/libbegemot.so.3
 OLD_LIBS+=usr/lib32/libbluetooth.so.3
 OLD_LIBS+=usr/lib32/libbsdxml.so.3
 OLD_LIBS+=usr/lib32/libbsm.so.2
 OLD_LIBS+=usr/lib32/libbsnmp.so.4
 OLD_LIBS+=usr/lib32/libbz2.so.3
 OLD_LIBS+=usr/lib32/libcalendar.so.4
 OLD_LIBS+=usr/lib32/libcam.so.4
 OLD_LIBS+=usr/lib32/libcom_err.so.4
 OLD_LIBS+=usr/lib32/libcrypt.so.4
 OLD_LIBS+=usr/lib32/libcrypto.so.5
 OLD_LIBS+=usr/lib32/libctf.so.1
 OLD_LIBS+=usr/lib32/libdevinfo.so.4
 OLD_LIBS+=usr/lib32/libdevstat.so.6
 OLD_LIBS+=usr/lib32/libdialog.so.6
 OLD_LIBS+=usr/lib32/libdtrace.so.1
 OLD_LIBS+=usr/lib32/libdwarf.so.1
 OLD_LIBS+=usr/lib32/libedit.so.6
 OLD_LIBS+=usr/lib32/libfetch.so.5
 OLD_LIBS+=usr/lib32/libform.so.4
 OLD_LIBS+=usr/lib32/libformw.so.4
 OLD_LIBS+=usr/lib32/libftpio.so.7
 OLD_LIBS+=usr/lib32/libgeom.so.4
 OLD_LIBS+=usr/lib32/libgnuregex.so.4
 OLD_LIBS+=usr/lib32/libgpib.so.2
 OLD_LIBS+=usr/lib32/libhistory.so.7
 OLD_LIBS+=usr/lib32/libipsec.so.3
 OLD_LIBS+=usr/lib32/libipx.so.4
 OLD_LIBS+=usr/lib32/libkiconv.so.3
 OLD_LIBS+=usr/lib32/libkvm.so.4
 OLD_LIBS+=usr/lib32/libmagic.so.3
 OLD_LIBS+=usr/lib32/libmd.so.4
 OLD_LIBS+=usr/lib32/libmemstat.so.2
 OLD_LIBS+=usr/lib32/libmenu.so.4
 OLD_LIBS+=usr/lib32/libmenuw.so.4
 OLD_LIBS+=usr/lib32/libmilter.so.4
 OLD_LIBS+=usr/lib32/libncp.so.3
 OLD_LIBS+=usr/lib32/libncurses.so.7
 OLD_LIBS+=usr/lib32/libncursesw.so.7
 OLD_LIBS+=usr/lib32/libnetgraph.so.3
 OLD_LIBS+=usr/lib32/libngatm.so.3
 OLD_LIBS+=usr/lib32/libnvpair.so.1
 OLD_LIBS+=usr/lib32/libobjc.so.3
 OLD_LIBS+=usr/lib32/libopie.so.5
 OLD_LIBS+=usr/lib32/libpam.so.4
 OLD_LIBS+=usr/lib32/libpanel.so.4
 OLD_LIBS+=usr/lib32/libpanelw.so.4
 OLD_LIBS+=usr/lib32/libpcap.so.6
 OLD_LIBS+=usr/lib32/libpmc.so.4
 OLD_LIBS+=usr/lib32/libproc.so.1
 OLD_LIBS+=usr/lib32/libradius.so.3
 OLD_LIBS+=usr/lib32/libreadline.so.7
 OLD_LIBS+=usr/lib32/librpcsvc.so.4
 OLD_LIBS+=usr/lib32/libsbuf.so.4
 OLD_LIBS+=usr/lib32/libsdp.so.3
 OLD_LIBS+=usr/lib32/libsmb.so.3
 OLD_LIBS+=usr/lib32/libssh.so.4
 OLD_LIBS+=usr/lib32/libssl.so.5
 OLD_LIBS+=usr/lib32/libtacplus.so.3
 OLD_LIBS+=usr/lib32/libufs.so.4
 OLD_LIBS+=usr/lib32/libugidfw.so.3
 OLD_LIBS+=usr/lib32/libumem.so.1
 OLD_LIBS+=usr/lib32/libusb.so.1
 OLD_LIBS+=usr/lib32/libusbhid.so.3
 OLD_LIBS+=usr/lib32/libutil.so.7
 OLD_LIBS+=usr/lib32/libuutil.so.1
 OLD_LIBS+=usr/lib32/libvgl.so.5
 OLD_LIBS+=usr/lib32/libwrap.so.5
 OLD_LIBS+=usr/lib32/libypclnt.so.3
 OLD_LIBS+=usr/lib32/libz.so.4
 OLD_LIBS+=usr/lib32/libzfs.so.1
 OLD_LIBS+=usr/lib32/libzpool.so.1
 OLD_LIBS+=usr/lib32/pam_chroot.so.4
 OLD_LIBS+=usr/lib32/pam_deny.so.4
 OLD_LIBS+=usr/lib32/pam_echo.so.4
 OLD_LIBS+=usr/lib32/pam_exec.so.4
 OLD_LIBS+=usr/lib32/pam_ftpusers.so.4
 OLD_LIBS+=usr/lib32/pam_group.so.4
 OLD_LIBS+=usr/lib32/pam_guest.so.4
 OLD_LIBS+=usr/lib32/pam_krb5.so.4
 OLD_LIBS+=usr/lib32/pam_ksu.so.4
 OLD_LIBS+=usr/lib32/pam_lastlog.so.4
 OLD_LIBS+=usr/lib32/pam_login_access.so.4
 OLD_LIBS+=usr/lib32/pam_nologin.so.4
 OLD_LIBS+=usr/lib32/pam_opie.so.4
 OLD_LIBS+=usr/lib32/pam_opieaccess.so.4
 OLD_LIBS+=usr/lib32/pam_passwdqc.so.4
 OLD_LIBS+=usr/lib32/pam_permit.so.4
 OLD_LIBS+=usr/lib32/pam_radius.so.4
 OLD_LIBS+=usr/lib32/pam_rhosts.so.4
 OLD_LIBS+=usr/lib32/pam_rootok.so.4
 OLD_LIBS+=usr/lib32/pam_securetty.so.4
 OLD_LIBS+=usr/lib32/pam_self.so.4
 OLD_LIBS+=usr/lib32/pam_ssh.so.4
 OLD_LIBS+=usr/lib32/pam_tacplus.so.4
 OLD_LIBS+=usr/lib32/pam_unix.so.4
 # 20090718: the gdm pam.d file is no longer required.
 OLD_FILES+=etc/pam.d/gdm
 # 20090714: net_add_domain(9) renamed to domain_add(9)
 OLD_FILES+=usr/share/man/man9/net_add_domain.9.gz
 # 20090713: vimage container structs removed.
 OLD_FILES+=usr/include/netinet/vinet.h
 OLD_FILES+=usr/include/netinet6/vinet6.h
 OLD_FILES+=usr/include/netipsec/vipsec.h
 # 20090712: ieee80211.4 -> net80211.4
 OLD_FILES+=usr/share/man/man4/ieee80211.4.gz
 # 20090711: typo fixed, kproc_resume,.9 -> kproc_resume.9
 OLD_FILES+=usr/share/man/man9/kproc_resume,.9.gz
 # 20090709: msgctl.3 msgget.3 msgrcv.3 msgsnd.3 manual pages moved
 OLD_FILES+=usr/share/man/man3/msgctl.3.gz
 OLD_FILES+=usr/share/man/man3/msgget.3.gz
 OLD_FILES+=usr/share/man/man3/msgrcv.3.gz
 OLD_FILES+=usr/share/man/man3/msgsnd.3.gz
 # 20090630: old kernel RPC implementation removal
 OLD_FILES+=usr/include/nfs/rpcv2.h
 # 20090624: update usbdi(9)
 OLD_FILES+=usr/share/man/man9/usbd_abort_default_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_abort_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_alloc_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_alloc_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall_async.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_toggle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_close_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_device2interface_handle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_do_request_async.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_do_request_flags_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_endpoint_count.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_find_edesc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_find_idesc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_free_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_free_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config_desc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config_desc_full.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_device_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_endpoint_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_interface_altindex.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_interface_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_no_alts.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_quirks.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_speed.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_string.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_string_desc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_xfer_status.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_interface2device_handle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_interface2endpoint_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_interface_count.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_open_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_open_pipe_intr.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_pipe2device_handle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_set_config_index.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_set_config_no.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_set_interface.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_setup_default_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_setup_isoc_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_setup_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_sync_transfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer.9.gz
 OLD_FILES+=usr/share/man/man9/usb_find_desc.9.gz
 # 20090623: number of headers needed for a usb driver reduced
 OLD_FILES+=usr/include/dev/usb/usb_defs.h
 OLD_FILES+=usr/include/dev/usb/usb_error.h
 OLD_FILES+=usr/include/dev/usb/usb_handle_request.h
 OLD_FILES+=usr/include/dev/usb/usb_hid.h
 OLD_FILES+=usr/include/dev/usb/usb_lookup.h
 OLD_FILES+=usr/include/dev/usb/usb_mfunc.h
 OLD_FILES+=usr/include/dev/usb/usb_parse.h
 OLD_FILES+=usr/include/dev/usb/usb_revision.h
 # 20090609: devclass_add_driver is no longer public
 OLD_FILES+=usr/share/man/man9/devclass_add_driver.9.gz
 OLD_FILES+=usr/share/man/man9/devclass_delete_driver.9.gz
 OLD_FILES+=usr/share/man/man9/devclass_find_driver.9.gz
 # 20090605: removal of clists
 OLD_FILES+=usr/include/sys/clist.h
 # 20090602: removal of window(1)
 OLD_FILES+=usr/bin/window
 OLD_FILES+=usr/share/man/man1/window.1.gz
 # 20090531: bind 9.6.1rc1 import
 OLD_LIBS+=usr/lib/liblwres.so.30
 # 20090530: removal of early.sh
 OLD_FILES+=etc/rc.d/early.sh
 # 20090527: renaming of S{LIST,TAILQ}_REMOVE_NEXT() to _REMOVE_AFTER()
 OLD_FILES+=usr/share/man/man3/SLIST_REMOVE_NEXT.3.gz
 OLD_FILES+=usr/share/man/man3/STAILQ_REMOVE_NEXT.3.gz
 # 20090527: removal of legacy USB stack
 OLD_FILES+=usr/include/legacy/dev/usb/dsbr100io.h
 OLD_FILES+=usr/include/legacy/dev/usb/ehcireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/ehcivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/hid.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_urtwreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_urtwvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/ohcireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/ohcivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/rio500_usb.h
 OLD_FILES+=usr/include/legacy/dev/usb/rt2573_ucode.h
 OLD_FILES+=usr/include/legacy/dev/usb/sl811hsreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/sl811hsvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/ubser.h
 OLD_FILES+=usr/include/legacy/dev/usb/ucomvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/udbp.h
 OLD_FILES+=usr/include/legacy/dev/usb/uftdireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/ugraphire_rdesc.h
 OLD_FILES+=usr/include/legacy/dev/usb/uhcireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/uhcivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_mem.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_port.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_quirks.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbcdc.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbdi.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbdi_util.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbdivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbhid.h
 OLD_FILES+=usr/include/legacy/dev/usb/uxb360gp_rdesc.h
 OLD_DIRS+=usr/include/legacy/dev/usb
 OLD_DIRS+=usr/include/legacy/dev
 OLD_DIRS+=usr/include/legacy
 # 20090526: removal of makekey(8)
 OLD_FILES+=usr/libexec/makekey
 OLD_FILES+=usr/share/man/man8/makekey.8.gz
 # 20090522: removal of University of Michigan NFSv4 client
 OLD_FILES+=etc/rc.d/idmapd
 OLD_FILES+=sbin/idmapd
 OLD_FILES+=sbin/mount_nfs4
 OLD_FILES+=usr/share/man/man8/idmapd.8.gz
 OLD_FILES+=usr/share/man/man8/mount_nfs4.8.gz
 # 20090513: removal of legacy versions of USB network interface drivers
 OLD_FILES+=usr/include/legacy/dev/usb/if_upgtvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_ethersubr.h
 # 20090417: removal of legacy versions of USB network interface drivers
 OLD_FILES+=usr/include/legacy/dev/usb/if_auereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_axereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_cdcereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_cuereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_kuereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_ruereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_rumreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_rumvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_udavreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_uralreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_uralvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_zydfw.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_zydreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/kue_fw.h
 # 20090416: removal of ar(4), ray(4), sr(4), raycontrol(8)
 OLD_FILES+=usr/sbin/raycontrol
 OLD_FILES+=usr/share/man/man4/i386/ar.4.gz
 OLD_FILES+=usr/share/man/man4/i386/ray.4.gz
 OLD_FILES+=usr/share/man/man4/i386/sr.4.gz
 OLD_FILES+=usr/share/man/man8/raycontrol.8.gz
 # 20090410: VOP_LEASE.9 removed
 OLD_FILES+=usr/share/man/man9/VOP_LEASE.9.gz
 # 20090406: usb_sw_transfer.h removed
 OLD_FILES+=usr/include/dev/usb/usb_sw_transfer.h
 # 20090405: removal of if_ppp(4) and if_sl(4)
 OLD_FILES+=sbin/slattach rescue/slattach
 OLD_FILES+=sbin/startslip rescue/startslip
 OLD_FILES+=usr/include/net/if_ppp.h
 OLD_FILES+=usr/include/net/if_pppvar.h
 OLD_FILES+=usr/include/net/if_slvar.h
 OLD_FILES+=usr/include/net/ppp_comp.h
 OLD_FILES+=usr/include/net/slip.h
 OLD_FILES+=usr/sbin/sliplogin
 OLD_FILES+=usr/sbin/slstat
 OLD_FILES+=usr/sbin/pppd
 OLD_FILES+=usr/sbin/pppstats
 OLD_FILES+=usr/share/man/man1/startslip.1.gz
 OLD_FILES+=usr/share/man/man4/if_ppp.4.gz
 OLD_FILES+=usr/share/man/man4/if_sl.4.gz
 OLD_FILES+=usr/share/man/man4/ppp.4.gz
 OLD_FILES+=usr/share/man/man4/sl.4.gz
 OLD_FILES+=usr/share/man/man8/pppd.8.gz
 OLD_FILES+=usr/share/man/man8/pppstats.8.gz
 OLD_FILES+=usr/share/man/man8/slattach.8.gz
 OLD_FILES+=usr/share/man/man8/slip.8.gz
 OLD_FILES+=usr/share/man/man8/sliplogin.8.gz
 OLD_FILES+=usr/share/man/man8/slstat.8.gz
 # 20090321: libpcap upgraded to 1.0.0
 OLD_LIBS+=lib/libpcap.so.5
 OLD_LIBS+=usr/lib32/libpcap.so.5
 # 20090319: uscanner(4) has been removed
 OLD_FILES+=usr/share/man/man4/uscanner.4.gz
 # 20090313: k8temp(4) renamed to amdtemp(4)
 OLD_FILES+=usr/share/man/man4/k8temp.4.gz
 # 20090308: libusb.so.1 renamed
 OLD_LIBS+=usr/lib/libusb20.so.1
 OLD_FILES+=usr/lib/libusb20.a
 OLD_FILES+=usr/lib/libusb20.so
 OLD_FILES+=usr/lib/libusb20_p.a
 OLD_FILES+=usr/include/libusb20_compat01.h
 OLD_FILES+=usr/include/libusb20_compat10.h
 OLD_LIBS+=usr/lib32/libusb20.so.1
 OLD_FILES+=usr/lib32/libusb20.a
 OLD_FILES+=usr/lib32/libusb20.so
 OLD_FILES+=usr/lib32/libusb20_p.a
 # 20090226: libmp(3) functions renamed
 OLD_LIBS+=usr/lib/libmp.so.6
 OLD_LIBS+=usr/lib32/libmp.so.6
 # 20090223: changeover of USB stacks
 OLD_FILES+=usr/include/dev/usb2/include/ufm2_ioctl.h
 OLD_FILES+=usr/include/dev/usb2/include/urio2_ioctl.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_cdc.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_defs.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_devid.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_devtable.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_endian.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_error.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_hid.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_ioctl.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_mfunc.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_revision.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_standard.h
 OLD_DIRS+=usr/include/dev/usb2/include
 OLD_DIRS+=usr/include/dev/usb2
 OLD_FILES+=usr/include/dev/usb/dsbr100io.h
 OLD_FILES+=usr/include/dev/usb/ehcireg.h
 OLD_FILES+=usr/include/dev/usb/ehcivar.h
 OLD_FILES+=usr/include/dev/usb/hid.h
 OLD_FILES+=usr/include/dev/usb/if_auereg.h
 OLD_FILES+=usr/include/dev/usb/if_axereg.h
 OLD_FILES+=usr/include/dev/usb/if_cdcereg.h
 OLD_FILES+=usr/include/dev/usb/if_cuereg.h
 OLD_FILES+=usr/include/dev/usb/if_kuereg.h
 OLD_FILES+=usr/include/dev/usb/if_ruereg.h
 OLD_FILES+=usr/include/dev/usb/if_rumreg.h
 OLD_FILES+=usr/include/dev/usb/if_rumvar.h
 OLD_FILES+=usr/include/dev/usb/if_udavreg.h
 OLD_FILES+=usr/include/dev/usb/if_upgtvar.h
 OLD_FILES+=usr/include/dev/usb/if_uralreg.h
 OLD_FILES+=usr/include/dev/usb/if_uralvar.h
 OLD_FILES+=usr/include/dev/usb/if_urtwreg.h
 OLD_FILES+=usr/include/dev/usb/if_urtwvar.h
 OLD_FILES+=usr/include/dev/usb/if_zydfw.h
 OLD_FILES+=usr/include/dev/usb/if_zydreg.h
 OLD_FILES+=usr/include/dev/usb/kue_fw.h
 OLD_FILES+=usr/include/dev/usb/ohcireg.h
 OLD_FILES+=usr/include/dev/usb/ohcivar.h
 OLD_FILES+=usr/include/dev/usb/rio500_usb.h
 OLD_FILES+=usr/include/dev/usb/rt2573_ucode.h
 OLD_FILES+=usr/include/dev/usb/sl811hsreg.h
 OLD_FILES+=usr/include/dev/usb/sl811hsvar.h
 OLD_FILES+=usr/include/dev/usb/ubser.h
 OLD_FILES+=usr/include/dev/usb/ucomvar.h
 OLD_FILES+=usr/include/dev/usb/udbp.h
 OLD_FILES+=usr/include/dev/usb/uftdireg.h
 OLD_FILES+=usr/include/dev/usb/ugraphire_rdesc.h
 OLD_FILES+=usr/include/dev/usb/uhcireg.h
 OLD_FILES+=usr/include/dev/usb/uhcivar.h
 OLD_FILES+=usr/include/dev/usb/usb_ethersubr.h
 OLD_FILES+=usr/include/dev/usb/usb_mem.h
 OLD_FILES+=usr/include/dev/usb/usb_port.h
 OLD_FILES+=usr/include/dev/usb/usb_quirks.h
 OLD_FILES+=usr/include/dev/usb/usbcdc.h
 OLD_FILES+=usr/include/dev/usb/usbdivar.h
 OLD_FILES+=usr/include/dev/usb/uxb360gp_rdesc.h
 OLD_FILES+=usr/sbin/usbdevs
 OLD_FILES+=usr/share/man/man8/usbdevs.8.gz
 # 20090203: removal of pccard header files
 OLD_FILES+=usr/include/pccard/cardinfo.h
 OLD_FILES+=usr/include/pccard/cis.h
 OLD_DIRS+=usr/include/pccard
 # 20090203: adding_user.8 moved to adding_user.7
 OLD_FILES+=usr/share/man/man8/adding_user.8.gz
 # 20090122: tzdata2009a import
 OLD_FILES+=usr/share/zoneinfo/Asia/Katmandu
 # 20090102: file 4.26 import
 OLD_FILES+=usr/share/misc/magic.mime
 OLD_FILES+=usr/share/misc/magic.mime.mgc
 # 20081223: bind 9.4.3 import, nsupdate.8 moved to nsupdate.1
 OLD_FILES+=usr/share/man/man8/nsupdate.8.gz
 # 20081223: ipprotosw.h removed
 OLD_FILES+=usr/include/netinet/ipprotosw.h
 # 20081123: vfs_mountedon.9 removed
 OLD_FILES+=usr/share/man/man9/vfs_mountedon.9.gz
 # 20081023: FREE.9 and MALLOC.9 removed
 OLD_FILES+=usr/share/man/man9/FREE.9.gz
 OLD_FILES+=usr/share/man/man9/MALLOC.9.gz
 # 20080928: removal of inaccurate device_ids(9) manual page
 OLD_FILES+=usr/share/man/man9/device_ids.9.gz
 OLD_FILES+=usr/share/man/man9/major.9.gz
 OLD_FILES+=usr/share/man/man9/minor.9.gz
 OLD_FILES+=usr/share/man/man9/umajor.9.gz
 OLD_FILES+=usr/share/man/man9/uminor.9.gz
 # 20080917: removal of manpage for axed kernel primitive suser(9)
 OLD_FILES+=usr/share/man/man9/suser.9.gz
 OLD_FILES+=usr/share/man/man9/suser_cred.9.gz
 # 20080913: pax removed from rescue
 OLD_FILES+=rescue/pax
 # 20080823: removal of unneeded pt_chown, to implement grantpt(3)
 OLD_FILES+=usr/libexec/pt_chown
 # 20080822: ntp 4.2.4p5 import
 OLD_FILES+=usr/share/doc/ntp/driver23.html
 OLD_FILES+=usr/share/doc/ntp/driver24.html
 # 20080821: several man pages moved from man4.i386 to man4
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/i386/acpi_aiboost.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_asus.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_fujitsu.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_ibm.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_panasonic.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_sony.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_toshiba.4.gz
 OLD_FILES+=usr/share/man/man4/i386/ichwd.4.gz
 OLD_FILES+=usr/share/man/man4/i386/if_ndis.4.gz
 OLD_FILES+=usr/share/man/man4/i386/io.4.gz
 OLD_FILES+=usr/share/man/man4/i386/linux.4.gz
 OLD_FILES+=usr/share/man/man4/i386/ndis.4.gz
 .endif
 # 20080820: MPSAFE TTY layer integrated
 OLD_FILES+=usr/include/sys/linedisc.h
 OLD_FILES+=usr/share/man/man3/posix_openpt.3.gz
 # 20080725: sgtty.h removed
 OLD_FILES+=usr/include/sgtty.h
 # 20080706: bsdlabel(8) removed on powerpc
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=sbin/bsdlabel
 OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz
 .endif
 # 20080704: sbsh(4) removed
 OLD_FILES+=usr/share/man/man4/if_sbsh.4.gz
 OLD_FILES+=usr/share/man/man4/sbsh.4.gz
 # 20080704: cnw(4) removed
 OLD_FILES+=usr/share/man/man4/if_cnw.4.gz
 OLD_FILES+=usr/share/man/man4/cnw.4.gz
 # 20080704: oltr(4) removed
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/i386/if_oltr.4.gz
 OLD_FILES+=usr/share/man/man4/i386/oltr.4.gz
 .endif
 # 20080704: arl(4) removed
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/sbin/arlcontrol
 OLD_FILES+=usr/share/man/man4/i386/arl.4.gz
 OLD_FILES+=usr/share/man/man8/arlcontrol.8.gz
 .endif
 # 20080703: sunlabel only for sparc64
 .if ${TARGET_ARCH} != "sparc64"
 OLD_FILES+=sbin/sunlabel
 OLD_FILES+=usr/share/man/man8/sunlabel.8.gz
 .endif
 # 20080701: wpa_supplicant.conf moved to share/examples/etc/
 OLD_FILES+=usr/share/examples/wpa_supplicant/wpa_supplicant.conf
 OLD_DIRS+=usr/share/examples/wpa_supplicant
 # 20080614: pecoff image activator removed
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/pecoff_machdep.h
 .endif
 # 20080614: sgtty removed
 OLD_FILES+=usr/include/sys/ttychars.h
 OLD_FILES+=usr/include/sys/ttydev.h
 OLD_FILES+=usr/share/man/man3/gtty.3.gz
 OLD_FILES+=usr/share/man/man3/stty.3.gz
 # 20080609: gpt(8) removed
 OLD_FILES+=sbin/gpt
 OLD_FILES+=usr/share/man/man8/gpt.8.gz
 # 20080525: I4B removed
 OLD_FILES+=etc/isdn/answer
 OLD_FILES+=etc/isdn/isdntel
 OLD_FILES+=etc/isdn/record
 OLD_FILES+=etc/isdn/tell
 OLD_FILES+=etc/isdn/tell-record
 OLD_FILES+=etc/isdn/unknown_incoming
 OLD_FILES+=etc/isdn/holidays.D
 OLD_FILES+=etc/isdn/isdnd.rates.A
 OLD_FILES+=etc/isdn/isdnd.rates.D
 OLD_FILES+=etc/isdn/isdnd.rates.F
 OLD_FILES+=etc/isdn/isdnd.rates.L
 OLD_FILES+=etc/isdn/isdnd.rates.UK.BT
 OLD_FILES+=etc/isdn/isdnd.rc.sample
 OLD_FILES+=etc/isdn/isdntel.alias.sample
 OLD_DIRS+=etc/isdn
 OLD_FILES+=etc/rc.d/isdnd
 OLD_FILES+=usr/include/i4b/i4b_cause.h
 OLD_FILES+=usr/include/i4b/i4b_debug.h
 OLD_FILES+=usr/include/i4b/i4b_ioctl.h
 OLD_FILES+=usr/include/i4b/i4b_rbch_ioctl.h
 OLD_FILES+=usr/include/i4b/i4b_tel_ioctl.h
 OLD_FILES+=usr/include/i4b/i4b_trace.h
 OLD_DIRS+=usr/include/i4b
 OLD_FILES+=usr/sbin/dtmfdecode
 OLD_FILES+=usr/sbin/g711conv
 OLD_FILES+=usr/sbin/isdnd
 OLD_FILES+=usr/sbin/isdndebug
 OLD_FILES+=usr/sbin/isdndecode
 OLD_FILES+=usr/sbin/isdnmonitor
 OLD_FILES+=usr/sbin/isdnphone
 OLD_FILES+=usr/sbin/isdntel
 OLD_FILES+=usr/sbin/isdntelctl
 OLD_FILES+=usr/sbin/isdntrace
 OLD_FILES+=usr/share/isdn/0.al
 OLD_FILES+=usr/share/isdn/1.al
 OLD_FILES+=usr/share/isdn/2.al
 OLD_FILES+=usr/share/isdn/3.al
 OLD_FILES+=usr/share/isdn/4.al
 OLD_FILES+=usr/share/isdn/5.al
 OLD_FILES+=usr/share/isdn/6.al
 OLD_FILES+=usr/share/isdn/7.al
 OLD_FILES+=usr/share/isdn/8.al
 OLD_FILES+=usr/share/isdn/9.al
 OLD_FILES+=usr/share/isdn/beep.al
 OLD_FILES+=usr/share/isdn/msg.al
 OLD_DIRS+=usr/share/isdn
 OLD_FILES+=usr/share/man/man1/dtmfdecode.1.gz
 OLD_FILES+=usr/share/man/man1/g711conv.1.gz
 OLD_FILES+=usr/share/man/man4/i4b.4.gz
 OLD_FILES+=usr/share/man/man4/i4bcapi.4.gz
 OLD_FILES+=usr/share/man/man4/i4bctl.4.gz
 OLD_FILES+=usr/share/man/man4/i4bing.4.gz
 OLD_FILES+=usr/share/man/man4/i4bipr.4.gz
 OLD_FILES+=usr/share/man/man4/i4bisppp.4.gz
 OLD_FILES+=usr/share/man/man4/i4bq921.4.gz
 OLD_FILES+=usr/share/man/man4/i4bq931.4.gz
 OLD_FILES+=usr/share/man/man4/i4brbch.4.gz
 OLD_FILES+=usr/share/man/man4/i4btel.4.gz
 OLD_FILES+=usr/share/man/man4/i4btrc.4.gz
 OLD_FILES+=usr/share/man/man4/iavc.4.gz
 OLD_FILES+=usr/share/man/man4/isic.4.gz
 OLD_FILES+=usr/share/man/man4/ifpi.4.gz
 OLD_FILES+=usr/share/man/man4/ifpi2.4.gz
 OLD_FILES+=usr/share/man/man4/ifpnp.4.gz
 OLD_FILES+=usr/share/man/man4/ihfc.4.gz
 OLD_FILES+=usr/share/man/man4/itjc.4.gz
 OLD_FILES+=usr/share/man/man4/iwic.4.gz
 OLD_FILES+=usr/share/man/man5/isdnd.rc.5.gz
 OLD_FILES+=usr/share/man/man5/isdnd.rates.5.gz
 OLD_FILES+=usr/share/man/man5/isdnd.acct.5.gz
 OLD_FILES+=usr/share/man/man8/isdnd.8.gz
 OLD_FILES+=usr/share/man/man8/isdndebug.8.gz
 OLD_FILES+=usr/share/man/man8/isdndecode.8.gz
 OLD_FILES+=usr/share/man/man8/isdnmonitor.8.gz
 OLD_FILES+=usr/share/man/man8/isdnphone.8.gz
 OLD_FILES+=usr/share/man/man8/isdntel.8.gz
 OLD_FILES+=usr/share/man/man8/isdntelctl.8.gz
 OLD_FILES+=usr/share/man/man8/isdntrace.8.gz
 OLD_FILES+=usr/share/examples/isdn/contrib/README
 OLD_FILES+=usr/share/examples/isdn/contrib/anleitung.ppp
 OLD_FILES+=usr/share/examples/isdn/contrib/answer.c
 OLD_FILES+=usr/share/examples/isdn/contrib/answer.sh
 OLD_FILES+=usr/share/examples/isdn/contrib/convert.sh
 OLD_FILES+=usr/share/examples/isdn/contrib/hplay.c
 OLD_FILES+=usr/share/examples/isdn/contrib/i4b-ppp-newbie.txt
 OLD_FILES+=usr/share/examples/isdn/contrib/isdnctl
 OLD_FILES+=usr/share/examples/isdn/contrib/isdnd_acct
 OLD_FILES+=usr/share/examples/isdn/contrib/isdnd_acct.pl
 OLD_FILES+=usr/share/examples/isdn/contrib/isdntelmux.c
 OLD_FILES+=usr/share/examples/isdn/contrib/mrtg-isp0.sh
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/Makefile
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/README
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/i4brunppp-isdnd.rc
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/i4brunppp.8
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/i4brunppp.c
 OLD_FILES+=usr/share/examples/isdn/v21/Makefile
 OLD_FILES+=usr/share/examples/isdn/v21/README
 OLD_FILES+=usr/share/examples/isdn/v21/v21modem.c
 OLD_FILES+=usr/share/examples/isdn/FAQ
 OLD_FILES+=usr/share/examples/isdn/KERNEL
 OLD_FILES+=usr/share/examples/isdn/Overview
 OLD_FILES+=usr/share/examples/isdn/README
 OLD_FILES+=usr/share/examples/isdn/ROADMAP
 OLD_FILES+=usr/share/examples/isdn/ReleaseNotes
 OLD_FILES+=usr/share/examples/isdn/Resources
 OLD_FILES+=usr/share/examples/isdn/SupportedCards
 OLD_FILES+=usr/share/examples/isdn/ThankYou
 OLD_DIRS+=usr/share/examples/isdn/contrib
 OLD_DIRS+=usr/share/examples/isdn/i4brunppp
 OLD_DIRS+=usr/share/examples/isdn/v21
 OLD_DIRS+=usr/share/examples/isdn
 OLD_FILES+=usr/share/examples/ppp/isdnd.rc
 OLD_FILES+=usr/share/examples/ppp/ppp.conf.isdn
 # 20080525: ng_atmpif removed
 OLD_FILES+=usr/include/netgraph/atm/ng_atmpif.h
 OLD_FILES+=usr/share/man/man4/ng_atmpif.4.gz
 # 20080522: pmap_addr_hint removed
 OLD_FILES+=usr/share/man/man9/pmap_addr_hint.9.gz
 # 20080517: ipsec_osdep.h removed
 OLD_FILES+=usr/include/netipsec/ipsec_osdep.h
 # 20080507: heimdal 1.1 import
 OLD_LIBS+=usr/lib/libasn1.so.9
 OLD_LIBS+=usr/lib/libgssapi.so.9
 OLD_LIBS+=usr/lib/libgssapi_krb5.so.9
 OLD_LIBS+=usr/lib/libhdb.so.9
 OLD_LIBS+=usr/lib/libkadm5clnt.so.9
 OLD_LIBS+=usr/lib/libkadm5srv.so.9
 OLD_LIBS+=usr/lib/libkafs5.so.9
 OLD_LIBS+=usr/lib/libkrb5.so.9
 OLD_LIBS+=usr/lib/libroken.so.9
 OLD_LIBS+=usr/lib32/libgssapi.so.9
 # 20080420: Symbol card support dropped
 OLD_FILES+=usr/include/dev/wi/spectrum24t_cf.h
 # 20080420: awi removal
 OLD_FILES+=usr/share/man/man4/awi.4.gz
 OLD_FILES+=usr/share/man/man4/if_awi.4.gz
 # 20080331: pkg_sign has been removed
 OLD_FILES+=usr/sbin/pkg_check
 OLD_FILES+=usr/sbin/pkg_sign
 OLD_FILES+=usr/share/man/man1/pkg_check.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz
 # 20080325: tzdata2008b import
 OLD_FILES+=usr/share/zoneinfo/Asia/Calcutta
 OLD_FILES+=usr/share/zoneinfo/Asia/Saigon
 # 20080314: stack_print(9) mlink fixed
 OLD_FILES+=usr/share/man/man9/stack_printf.9.gz
 # 20080312: libkse removal
 OLD_FILES+=usr/include/sys/kse.h
 OLD_FILES+=usr/lib/libkse.so
 OLD_LIBS+=usr/lib/libkse.so.3
 OLD_FILES+=usr/share/man/man2/kse.2.gz
 OLD_FILES+=usr/share/man/man2/kse_create.2.gz
 OLD_FILES+=usr/share/man/man2/kse_exit.2.gz
 OLD_FILES+=usr/share/man/man2/kse_release.2.gz
 OLD_FILES+=usr/share/man/man2/kse_switchin.2.gz
 OLD_FILES+=usr/share/man/man2/kse_thr_interrupt.2.gz
 OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz
 OLD_FILES+=usr/lib32/libkse.so
 OLD_LIBS+=usr/lib32/libkse.so.3
 # 20080225: bsdar/bsdranlib rename to ar/ranlib
 OLD_FILES+=usr/bin/bsdar
 OLD_FILES+=usr/bin/bsdranlib
 OLD_FILES+=usr/share/man/man1/bsdar.1.gz
 OLD_FILES+=usr/share/man/man1/bsdranlib.1.gz
 # 20080220: geom_lvm rename to geom_linux_lvm
 OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz
 # 20080126: oldcard.4 removal
 OLD_FILES+=usr/share/man/man4/card.4.gz
 OLD_FILES+=usr/share/man/man4/oldcard.4.gz
 # 20080122: Removed from the tree
 OLD_FILES+=usr/share/man/man9/BUF_REFCNT.9.gz
 # 20080108: Moved to section 2
 OLD_FILES+=usr/share/man/man3/shm_open.3.gz
 OLD_FILES+=usr/share/man/man3/shm_unlink.3.gz
 # 20071207: Merged with fortunes-o.real
 OLD_FILES+=usr/share/games/fortune/fortunes2-o
 OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat
 # 20071201: Removal of XRPU driver
 OLD_FILES+=usr/include/sys/xrpuio.h
 # 20071129: Disabled static versions of libkse by default
 OLD_FILES+=usr/lib/libkse.a
 OLD_FILES+=usr/lib/libkse_p.a
 OLD_FILES+=usr/lib/libkse_pic.a
 OLD_FILES+=usr/lib32/libkse.a
 OLD_FILES+=usr/lib32/libkse_p.a
 OLD_FILES+=usr/lib32/libkse_pic.a
 # 20071129: Removed a Solaris compatibility header
 OLD_FILES+=usr/include/sys/_elf_solaris.h
 # 20071125: Renamed to pmc_get_msr()
 OLD_FILES+=usr/share/man/man3/pmc_x86_get_msr.3.gz
 # 20071108: Removed very crunch OLDCARD support file
 OLD_FILES+=etc/defaults/pccard.conf
 # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd
 OLD_FILES+=etc/rc.d/nfslocking
 # 20070930: rename of cached to nscd
 OLD_FILES+=etc/cached.conf
 OLD_FILES+=etc/rc.d/cached
 OLD_FILES+=usr/sbin/cached
 OLD_FILES+=usr/share/man/man5/cached.conf.5.gz
 OLD_FILES+=usr/share/man/man8/cached.8.gz
 # 20070807: removal of PowerPC specific header file.
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/machine/interruptvar.h
 .endif
 # 20070801: fast_ipsec.4 gone
 OLD_FILES+=usr/share/man/man4/fast_ipsec.4.gz
 # 20070715: netatm temporarily disconnected (removed 20080525)
 OLD_FILES+=rescue/atm
 OLD_FILES+=rescue/fore_dnld
 OLD_FILES+=rescue/ilmid
 OLD_FILES+=sbin/atm
 OLD_FILES+=sbin/fore_dnld
 OLD_FILES+=sbin/ilmid
 OLD_FILES+=usr/include/libatm.h
 OLD_FILES+=usr/include/netatm/atm.h
 OLD_FILES+=usr/include/netatm/atm_cm.h
 OLD_FILES+=usr/include/netatm/atm_if.h
 OLD_FILES+=usr/include/netatm/atm_ioctl.h
 OLD_FILES+=usr/include/netatm/atm_pcb.h
 OLD_FILES+=usr/include/netatm/atm_sap.h
 OLD_FILES+=usr/include/netatm/atm_sigmgr.h
 OLD_FILES+=usr/include/netatm/atm_stack.h
 OLD_FILES+=usr/include/netatm/atm_sys.h
 OLD_FILES+=usr/include/netatm/atm_var.h
 OLD_FILES+=usr/include/netatm/atm_vc.h
 OLD_FILES+=usr/include/netatm/ipatm/ipatm.h
 OLD_FILES+=usr/include/netatm/ipatm/ipatm_serv.h
 OLD_FILES+=usr/include/netatm/ipatm/ipatm_var.h
 OLD_FILES+=usr/include/netatm/port.h
 OLD_FILES+=usr/include/netatm/queue.h
 OLD_FILES+=usr/include/netatm/sigpvc/sigpvc_var.h
 OLD_FILES+=usr/include/netatm/spans/spans_cls.h
 OLD_FILES+=usr/include/netatm/spans/spans_kxdr.h
 OLD_FILES+=usr/include/netatm/spans/spans_var.h
 OLD_FILES+=usr/include/netatm/uni/sscf_uni.h
 OLD_FILES+=usr/include/netatm/uni/sscf_uni_var.h
 OLD_FILES+=usr/include/netatm/uni/sscop.h
 OLD_FILES+=usr/include/netatm/uni/sscop_misc.h
 OLD_FILES+=usr/include/netatm/uni/sscop_pdu.h
 OLD_FILES+=usr/include/netatm/uni/sscop_var.h
 OLD_FILES+=usr/include/netatm/uni/uni.h
 OLD_FILES+=usr/include/netatm/uni/uniip_var.h
 OLD_FILES+=usr/include/netatm/uni/unisig.h
 OLD_FILES+=usr/include/netatm/uni/unisig_decode.h
 OLD_FILES+=usr/include/netatm/uni/unisig_mbuf.h
 OLD_FILES+=usr/include/netatm/uni/unisig_msg.h
 OLD_FILES+=usr/include/netatm/uni/unisig_print.h
 OLD_FILES+=usr/include/netatm/uni/unisig_var.h
 OLD_FILES+=usr/lib/libatm.a
 OLD_FILES+=usr/lib/libatm_p.a
 OLD_FILES+=usr/sbin/atmarpd
 OLD_FILES+=usr/sbin/scspd
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/atm.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/atmarpd.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/fore_dnld.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/ilmid.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/scspd.8.gz
 OLD_FILES+=usr/share/man/man8/atm.8.gz
 OLD_FILES+=usr/share/man/man8/atmarpd.8.gz
 OLD_FILES+=usr/share/man/man8/fore_dnld.8.gz
 OLD_FILES+=usr/share/man/man8/ilmid.8.gz
 OLD_FILES+=usr/share/man/man8/scspd.8.gz
 OLD_FILES+=usr/share/examples/atm/NOTES
 OLD_FILES+=usr/share/examples/atm/README
 OLD_FILES+=usr/share/examples/atm/Startup
 OLD_FILES+=usr/share/examples/atm/atm-config.sh
 OLD_FILES+=usr/share/examples/atm/atm-sockets.txt
 OLD_FILES+=usr/share/examples/atm/cpcs-design.txt
 OLD_FILES+=usr/share/examples/atm/fore-microcode.txt
 OLD_FILES+=usr/share/examples/atm/sscf-design.txt
 OLD_FILES+=usr/share/examples/atm/sscop-design.txt
 OLD_LIBS+=lib/libatm.so.5
 OLD_LIBS+=usr/lib/libatm.so
 OLD_DIRS+=usr/include/netatm/sigpvc
 OLD_DIRS+=usr/include/netatm/spans
 OLD_DIRS+=usr/include/netatm/ipatm
 OLD_DIRS+=usr/include/netatm/uni
 OLD_DIRS+=usr/include/netatm
 OLD_DIRS+=usr/share/examples/atm
 OLD_FILES+=usr/lib32/libatm.a
 OLD_FILES+=usr/lib32/libatm.so
 OLD_LIBS+=usr/lib32/libatm.so.5
 OLD_FILES+=usr/lib32/libatm_p.a
 # 20070705: I4B headers repo-copied to include/i4b/
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/i4b_cause.h
 OLD_FILES+=usr/include/machine/i4b_debug.h
 OLD_FILES+=usr/include/machine/i4b_ioctl.h
 OLD_FILES+=usr/include/machine/i4b_rbch_ioctl.h
 OLD_FILES+=usr/include/machine/i4b_tel_ioctl.h
 OLD_FILES+=usr/include/machine/i4b_trace.h
 .endif
 # 20070703: pf 4.1 import
 OLD_FILES+=usr/libexec/ftp-proxy
 # 20070701: KAME IPSec removal
 OLD_FILES+=usr/include/netinet6/ah.h
 OLD_FILES+=usr/include/netinet6/ah6.h
 OLD_FILES+=usr/include/netinet6/ah_aesxcbcmac.h
 OLD_FILES+=usr/include/netinet6/esp.h
 OLD_FILES+=usr/include/netinet6/esp6.h
 OLD_FILES+=usr/include/netinet6/esp_aesctr.h
 OLD_FILES+=usr/include/netinet6/esp_camellia.h
 OLD_FILES+=usr/include/netinet6/esp_rijndael.h
 OLD_FILES+=usr/include/netinet6/ipsec.h
 OLD_FILES+=usr/include/netinet6/ipsec6.h
 OLD_FILES+=usr/include/netinet6/ipcomp.h
 OLD_FILES+=usr/include/netinet6/ipcomp6.h
 OLD_FILES+=usr/include/netkey/key.h
 OLD_FILES+=usr/include/netkey/key_debug.h
 OLD_FILES+=usr/include/netkey/key_var.h
 OLD_FILES+=usr/include/netkey/keydb.h
 OLD_FILES+=usr/include/netkey/keysock.h
 OLD_DIRS+=usr/include/netkey
 # 20070701: remove wicontrol
 OLD_FILES+=usr/sbin/wicontrol
 OLD_FILES+=usr/share/man/man8/wicontrol.8.gz
 # 20070625: umapfs removal
 OLD_FILES+=rescue/mount_umapfs
 OLD_FILES+=sbin/mount_umapfs
 OLD_FILES+=usr/include/fs/umapfs/umap.h
 OLD_FILES+=usr/share/man/man8/mount_umapfs.8.gz
 OLD_DIRS+=usr/include/fs/umapfs
 # 20070618: Removal of the PROTO.localhost* files
 OLD_FILES+=etc/namedb/PROTO.localhost-v6.rev
 OLD_FILES+=etc/namedb/PROTO.localhost.rev
 OLD_FILES+=etc/namedb/make-localhost
 # 20070618: shared library version bump
 OLD_LIBS+=lib/libalias.so.5
 OLD_LIBS+=lib/libbsnmp.so.3
 OLD_LIBS+=lib/libncurses.so.6
 OLD_LIBS+=lib/libncursesw.so.6
 OLD_LIBS+=lib/libreadline.so.6
 OLD_LIBS+=usr/lib/libdialog.so.5
 OLD_LIBS+=usr/lib/libgnuregex.so.3
 OLD_LIBS+=usr/lib/libhistory.so.6
 OLD_LIBS+=usr/lib/libpam.so.3
 OLD_LIBS+=usr/lib/libssh.so.3
 OLD_LIBS+=usr/lib/pam_chroot.so.3
 OLD_LIBS+=usr/lib/pam_deny.so.3
 OLD_LIBS+=usr/lib/pam_echo.so.3
 OLD_LIBS+=usr/lib/pam_exec.so.3
 OLD_LIBS+=usr/lib/pam_ftpusers.so.3
 OLD_LIBS+=usr/lib/pam_group.so.3
 OLD_LIBS+=usr/lib/pam_guest.so.3
 OLD_LIBS+=usr/lib/pam_krb5.so.3
 OLD_LIBS+=usr/lib/pam_ksu.so.3
 OLD_LIBS+=usr/lib/pam_lastlog.so.3
 OLD_LIBS+=usr/lib/pam_login_access.so.3
 OLD_LIBS+=usr/lib/pam_nologin.so.3
 OLD_LIBS+=usr/lib/pam_opie.so.3
 OLD_LIBS+=usr/lib/pam_opieaccess.so.3
 OLD_LIBS+=usr/lib/pam_passwdqc.so.3
 OLD_LIBS+=usr/lib/pam_permit.so.3
 OLD_LIBS+=usr/lib/pam_radius.so.3
 OLD_LIBS+=usr/lib/pam_rhosts.so.3
 OLD_LIBS+=usr/lib/pam_rootok.so.3
 OLD_LIBS+=usr/lib/pam_securetty.so.3
 OLD_LIBS+=usr/lib/pam_self.so.3
 OLD_LIBS+=usr/lib/pam_ssh.so.3
 OLD_LIBS+=usr/lib/pam_tacplus.so.3
 OLD_LIBS+=usr/lib/pam_unix.so.3
 OLD_LIBS+=usr/lib/snmp_atm.so.4
 OLD_LIBS+=usr/lib/snmp_bridge.so.4
 OLD_LIBS+=usr/lib/snmp_hostres.so.4
 OLD_LIBS+=usr/lib/snmp_mibII.so.4
 OLD_LIBS+=usr/lib/snmp_netgraph.so.4
 OLD_LIBS+=usr/lib/snmp_pf.so.4
 OLD_LIBS+=usr/lib32/libalias.so.5
 OLD_LIBS+=usr/lib32/libbsnmp.so.3
 OLD_LIBS+=usr/lib32/libdialog.so.5
 OLD_LIBS+=usr/lib32/libgnuregex.so.3
 OLD_LIBS+=usr/lib32/libhistory.so.6
 OLD_LIBS+=usr/lib32/libncurses.so.6
 OLD_LIBS+=usr/lib32/libncursesw.so.6
 OLD_LIBS+=usr/lib32/libpam.so.3
 OLD_LIBS+=usr/lib32/libreadline.so.6
 OLD_LIBS+=usr/lib32/libssh.so.3
 OLD_LIBS+=usr/lib32/pam_chroot.so.3
 OLD_LIBS+=usr/lib32/pam_deny.so.3
 OLD_LIBS+=usr/lib32/pam_echo.so.3
 OLD_LIBS+=usr/lib32/pam_exec.so.3
 OLD_LIBS+=usr/lib32/pam_ftpusers.so.3
 OLD_LIBS+=usr/lib32/pam_group.so.3
 OLD_LIBS+=usr/lib32/pam_guest.so.3
 OLD_LIBS+=usr/lib32/pam_krb5.so.3
 OLD_LIBS+=usr/lib32/pam_ksu.so.3
 OLD_LIBS+=usr/lib32/pam_lastlog.so.3
 OLD_LIBS+=usr/lib32/pam_login_access.so.3
 OLD_LIBS+=usr/lib32/pam_nologin.so.3
 OLD_LIBS+=usr/lib32/pam_opie.so.3
 OLD_LIBS+=usr/lib32/pam_opieaccess.so.3
 OLD_LIBS+=usr/lib32/pam_passwdqc.so.3
 OLD_LIBS+=usr/lib32/pam_permit.so.3
 OLD_LIBS+=usr/lib32/pam_radius.so.3
 OLD_LIBS+=usr/lib32/pam_rhosts.so.3
 OLD_LIBS+=usr/lib32/pam_rootok.so.3
 OLD_LIBS+=usr/lib32/pam_securetty.so.3
 OLD_LIBS+=usr/lib32/pam_self.so.3
 OLD_LIBS+=usr/lib32/pam_ssh.so.3
 OLD_LIBS+=usr/lib32/pam_tacplus.so.3
 OLD_LIBS+=usr/lib32/pam_unix.so.3
 # 20070613: IPX over IP tunnel removal
 OLD_FILES+=usr/include/netipx/ipx_ip.h
 # 20070605: sched_core removal
 OLD_FILES+=usr/share/man/man4/sched_core.4.gz
 # 20070603: BIND 9.4.1 import
 OLD_LIBS+=usr/lib/liblwres.so.10
 # 20070521: shared library version bump
 OLD_LIBS+=lib/libatm.so.4
 OLD_LIBS+=lib/libbegemot.so.2
 OLD_LIBS+=lib/libbsdxml.so.2
 OLD_LIBS+=lib/libcam.so.3
 OLD_LIBS+=lib/libcrypt.so.3
 OLD_LIBS+=lib/libdevstat.so.5
 OLD_LIBS+=lib/libedit.so.5
 OLD_LIBS+=lib/libgeom.so.3
 OLD_LIBS+=lib/libipsec.so.2
 OLD_LIBS+=lib/libipx.so.3
 OLD_LIBS+=lib/libkiconv.so.2
 OLD_LIBS+=lib/libkse.so.2
 OLD_LIBS+=lib/libkvm.so.3
 OLD_LIBS+=lib/libm.so.4
 OLD_LIBS+=lib/libmd.so.3
 OLD_LIBS+=lib/libpcap.so.4
 OLD_LIBS+=lib/libpthread.so.2
 OLD_LIBS+=lib/libsbuf.so.3
 OLD_LIBS+=lib/libthr.so.2
 OLD_LIBS+=lib/libufs.so.3
 OLD_LIBS+=lib/libutil.so.6
 OLD_LIBS+=lib/libz.so.3
 OLD_LIBS+=usr/lib/libbluetooth.so.2
 OLD_LIBS+=usr/lib/libbsm.so.1
 OLD_LIBS+=usr/lib/libbz2.so.2
 OLD_LIBS+=usr/lib/libcalendar.so.3
 OLD_LIBS+=usr/lib/libcom_err.so.3
 OLD_LIBS+=usr/lib/libdevinfo.so.3
 OLD_LIBS+=usr/lib/libfetch.so.4
 OLD_LIBS+=usr/lib/libform.so.3
 OLD_LIBS+=usr/lib/libformw.so.3
 OLD_LIBS+=usr/lib/libftpio.so.6
 OLD_LIBS+=usr/lib/libgpib.so.1
 OLD_LIBS+=usr/lib/libkse.so.2
 OLD_LIBS+=usr/lib/libmagic.so.2
 OLD_LIBS+=usr/lib/libmemstat.so.1
 OLD_LIBS+=usr/lib/libmenu.so.3
 OLD_LIBS+=usr/lib/libmenuw.so.3
 OLD_LIBS+=usr/lib/libmilter.so.3
 OLD_LIBS+=usr/lib/libmp.so.5
 OLD_LIBS+=usr/lib/libncp.so.2
 OLD_LIBS+=usr/lib/libnetgraph.so.2
 OLD_LIBS+=usr/lib/libngatm.so.2
 OLD_LIBS+=usr/lib/libopie.so.4
 OLD_LIBS+=usr/lib/libpanel.so.3
 OLD_LIBS+=usr/lib/libpanelw.so.3
 OLD_LIBS+=usr/lib/libpmc.so.3
 OLD_LIBS+=usr/lib/libradius.so.2
 OLD_LIBS+=usr/lib/librpcsvc.so.3
 OLD_LIBS+=usr/lib/libsdp.so.2
 OLD_LIBS+=usr/lib/libsmb.so.2
 OLD_LIBS+=usr/lib/libstdc++.so.5
 OLD_LIBS+=usr/lib/libtacplus.so.2
 OLD_LIBS+=usr/lib/libthr.so.2
 OLD_LIBS+=usr/lib/libthread_db.so.2
 OLD_LIBS+=usr/lib/libugidfw.so.2
 OLD_LIBS+=usr/lib/libusbhid.so.2
 OLD_LIBS+=usr/lib/libvgl.so.4
 OLD_LIBS+=usr/lib/libwrap.so.4
 OLD_LIBS+=usr/lib/libypclnt.so.2
 OLD_LIBS+=usr/lib/snmp_bridge.so.3
 OLD_LIBS+=usr/lib/snmp_hostres.so.3
 OLD_LIBS+=usr/lib32/libatm.so.4
 OLD_LIBS+=usr/lib32/libbegemot.so.2
 OLD_LIBS+=usr/lib32/libbluetooth.so.2
 OLD_LIBS+=usr/lib32/libbsdxml.so.2
 OLD_LIBS+=usr/lib32/libbsm.so.1
 OLD_LIBS+=usr/lib32/libbz2.so.2
 OLD_LIBS+=usr/lib32/libcalendar.so.3
 OLD_LIBS+=usr/lib32/libcam.so.3
 OLD_LIBS+=usr/lib32/libcom_err.so.3
 OLD_LIBS+=usr/lib32/libcrypt.so.3
 OLD_LIBS+=usr/lib32/libdevinfo.so.3
 OLD_LIBS+=usr/lib32/libdevstat.so.5
 OLD_LIBS+=usr/lib32/libedit.so.5
 OLD_LIBS+=usr/lib32/libfetch.so.4
 OLD_LIBS+=usr/lib32/libform.so.3
 OLD_LIBS+=usr/lib32/libformw.so.3
 OLD_LIBS+=usr/lib32/libftpio.so.6
 OLD_LIBS+=usr/lib32/libgeom.so.3
 OLD_LIBS+=usr/lib32/libgpib.so.1
 OLD_LIBS+=usr/lib32/libipsec.so.2
 OLD_LIBS+=usr/lib32/libipx.so.3
 OLD_LIBS+=usr/lib32/libkiconv.so.2
 OLD_LIBS+=usr/lib32/libkse.so.2
 OLD_LIBS+=usr/lib32/libkvm.so.3
 OLD_LIBS+=usr/lib32/libm.so.4
 OLD_LIBS+=usr/lib32/libmagic.so.2
 OLD_LIBS+=usr/lib32/libmd.so.3
 OLD_LIBS+=usr/lib32/libmemstat.so.1
 OLD_LIBS+=usr/lib32/libmenu.so.3
 OLD_LIBS+=usr/lib32/libmenuw.so.3
 OLD_LIBS+=usr/lib32/libmilter.so.3
 OLD_LIBS+=usr/lib32/libmp.so.5
 OLD_LIBS+=usr/lib32/libncp.so.2
 OLD_LIBS+=usr/lib32/libnetgraph.so.2
 OLD_LIBS+=usr/lib32/libngatm.so.2
 OLD_LIBS+=usr/lib32/libopie.so.4
 OLD_LIBS+=usr/lib32/libpanel.so.3
 OLD_LIBS+=usr/lib32/libpanelw.so.3
 OLD_LIBS+=usr/lib32/libpcap.so.4
 OLD_LIBS+=usr/lib32/libpmc.so.3
 OLD_LIBS+=usr/lib32/libpthread.so.2
 OLD_LIBS+=usr/lib32/libradius.so.2
 OLD_LIBS+=usr/lib32/librpcsvc.so.3
 OLD_LIBS+=usr/lib32/libsbuf.so.3
 OLD_LIBS+=usr/lib32/libsdp.so.2
 OLD_LIBS+=usr/lib32/libsmb.so.2
 OLD_LIBS+=usr/lib32/libstdc++.so.5
 OLD_LIBS+=usr/lib32/libtacplus.so.2
 OLD_LIBS+=usr/lib32/libthr.so.2
 OLD_LIBS+=usr/lib32/libthread_db.so.2
 OLD_LIBS+=usr/lib32/libufs.so.3
 OLD_LIBS+=usr/lib32/libugidfw.so.2
 OLD_LIBS+=usr/lib32/libusbhid.so.2
 OLD_LIBS+=usr/lib32/libutil.so.6
 OLD_LIBS+=usr/lib32/libvgl.so.4
 OLD_LIBS+=usr/lib32/libwrap.so.4
 OLD_LIBS+=usr/lib32/libypclnt.so.2
 OLD_LIBS+=usr/lib32/libz.so.3
 # 20070519: GCC 4.2
 OLD_FILES+=usr/bin/f77
 OLD_FILES+=usr/bin/protoize
 OLD_FILES+=usr/include/g2c.h
 OLD_FILES+=usr/libexec/f771
 OLD_FILES+=usr/share/info/g77.info.gz
 OLD_FILES+=usr/share/man/man1/f77.1.gz
 OLD_FILES+=usr/include/c++/3.4/algorithm
 OLD_FILES+=usr/include/c++/3.4/backward/algo.h
 OLD_FILES+=usr/include/c++/3.4/backward/algobase.h
 OLD_FILES+=usr/include/c++/3.4/backward/alloc.h
 OLD_FILES+=usr/include/c++/3.4/backward/backward_warning.h
 OLD_FILES+=usr/include/c++/3.4/backward/bvector.h
 OLD_FILES+=usr/include/c++/3.4/backward/complex.h
 OLD_FILES+=usr/include/c++/3.4/backward/defalloc.h
 OLD_FILES+=usr/include/c++/3.4/backward/deque.h
 OLD_FILES+=usr/include/c++/3.4/backward/fstream.h
 OLD_FILES+=usr/include/c++/3.4/backward/function.h
 OLD_FILES+=usr/include/c++/3.4/backward/hash_map.h
 OLD_FILES+=usr/include/c++/3.4/backward/hash_set.h
 OLD_FILES+=usr/include/c++/3.4/backward/hashtable.h
 OLD_FILES+=usr/include/c++/3.4/backward/heap.h
 OLD_FILES+=usr/include/c++/3.4/backward/iomanip.h
 OLD_FILES+=usr/include/c++/3.4/backward/iostream.h
 OLD_FILES+=usr/include/c++/3.4/backward/istream.h
 OLD_FILES+=usr/include/c++/3.4/backward/iterator.h
 OLD_FILES+=usr/include/c++/3.4/backward/list.h
 OLD_FILES+=usr/include/c++/3.4/backward/map.h
 OLD_FILES+=usr/include/c++/3.4/backward/multimap.h
 OLD_FILES+=usr/include/c++/3.4/backward/multiset.h
 OLD_FILES+=usr/include/c++/3.4/backward/new.h
 OLD_FILES+=usr/include/c++/3.4/backward/ostream.h
 OLD_FILES+=usr/include/c++/3.4/backward/pair.h
 OLD_FILES+=usr/include/c++/3.4/backward/queue.h
 OLD_FILES+=usr/include/c++/3.4/backward/rope.h
 OLD_FILES+=usr/include/c++/3.4/backward/set.h
 OLD_FILES+=usr/include/c++/3.4/backward/slist.h
 OLD_FILES+=usr/include/c++/3.4/backward/stack.h
 OLD_FILES+=usr/include/c++/3.4/backward/stream.h
 OLD_FILES+=usr/include/c++/3.4/backward/streambuf.h
 OLD_FILES+=usr/include/c++/3.4/backward/strstream
 OLD_FILES+=usr/include/c++/3.4/backward/tempbuf.h
 OLD_FILES+=usr/include/c++/3.4/backward/tree.h
 OLD_FILES+=usr/include/c++/3.4/backward/vector.h
 OLD_FILES+=usr/include/c++/3.4/bits/allocator.h
 OLD_FILES+=usr/include/c++/3.4/bits/atomic_word.h
 OLD_FILES+=usr/include/c++/3.4/bits/atomicity.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_file.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_ios.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_ios.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/basic_string.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_string.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/boost_concept_check.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++allocator.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++config.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++io.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++locale.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++locale_internal.h
 OLD_FILES+=usr/include/c++/3.4/bits/char_traits.h
 OLD_FILES+=usr/include/c++/3.4/bits/cmath.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/codecvt.h
 OLD_FILES+=usr/include/c++/3.4/bits/codecvt_specializations.h
 OLD_FILES+=usr/include/c++/3.4/bits/concept_check.h
 OLD_FILES+=usr/include/c++/3.4/bits/concurrence.h
 OLD_FILES+=usr/include/c++/3.4/bits/cpp_type_traits.h
 OLD_FILES+=usr/include/c++/3.4/bits/ctype_base.h
 OLD_FILES+=usr/include/c++/3.4/bits/ctype_inline.h
 OLD_FILES+=usr/include/c++/3.4/bits/ctype_noninline.h
 OLD_FILES+=usr/include/c++/3.4/bits/deque.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/fstream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/functexcept.h
 OLD_FILES+=usr/include/c++/3.4/bits/gslice.h
 OLD_FILES+=usr/include/c++/3.4/bits/gslice_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr-default.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr-posix.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr-single.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr.h
 OLD_FILES+=usr/include/c++/3.4/bits/indirect_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/ios_base.h
 OLD_FILES+=usr/include/c++/3.4/bits/istream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/list.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/locale_classes.h
 OLD_FILES+=usr/include/c++/3.4/bits/locale_facets.h
 OLD_FILES+=usr/include/c++/3.4/bits/locale_facets.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/localefwd.h
 OLD_FILES+=usr/include/c++/3.4/bits/mask_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/messages_members.h
 OLD_FILES+=usr/include/c++/3.4/bits/os_defines.h
 OLD_FILES+=usr/include/c++/3.4/bits/ostream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/postypes.h
 OLD_FILES+=usr/include/c++/3.4/bits/slice_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/sstream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/stl_algo.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_algobase.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_bvector.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_construct.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_deque.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_function.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_heap.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator_base_funcs.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator_base_types.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_list.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_map.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_multimap.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_multiset.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_numeric.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_pair.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_queue.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_relops.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_set.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_stack.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_tempbuf.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_threads.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_tree.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_uninitialized.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_vector.h
 OLD_FILES+=usr/include/c++/3.4/bits/stream_iterator.h
 OLD_FILES+=usr/include/c++/3.4/bits/streambuf.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/streambuf_iterator.h
 OLD_FILES+=usr/include/c++/3.4/bits/stringfwd.h
 OLD_FILES+=usr/include/c++/3.4/bits/time_members.h
 OLD_FILES+=usr/include/c++/3.4/bits/type_traits.h
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_after.h
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_array.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_before.h
 OLD_FILES+=usr/include/c++/3.4/bits/vector.tcc
 OLD_FILES+=usr/include/c++/3.4/bitset
 OLD_FILES+=usr/include/c++/3.4/cassert
 OLD_FILES+=usr/include/c++/3.4/cctype
 OLD_FILES+=usr/include/c++/3.4/cerrno
 OLD_FILES+=usr/include/c++/3.4/cfloat
 OLD_FILES+=usr/include/c++/3.4/ciso646
 OLD_FILES+=usr/include/c++/3.4/climits
 OLD_FILES+=usr/include/c++/3.4/clocale
 OLD_FILES+=usr/include/c++/3.4/cmath
 OLD_FILES+=usr/include/c++/3.4/complex
 OLD_FILES+=usr/include/c++/3.4/csetjmp
 OLD_FILES+=usr/include/c++/3.4/csignal
 OLD_FILES+=usr/include/c++/3.4/cstdarg
 OLD_FILES+=usr/include/c++/3.4/cstddef
 OLD_FILES+=usr/include/c++/3.4/cstdio
 OLD_FILES+=usr/include/c++/3.4/cstdlib
 OLD_FILES+=usr/include/c++/3.4/cstring
 OLD_FILES+=usr/include/c++/3.4/ctime
 OLD_FILES+=usr/include/c++/3.4/cwchar
 OLD_FILES+=usr/include/c++/3.4/cwctype
 OLD_FILES+=usr/include/c++/3.4/cxxabi.h
 OLD_FILES+=usr/include/c++/3.4/debug/bitset
 OLD_FILES+=usr/include/c++/3.4/debug/debug.h
 OLD_FILES+=usr/include/c++/3.4/debug/deque
 OLD_FILES+=usr/include/c++/3.4/debug/formatter.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_map
 OLD_FILES+=usr/include/c++/3.4/debug/hash_map.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_multimap.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_multiset.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_set
 OLD_FILES+=usr/include/c++/3.4/debug/hash_set.h
 OLD_FILES+=usr/include/c++/3.4/debug/list
 OLD_FILES+=usr/include/c++/3.4/debug/map
 OLD_FILES+=usr/include/c++/3.4/debug/map.h
 OLD_FILES+=usr/include/c++/3.4/debug/multimap.h
 OLD_FILES+=usr/include/c++/3.4/debug/multiset.h
 OLD_FILES+=usr/include/c++/3.4/debug/safe_base.h
 OLD_FILES+=usr/include/c++/3.4/debug/safe_iterator.h
 OLD_FILES+=usr/include/c++/3.4/debug/safe_iterator.tcc
 OLD_FILES+=usr/include/c++/3.4/debug/safe_sequence.h
 OLD_FILES+=usr/include/c++/3.4/debug/set
 OLD_FILES+=usr/include/c++/3.4/debug/set.h
 OLD_FILES+=usr/include/c++/3.4/debug/string
 OLD_FILES+=usr/include/c++/3.4/debug/vector
 OLD_FILES+=usr/include/c++/3.4/deque
 OLD_FILES+=usr/include/c++/3.4/exception
 OLD_FILES+=usr/include/c++/3.4/exception_defines.h
 OLD_FILES+=usr/include/c++/3.4/ext/algorithm
 OLD_FILES+=usr/include/c++/3.4/ext/bitmap_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/debug_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/enc_filebuf.h
 OLD_FILES+=usr/include/c++/3.4/ext/functional
 OLD_FILES+=usr/include/c++/3.4/ext/hash_fun.h
 OLD_FILES+=usr/include/c++/3.4/ext/hash_map
 OLD_FILES+=usr/include/c++/3.4/ext/hash_set
 OLD_FILES+=usr/include/c++/3.4/ext/hashtable.h
 OLD_FILES+=usr/include/c++/3.4/ext/iterator
 OLD_FILES+=usr/include/c++/3.4/ext/malloc_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/memory
 OLD_FILES+=usr/include/c++/3.4/ext/mt_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/new_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/numeric
 OLD_FILES+=usr/include/c++/3.4/ext/pod_char_traits.h
 OLD_FILES+=usr/include/c++/3.4/ext/pool_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/rb_tree
 OLD_FILES+=usr/include/c++/3.4/ext/rope
 OLD_FILES+=usr/include/c++/3.4/ext/ropeimpl.h
 OLD_FILES+=usr/include/c++/3.4/ext/slist
 OLD_FILES+=usr/include/c++/3.4/ext/stdio_filebuf.h
 OLD_FILES+=usr/include/c++/3.4/ext/stdio_sync_filebuf.h
 OLD_FILES+=usr/include/c++/3.4/fstream
 OLD_FILES+=usr/include/c++/3.4/functional
 OLD_FILES+=usr/include/c++/3.4/iomanip
 OLD_FILES+=usr/include/c++/3.4/ios
 OLD_FILES+=usr/include/c++/3.4/iosfwd
 OLD_FILES+=usr/include/c++/3.4/iostream
 OLD_FILES+=usr/include/c++/3.4/istream
 OLD_FILES+=usr/include/c++/3.4/iterator
 OLD_FILES+=usr/include/c++/3.4/limits
 OLD_FILES+=usr/include/c++/3.4/list
 OLD_FILES+=usr/include/c++/3.4/locale
 OLD_FILES+=usr/include/c++/3.4/map
 OLD_FILES+=usr/include/c++/3.4/memory
 OLD_FILES+=usr/include/c++/3.4/new
 OLD_FILES+=usr/include/c++/3.4/numeric
 OLD_FILES+=usr/include/c++/3.4/ostream
 OLD_FILES+=usr/include/c++/3.4/queue
 OLD_FILES+=usr/include/c++/3.4/set
 OLD_FILES+=usr/include/c++/3.4/sstream
 OLD_FILES+=usr/include/c++/3.4/stack
 OLD_FILES+=usr/include/c++/3.4/stdexcept
 OLD_FILES+=usr/include/c++/3.4/streambuf
 OLD_FILES+=usr/include/c++/3.4/string
 OLD_FILES+=usr/include/c++/3.4/typeinfo
 OLD_FILES+=usr/include/c++/3.4/utility
 OLD_FILES+=usr/include/c++/3.4/valarray
 OLD_FILES+=usr/include/c++/3.4/vector
 OLD_DIRS+=usr/include/c++/3.4/backward
 OLD_DIRS+=usr/include/c++/3.4/bits
 OLD_DIRS+=usr/include/c++/3.4/debug
 OLD_DIRS+=usr/include/c++/3.4/ext
 OLD_DIRS+=usr/include/c++/3.4
 # 20070510: zpool/zfs moved to /sbin
 OLD_FILES+=usr/sbin/zfs
 OLD_FILES+=usr/sbin/zpool
 # 20070423: rc.bluetooth (examples) removed
 OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth
 OLD_DIRS+=usr/share/examples/netgraph/bluetooth
 # 20070421: worm.4 removed
 OLD_FILES+=usr/share/man/man4/worm.4.gz
 # 20070417: trunk(4) renamed to lagg(4)
 OLD_FILES+=usr/include/net/if_trunk.h
 # 20070409: uuidgen moved to /bin/
 OLD_FILES+=usr/bin/uuidgen
 # 20070328: bzip2 1.0.4
 OLD_FILES+=usr/share/info/bzip2.info.gz
 # 20070303: libarchive 2.0
 OLD_LIBS+=usr/lib/libarchive.so.3
 OLD_LIBS+=usr/lib32/libarchive.so.3
 # 20070301: remove addr2ascii and ascii2addr
 OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz
 OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz
 # 20070225: vm_page_unmanage() removed
 OLD_FILES+=usr/share/man/man9/vm_page_unmanage.9.gz
 # 20070216: VFS_VPTOFH(9) -> VOP_VPTOFH(9)
 OLD_FILES+=usr/share/man/man9/VFS_VPTOFH.9.gz
 # 20070212: kame.4 removed
 OLD_FILES+=usr/share/man/man4/kame.4.gz
 # 20070201: remove libmytinfo link
 OLD_FILES+=usr/lib/libmytinfo.a
 OLD_FILES+=usr/lib/libmytinfo.so
 OLD_FILES+=usr/lib/libmytinfo_p.a
 OLD_FILES+=usr/lib/libmytinfow.a
 OLD_FILES+=usr/lib/libmytinfow.so
 OLD_FILES+=usr/lib/libmytinfow_p.a
 OLD_FILES+=usr/lib32/libmytinfo.a
 OLD_FILES+=usr/lib32/libmytinfo.so
 OLD_FILES+=usr/lib32/libmytinfo_p.a
 OLD_FILES+=usr/lib32/libmytinfow.a
 OLD_FILES+=usr/lib32/libmytinfow.so
 OLD_FILES+=usr/lib32/libmytinfow_p.a
 # 20070128: remove vnconfig
 OLD_FILES+=usr/sbin/vnconfig
 # 20070127: remove bpf_compat.h
 OLD_FILES+=usr/include/net/bpf_compat.h
 # 20070125: objformat bites the dust
 OLD_FILES+=usr/bin/objformat
 OLD_FILES+=usr/share/man/man1/objformat.1.gz
 OLD_FILES+=usr/include/objformat.h
 OLD_FILES+=usr/share/man/man3/getobjformat.3.gz
 # 20061201: remove symlink to *.so.4 libalias modules
 OLD_FILES+=usr/lib/libalias_cuseeme.so
 OLD_FILES+=usr/lib/libalias_dummy.so
 OLD_FILES+=usr/lib/libalias_ftp.so
 OLD_FILES+=usr/lib/libalias_irc.so
 OLD_FILES+=usr/lib/libalias_nbt.so
 OLD_FILES+=usr/lib/libalias_pptp.so
 OLD_FILES+=usr/lib/libalias_skinny.so
 OLD_FILES+=usr/lib/libalias_smedia.so
 # 20061201: remove old *.so.4 libalias modules
 OLD_FILES+=lib/libalias_cuseeme.so.4
 OLD_FILES+=lib/libalias_dummy.so.4
 OLD_FILES+=lib/libalias_ftp.so.4
 OLD_FILES+=lib/libalias_irc.so.4
 OLD_FILES+=lib/libalias_nbt.so.4
 OLD_FILES+=lib/libalias_pptp.so.4
 OLD_FILES+=lib/libalias_skinny.so.4
 OLD_FILES+=lib/libalias_smedia.so.4
 # 20061126: remove old man page
 OLD_FILES+=usr/share/man/man3/archive_read_set_bytes_per_block.3.gz
 # 20061125: remove old man page
 OLD_FILES+=usr/share/man/man9/devsw.9.gz
 # 20061122: remove obsolete mount programs
 OLD_FILES+=sbin/mount_devfs
 OLD_FILES+=sbin/mount_ext2fs
 OLD_FILES+=sbin/mount_fdescfs
 OLD_FILES+=sbin/mount_linprocfs
 OLD_FILES+=sbin/mount_procfs
 OLD_FILES+=sbin/mount_std
 OLD_FILES+=rescue/mount_devfs
 OLD_FILES+=rescue/mount_ext2fs
 OLD_FILES+=rescue/mount_fdescfs
 OLD_FILES+=rescue/mount_linprocfs
 OLD_FILES+=rescue/mount_procfs
 OLD_FILES+=rescue/mount_std
 OLD_FILES+=usr/share/man/man8/mount_devfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_ext2fs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_fdescfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_linprocfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_procfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_std.8.gz
 # 20061116: uhidev.4 removed
 OLD_FILES+=usr/share/man/man4/uhidev.4.gz
 # 20061106: archive_write_prepare.3 removed
 OLD_FILES+=usr/share/man/man3/archive_write_prepare.3.gz
 # 20061018: pccardc removed
 OLD_FILES+=usr/sbin/pccardc usr/share/man/man8/pccardc.8.gz
 # 20060930: demangle.h from contrib/libstdc++/include/ext/
 OLD_FILES+=usr/include/c++/3.4/ext/demangle.h
 # 20060929: mrouted removed
 OLD_FILES+=usr/sbin/map-mbone
 OLD_FILES+=usr/sbin/mrinfo
 OLD_FILES+=usr/sbin/mrouted
 OLD_FILES+=usr/sbin/mtrace
 OLD_FILES+=usr/share/man/man8/map-mbone.8.gz
 OLD_FILES+=usr/share/man/man8/mrinfo.8.gz
 OLD_FILES+=usr/share/man/man8/mrouted.8.gz
 OLD_FILES+=usr/share/man/man8/mtrace.8.gz
 # 20060924: tcpslice removed
 OLD_FILES+=usr/sbin/tcpslice
 OLD_FILES+=usr/share/man/man1/tcpslice.1.gz
 # 20060829: kvmdb cleanup script removed
 OLD_FILES+=etc/periodic/weekly/120.clean-kvmdb
 # 20060822: ramdisk{,-own} have been replaced by mdconfig{,2}
 OLD_FILES+=etc/rc.d/ramdisk
 OLD_FILES+=etc/rc.d/ramdisk-own
 # 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade
 OLD_FILES+=usr/include/openssl/eng_int.h
 OLD_FILES+=usr/include/openssl/hw_4758_cca_err.h
 OLD_FILES+=usr/include/openssl/hw_aep_err.h
 OLD_FILES+=usr/include/openssl/hw_atalla_err.h
 OLD_FILES+=usr/include/openssl/hw_cswift_err.h
 OLD_FILES+=usr/include/openssl/hw_ncipher_err.h
 OLD_FILES+=usr/include/openssl/hw_nuron_err.h
 OLD_FILES+=usr/include/openssl/hw_sureware_err.h
 OLD_FILES+=usr/include/openssl/hw_ubsec_err.h
 # 20060713: mount_linsysfs(8) never existed in 7.x
 OLD_FILES+=sbin/mount_linsysfs
 OLD_FILES+=usr/share/man/man8/mount_linsysfs.8.gz
 # 20060704: KAME compat file net_osdep.h removed
 OLD_FILES+=usr/include/net/net_osdep.h
 # 20060605: man page links removed by OpenBSM 1.0 alpha 6 import
 OLD_FILES+=usr/share/man/man3/au_to_socket.3.gz
 OLD_FILES+=usr/share/man/man3/au_to_socket_ex_128.3.gz
 OLD_FILES+=usr/share/man/man3/au_to_socket_ex_32.3.gz
 # 20060517: pcvt removed
 OLD_FILES+=usr/share/pcvt/README.FIRST
 OLD_FILES+=usr/share/pcvt/Etc/xmodmap-german
 OLD_FILES+=usr/share/pcvt/Etc/pcvt.sh
 OLD_FILES+=usr/share/pcvt/Etc/pcvt.el
 OLD_FILES+=usr/share/pcvt/Etc/Terminfo
 OLD_FILES+=usr/share/pcvt/Etc/Termcap
 OLD_DIRS+=usr/share/pcvt/Etc
 OLD_FILES+=usr/share/pcvt/Doc/NotesAndHints
 OLD_FILES+=usr/share/pcvt/Doc/Keyboard.VT
 OLD_FILES+=usr/share/pcvt/Doc/Keyboard.HP
 OLD_FILES+=usr/share/pcvt/Doc/EscapeSequences
 OLD_FILES+=usr/share/pcvt/Doc/Charsets
 OLD_FILES+=usr/share/pcvt/Doc/CharGen
 OLD_FILES+=usr/share/pcvt/Doc/Bibliography
 OLD_FILES+=usr/share/pcvt/Doc/Acknowledgements
 OLD_DIRS+=usr/share/pcvt/Doc
 OLD_DIRS+=usr/share/pcvt
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.816
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.814
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.810
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.808
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.816
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.814
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.810
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.808
 OLD_DIRS+=usr/share/misc/pcvtfonts
 OLD_FILES+=usr/share/misc/keycap.pcvt
 OLD_FILES+=usr/share/man/man8/ispcvt.8.gz
 OLD_FILES+=usr/share/man/man5/keycap.5.gz
 OLD_FILES+=usr/share/man/man4/pcvt.4.gz
 OLD_FILES+=usr/share/man/man3/kgetstr.3.gz
 OLD_FILES+=usr/share/man/man3/kgetnum.3.gz
 OLD_FILES+=usr/share/man/man3/kgetflag.3.gz
 OLD_FILES+=usr/share/man/man3/kgetent.3.gz
 OLD_FILES+=usr/share/man/man3/keycap.3.gz
 OLD_FILES+=usr/share/man/man1/vt220keys.1.gz
 OLD_FILES+=usr/share/man/man1/scon.1.gz
 OLD_FILES+=usr/share/man/man1/loadfont.1.gz
 OLD_FILES+=usr/share/man/man1/kcon.1.gz
 OLD_FILES+=usr/share/man/man1/fontedit.1.gz
 OLD_FILES+=usr/share/man/man1/cursor.1.gz
 OLD_FILES+=usr/sbin/vt220keys
 OLD_FILES+=usr/sbin/scon
 OLD_FILES+=usr/sbin/loadfont
 OLD_FILES+=usr/sbin/kcon
 OLD_FILES+=usr/sbin/ispcvt
 OLD_FILES+=usr/sbin/fontedit
 OLD_FILES+=usr/sbin/cursor
 OLD_FILES+=usr/lib/libkeycap_p.a
 OLD_FILES+=usr/lib/libkeycap.a
 OLD_FILES+=usr/include/machine/pcvt_ioctl.h
 # 20060514: lnc(4) replaced by le(4)
 OLD_FILES+=usr/share/man/man4/i386/lnc.4.gz
 # 20060512: remove ip6fw
 OLD_FILES+=etc/periodic/security/600.ip6fwdenied
 OLD_FILES+=etc/periodic/security/650.ip6fwlimit
 OLD_FILES+=sbin/ip6fw
 OLD_FILES+=usr/include/netinet6/ip6_fw.h
 OLD_FILES+=usr/share/man/man8/ip6fw.8.gz
 # 20060424: sab(4) removed
 OLD_FILES+=usr/share/man/man4/sab.4.gz
 # 20060328: remove redundant rc.d script
 OLD_FILES+=etc/rc.d/ike
 # 20060127: revert libdisk to static-only
 OLD_FILES+=usr/lib/libdisk.so
 # 20060115: sys/pccard includes cleanup
 OLD_FILES+=usr/include/pccard/driver.h
 OLD_FILES+=usr/include/pccard/i82365.h
 OLD_FILES+=usr/include/pccard/meciareg.h
 OLD_FILES+=usr/include/pccard/pccard_nbk.h
 OLD_FILES+=usr/include/pccard/pcic_pci.h
 OLD_FILES+=usr/include/pccard/pcicvar.h
 OLD_FILES+=usr/include/pccard/slot.h
 # 20051215: rescue/nextboot.sh renamed to rescue/nextboot
 OLD_FILES+=rescue/nextboot.sh
 # 20051214: usbd(8) removed
 OLD_FILES+=etc/rc.d/usbd
 OLD_FILES+=etc/usbd.conf
 OLD_FILES+=usr/sbin/usbd
 OLD_FILES+=usr/share/man/man8/usbd.8.gz
 # 20051029: rc.d/ppp-user renamed to rc.d/ppp for convenience
 OLD_FILES+=etc/rc.d/ppp-user
 # 20051012: setkey(8) moved to /sbin/
 OLD_FILES+=usr/sbin/setkey
 # 20050930: pccardd(8) removed
 OLD_FILES+=usr/sbin/pccardd
 OLD_FILES+=usr/share/man/man5/pccard.conf.5.gz
 OLD_FILES+=usr/share/man/man8/pccardd.8.gz
 # 20050927: bridge(4) replaced by if_bridge(4)
 OLD_FILES+=usr/include/net/bridge.h
 # 20050831: not implemented
 OLD_FILES+=usr/share/man/man3/getino.3.gz
 OLD_FILES+=usr/share/man/man3/putino.3.gz
 # 20050825: T/TCP retired several months ago
 OLD_FILES+=usr/share/man/man4/ttcp.4.gz
 # 20050805 tn3270 retired long ago
 OLD_FILES+=usr/share/misc/map3270
 # 20050801: too old to be interesting here
 OLD_FILES+=usr/share/doc/papers/px.ps.gz
 # 20050721: moved to ports
 OLD_FILES+=usr/sbin/vttest
 OLD_FILES+=usr/share/man/man1/vttest.1.gz
 # 20050617: wpa man pages moved to section 8
 OLD_FILES+=usr/share/man/man1/hostapd.1.gz
 OLD_FILES+=usr/share/man/man1/hostapd_cli.1.gz
 OLD_FILES+=usr/share/man/man1/wpa_cli.1.gz
 OLD_FILES+=usr/share/man/man1/wpa_supplicant.1.gz
 # 20050610: rexecd (insecure by design)
 OLD_FILES+=etc/pam.d/rexecd
 OLD_FILES+=usr/share/man/man8/rexecd.8.gz
 OLD_FILES+=usr/libexec/rexecd
 # 20050606: OpenBSD dhclient replaces ISC one
 OLD_FILES+=bin/omshell
 OLD_FILES+=sbin/omshell
 OLD_FILES+=usr/share/man/man1/omshell.1.gz
 OLD_FILES+=usr/share/man/man5/dhcp-eval.5.gz
 # 200504XX: ipf tools moved from /usr to /
 OLD_FILES+=rescue/ipfs
 OLD_FILES+=rescue/ipfstat
 OLD_FILES+=rescue/ipmon
 OLD_FILES+=rescue/ipnat
 OLD_FILES+=usr/sbin/ipftest
 OLD_FILES+=usr/sbin/ipresend
 OLD_FILES+=usr/sbin/ipsend
 OLD_FILES+=usr/sbin/iptest
 OLD_FILES+=usr/share/man/man1/ipnat.1.gz
 OLD_FILES+=usr/share/man/man1/ipsend.1.gz
 OLD_FILES+=usr/share/man/man1/iptest.1.gz
 OLD_FILES+=usr/share/man/man5/ipsend.5.gz
 # 200503XX: bsdtar takes over gtar
 OLD_FILES+=usr/bin/gtar
 OLD_FILES+=usr/share/man/man1/gtar.1.gz
 # 200503XX
 OLD_FILES+=usr/share/man/man3/exp10.3.gz
 OLD_FILES+=usr/share/man/man3/exp10f.3.gz
 OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz
 # 20050324: updated release infrastructure
 OLD_FILES+=usr/share/man/man5/drivers.conf.5.gz
 # 20050317: removed from BIND 9 distribution
 OLD_FILES+=usr/share/doc/bind9/KNOWN_DEFECTS
 # 2005XXXX:
 OLD_FILES+=sbin/mount_autofs
 OLD_FILES+=usr/lib/libautofs.a
 OLD_FILES+=usr/lib/libautofs.so
 OLD_FILES+=usr/share/man/man8/mount_autofs.8.gz
 # 20050203: Merged with fortunes
 OLD_FILES+=usr/share/games/fortune/fortunes2
 OLD_FILES+=usr/share/games/fortune/fortunes2.dat
 # 200501XX:
 OLD_FILES+=usr/libexec/getNAME
 # 200411XX: gvinum replaces vinum
 OLD_FILES+=bin/vinum
 OLD_FILES+=rescue/vinum
 OLD_FILES+=sbin/vinum
 OLD_FILES+=usr/share/man/man8/vinum.8.gz
 # 200411XX: libxpg4 removal
 OLD_FILES+=usr/lib/libxpg4.a
 OLD_FILES+=usr/lib/libxpg4.so
 OLD_FILES+=usr/lib/libxpg4_p.a
 # 20041109: replaced by em(4)
 OLD_FILES+=usr/share/man/man4/gx.4.gz
 OLD_FILES+=usr/share/man/man4/if_gx.4.gz
 # 20041017: rune interface removed
 OLD_FILES+=usr/include/rune.h
 OLD_FILES+=usr/share/man/man3/fgetrune.3.gz
 OLD_FILES+=usr/share/man/man3/fputrune.3.gz
 OLD_FILES+=usr/share/man/man3/fungetrune.3.gz
 OLD_FILES+=usr/share/man/man3/mbrrune.3.gz
 OLD_FILES+=usr/share/man/man3/mbrune.3.gz
 OLD_FILES+=usr/share/man/man3/rune.3.gz
 OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz
 OLD_FILES+=usr/share/man/man3/sgetrune.3.gz
 OLD_FILES+=usr/share/man/man3/sputrune.3.gz
 # 20040925: bind9 import
 OLD_FILES+=usr/bin/dnskeygen
 OLD_FILES+=usr/bin/dnsquery
 OLD_FILES+=usr/lib/libisc.a
 OLD_FILES+=usr/lib/libisc.so
 OLD_FILES+=usr/lib/libisc_p.a
 OLD_FILES+=usr/libexec/named-xfer
 OLD_FILES+=usr/sbin/named.restart
 OLD_FILES+=usr/sbin/ndc
 OLD_FILES+=usr/sbin/nslookup
 OLD_FILES+=usr/sbin/nsupdate
 OLD_FILES+=usr/share/doc/bind/html/acl.html
 OLD_FILES+=usr/share/doc/bind/html/address_list.html
 OLD_FILES+=usr/share/doc/bind/html/comments.html
 OLD_FILES+=usr/share/doc/bind/html/config.html
 OLD_FILES+=usr/share/doc/bind/html/controls.html
 OLD_FILES+=usr/share/doc/bind/html/docdef.html
 OLD_FILES+=usr/share/doc/bind/html/example.html
 OLD_FILES+=usr/share/doc/bind/html/include.html
 OLD_FILES+=usr/share/doc/bind/html/index.html
 OLD_FILES+=usr/share/doc/bind/html/key.html
 OLD_FILES+=usr/share/doc/bind/html/logging.html
 OLD_FILES+=usr/share/doc/bind/html/master.html
 OLD_FILES+=usr/share/doc/bind/html/options.html
 OLD_FILES+=usr/share/doc/bind/html/server.html
 OLD_FILES+=usr/share/doc/bind/html/trusted-keys.html
 OLD_FILES+=usr/share/doc/bind/html/zone.html
 OLD_FILES+=usr/share/doc/bind/misc/DynamicUpdate
 OLD_FILES+=usr/share/doc/bind/misc/FAQ.1of2
 OLD_FILES+=usr/share/doc/bind/misc/FAQ.2of2
 OLD_FILES+=usr/share/doc/bind/misc/rfc2317-notes.txt
 OLD_FILES+=usr/share/doc/bind/misc/style.txt
 OLD_FILES+=usr/share/man/man1/dnskeygen.1.gz
 OLD_FILES+=usr/share/man/man1/dnsquery.1.gz
 OLD_FILES+=usr/share/man/man8/named-bootconf.8.gz
 OLD_FILES+=usr/share/man/man8/named-xfer.8.gz
 OLD_FILES+=usr/share/man/man8/named.restart.8.gz
 OLD_FILES+=usr/share/man/man8/ndc.8.gz
 OLD_FILES+=usr/share/man/man8/nslookup.8.gz
 # 200409XX
 OLD_FILES+=usr/share/man/man3/ENSURE.3.gz
 OLD_FILES+=usr/share/man/man3/ENSURE_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/INSIST.3.gz
 OLD_FILES+=usr/share/man/man3/INSIST_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/INVARIANT.3.gz
 OLD_FILES+=usr/share/man/man3/INVARIANT_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/REQUIRE.3.gz
 OLD_FILES+=usr/share/man/man3/REQUIRE_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/assertion_type_to_text.3.gz
 OLD_FILES+=usr/share/man/man3/assertions.3.gz
 OLD_FILES+=usr/share/man/man3/bitncmp.3.gz
 OLD_FILES+=usr/share/man/man3/evAddTime.3.gz
 OLD_FILES+=usr/share/man/man3/evCancelConn.3.gz
 OLD_FILES+=usr/share/man/man3/evCancelRW.3.gz
 OLD_FILES+=usr/share/man/man3/evClearIdleTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evClearTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evCmpTime.3.gz
 OLD_FILES+=usr/share/man/man3/evConnFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evConnect.3.gz
 OLD_FILES+=usr/share/man/man3/evConsIovec.3.gz
 OLD_FILES+=usr/share/man/man3/evConsTime.3.gz
 OLD_FILES+=usr/share/man/man3/evCreate.3.gz
 OLD_FILES+=usr/share/man/man3/evDefer.3.gz
 OLD_FILES+=usr/share/man/man3/evDeselectFD.3.gz
 OLD_FILES+=usr/share/man/man3/evDestroy.3.gz
 OLD_FILES+=usr/share/man/man3/evDispatch.3.gz
 OLD_FILES+=usr/share/man/man3/evDo.3.gz
 OLD_FILES+=usr/share/man/man3/evDrop.3.gz
 OLD_FILES+=usr/share/man/man3/evFileFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evGetNext.3.gz
 OLD_FILES+=usr/share/man/man3/evHold.3.gz
 OLD_FILES+=usr/share/man/man3/evInitID.3.gz
 OLD_FILES+=usr/share/man/man3/evLastEventTime.3.gz
 OLD_FILES+=usr/share/man/man3/evListen.3.gz
 OLD_FILES+=usr/share/man/man3/evMainLoop.3.gz
 OLD_FILES+=usr/share/man/man3/evNowTime.3.gz
 OLD_FILES+=usr/share/man/man3/evPrintf.3.gz
 OLD_FILES+=usr/share/man/man3/evRead.3.gz
 OLD_FILES+=usr/share/man/man3/evResetTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evSelectFD.3.gz
 OLD_FILES+=usr/share/man/man3/evSetDebug.3.gz
 OLD_FILES+=usr/share/man/man3/evSetIdleTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evSetTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evStreamFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evSubTime.3.gz
 OLD_FILES+=usr/share/man/man3/evTestID.3.gz
 OLD_FILES+=usr/share/man/man3/evTimeRW.3.gz
 OLD_FILES+=usr/share/man/man3/evTimeSpec.3.gz
 OLD_FILES+=usr/share/man/man3/evTimeVal.3.gz
 OLD_FILES+=usr/share/man/man3/evTimerFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evTouchIdleTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evTryAccept.3.gz
 OLD_FILES+=usr/share/man/man3/evUnhold.3.gz
 OLD_FILES+=usr/share/man/man3/evUntimeRW.3.gz
 OLD_FILES+=usr/share/man/man3/evUnwait.3.gz
 OLD_FILES+=usr/share/man/man3/evWaitFor.3.gz
 OLD_FILES+=usr/share/man/man3/evWaitFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evWrite.3.gz
 OLD_FILES+=usr/share/man/man3/eventlib.3.gz
 OLD_FILES+=usr/share/man/man3/heap.3.gz
 OLD_FILES+=usr/share/man/man3/heap_decreased.3.gz
 OLD_FILES+=usr/share/man/man3/heap_delete.3.gz
 OLD_FILES+=usr/share/man/man3/heap_element.3.gz
 OLD_FILES+=usr/share/man/man3/heap_for_each.3.gz
 OLD_FILES+=usr/share/man/man3/heap_free.3.gz
 OLD_FILES+=usr/share/man/man3/heap_increased.3.gz
 OLD_FILES+=usr/share/man/man3/heap_insert.3.gz
 OLD_FILES+=usr/share/man/man3/heap_new.3.gz
 OLD_FILES+=usr/share/man/man3/log_add_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_category_is_active.3.gz
 OLD_FILES+=usr/share/man/man3/log_close_stream.3.gz
 OLD_FILES+=usr/share/man/man3/log_dec_references.3.gz
 OLD_FILES+=usr/share/man/man3/log_free_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_free_context.3.gz
 OLD_FILES+=usr/share/man/man3/log_get_filename.3.gz
 OLD_FILES+=usr/share/man/man3/log_get_stream.3.gz
 OLD_FILES+=usr/share/man/man3/log_inc_references.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_context.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_file_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_null_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_syslog_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_open_stream.3.gz
 OLD_FILES+=usr/share/man/man3/log_option.3.gz
 OLD_FILES+=usr/share/man/man3/log_remove_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_set_file_owner.3.gz
 OLD_FILES+=usr/share/man/man3/log_vwrite.3.gz
 OLD_FILES+=usr/share/man/man3/log_write.3.gz
 OLD_FILES+=usr/share/man/man3/logging.3.gz
 OLD_FILES+=usr/share/man/man3/memcluster.3.gz
 OLD_FILES+=usr/share/man/man3/memget.3.gz
 OLD_FILES+=usr/share/man/man3/memput.3.gz
 OLD_FILES+=usr/share/man/man3/memstats.3.gz
 OLD_FILES+=usr/share/man/man3/set_assertion_failure_callback.3.
 OLD_FILES+=usr/share/man/man3/sigwait.3.gz
 OLD_FILES+=usr/share/man/man3/tree_add.3.gz
 OLD_FILES+=usr/share/man/man3/tree_delete.3.gz
 OLD_FILES+=usr/share/man/man3/tree_init.3.gz
 OLD_FILES+=usr/share/man/man3/tree_mung.3.gz
 OLD_FILES+=usr/share/man/man3/tree_srch.3.gz
 OLD_FILES+=usr/share/man/man3/tree_trav.3.gz
 # 2004XXYY: OS internal libs, no ports use them, no need to use OLD_LIBS
 OLD_FILES+=lib/geom/geom_concat.so.1
 OLD_FILES+=lib/geom/geom_label.so.1
 OLD_FILES+=lib/geom/geom_nop.so.1
 OLD_FILES+=lib/geom/geom_stripe.so.1
 # 20040728: GCC 3.4.2
 OLD_DIRS+=usr/include/c++/3.3
 OLD_FILES+=usr/include/c++/3.3/FlexLexer.h
 OLD_FILES+=usr/include/c++/3.3/algorithm
 OLD_FILES+=usr/include/c++/3.3/backward/algo.h
 OLD_FILES+=usr/include/c++/3.3/backward/algobase.h
 OLD_FILES+=usr/include/c++/3.3/backward/alloc.h
 OLD_FILES+=usr/include/c++/3.3/backward/backward_warning.h
 OLD_FILES+=usr/include/c++/3.3/backward/bvector.h
 OLD_FILES+=usr/include/c++/3.3/backward/complex.h
 OLD_FILES+=usr/include/c++/3.3/backward/defalloc.h
 OLD_FILES+=usr/include/c++/3.3/backward/deque.h
 OLD_FILES+=usr/include/c++/3.3/backward/fstream.h
 OLD_FILES+=usr/include/c++/3.3/backward/function.h
 OLD_FILES+=usr/include/c++/3.3/backward/hash_map.h
 OLD_FILES+=usr/include/c++/3.3/backward/hash_set.h
 OLD_FILES+=usr/include/c++/3.3/backward/hashtable.h
 OLD_FILES+=usr/include/c++/3.3/backward/heap.h
 OLD_FILES+=usr/include/c++/3.3/backward/iomanip.h
 OLD_FILES+=usr/include/c++/3.3/backward/iostream.h
 OLD_FILES+=usr/include/c++/3.3/backward/istream.h
 OLD_FILES+=usr/include/c++/3.3/backward/iterator.h
 OLD_FILES+=usr/include/c++/3.3/backward/list.h
 OLD_FILES+=usr/include/c++/3.3/backward/map.h
 OLD_FILES+=usr/include/c++/3.3/backward/multimap.h
 OLD_FILES+=usr/include/c++/3.3/backward/multiset.h
 OLD_FILES+=usr/include/c++/3.3/backward/new.h
 OLD_FILES+=usr/include/c++/3.3/backward/ostream.h
 OLD_FILES+=usr/include/c++/3.3/backward/pair.h
 OLD_FILES+=usr/include/c++/3.3/backward/queue.h
 OLD_FILES+=usr/include/c++/3.3/backward/rope.h
 OLD_FILES+=usr/include/c++/3.3/backward/set.h
 OLD_FILES+=usr/include/c++/3.3/backward/slist.h
 OLD_FILES+=usr/include/c++/3.3/backward/stack.h
 OLD_FILES+=usr/include/c++/3.3/backward/stream.h
 OLD_FILES+=usr/include/c++/3.3/backward/streambuf.h
 OLD_FILES+=usr/include/c++/3.3/backward/strstream
 OLD_FILES+=usr/include/c++/3.3/backward/strstream.h
 OLD_FILES+=usr/include/c++/3.3/backward/tempbuf.h
 OLD_FILES+=usr/include/c++/3.3/backward/tree.h
 OLD_FILES+=usr/include/c++/3.3/backward/vector.h
 OLD_DIRS+=usr/include/c++/3.3/backward
 OLD_FILES+=usr/include/c++/3.3/bits/atomicity.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_file.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/basic_string.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_string.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/boost_concept_check.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++config.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++io.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++locale.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++locale_internal.h
 OLD_FILES+=usr/include/c++/3.3/bits/char_traits.h
 OLD_FILES+=usr/include/c++/3.3/bits/cmath.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/codecvt.h
 OLD_FILES+=usr/include/c++/3.3/bits/codecvt_specializations.h
 OLD_FILES+=usr/include/c++/3.3/bits/concept_check.h
 OLD_FILES+=usr/include/c++/3.3/bits/cpp_type_traits.h
 OLD_FILES+=usr/include/c++/3.3/bits/ctype_base.h
 OLD_FILES+=usr/include/c++/3.3/bits/ctype_inline.h
 OLD_FILES+=usr/include/c++/3.3/bits/ctype_noninline.h
 OLD_FILES+=usr/include/c++/3.3/bits/deque.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/fpos.h
 OLD_FILES+=usr/include/c++/3.3/bits/fstream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/functexcept.h
 OLD_FILES+=usr/include/c++/3.3/bits/generic_shadow.h
 OLD_FILES+=usr/include/c++/3.3/bits/gslice.h
 OLD_FILES+=usr/include/c++/3.3/bits/gslice_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr-default.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr-posix.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr-single.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr.h
 OLD_FILES+=usr/include/c++/3.3/bits/indirect_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/ios_base.h
 OLD_FILES+=usr/include/c++/3.3/bits/istream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/list.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/locale_classes.h
 OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.h
 OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/localefwd.h
 OLD_FILES+=usr/include/c++/3.3/bits/mask_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/messages_members.h
 OLD_FILES+=usr/include/c++/3.3/bits/os_defines.h
 OLD_FILES+=usr/include/c++/3.3/bits/ostream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/pthread_allocimpl.h
 OLD_FILES+=usr/include/c++/3.3/bits/slice.h
 OLD_FILES+=usr/include/c++/3.3/bits/slice_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/sstream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/stl_algo.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_algobase.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_alloc.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_bvector.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_construct.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_deque.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_function.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_heap.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_funcs.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_types.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_list.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_map.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_multimap.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_multiset.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_numeric.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_pair.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_pthread_alloc.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_queue.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_relops.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_set.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_stack.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_tempbuf.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_threads.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_tree.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_uninitialized.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_vector.h
 OLD_FILES+=usr/include/c++/3.3/bits/stream_iterator.h
 OLD_FILES+=usr/include/c++/3.3/bits/streambuf.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/streambuf_iterator.h
 OLD_FILES+=usr/include/c++/3.3/bits/stringfwd.h
 OLD_FILES+=usr/include/c++/3.3/bits/time_members.h
 OLD_FILES+=usr/include/c++/3.3/bits/type_traits.h
 OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/valarray_meta.h
 OLD_FILES+=usr/include/c++/3.3/bits/vector.tcc
 OLD_DIRS+=usr/include/c++/3.3/bits
 OLD_FILES+=usr/include/c++/3.3/bitset
 OLD_FILES+=usr/include/c++/3.3/cassert
 OLD_FILES+=usr/include/c++/3.3/cctype
 OLD_FILES+=usr/include/c++/3.3/cerrno
 OLD_FILES+=usr/include/c++/3.3/cfloat
 OLD_FILES+=usr/include/c++/3.3/ciso646
 OLD_FILES+=usr/include/c++/3.3/climits
 OLD_FILES+=usr/include/c++/3.3/clocale
 OLD_FILES+=usr/include/c++/3.3/cmath
 OLD_FILES+=usr/include/c++/3.3/complex
 OLD_FILES+=usr/include/c++/3.3/csetjmp
 OLD_FILES+=usr/include/c++/3.3/csignal
 OLD_FILES+=usr/include/c++/3.3/cstdarg
 OLD_FILES+=usr/include/c++/3.3/cstddef
 OLD_FILES+=usr/include/c++/3.3/cstdio
 OLD_FILES+=usr/include/c++/3.3/cstdlib
 OLD_FILES+=usr/include/c++/3.3/cstring
 OLD_FILES+=usr/include/c++/3.3/ctime
 OLD_FILES+=usr/include/c++/3.3/cwchar
 OLD_FILES+=usr/include/c++/3.3/cwctype
 OLD_FILES+=usr/include/c++/3.3/cxxabi.h
 OLD_FILES+=usr/include/c++/3.3/deque
 OLD_FILES+=usr/include/c++/3.3/exception
 OLD_FILES+=usr/include/c++/3.3/exception_defines.h
 OLD_FILES+=usr/include/c++/3.3/ext/algorithm
 OLD_FILES+=usr/include/c++/3.3/ext/enc_filebuf.h
 OLD_FILES+=usr/include/c++/3.3/ext/functional
 OLD_FILES+=usr/include/c++/3.3/ext/hash_map
 OLD_FILES+=usr/include/c++/3.3/ext/hash_set
 OLD_FILES+=usr/include/c++/3.3/ext/iterator
 OLD_FILES+=usr/include/c++/3.3/ext/memory
 OLD_FILES+=usr/include/c++/3.3/ext/numeric
 OLD_FILES+=usr/include/c++/3.3/ext/rb_tree
 OLD_FILES+=usr/include/c++/3.3/ext/rope
 OLD_FILES+=usr/include/c++/3.3/ext/ropeimpl.h
 OLD_FILES+=usr/include/c++/3.3/ext/slist
 OLD_FILES+=usr/include/c++/3.3/ext/stdio_filebuf.h
 OLD_FILES+=usr/include/c++/3.3/ext/stl_hash_fun.h
 OLD_FILES+=usr/include/c++/3.3/ext/stl_hashtable.h
 OLD_FILES+=usr/include/c++/3.3/ext/stl_rope.h
 OLD_DIRS+=usr/include/c++/3.3/ext
 OLD_FILES+=usr/include/c++/3.3/fstream
 OLD_FILES+=usr/include/c++/3.3/functional
 OLD_FILES+=usr/include/c++/3.3/iomanip
 OLD_FILES+=usr/include/c++/3.3/ios
 OLD_FILES+=usr/include/c++/3.3/iosfwd
 OLD_FILES+=usr/include/c++/3.3/iostream
 OLD_FILES+=usr/include/c++/3.3/istream
 OLD_FILES+=usr/include/c++/3.3/iterator
 OLD_FILES+=usr/include/c++/3.3/limits
 OLD_FILES+=usr/include/c++/3.3/list
 OLD_FILES+=usr/include/c++/3.3/locale
 OLD_FILES+=usr/include/c++/3.3/map
 OLD_FILES+=usr/include/c++/3.3/memory
 OLD_FILES+=usr/include/c++/3.3/new
 OLD_FILES+=usr/include/c++/3.3/numeric
 OLD_FILES+=usr/include/c++/3.3/ostream
 OLD_FILES+=usr/include/c++/3.3/queue
 OLD_FILES+=usr/include/c++/3.3/set
 OLD_FILES+=usr/include/c++/3.3/sstream
 OLD_FILES+=usr/include/c++/3.3/stack
 OLD_FILES+=usr/include/c++/3.3/stdexcept
 OLD_FILES+=usr/include/c++/3.3/streambuf
 OLD_FILES+=usr/include/c++/3.3/string
 OLD_FILES+=usr/include/c++/3.3/typeinfo
 OLD_FILES+=usr/include/c++/3.3/utility
 OLD_FILES+=usr/include/c++/3.3/valarray
 OLD_FILES+=usr/include/c++/3.3/vector
 # 20040713: fla(4) removed.
 OLD_FILES+=usr/share/man/man4/fla.4.gz
 # 200407XX
 OLD_FILES+=usr/sbin/kernbb
 OLD_FILES+=usr/sbin/ntp-genkeys
 OLD_FILES+=usr/sbin/ntptimeset
 OLD_FILES+=usr/share/man/man8/kernbb.8.gz
 OLD_FILES+=usr/share/man/man8/ntp-genkeys.8.gz
 # 20040627: usbdevs.h and usbdevs_data.h removal
 OLD_FILES+=usr/include/dev/usb/usbdevs.h
 OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 # 200406XX
 OLD_FILES+=usr/bin/gasp
 OLD_FILES+=usr/bin/gdbreplay
 OLD_FILES+=usr/share/man/man1/gasp.1.gz
 OLD_FILES+=sbin/mountd
 OLD_FILES+=sbin/mount_fdesc
 OLD_FILES+=sbin/mount_umap
 OLD_FILES+=sbin/mount_union
 OLD_FILES+=sbin/mount_msdos
 OLD_FILES+=sbin/mount_null
 OLD_FILES+=sbin/mount_kernfs
 # 200405XX: arl
 OLD_FILES+=usr/sbin/arlconfig
 OLD_FILES+=usr/share/man/man8/arlconfig.8.gz
 # 200403XX
 OLD_FILES+=bin/raidctl
 OLD_FILES+=sbin/raidctl
 OLD_FILES+=usr/bin/sasc
 OLD_FILES+=usr/sbin/sgsc
 OLD_FILES+=usr/sbin/stlload
 OLD_FILES+=usr/sbin/stlstats
 OLD_FILES+=usr/share/man/man1/sasc.1.gz
 OLD_FILES+=usr/share/man/man1/sgsc.1.gz
 OLD_FILES+=usr/share/man/man4/i386/stl.4.gz
 OLD_FILES+=usr/share/man/man8/raidctl.8.gz
 # 20040229: clean_environment() was removed after 3 days
 OLD_FILES+=usr/share/man/man3/clean_environment.3.gz
 # 20040119: installed as `isdntel' in newer systems
 OLD_FILES+=etc/isdn/isdntel.sh
 # 200XYYZZ: /lib transition clitches
 OLD_FILES+=lib/libalias.so
 OLD_FILES+=lib/libatm.so
 OLD_FILES+=lib/libbsdxml.so
 OLD_FILES+=lib/libc.so
 OLD_FILES+=lib/libcam.so
 OLD_FILES+=lib/libcrypt.so
 OLD_FILES+=lib/libcrypto.so
 OLD_FILES+=lib/libdevstat.so
 OLD_FILES+=lib/libedit.so
 OLD_FILES+=lib/libgeom.so
 OLD_FILES+=lib/libipsec.so
 OLD_FILES+=lib/libipx.so
 OLD_FILES+=lib/libkvm.so
 OLD_FILES+=lib/libm.so
 OLD_FILES+=lib/libmd.so
 OLD_FILES+=lib/libncurses.so
 OLD_FILES+=lib/libreadline.so
 OLD_FILES+=lib/libsbuf.so
 OLD_FILES+=lib/libufs.so
 OLD_FILES+=lib/libz.so
 # 200312XX
 OLD_FILES+=bin/cxconfig
 OLD_FILES+=sbin/cxconfig
 OLD_FILES+=usr/share/man/man8/cxconfig.8.gz
 # 20031016: MULTI_DRIVER_MODULE macro removed
 OLD_FILES+=usr/share/man/man9/MULTI_DRIVER_MODULE.9.gz
 # 200309XX
 OLD_FILES+=usr/bin/symorder
 OLD_FILES+=usr/share/man/man1/symorder.1.gz
 # 200308XX
 OLD_FILES+=usr/sbin/amldb
 OLD_FILES+=usr/share/man/man8/amldb.8.gz
 # 200307XX
 OLD_FILES+=sbin/mount_nwfs
 OLD_FILES+=sbin/mount_portalfs
 OLD_FILES+=sbin/mount_smbfs
 # 200306XX
 OLD_FILES+=usr/sbin/dev_mkdb
 OLD_FILES+=usr/share/man/man8/dev_mkdb.8.gz
 # 200304XX
 OLD_FILES+=usr/lib/libcipher.a
 OLD_FILES+=usr/lib/libcipher.so
 OLD_FILES+=usr/lib/libcipher_p.a
 OLD_FILES+=usr/lib/libgmp.a
 OLD_FILES+=usr/lib/libgmp.so
 OLD_FILES+=usr/lib/libgmp_p.a
 OLD_FILES+=usr/lib/libperl.a
 OLD_FILES+=usr/lib/libperl.so
 OLD_FILES+=usr/lib/libperl_p.a
 OLD_FILES+=usr/lib/libposix1e.a
 OLD_FILES+=usr/lib/libposix1e.so
 OLD_FILES+=usr/lib/libposix1e_p.a
 OLD_FILES+=usr/lib/libskey.a
 OLD_FILES+=usr/lib/libskey.so
 OLD_FILES+=usr/lib/libskey_p.a
 OLD_FILES+=usr/libexec/tradcpp0
 OLD_FILES+=usr/libexec/cpp0
 # 200304XX: removal of xten
 OLD_FILES+=usr/libexec/xtend
 OLD_FILES+=usr/sbin/xten
 OLD_FILES+=usr/share/man/man1/xten.1.gz
 OLD_FILES+=usr/share/man/man8/xtend.8.gz
 # 200303XX
 OLD_FILES+=usr/lib/libacl.so
 OLD_FILES+=usr/lib/libdescrypt.so
 OLD_FILES+=usr/lib/libf2c.so
 OLD_FILES+=usr/lib/libg++.so
 OLD_FILES+=usr/lib/libkdb.so
 OLD_FILES+=usr/lib/librsaINTL.so
 OLD_FILES+=usr/lib/libscrypt.so
 OLD_FILES+=usr/lib/libss.so
 # 200302XX
 OLD_FILES+=usr/lib/libacl.a
 OLD_FILES+=usr/lib/libacl_p.a
 OLD_FILES+=usr/lib/libkadm.a
 OLD_FILES+=usr/lib/libkadm.so
 OLD_FILES+=usr/lib/libkadm_p.a
 OLD_FILES+=usr/lib/libkafs.a
 OLD_FILES+=usr/lib/libkafs.so
 OLD_FILES+=usr/lib/libkafs_p.a
 OLD_FILES+=usr/lib/libkdb.a
 OLD_FILES+=usr/lib/libkdb_p.a
 OLD_FILES+=usr/lib/libkrb.a
 OLD_FILES+=usr/lib/libkrb.so
 OLD_FILES+=usr/lib/libkrb_p.a
 OLD_FILES+=usr/share/man/man3/SSL_CIPHER_get_name.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_COMP_add_compression_method.3
 OLD_FILES+=usr/share/man/man3/SSL_CTX_add_extra_chain_cert.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_add_session.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_ctrl.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_flush_sessions.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_free.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_get_verify_mode.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_load_verify_locations.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_new.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sess_number.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sess_set_cache_size.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sess_set_get_cb.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sessions.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_cert_store.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_cert_verify_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_cipher_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_client_CA_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_client_cert_cb.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_default_passwd_cb.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_generate_session_id.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_info_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_max_cert_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_mode.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_msg_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_options.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_quiet_shutdown.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_session_cache_mode.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_session_id_context.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_ssl_version.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_timeout.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_tmp_dh_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_tmp_rsa_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_verify.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_use_certificate.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_SESSION_free.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_SESSION_get_ex_new_index.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_SESSION_get_time.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_accept.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_alert_type_string.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_clear.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_connect.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_do_handshake.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_free.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_SSL_CTX.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_ciphers.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_client_CA_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_current_cipher.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_default_timeout.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_error.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_ex_data_X509_STORE_CTX_idx.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_ex_new_index.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_fd.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_peer_cert_chain.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_peer_certificate.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_rbio.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_session.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_verify_result.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_version.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_library_init.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_load_client_CA_file.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_new.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_pending.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_read.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_rstate_string.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_session_reused.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_bio.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_connect_state.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_fd.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_session.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_shutdown.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_verify_result.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_shutdown.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_state_string.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_want.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_write.3.gz
 OLD_FILES+=usr/share/man/man3/d2i_SSL_SESSION.3.gz
 # 200301XX
 OLD_FILES+=usr/share/man/man3/des_3cbc_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_3ecb_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_cbc_cksum.3.gz
 OLD_FILES+=usr/share/man/man3/des_cbc_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_cfb_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_ecb_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_enc_read.3.gz
 OLD_FILES+=usr/share/man/man3/des_enc_write.3.gz
 OLD_FILES+=usr/share/man/man3/des_is_weak_key.3.gz
 OLD_FILES+=usr/share/man/man3/des_key_sched.3.gz
 OLD_FILES+=usr/share/man/man3/des_ofb_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_pcbc_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_quad_cksum.3.gz
 OLD_FILES+=usr/share/man/man3/des_random_key.3.gz
 OLD_FILES+=usr/share/man/man3/des_read_2password.3.gz
 OLD_FILES+=usr/share/man/man3/des_read_password.3.gz
 OLD_FILES+=usr/share/man/man3/des_read_pw_string.3.gz
 OLD_FILES+=usr/share/man/man3/des_set_key.3.gz
 OLD_FILES+=usr/share/man/man3/des_set_odd_parity.3.gz
 OLD_FILES+=usr/share/man/man3/des_string_to_2key.3.gz
 OLD_FILES+=usr/share/man/man3/des_string_to_key.3.gz
 # 200212XX
 OLD_FILES+=usr/sbin/kenv
 OLD_FILES+=usr/bin/kenv
 OLD_FILES+=usr/sbin/elf2aout
 # 200210XX
 OLD_FILES+=usr/include/libusbhid.h
 OLD_FILES+=usr/share/man/man3/All_FreeBSD.3.gz
 OLD_FILES+=usr/share/man/man3/CheckRules.3.gz
 OLD_FILES+=usr/share/man/man3/ChunkCanBeRoot.3.gz
 OLD_FILES+=usr/share/man/man3/Clone_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/Collapse_Chunk.3.gz
 OLD_FILES+=usr/share/man/man3/Collapse_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/Create_Chunk.3.gz
 OLD_FILES+=usr/share/man/man3/Create_Chunk_DWIM.3.gz
 OLD_FILES+=usr/share/man/man3/Cyl_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Debug_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/Delete_Chunk.3.gz
 OLD_FILES+=usr/share/man/man3/Disk_Names.3.gz
 OLD_FILES+=usr/share/man/man3/Free_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/MakeDev.3.gz
 OLD_FILES+=usr/share/man/man3/MakeDevDisk.3.gz
 OLD_FILES+=usr/share/man/man3/Next_Cyl_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Next_Track_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Open_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/Prev_Cyl_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Prev_Track_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Set_Bios_Geom.3.gz
 OLD_FILES+=usr/share/man/man3/Set_Boot_Blocks.3.gz
 OLD_FILES+=usr/share/man/man3/Set_Boot_Mgr.3.gz
 OLD_FILES+=usr/share/man/man3/ShowChunkFlags.3.gz
 OLD_FILES+=usr/share/man/man3/Track_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Write_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/slice_type_name.3.gz
 # 200210XX: most games moved to ports
 OLD_FILES+=usr/share/man/man6/adventure.6.gz
 OLD_FILES+=usr/share/man/man6/arithmetic.6.gz
 OLD_FILES+=usr/share/man/man6/atc.6.gz
 OLD_FILES+=usr/share/man/man6/backgammon.6.gz
 OLD_FILES+=usr/share/man/man6/battlestar.6.gz
 OLD_FILES+=usr/share/man/man6/bs.6.gz
 OLD_FILES+=usr/share/man/man6/canfield.6.gz
 OLD_FILES+=usr/share/man/man6/cfscores.6.gz
 OLD_FILES+=usr/share/man/man6/cribbage.6.gz
 OLD_FILES+=usr/share/man/man6/fish.6.gz
 OLD_FILES+=usr/share/man/man6/hack.6.gz
 OLD_FILES+=usr/share/man/man6/hangman.6.gz
 OLD_FILES+=usr/share/man/man6/larn.6.gz
 OLD_FILES+=usr/share/man/man6/mille.6.gz
 OLD_FILES+=usr/share/man/man6/phantasia.6.gz
 OLD_FILES+=usr/share/man/man6/piano.6.gz
 OLD_FILES+=usr/share/man/man6/pig.6.gz
 OLD_FILES+=usr/share/man/man6/quiz.6.gz
 OLD_FILES+=usr/share/man/man6/rain.6.gz
 OLD_FILES+=usr/share/man/man6/robots.6.gz
 OLD_FILES+=usr/share/man/man6/rogue.6.gz
 OLD_FILES+=usr/share/man/man6/sail.6.gz
 OLD_FILES+=usr/share/man/man6/snake.6.gz
 OLD_FILES+=usr/share/man/man6/snscore.6.gz
 OLD_FILES+=usr/share/man/man6/trek.6.gz
 OLD_FILES+=usr/share/man/man6/wargames.6.gz
 OLD_FILES+=usr/share/man/man6/worm.6.gz
 OLD_FILES+=usr/share/man/man6/worms.6.gz
 OLD_FILES+=usr/share/man/man6/wump.6.gz
 # 200207XX
 OLD_FILES+=usr/share/man/man1aout/ar.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/as.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/ld.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/nm.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/ranlib.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/size.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/strings.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/strip.1aout.gz
 OLD_FILES+=bin/mountd
 OLD_FILES+=bin/nfsd
 # 20020707 sbin/nfsd -> usr.sbin/nfsd
 OLD_FILES+=sbin/nfsd
 # 200206XX
 OLD_FILES+=usr/lib/libpam_ssh.a
 OLD_FILES+=usr/lib/libpam_ssh_p.a
 OLD_FILES+=usr/bin/help
 OLD_FILES+=usr/bin/sccs
 .if ${TARGET_ARCH} != "amd64" && ${TARGET} != "arm" && ${TARGET_ARCH} != "i386" && ${TARGET} != "powerpc"
 OLD_FILES+=usr/bin/gdbserver
 .endif
 OLD_FILES+=usr/bin/ssh-keysign
 OLD_FILES+=usr/sbin/gifconfig
 OLD_FILES+=usr/sbin/prefix
 # 200205XX
 OLD_FILES+=usr/bin/doscmd
 # 200204XX
 OLD_FILES+=usr/bin/a2p
 OLD_FILES+=usr/bin/ptx
 OLD_FILES+=usr/bin/pod2text
 OLD_FILES+=usr/bin/pod2man
 OLD_FILES+=usr/bin/pod2latex
 OLD_FILES+=usr/bin/pod2html
 OLD_FILES+=usr/bin/h2ph
 OLD_FILES+=usr/bin/dprofpp
 OLD_FILES+=usr/bin/c2ph
 OLD_FILES+=usr/bin/h2xs
 OLD_FILES+=usr/bin/pl2pm
 OLD_FILES+=usr/bin/splain
 OLD_FILES+=usr/bin/s2p
 OLD_FILES+=usr/bin/find2perl
 OLD_FILES+=usr/sbin/pkg_update
 OLD_FILES+=usr/sbin/scriptdump
 # 20020409 GC kget(1), userconfig is long dead.
 OLD_FILES+=sbin/kget
 OLD_FILES+=usr/share/man/man8/kget.8.gz
 # 200203XX
 OLD_FILES+=usr/lib/libss.a
 OLD_FILES+=usr/lib/libss_p.a
 OLD_FILES+=usr/lib/libtelnet.a
 OLD_FILES+=usr/lib/libtelnet_p.a
 OLD_FILES+=usr/sbin/diskpart
 # 200202XX
 OLD_FILES+=usr/bin/gprof4
 # 200201XX
 OLD_FILES+=usr/sbin/linux
 # 2001XXXX
 OLD_FILES+=usr/bin/joy
 OLD_FILES+=usr/sbin/ibcs2
 OLD_FILES+=usr/sbin/svr4
 OLD_FILES+=usr/bin/chflags
 OLD_FILES+=usr/sbin/uuconv
 OLD_FILES+=usr/sbin/uuchk
 OLD_FILES+=usr/sbin/portmap
 OLD_FILES+=usr/sbin/pmap_set
 OLD_FILES+=usr/sbin/pmap_dump
 OLD_FILES+=usr/sbin/mcon
 OLD_FILES+=usr/sbin/stlstty
 OLD_FILES+=usr/sbin/ispppcontrol
 OLD_FILES+=usr/sbin/rndcontrol
 # 20011001: UUCP migration to ports
 OLD_FILES+=usr/bin/uucp
 OLD_FILES+=usr/bin/uulog
 OLD_FILES+=usr/bin/uuname
 OLD_FILES+=usr/bin/uupick
 OLD_FILES+=usr/bin/uusched
 OLD_FILES+=usr/bin/uustat
 OLD_FILES+=usr/bin/uuto
 OLD_FILES+=usr/bin/uux
 OLD_FILES+=usr/libexec/uucp/uucico
 OLD_FILES+=usr/libexec/uucp/uuxqt
 OLD_FILES+=usr/libexec/uucpd
 OLD_FILES+=usr/share/man/man1/uuconv.1.gz
 OLD_FILES+=usr/share/man/man1/uucp.1.gz
 OLD_FILES+=usr/share/man/man1/uulog.1.gz
 OLD_FILES+=usr/share/man/man1/uuname.1.gz
 OLD_FILES+=usr/share/man/man1/uupick.1.gz
 OLD_FILES+=usr/share/man/man1/uustat.1.gz
 OLD_FILES+=usr/share/man/man1/uuto.1.gz
 OLD_FILES+=usr/share/man/man1/uux.1.gz
 OLD_FILES+=usr/share/man/man8/uuchk.8.gz
 OLD_FILES+=usr/share/man/man8/uucico.8.gz
 OLD_FILES+=usr/share/man/man8/uucpd.8.gz
 OLD_FILES+=usr/share/man/man8/uusched.8.gz
 OLD_FILES+=usr/share/man/man8/uuxqt.8.gz
 # 20010523 mount_portal -> mount_portalfs
 OLD_FILES+=sbin/mount_portal
 OLD_FILES+=usr/share/man/man8/mount_portal.8.gz
 # 200104XX
 OLD_FILES+=usr/lib/libdescrypt.a
 OLD_FILES+=usr/lib/libscrypt.a
 OLD_FILES+=usr/lib/libscrypt_p.a
 OLD_FILES+=usr/sbin/pim6stat
 OLD_FILES+=usr/sbin/pim6sd
 OLD_FILES+=usr/sbin/pim6dd
 # 20010217
 OLD_FILES+=usr/share/doc/bind/misc/dns-setup
 # 20001200
 OLD_FILES+=usr/lib/libgcc_r_pic.a
 # 200009XX
 OLD_FILES+=usr/lib/libRSAglue.a
 OLD_FILES+=usr/lib/libRSAglue.so
 OLD_FILES+=usr/lib/librsaINTL.a
 OLD_FILES+=usr/lib/librsaUSA.a
 OLD_FILES+=usr/lib/librsaUSA.so
 # 200002XX ?
 OLD_FILES+=usr/lib/libf2c.a
 OLD_FILES+=usr/lib/libf2c_p.a
 OLD_FILES+=usr/lib/libg++.a
 OLD_FILES+=usr/lib/libg++_p.a
 # 20001006
 OLD_FILES+=usr/bin/miniperl
 # 20000810
 OLD_FILES+=usr/bin/sperl
 # 200001XX
 OLD_FILES+=usr/sbin/apmconf
 # 199911XX
 OLD_FILES+=usr/sbin/ipfstat
 OLD_FILES+=usr/sbin/ipmon
 OLD_FILES+=usr/sbin/ipnat
 OLD_FILES+=usr/sbin/bad144
 OLD_FILES+=usr/sbin/wormcontrol
 OLD_FILES+=usr/sbin/named-bootconf
 OLD_FILES+=usr/sbin/kvm_mkdb
 OLD_FILES+=usr/sbin/keyadmin
 # 199909XX
 OLD_FILES+=usr/lib/libdesrypt_p.a
 OLD_FILES+=sbin/ft
 # 199903XX
 OLD_FILES+=sbin/modload
 OLD_FILES+=sbin/modunload
 OLD_FILES+=usr/sbin/natd
 # 199812XX
 OLD_FILES+=sbin/dset
 # 199809XX
 OLD_FILES+=sbin/scsi
 OLD_FILES+=sbin/scsiformat
 OLD_FILES+=usr/sbin/ncrcontrol
 OLD_FILES+=usr/sbin/tickadj
 # 199806XX
 OLD_FILES+=usr/sbin/mkdosfs
 # 199801XX
 OLD_FILES+=sbin/mount_lfs
 OLD_FILES+=sbin/newlfs
 OLD_FILES+=sbin/dumplfs
 OLD_FILES+=usr/sbin/qcamcontrol
 OLD_FILES+=usr/sbin/supscan
 # 1997XXXX
 OLD_FILES+=usr/sbin/sysctl
 OLD_FILES+=usr/sbin/ctm_scan
 OLD_FILES+=usr/sbin/addgroup
 OLD_FILES+=usr/sbin/rmgroup
 # 1996XXXX
 OLD_FILES+=sbin/rdisc
 OLD_FILES+=usr/sbin/cdplay
 OLD_FILES+=usr/sbin/supfilesrv
 OLD_FILES+=usr/sbin/routed
 OLD_FILES+=usr/sbin/lsdev
 OLD_FILES+=usr/sbin/yppasswdd
 ## unsorted
 # do we still support aout builds?
 #OLD_FILES+=usr/lib/aout/c++rt0.o
 #OLD_FILES+=usr/lib/aout/crt0.o
 #OLD_FILES+=usr/lib/aout/gcrt0.o
 #OLD_FILES+=usr/lib/aout/scrt0.o
 #OLD_FILES+=usr/lib/aout/sgcrt0.o
 OLD_FILES+=usr/bin/sperl5
 OLD_FILES+=usr/bin/perl5.6.0
 OLD_FILES+=usr/bin/sperl5.6.0
 OLD_FILES+=usr/bin/perlbc
 OLD_FILES+=usr/bin/perl5.00503
 OLD_FILES+=usr/bin/sperl5.00503
 OLD_FILES+=usr/bin/perlbug
 OLD_FILES+=usr/bin/perlcc
 OLD_FILES+=usr/bin/perldoc
 OLD_FILES+=usr/bin/suidperl
 OLD_FILES+=usr/lib/pam_ftp.so
 OLD_FILES+=usr/libdata/perl/5.00503/CGI/Apache.pm
 OLD_FILES+=usr/libdata/perl/5.00503/CGI/Carp.pm
 OLD_FILES+=usr/libdata/perl/5.00503/CGI/Cookie.pm
 OLD_FILES+=usr/libdata/perl/5.00503/CGI/Fast.pm
 OLD_FILES+=usr/libdata/perl/5.00503/CGI/Push.pm
 OLD_FILES+=usr/libdata/perl/5.00503/CGI/Switch.pm
 OLD_FILES+=usr/libdata/perl/5.00503/CPAN/FirstTime.pm
 OLD_FILES+=usr/libdata/perl/5.00503/CPAN/Nox.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Class/Struct.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Devel/SelfStubber.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/Command.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/Embed.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/Install.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/Installed.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/Liblist.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/MM_OS2.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/MM_Unix.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/MM_VMS.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/MM_Win32.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/MakeMaker.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/Manifest.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/Mkbootstrap.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/Mksymlists.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/Packlist.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/inst
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/testlib.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/typemap
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/xsubpp
 OLD_FILES+=usr/libdata/perl/5.00503/File/Spec/Mac.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Spec/OS2.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Spec/Unix.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Spec/VMS.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Spec/Win32.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Basename.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/CheckTree.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Compare.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Copy.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/DosGlob.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Find.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Path.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Spec.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/stat.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Getopt/Long.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Getopt/Std.pm
 OLD_FILES+=usr/libdata/perl/5.00503/I18N/Collate.pm
 OLD_FILES+=usr/libdata/perl/5.00503/IPC/Open2.pm
 OLD_FILES+=usr/libdata/perl/5.00503/IPC/Open3.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Math/BigFloat.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Math/BigInt.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Math/Complex.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Math/Trig.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Net/Ping.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Net/hostent.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Net/netent.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Net/protoent.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Net/servent.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Pod/Functions.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Pod/Html.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Pod/Text.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Search/Dict.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Sys/Hostname.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Sys/Syslog.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Term/Cap.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Term/Complete.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Term/ReadLine.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Test/Harness.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Text/Abbrev.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Text/ParseWords.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Text/Soundex.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Text/Tabs.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Text/Wrap.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Tie/Array.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Tie/Handle.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Tie/Hash.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Tie/RefHash.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Tie/Scalar.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Tie/SubstrHash.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Time/Local.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Time/gmtime.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Time/localtime.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Time/tm.pm
 OLD_FILES+=usr/libdata/perl/5.00503/User/grent.pm
 OLD_FILES+=usr/libdata/perl/5.00503/User/pwent.pm
 OLD_FILES+=usr/libdata/perl/5.00503/auto/Getopt/Long/GetOptions.al
 OLD_FILES+=usr/libdata/perl/5.00503/auto/Getopt/Long/FindOption.al
 OLD_FILES+=usr/libdata/perl/5.00503/auto/Getopt/Long/Configure.al
 OLD_FILES+=usr/libdata/perl/5.00503/auto/Getopt/Long/config.al
 OLD_FILES+=usr/libdata/perl/5.00503/auto/Getopt/Long/Croak.al
 OLD_FILES+=usr/libdata/perl/5.00503/auto/Getopt/Long/autosplit.ix
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Deparse.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/CC.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Debug.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Showlex.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/makeliblinks
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Bblock.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/cc_harness
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Bytecode.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Stackobj.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Xref.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Lint.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Asmdata.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Assembler.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Disassembler.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/disassemble
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/assemble
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Terse.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/C.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/EXTERN.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/INTERN.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/XSUB.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/XSlock.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/av.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/bytecode.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/byterun.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/cc_runtime.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/config.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/cop.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/cv.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/dosish.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/embed.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/embedvar.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/fakethr.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/form.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/gv.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/handy.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/hv.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/intrpvar.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/iperlsys.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/keywords.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/mg.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/nostdio.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/objXSUB.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/objpp.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/op.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/opcode.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/patchlevel.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/perl.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/perlio.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/perlsdio.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/perlsfio.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/perlvars.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/perly.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/pp.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/pp_proto.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/proto.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/regcomp.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/regexp.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/regnodes.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/scope.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/sv.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/thrdvar.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/thread.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/unixish.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/util.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/Data/Dumper.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IO/File.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IO/Select.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IO/Socket.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IO/Handle.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IO/Seekable.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IO/Pipe.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IPC/SysV.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IPC/Msg.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IPC/Semaphore.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/B/B.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/B/B.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/B/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DB_File/autosplit.ix
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DB_File/DB_File.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DB_File/DB_File.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DB_File/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Data/Dumper/Dumper.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Data/Dumper/Dumper.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Data/Dumper/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DynaLoader/.exists
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DynaLoader/dl_findfile.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DynaLoader/dl_expandspec.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DynaLoader/dl_find_symbol_anywhere.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DynaLoader/autosplit.ix
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DynaLoader/DynaLoader.a
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DynaLoader/extralibs.ld
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Fcntl/Fcntl.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Fcntl/Fcntl.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Fcntl/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/IO/IO.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/IO/IO.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/IO/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/IPC/SysV/SysV.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/IPC/SysV/SysV.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/IPC/SysV/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/NDBM_File/NDBM_File.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/NDBM_File/NDBM_File.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/NDBM_File/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Opcode/Opcode.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Opcode/Opcode.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Opcode/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/assert.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/tolower.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/toupper.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/closedir.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/opendir.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/readdir.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/rewinddir.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/errno.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/creat.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fcntl.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getgrgid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getgrnam.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/atan2.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/cos.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/exp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fabs.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/log.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/pow.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/sin.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/sqrt.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getpwnam.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getpwuid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/longjmp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/setjmp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/kill.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/feof.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/siglongjmp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/sigsetjmp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/raise.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/offsetof.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/clearerr.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fclose.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fdopen.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fgetc.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fgets.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fileno.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fopen.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fprintf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fputc.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fputs.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fread.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/freopen.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fscanf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fseek.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/ferror.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fflush.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fgetpos.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fsetpos.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/ftell.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fwrite.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getc.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getchar.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/gets.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/perror.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/printf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/putc.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/putchar.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/puts.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/remove.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/rename.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/rewind.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/scanf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/sprintf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/sscanf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/tmpfile.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/ungetc.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/vfprintf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/vprintf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/vsprintf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/abs.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/atexit.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/atof.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/atoi.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/atol.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/bsearch.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/calloc.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/div.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/exit.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/free.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getenv.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/labs.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/ldiv.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/malloc.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/qsort.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/rand.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/realloc.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/srand.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/system.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/memchr.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/memcmp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/memcpy.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/memmove.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/memset.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strcat.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strchr.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strcmp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strcpy.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strcspn.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strerror.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strlen.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strncat.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strncmp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strncpy.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strpbrk.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strrchr.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strspn.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strstr.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strtok.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/chmod.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fstat.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/mkdir.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/stat.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/umask.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/wait.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/waitpid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/gmtime.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/localtime.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/time.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/alarm.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/chdir.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/chown.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/execl.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/execle.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/execlp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/execv.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/execve.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/execvp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fork.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getcwd.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getegid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/geteuid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getgid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getgroups.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getlogin.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getpgrp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getpid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getppid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getuid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/isatty.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/link.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/rmdir.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/setbuf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/setgid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/setuid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/setvbuf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/sleep.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/unlink.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/utime.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/autosplit.ix
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/POSIX.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/POSIX.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/SDBM_File/SDBM_File.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/SDBM_File/SDBM_File.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/SDBM_File/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Socket/Socket.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Socket/Socket.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Socket/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/attrs/attrs.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/attrs/attrs.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/attrs/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/re/re.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/re/re.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/re/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/sdbm/extralibs.ld
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Errno/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/Config.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/O.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/perllocal.pod
 OLD_FILES+=usr/libdata/perl/5.00503/mach/DB_File.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/Errno.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/Fcntl.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IO.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/NDBM_File.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/Safe.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/Opcode.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ops.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/POSIX.pod
 OLD_FILES+=usr/libdata/perl/5.00503/mach/POSIX.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/SDBM_File.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/Socket.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/attrs.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/re.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/_h2ph_pre.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/a.out.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam_ccb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam_debug.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam_extend.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam_periph.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam_queue.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam_sim.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam_xpt.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam_xpt_periph.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam_xpt_sim.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/aio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/alias.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/assert.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/bitstring.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/calendar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/camlib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/com_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/com_right.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ctype.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/curses.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/db.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/des.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/devstat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/dialog.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/dirent.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/disktab.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/dlfcn.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/elf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/errno.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/eti.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/fcntl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/fetch.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/float.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/floatingpoint.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/fnmatch.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/form.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/fstab.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ftpio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/fts.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/glob.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/gmp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/gnuregex.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/grp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/histedit.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ieeefp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ifaddrs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/inttypes.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/iso646.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/kvm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/libatm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/libdisk.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/libgen.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/libusb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/libutil.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/limits.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/link.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/linker_set.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/locale.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/login_cap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/malloc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/FlexLexer.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/PlotFile.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/SFile.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/_G_config.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/algo.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/algobase.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/alloc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/builtinbuf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/bvector.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/complex.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/defalloc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/deque.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/editbuf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/floatio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/fstream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/function.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/hash_map.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/hash_set.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/hashtable.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/heap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/indstream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/iolibio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/iomanip.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/list.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/iostdio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/iostream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/iostreamP.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/istream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/iterator.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/libio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/libioP.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/map.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/multimap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/multiset.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/new.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/ostream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/pair.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/parsestream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/pfstream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/procbuf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/pthread_alloc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/rope.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/ropeimpl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/set.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/slist.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stack.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stdiostream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_algo.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/tree.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_algobase.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_alloc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_bvector.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_config.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_construct.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_deque.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_function.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_hash_fun.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_hash_map.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_hash_set.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_hashtable.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_heap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_iterator.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_list.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_map.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_multimap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_multiset.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_numeric.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_pair.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_queue.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_raw_storage_iter.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_relops.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_rope.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_set.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_slist.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_stack.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_tempbuf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_tree.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_uninitialized.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_vector.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/streambuf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/strfile.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/strstream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/tempbuf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/type_traits.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/vector.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/math.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/md2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/md4.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/md5.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/memory.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/menu.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/mp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/mpool.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/mqueue.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ncurses.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ndbm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netdb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nl_types.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nlist.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objformat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/opie.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/osreldate.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/panel.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/paths.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pcap-int.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pcap-namedb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pcap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/poll.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pthread.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pthread_np.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pwd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/radlib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ranlib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/regex.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/regexp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/resolv.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ripemd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rune.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/runetype.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sched.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/search.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/semaphore.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/setjmp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sgtty.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sha.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/signal.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/skey.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/stab.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/stand.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/stdarg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/stddef.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/stdio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/stdlib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/strhash.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/string.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/stringlist.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/strings.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/struct.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sysexits.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/syslog.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/taclib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/tar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/tcpd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/term.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/termcap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/termios.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/time.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/timers.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ttyent.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ucontext.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/unctrl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/unistd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/utime.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/utmp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/values.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/varargs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vgl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vis.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/zconf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/zlib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/arpa/ftp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/arpa/inet.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/arpa/nameser.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/arpa/nameser_compat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/arpa/telnet.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/arpa/tftp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/assertions.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/ctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/dst.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/eventlib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/heap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/irpmarshall.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/logging.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/memcluster.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/misc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/tree.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/list.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ansi.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/apic.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/apm_bios.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/apm_segments.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/asc_ioctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/asm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/asmacros.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/asnames.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/atomic.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/bootinfo.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/bus.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/bus_at386.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/bus_memio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/bus_pc98.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/bus_pio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/bus_pio_ind.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/cdk.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/clock.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/comstats.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/console.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/cpu.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/cpufunc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/cputypes.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/cronyx.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/db_machdep.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/dvcfg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/elf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/endian.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/exec.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/float.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/floatingpoint.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/frame.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/globaldata.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/globals.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/gsc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/i4b_cause.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/i4b_debug.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/i4b_ioctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/i4b_rbch_ioctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/i4b_tel_ioctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/i4b_trace.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ieeefp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/if_wavelan_ieee.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/if_wl_wavelan.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/iic.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/in_cksum.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ioctl_bt848.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ioctl_ctx.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ioctl_fd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ioctl_meteor.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ipl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/joystick.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/limits.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/lock.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/md_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/mouse.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/mpapic.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/mtpr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/bus_dma.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/npx.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/param.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/pcaudioio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/pcb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/pcb_ext.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/pcvt_ioctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/perfmon.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/physio_proc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/pmap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/proc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/profile.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/psl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ptrace.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/reg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/reloc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/resource.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/segments.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/setjmp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/sigframe.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/signal.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/smb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/smp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/smptests.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/soundcard.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/speaker.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/specialreg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/spigot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/stdarg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/sysarch.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/trap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/tss.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/types.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/uc_device.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ucontext.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ultrasound.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/varargs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/vm86.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/vmparam.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/wtio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/i4b_isppp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/pci_cfgreg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/msdosfs/bootsect.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/msdosfs/bpb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/msdosfs/denode.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/msdosfs/direntry.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/msdosfs/fat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/msdosfs/msdosfsmount.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/bpf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/bpf_compat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/bpfdesc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/bridge.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/ethernet.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/hostcache.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_arp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_atm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_dl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_gif.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_ieee80211.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_llc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_media.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_mib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_ppp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_pppvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_slvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_sppp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_stf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_tap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_tapvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_tun.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/slip.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_tunvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_types.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_vlan_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/intrq.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/iso88025.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/net_osdep.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/netisr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/pfkeyv2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/ppp_comp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/ppp_defs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/radix.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/raw_cb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/route.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/slcompress.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/zlib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_faith.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_arc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_gre.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/krpc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nfs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nfsdiskless.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nfsm_subs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nfsmount.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nfsnode.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nfsproto.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nfsrtt.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nfsrvcache.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nfsv2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nqnfs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/rpcv2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/xdr_subs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatalk/aarp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatalk/at.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatalk/at_extern.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatalk/at_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatalk/ddp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatalk/ddp_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatalk/endian.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatalk/phase2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_cm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_if.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_ioctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_pcb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_sap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_sigmgr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_stack.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_sys.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_vc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/kern_include.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/port.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/queue.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/netgraph.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_UI.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_async.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_bpf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_bridge.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_cisco.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_echo.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_ether.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_frame_relay.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_hole.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_iface.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_ksocket.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_lmi.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_message.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_mppc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_one2many.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_parse.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_ppp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_pppoe.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_pptpgre.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_rfc1490.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_sample.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_socket.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_socketvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_tee.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_tty.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_vjc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_eiface.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_etf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_device.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_l2tp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_fec.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/icmp6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/icmp_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/if_atm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/if_ether.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/if_fddi.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/igmp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/igmp_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/in.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/in_gif.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/in_hostcache.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/in_pcb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/in_systm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/in_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_auth.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_compat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_dummynet.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_ecn.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_encap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_fil.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_flow.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_frag.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_fw.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_icmp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_mroute.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_nat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_proxy.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_state.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ipl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ipprotosw.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/tcp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/tcp_debug.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/tcp_fsm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/tcp_seq.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/tcp_timer.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/tcp_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/tcpip.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/udp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/udp_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_fw2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_gre.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ah.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ah6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/esp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/esp6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/icmp6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/in6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/in6_gif.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/in6_ifattach.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/in6_pcb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/in6_prefix.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/in6_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ip6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ip6_ecn.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ip6_fw.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ip6_mroute.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ip6_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ip6protosw.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ipcomp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ipcomp6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ipsec.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ipsec6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/mld6_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/nd6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/pim6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/pim6_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/scope6_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/tcp6_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/udp6_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/esp_rijndael.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/raw_ip6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipx/ipx.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipx/ipx_if.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipx/ipx_ip.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipx/ipx_pcb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipx/ipx_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipx/spx.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipx/spx_debug.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipx/spx_timer.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipx/spx_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netkey/key.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netkey/key_debug.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netkey/key_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netkey/keydb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netkey/keysock.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netnatm/natm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_cfg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_conn.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_file.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_lib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_ncp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_nls.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_rcfile.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_rq.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_sock.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_subr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_user.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/nwerror.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/idp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/idp_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/ns.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/ns_error.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/ns_if.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/ns_pcb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/sp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/spidp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/spp_debug.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/spp_timer.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/spp_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ntfs/ntfs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ntfs/ntfs_compr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ntfs/ntfs_ihash.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ntfs/ntfs_inode.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ntfs/ntfs_subr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ntfs/ntfs_vfsops.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ntfs/ntfsmount.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nwfs/nwfs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nwfs/nwfs_mount.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nwfs/nwfs_node.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nwfs/nwfs_subr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/NXConstStr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/Object.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/Protocol.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/encoding.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/hash.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/objc-api.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/objc-list.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/objc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/runtime.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/sarray.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/thr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/typedstream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/asn1.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/asn1_mac.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/bio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/blowfish.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/bn.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/buffer.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/cast.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/comp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/conf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/conf_api.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/crypto.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/des.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/dh.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/dsa.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/dso.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/e_os.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/e_os2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ebcdic.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/evp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/hmac.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/lhash.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/md2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/md4.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/md5.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/mdc2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/obj_mac.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/objects.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/opensslconf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/opensslv.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/pem.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/pem2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/pkcs12.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/pkcs7.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/rand.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/rc2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/rc4.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/rc5.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ripemd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/rsa.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/safestack.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/sha.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ssl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ssl2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ssl23.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ssl3.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ssl_locl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/stack.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/symhacks.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/tls1.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/tmdiff.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/txt_db.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/x509.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/x509_vfy.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/x509v3.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/idea.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/aes.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/asn1t.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/cryptlib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/des_old.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ec.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/engine.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/krb5_asn.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/kssl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ocsp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ossl_typ.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ui.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ui_compat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/aes_locl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/eng_int.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/hw_4758_cca_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/hw_aep_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/hw_atalla_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/hw_cswift_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/hw_ncipher_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/hw_nuron_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/hw_sureware_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/hw_ubsec_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ui_locl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pccard/cardinfo.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pccard/cis.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pccard/driver.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pccard/i82365.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pccard/pccard_nbk.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pccard/slot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pccard/meciareg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pccard/pcic_pci.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pccard/pcicvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/posix4/aio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/posix4/mqueue.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/posix4/posix4.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/posix4/sched.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/posix4/semaphore.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/protocols/dumprestore.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/protocols/routed.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/protocols/rwhod.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/protocols/talkd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/protocols/timed.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/readline/chardefs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/readline/history.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/readline/keymaps.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/readline/readline.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/readline/rlconf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/readline/rlstdc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/readline/tilde.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/auth.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/auth_des.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/auth_unix.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/clnt.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/des.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/des_crypt.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/key_prot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/pmap_clnt.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/pmap_prot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/pmap_rmt.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/rpc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/rpc_com.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/rpc_msg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/svc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/svc_auth.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/types.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/xdr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/bootparam_prot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/crypt.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/key_prot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/klm_prot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/mount.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/nfs_prot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/nis.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/nis_cache.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/nis_callback.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/nis_db.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/nis_tags.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/nislib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/nlm_prot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/rex.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/rnusers.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/rquota.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/rstat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/rwall.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/sm_inter.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/spray.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/yp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/yp_prot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/ypclnt.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/yppasswd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/ypupdate_prot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/ypxfrd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/security/_pam_compat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/security/_pam_macros.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/security/_pam_types.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/security/pam_appl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/security/pam_malloc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/security/pam_misc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/security/pam_mod_misc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/security/pam_modules.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ss/mit-sipb-copyright.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ss/ss.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ss/ss_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/_posix.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ata.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/acct.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/acl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/agpio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/aio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/assym.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/blist.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/buf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/bus.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/bus_private.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/callout.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ccdvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/cdefs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/cdio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/cdrio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/chio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/clist.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/endian.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/conf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/cons.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/consio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/copyright.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ctype.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/dir.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/dataacq.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/link_elf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/device_port.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/devicestat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/dirent.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/disk.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/disklabel.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/diskslice.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/dkstat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/dmap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/domain.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/dvdio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/elf32.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/elf64.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/elf_common.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/elf_generic.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/errno.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/event.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/eventhandler.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/eventvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/exec.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/extattr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/fbio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/fcntl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/file.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/filedesc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/filio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/gmon.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/imgact.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/imgact_aout.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/imgact_elf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/inflate.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/interrupt.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/inttypes.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ioccom.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ioctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ioctl_compat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ipc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/jail.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/joystick.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/kbio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/kernel.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/kthread.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ktrace.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/libkern.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/linker.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/linker_set.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/lock.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/lockf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/malloc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/mbuf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/md5.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/memrange.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/mman.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/module.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/mount.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/msg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/msgbuf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/mtio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/namei.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/param.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/pciio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/pioctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/pipe.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/poll.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/proc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/procfs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/protosw.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ptio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ptrace.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/queue.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/random.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/reboot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/resource.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/resourcevar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/rman.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/rtprio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/sbuf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/select.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/sem.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/shm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/signal.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/signalvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/snoop.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/socket.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/socketvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/sockio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/soundcard.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/stat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/syscall-hide.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/syscall.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/sysctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/sysent.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/syslimits.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/syslog.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/sysproto.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/systm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/taskqueue.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/termios.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/time.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/timeb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/timepps.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/timers.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/times.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/timex.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/tprintf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/tty.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ttychars.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ttycom.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ttydefaults.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ttydev.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/types.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ucontext.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ucred.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/uio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/un.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/unistd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/unpcb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/user.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/utsname.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/vmmeter.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/vnioctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/vnode.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/wait.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/wormio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/xrpuio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/kobj.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/link_aout.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/nlist_aout.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/mchain.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/fnv_hash.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/iconv.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/md4.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/pmap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/swap_pager.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm_extern.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm_kern.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm_map.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm_object.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm_page.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm_pageout.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm_pager.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm_param.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm_zone.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vnode_pager.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/complex.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/stdbool.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/langinfo.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netsmb/netbios.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netsmb/smb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netsmb/smb_conn.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netsmb/smb_dev.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netsmb/smb_rq.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netsmb/smb_subr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netsmb/smb_tran.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netsmb/smb_trantcp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g2c.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/telnet.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/elf-hints.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/libusbhid.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/radlib_vs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/readpassphrase.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/wchar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/wctype.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/crypto/cast.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/crypto/castsb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/crypto/cryptodev.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/crypto/cryptosoft.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/crypto/deflate.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/crypto/rijndael.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/crypto/rmd160.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/crypto/skipjack.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/crypto/xform.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/ah.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/ah_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/esp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/esp_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/ipcomp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/ipcomp_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/ipip_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/ipsec.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/ipsec6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/key.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/key_debug.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/key_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/keydb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/keysock.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/xform.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/bzlib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perl.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perl5004delta.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlapio.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlbook.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlbot.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlcall.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perldata.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perldebug.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perldelta.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perldiag.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perldsc.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlembed.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq1.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq2.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq3.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq4.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq5.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq6.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq7.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlipc.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq8.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq9.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlform.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfunc.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlguts.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlhist.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perllocale.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perllol.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlmod.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlmodinstall.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlmodlib.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlobj.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlop.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlopentut.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlpod.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlport.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlre.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlref.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlreftut.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlrun.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlsec.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlstyle.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlsub.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlsyn.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlthrtut.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perltie.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perltoc.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perltoot.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perltrap.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlvar.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlxs.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlxstut.pod
 OLD_FILES+=usr/libdata/perl/5.00503/AnyDBM_File.pm
 OLD_FILES+=usr/libdata/perl/5.00503/AutoLoader.pm
 OLD_FILES+=usr/libdata/perl/5.00503/AutoSplit.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Benchmark.pm
 OLD_FILES+=usr/libdata/perl/5.00503/CGI.pm
 OLD_FILES+=usr/libdata/perl/5.00503/CPAN.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Carp.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Cwd.pm
 OLD_FILES+=usr/libdata/perl/5.00503/DirHandle.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Dumpvalue.pm
 OLD_FILES+=usr/libdata/perl/5.00503/English.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Env.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Exporter.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Fatal.pm
 OLD_FILES+=usr/libdata/perl/5.00503/FileCache.pm
 OLD_FILES+=usr/libdata/perl/5.00503/FileHandle.pm
 OLD_FILES+=usr/libdata/perl/5.00503/FindBin.pm
 OLD_FILES+=usr/libdata/perl/5.00503/SelectSaver.pm
 OLD_FILES+=usr/libdata/perl/5.00503/SelfLoader.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Shell.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Symbol.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Test.pm
 OLD_FILES+=usr/libdata/perl/5.00503/abbrev.pl
 OLD_FILES+=usr/libdata/perl/5.00503/UNIVERSAL.pm
 OLD_FILES+=usr/libdata/perl/5.00503/assert.pl
 OLD_FILES+=usr/libdata/perl/5.00503/autouse.pm
 OLD_FILES+=usr/libdata/perl/5.00503/base.pm
 OLD_FILES+=usr/libdata/perl/5.00503/bigfloat.pl
 OLD_FILES+=usr/libdata/perl/5.00503/bigint.pl
 OLD_FILES+=usr/libdata/perl/5.00503/bigrat.pl
 OLD_FILES+=usr/libdata/perl/5.00503/blib.pm
 OLD_FILES+=usr/libdata/perl/5.00503/cacheout.pl
 OLD_FILES+=usr/libdata/perl/5.00503/chat2.pl
 OLD_FILES+=usr/libdata/perl/5.00503/complete.pl
 OLD_FILES+=usr/libdata/perl/5.00503/constant.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ctime.pl
 OLD_FILES+=usr/libdata/perl/5.00503/diagnostics.pm
 OLD_FILES+=usr/libdata/perl/5.00503/dotsh.pl
 OLD_FILES+=usr/libdata/perl/5.00503/dumpvar.pl
 OLD_FILES+=usr/libdata/perl/5.00503/exceptions.pl
 OLD_FILES+=usr/libdata/perl/5.00503/fastcwd.pl
 OLD_FILES+=usr/libdata/perl/5.00503/fields.pm
 OLD_FILES+=usr/libdata/perl/5.00503/find.pl
 OLD_FILES+=usr/libdata/perl/5.00503/finddepth.pl
 OLD_FILES+=usr/libdata/perl/5.00503/flush.pl
 OLD_FILES+=usr/libdata/perl/5.00503/ftp.pl
 OLD_FILES+=usr/libdata/perl/5.00503/getcwd.pl
 OLD_FILES+=usr/libdata/perl/5.00503/getopt.pl
 OLD_FILES+=usr/libdata/perl/5.00503/getopts.pl
 OLD_FILES+=usr/libdata/perl/5.00503/hostname.pl
 OLD_FILES+=usr/libdata/perl/5.00503/importenv.pl
 OLD_FILES+=usr/libdata/perl/5.00503/integer.pm
 OLD_FILES+=usr/libdata/perl/5.00503/less.pm
 OLD_FILES+=usr/libdata/perl/5.00503/lib.pm
 OLD_FILES+=usr/libdata/perl/5.00503/locale.pm
 OLD_FILES+=usr/libdata/perl/5.00503/look.pl
 OLD_FILES+=usr/libdata/perl/5.00503/newgetopt.pl
 OLD_FILES+=usr/libdata/perl/5.00503/open2.pl
 OLD_FILES+=usr/libdata/perl/5.00503/open3.pl
 OLD_FILES+=usr/libdata/perl/5.00503/overload.pm
 OLD_FILES+=usr/libdata/perl/5.00503/perl5db.pl
 OLD_FILES+=usr/libdata/perl/5.00503/pwd.pl
 OLD_FILES+=usr/libdata/perl/5.00503/shellwords.pl
 OLD_FILES+=usr/libdata/perl/5.00503/sigtrap.pm
 OLD_FILES+=usr/libdata/perl/5.00503/stat.pl
 OLD_FILES+=usr/libdata/perl/5.00503/strict.pm
 OLD_FILES+=usr/libdata/perl/5.00503/subs.pm
 OLD_FILES+=usr/libdata/perl/5.00503/syslog.pl
 OLD_FILES+=usr/libdata/perl/5.00503/tainted.pl
 OLD_FILES+=usr/libdata/perl/5.00503/termcap.pl
 OLD_FILES+=usr/libdata/perl/5.00503/timelocal.pl
 OLD_FILES+=usr/libdata/perl/5.00503/validate.pl
 OLD_FILES+=usr/libdata/perl/5.00503/vars.pm
 OLD_FILES+=usr/libdata/perl/5.00503/re.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Config.pm
 OLD_FILES+=usr/libdata/perl/5.00503/.exists
 OLD_FILES+=usr/libdata/perl/5.00503/DynaLoader.pm
 OLD_FILES+=usr/share/perl/man/man3/AnyDBM_File.3.gz
 OLD_FILES+=usr/share/perl/man/man3/AutoLoader.3.gz
 OLD_FILES+=usr/share/perl/man/man3/AutoSplit.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Asmdata.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Assembler.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Bblock.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Bytecode.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::C.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::CC.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Debug.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Deparse.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Disassembler.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Lint.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Showlex.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Stackobj.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Terse.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Xref.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Benchmark.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CGI.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CGI::Apache.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CGI::Carp.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CGI::Cookie.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CGI::Fast.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CGI::Push.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CGI::Switch.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CPAN.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CPAN::FirstTime.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CPAN::Nox.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Carp.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Class::Struct.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Config.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Cwd.3.gz
 OLD_FILES+=usr/share/perl/man/man3/DB_File.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Data::Dumper.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Devel::SelfStubber.3.gz
 OLD_FILES+=usr/share/perl/man/man3/DirHandle.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Dumpvalue.3.gz
 OLD_FILES+=usr/share/perl/man/man3/DynaLoader.3.gz
 OLD_FILES+=usr/share/perl/man/man3/English.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Env.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Exporter.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::Command.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::Embed.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::Install.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::Installed.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::Liblist.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::MM_OS2.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::MM_Unix.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::MM_VMS.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::MM_Win32.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::MakeMaker.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::Manifest.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::Mkbootstrap.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::Mksymlists.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::Packlist.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::testlib.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Fatal.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Fcntl.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Basename.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::CheckTree.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Compare.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Copy.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::DosGlob.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Find.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Path.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Spec.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Spec::Mac.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Spec::OS2.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Spec::Unix.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Spec::VMS.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Spec::Win32.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::stat.3.gz
 OLD_FILES+=usr/share/perl/man/man3/FileCache.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO.3.gz
 OLD_FILES+=usr/share/perl/man/man3/FileHandle.3.gz
 OLD_FILES+=usr/share/perl/man/man3/FindBin.3.gz
 OLD_FILES+=usr/share/perl/man/man3/GDBM_File.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Getopt::Long.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Getopt::Std.3.gz
 OLD_FILES+=usr/share/perl/man/man3/I18N::Collate.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::File.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::Handle.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::Pipe.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::Seekable.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::Select.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::Socket.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IPC::Msg.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IPC::Open2.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IPC::Open3.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IPC::Semaphore.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IPC::SysV.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Math::BigFloat.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Math::BigInt.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Math::Complex.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Math::Trig.3.gz
 OLD_FILES+=usr/share/perl/man/man3/NDBM_File.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Net::Ping.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Net::hostent.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Net::netent.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Net::protoent.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Net::servent.3.gz
 OLD_FILES+=usr/share/perl/man/man3/O.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ODBM_File.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Opcode.3.gz
 OLD_FILES+=usr/share/perl/man/man3/POSIX.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Html.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Text.3.gz
 OLD_FILES+=usr/share/perl/man/man3/SDBM_File.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Safe.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Search::Dict.3.gz
 OLD_FILES+=usr/share/perl/man/man3/SelectSaver.3.gz
 OLD_FILES+=usr/share/perl/man/man3/SelfLoader.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Shell.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Socket.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Symbol.3.gz
 OLD_FILES+=usr/share/perl/man/man3/re.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Sys::Hostname.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Sys::Syslog.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Term::Cap.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Term::Complete.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Term::ReadLine.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Test.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Test::Harness.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Text::Abbrev.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Text::ParseWords.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Text::Soundex.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Text::Tabs.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Text::Wrap.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Thread.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Thread::Queue.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Thread::Semaphore.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Thread::Signal.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Thread::Specific.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Tie::Array.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Tie::Handle.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Tie::Hash.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Tie::RefHash.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Tie::Scalar.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Tie::SubstrHash.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Time::Local.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Time::gmtime.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Time::localtime.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Time::tm.3.gz
 OLD_FILES+=usr/share/perl/man/man3/UNIVERSAL.3.gz
 OLD_FILES+=usr/share/perl/man/man3/User::grent.3.gz
 OLD_FILES+=usr/share/perl/man/man3/User::pwent.3.gz
 OLD_FILES+=usr/share/perl/man/man3/attrs.3.gz
 OLD_FILES+=usr/share/perl/man/man3/autouse.3.gz
 OLD_FILES+=usr/share/perl/man/man3/base.3.gz
 OLD_FILES+=usr/share/perl/man/man3/blib.3.gz
 OLD_FILES+=usr/share/perl/man/man3/constant.3.gz
 OLD_FILES+=usr/share/perl/man/man3/diagnostics.3.gz
 OLD_FILES+=usr/share/perl/man/man3/fields.3.gz
 OLD_FILES+=usr/share/perl/man/man3/integer.3.gz
 OLD_FILES+=usr/share/perl/man/man3/less.3.gz
 OLD_FILES+=usr/share/perl/man/man3/lib.3.gz
 OLD_FILES+=usr/share/perl/man/man3/locale.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ops.3.gz
 OLD_FILES+=usr/share/perl/man/man3/overload.3.gz
 OLD_FILES+=usr/share/perl/man/man3/sigtrap.3.gz
 OLD_FILES+=usr/share/perl/man/man3/strict.3.gz
 OLD_FILES+=usr/share/perl/man/man3/subs.3.gz
 OLD_FILES+=usr/share/perl/man/man3/vars.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Stash.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ByteLoader.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CGI::Pretty.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Carp::Heavy.3.gz
 OLD_FILES+=usr/share/perl/man/man3/DB.3.gz
 OLD_FILES+=usr/share/perl/man/man3/DProf::DProf.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Exporter::Heavy.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::MM_Cygwin.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Glob.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Glob::Glob.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Hostname::Hostname.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::Dir.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::Poll.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::Socket::INET.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::Socket::UNIX.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Peek::Peek.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Checker.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Find.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::InputObjects.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Man.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::ParseUtils.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Parser.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Plainer.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Select.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Text::Color.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Text::Termcap.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Usage.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Syslog::Syslog.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Term::ANSIColor.3.gz
 OLD_FILES+=usr/share/perl/man/man3/XSLoader.3.gz
 OLD_FILES+=usr/share/perl/man/man3/attributes.3.gz
 OLD_FILES+=usr/share/perl/man/man3/bytes.3.gz
 OLD_FILES+=usr/share/perl/man/man3/charnames.3.gz
 OLD_FILES+=usr/share/perl/man/man3/filetest.3.gz
 OLD_FILES+=usr/share/perl/man/man3/open.3.gz
 OLD_FILES+=usr/share/perl/man/man3/utf8.3.gz
 OLD_FILES+=usr/share/perl/man/man3/warnings.3.gz
 OLD_FILES+=usr/share/perl/man/man3/warnings::register.3.gz
 OLD_FILES+=usr/share/perl/man/whatis
 OLD_FILES+=usr/share/man/man1/CA.pl.1.gz
 OLD_FILES+=usr/share/man/man1/asn1parse.1.gz
 OLD_FILES+=usr/share/man/man1/ca.1.gz
 OLD_FILES+=usr/share/man/man1/ciphers.1.gz
 OLD_FILES+=usr/share/man/man1/config.1.gz
 OLD_FILES+=usr/share/man/man1/crl.1.gz
 OLD_FILES+=usr/share/man/man1/crl2pkcs7.1.gz
 OLD_FILES+=usr/share/man/man1/dgst.1.gz
 OLD_FILES+=usr/share/man/man1/dhparam.1.gz
 OLD_FILES+=usr/share/man/man1/doscmd.1.gz
 OLD_FILES+=usr/share/man/man1/dsa.1.gz
 OLD_FILES+=usr/share/man/man1/dsaparam.1.gz
 OLD_FILES+=usr/share/man/man1/enc.1.gz
 OLD_FILES+=usr/share/man/man1/gendsa.1.gz
 OLD_FILES+=usr/share/man/man1/genrsa.1.gz
 OLD_FILES+=usr/share/man/man1/getNAME.1.gz
 OLD_FILES+=usr/share/man/man1/nseq.1.gz
 OLD_FILES+=usr/share/man/man1/ocsp.1.gz
 OLD_FILES+=usr/share/man/man1/openssl.1.gz
 OLD_FILES+=usr/share/man/man1/perl.1.gz
 OLD_FILES+=usr/share/man/man1/perl5004delta.1.gz
 OLD_FILES+=usr/share/man/man1/perlapio.1.gz
 OLD_FILES+=usr/share/man/man1/perlbook.1.gz
 OLD_FILES+=usr/share/man/man1/perlbot.1.gz
 OLD_FILES+=usr/share/man/man1/perlcall.1.gz
 OLD_FILES+=usr/share/man/man1/perldata.1.gz
 OLD_FILES+=usr/share/man/man1/perldebug.1.gz
 OLD_FILES+=usr/share/man/man1/perldelta.1.gz
 OLD_FILES+=usr/share/man/man1/perldiag.1.gz
 OLD_FILES+=usr/share/man/man1/perldsc.1.gz
 OLD_FILES+=usr/share/man/man1/perlembed.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq1.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq2.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq3.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq4.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq5.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq6.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq7.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq8.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq9.1.gz
 OLD_FILES+=usr/share/man/man1/perlform.1.gz
 OLD_FILES+=usr/share/man/man1/perlfunc.1.gz
 OLD_FILES+=usr/share/man/man1/perlguts.1.gz
 OLD_FILES+=usr/share/man/man1/perlhist.1.gz
 OLD_FILES+=usr/share/man/man1/perlipc.1.gz
 OLD_FILES+=usr/share/man/man1/perllocale.1.gz
 OLD_FILES+=usr/share/man/man1/perllol.1.gz
 OLD_FILES+=usr/share/man/man1/perlmod.1.gz
 OLD_FILES+=usr/share/man/man1/perlmodinstall.1.gz
 OLD_FILES+=usr/share/man/man1/perlmodlib.1.gz
 OLD_FILES+=usr/share/man/man1/perlobj.1.gz
 OLD_FILES+=usr/share/man/man1/perlop.1.gz
 OLD_FILES+=usr/share/man/man1/perlopentut.1.gz
 OLD_FILES+=usr/share/man/man1/perlpod.1.gz
 OLD_FILES+=usr/share/man/man1/perlport.1.gz
 OLD_FILES+=usr/share/man/man1/perlre.1.gz
 OLD_FILES+=usr/share/man/man1/perlref.1.gz
 OLD_FILES+=usr/share/man/man1/perlreftut.1.gz
 OLD_FILES+=usr/share/man/man1/perlrun.1.gz
 OLD_FILES+=usr/share/man/man1/perlsec.1.gz
 OLD_FILES+=usr/share/man/man1/perlstyle.1.gz
 OLD_FILES+=usr/share/man/man1/perlsub.1.gz
 OLD_FILES+=usr/share/man/man1/perlsyn.1.gz
 OLD_FILES+=usr/share/man/man1/perlthrtut.1.gz
 OLD_FILES+=usr/share/man/man1/perltie.1.gz
 OLD_FILES+=usr/share/man/man1/perltoc.1.gz
 OLD_FILES+=usr/share/man/man1/perltoot.1.gz
 OLD_FILES+=usr/share/man/man1/perltrap.1.gz
 OLD_FILES+=usr/share/man/man1/perlvar.1.gz
 OLD_FILES+=usr/share/man/man1/perlxs.1.gz
 OLD_FILES+=usr/share/man/man1/perlxstut.1.gz
 OLD_FILES+=usr/share/man/man1/perlbug.1.gz
 OLD_FILES+=usr/share/man/man1/perlcc.1.gz
 OLD_FILES+=usr/share/man/man1/perldoc.1.gz
 OLD_FILES+=usr/share/man/man1/perl5005delta.1.gz
 OLD_FILES+=usr/share/man/man1/perlfork.1.gz
 OLD_FILES+=usr/share/man/man1/perlboot.1.gz
 OLD_FILES+=usr/share/man/man1/perltootc.1.gz
 OLD_FILES+=usr/share/man/man1/perldbmfilter.1.gz
 OLD_FILES+=usr/share/man/man1/perldebguts.1.gz
 OLD_FILES+=usr/share/man/man1/perlnumber.1.gz
 OLD_FILES+=usr/share/man/man1/perlcompile.1.gz
 OLD_FILES+=usr/share/man/man1/perltodo.1.gz
 OLD_FILES+=usr/share/man/man1/perlapi.1.gz
 OLD_FILES+=usr/share/man/man1/perlintern.1.gz
 OLD_FILES+=usr/share/man/man1/perlhack.1.gz
 OLD_FILES+=usr/share/man/man1/perlbc.1.gz
 OLD_FILES+=usr/share/man/man1/pkcs12.1.gz
 OLD_FILES+=usr/share/man/man1/pkcs7.1.gz
 OLD_FILES+=usr/share/man/man1/pkcs8.1.gz
 OLD_FILES+=usr/share/man/man1/rand.1.gz
 OLD_FILES+=usr/share/man/man1/req.1.gz
 OLD_FILES+=usr/share/man/man1/rsa.1.gz
 OLD_FILES+=usr/share/man/man1/rsautl.1.gz
 OLD_FILES+=usr/share/man/man1/s_client.1.gz
 OLD_FILES+=usr/share/man/man1/s_server.1.gz
 OLD_FILES+=usr/share/man/man1/sess_id.1.gz
 OLD_FILES+=usr/share/man/man1/smime.1.gz
 OLD_FILES+=usr/share/man/man1/speed.1.gz
 OLD_FILES+=usr/share/man/man1/spkac.1.gz
 OLD_FILES+=usr/share/man/man1/verify.1.gz
 OLD_FILES+=usr/share/man/man1/version.1.gz
 OLD_FILES+=usr/share/man/man1/x509.1.gz
 OLD_FILES+=usr/share/man/man3/SSL_COMP_add_compression_method.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_get_ex_new_index.3.gz
 OLD_FILES+=usr/share/man/man3/archive_entry_dup.3.gz
 OLD_FILES+=usr/share/man/man3/archive_entry_set_tartype.3.gz
 OLD_FILES+=usr/share/man/man3/archive_entry_tartype.3.gz
 OLD_FILES+=usr/share/man/man3/archive_read_data_into_file.3.gz
 OLD_FILES+=usr/share/man/man3/archive_read_open_tar.3.gz
 OLD_FILES+=usr/share/man/man3/archive_read_support_format_gnutar.3.gz
 OLD_FILES+=usr/share/man/man3/cipher.3.gz
 OLD_FILES+=usr/share/man/man3/des_cipher.3.gz
 OLD_FILES+=usr/share/man/man3/des_setkey.3.gz
 OLD_FILES+=usr/share/man/man3/encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/endvfsent.3.gz
 OLD_FILES+=usr/share/man/man3/getvfsbytype.3.gz
 OLD_FILES+=usr/share/man/man3/getvfsent.3.gz
 OLD_FILES+=usr/share/man/man3/isnanf.3.gz
 OLD_FILES+=usr/share/man/man3/libautofs.3.gz
 OLD_FILES+=usr/share/man/man3/pthread_attr_setsstack.3.gz
 OLD_FILES+=usr/share/man/man3/pthread_getcancelstate.3.gz
 OLD_FILES+=usr/share/man/man3/pthread_mutexattr_getpshared.3.gz
 OLD_FILES+=usr/share/man/man3/pthread_mutexattr_setpshared.3.gz
 OLD_FILES+=usr/share/man/man3/set_assertion_failure_callback.3.gz
 OLD_FILES+=usr/share/man/man3/setkey.3.gz
 OLD_FILES+=usr/share/man/man3/setvfsent.3.gz
 OLD_FILES+=usr/share/man/man3/ssl.3.gz
 OLD_FILES+=usr/share/man/man3/vfsisloadable.3.gz
 OLD_FILES+=usr/share/man/man3/vfsload.3.gz
 OLD_FILES+=usr/share/man/man4/als4000.4.gz
 OLD_FILES+=usr/share/man/man4/csa.4.gz
 OLD_FILES+=usr/share/man/man4/emu10k1.4.gz
 OLD_FILES+=usr/share/man/man4/euc.4.gz
 OLD_FILES+=usr/share/man/man4/gusc.4.gz
 OLD_FILES+=usr/share/man/man4/if_fwp.4.gz
 OLD_FILES+=usr/share/man/man4/lomac.4.gz
 OLD_FILES+=usr/share/man/man4/maestro3.4.gz
 OLD_FILES+=usr/share/man/man4/raid.4.gz
 OLD_FILES+=usr/share/man/man4/sbc.4.gz
 OLD_FILES+=usr/share/man/man4/sd.4.gz
 OLD_FILES+=usr/share/man/man4/snc.4.gz
 OLD_FILES+=usr/share/man/man4/st.4.gz
 OLD_FILES+=usr/share/man/man4/uaudio.4.gz
 OLD_FILES+=usr/share/man/man4/utf2.4.gz
 OLD_FILES+=usr/share/man/man4/vinumdebug.4.gz
 OLD_FILES+=usr/share/man/man5/disklabel.5.gz
 OLD_FILES+=usr/share/man/man5/dm.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ranlib.5.gz
 OLD_FILES+=usr/share/man/man5/utf2.5.gz
 OLD_FILES+=usr/share/man/man7/groff_mwww.7.gz
 OLD_FILES+=usr/share/man/man7/mmroff.7.gz
 OLD_FILES+=usr/share/man/man7/mwww.7.gz
 OLD_FILES+=usr/share/man/man7/style.perl.7.gz
 OLD_FILES+=usr/share/man/man8/apm.8.gz
 OLD_FILES+=usr/share/man/man8/apmconf.8.gz
 OLD_FILES+=usr/share/man/man8/apmd.8.gz
 OLD_FILES+=usr/share/man/man8/dm.8.gz
 OLD_FILES+=usr/share/man/man8/pam_ftp.8.gz
 OLD_FILES+=usr/share/man/man8/pam_wheel.8.gz
 OLD_FILES+=usr/share/man/man8/sconfig.8.gz
 OLD_FILES+=usr/share/man/man8/ssl.8.gz
 OLD_FILES+=usr/share/man/man8/wlconfig.8.gz
 OLD_FILES+=usr/share/man/man9/CURSIG.9.gz
 OLD_FILES+=usr/share/man/man9/VFS_INIT.9.gz
 OLD_FILES+=usr/share/man/man9/at_exit.9.gz
 OLD_FILES+=usr/share/man/man9/at_fork.9.gz
 OLD_FILES+=usr/share/man/man9/cdevsw_add.9.gz
 OLD_FILES+=usr/share/man/man9/cdevsw_remove.9.gz
 OLD_FILES+=usr/share/man/man9/cv_waitq_empty.9.gz
 OLD_FILES+=usr/share/man/man9/cv_waitq_remove.9.gz
 OLD_FILES+=usr/share/man/man9/endtsleep.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_freem.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_pg_alloc.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_pg_free.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_pg_steal.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_phys_to_kva.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_vm_init.9.gz
 OLD_FILES+=usr/share/man/man9/mac_biba.9.gz
 OLD_FILES+=usr/share/man/man9/mac_bsdextended.9.gz
 OLD_FILES+=usr/share/man/man9/mono_time.9.gz
 OLD_FILES+=usr/share/man/man9/p1003_1b.9.gz
 OLD_FILES+=usr/share/man/man9/pmap_prefault.9.gz
 OLD_FILES+=usr/share/man/man9/posix4.9.gz
 OLD_FILES+=usr/share/man/man9/resource_query_name.9.gz
 OLD_FILES+=usr/share/man/man9/resource_query_string.9.gz
 OLD_FILES+=usr/share/man/man9/resource_query_unit.9.gz
 OLD_FILES+=usr/share/man/man9/rm_at_exit.9.gz
 OLD_FILES+=usr/share/man/man9/rm_at_fork.9.gz
 OLD_FILES+=usr/share/man/man9/runtime.9.gz
 OLD_FILES+=usr/share/man/man9/sleepinit.9.gz
 OLD_FILES+=usr/share/man/man9/unsleep.9.gz
 OLD_FILES+=usr/share/man/ja/man1/perl.1.gz
 OLD_FILES+=usr/share/games/atc/Game_List
 OLD_FILES+=usr/share/games/atc/Killer
 OLD_FILES+=usr/share/games/atc/crossover
 OLD_FILES+=usr/share/games/atc/default
 OLD_FILES+=usr/share/games/atc/easy
 OLD_FILES+=usr/share/games/atc/game_2
 OLD_FILES+=usr/share/games/larn/larnmaze
 OLD_FILES+=usr/share/games/larn/larnopts
 OLD_FILES+=usr/share/games/larn/larn.help
 OLD_FILES+=usr/share/games/quiz.db/africa
 OLD_FILES+=usr/share/games/quiz.db/america
 OLD_FILES+=usr/share/games/quiz.db/areas
 OLD_FILES+=usr/share/games/quiz.db/arith
 OLD_FILES+=usr/share/games/quiz.db/asia
 OLD_FILES+=usr/share/games/quiz.db/babies
 OLD_FILES+=usr/share/games/quiz.db/bard
 OLD_FILES+=usr/share/games/quiz.db/chinese
 OLD_FILES+=usr/share/games/quiz.db/collectives
 OLD_FILES+=usr/share/games/quiz.db/ed
 OLD_FILES+=usr/share/games/quiz.db/elements
 OLD_FILES+=usr/share/games/quiz.db/europe
 OLD_FILES+=usr/share/games/quiz.db/flowers
 OLD_FILES+=usr/share/games/quiz.db/greek
 OLD_FILES+=usr/share/games/quiz.db/inca
 OLD_FILES+=usr/share/games/quiz.db/index
 OLD_FILES+=usr/share/games/quiz.db/latin
 OLD_FILES+=usr/share/games/quiz.db/locomotive
 OLD_FILES+=usr/share/games/quiz.db/midearth
 OLD_FILES+=usr/share/games/quiz.db/morse
 OLD_FILES+=usr/share/games/quiz.db/murders
 OLD_FILES+=usr/share/games/quiz.db/poetry
 OLD_FILES+=usr/share/games/quiz.db/posneg
 OLD_FILES+=usr/share/games/quiz.db/pres
 OLD_FILES+=usr/share/games/quiz.db/province
 OLD_FILES+=usr/share/games/quiz.db/seq-easy
 OLD_FILES+=usr/share/games/quiz.db/seq-hard
 OLD_FILES+=usr/share/games/quiz.db/sexes
 OLD_FILES+=usr/share/games/quiz.db/sov
 OLD_FILES+=usr/share/games/quiz.db/spell
 OLD_FILES+=usr/share/games/quiz.db/state
 OLD_FILES+=usr/share/games/quiz.db/trek
 OLD_FILES+=usr/share/games/quiz.db/ucc
 OLD_FILES+=usr/share/games/cribbage.instr
 OLD_FILES+=usr/share/games/fish.instr
 OLD_FILES+=usr/share/games/wump.info
 OLD_FILES+=usr/games/hide/adventure
 OLD_FILES+=usr/games/hide/arithmetic
 OLD_FILES+=usr/games/hide/atc
 OLD_FILES+=usr/games/hide/backgammon
 OLD_FILES+=usr/games/hide/teachgammon
 OLD_FILES+=usr/games/hide/battlestar
 OLD_FILES+=usr/games/hide/bs
 OLD_FILES+=usr/games/hide/canfield
 OLD_FILES+=usr/games/hide/cribbage
 OLD_FILES+=usr/games/hide/fish
 OLD_FILES+=usr/games/hide/hack
 OLD_FILES+=usr/games/hide/hangman
 OLD_FILES+=usr/games/hide/larn
 OLD_FILES+=usr/games/hide/mille
 OLD_FILES+=usr/games/hide/phantasia
 OLD_FILES+=usr/games/hide/quiz
 OLD_FILES+=usr/games/hide/robots
 OLD_FILES+=usr/games/hide/rogue
 OLD_FILES+=usr/games/hide/sail
 OLD_FILES+=usr/games/hide/snake
 OLD_FILES+=usr/games/hide/trek
 OLD_FILES+=usr/games/hide/worm
 OLD_FILES+=usr/games/hide/wump
 OLD_FILES+=usr/games/adventure
 OLD_FILES+=usr/games/arithmetic
 OLD_FILES+=usr/games/atc
 OLD_FILES+=usr/games/backgammon
 OLD_FILES+=usr/games/teachgammon
 OLD_FILES+=usr/games/battlestar
 OLD_FILES+=usr/games/bs
 OLD_FILES+=usr/games/canfield
 OLD_FILES+=usr/games/cfscores
 OLD_FILES+=usr/games/cribbage
 OLD_FILES+=usr/games/dm
 OLD_FILES+=usr/games/fish
 OLD_FILES+=usr/games/hack
 OLD_FILES+=usr/games/hangman
 OLD_FILES+=usr/games/larn
 OLD_FILES+=usr/games/mille
 OLD_FILES+=usr/games/phantasia
 OLD_FILES+=usr/games/piano
 OLD_FILES+=usr/games/pig
 OLD_FILES+=usr/games/quiz
 OLD_FILES+=usr/games/rain
 OLD_FILES+=usr/games/robots
 OLD_FILES+=usr/games/rogue
 OLD_FILES+=usr/games/sail
 OLD_FILES+=usr/games/snake
 OLD_FILES+=usr/games/snscore
 OLD_FILES+=usr/games/trek
 OLD_FILES+=usr/games/wargames
 OLD_FILES+=usr/games/worm
 OLD_FILES+=usr/games/worms
 OLD_FILES+=usr/games/wump
 OLD_FILES+=sbin/mount_reiserfs
 OLD_FILES+=usr/include/cam/cam_extend.h
 OLD_FILES+=usr/include/dev/wi/wi_hostap.h
 OLD_FILES+=usr/include/disktab.h
 OLD_FILES+=usr/include/g++/FlexLexer.h
 OLD_FILES+=usr/include/g++/PlotFile.h
 OLD_FILES+=usr/include/g++/SFile.h
 OLD_FILES+=usr/include/g++/_G_config.h
 OLD_FILES+=usr/include/g++/algo.h
 OLD_FILES+=usr/include/g++/algobase.h
 OLD_FILES+=usr/include/g++/algorithm
 OLD_FILES+=usr/include/g++/alloc.h
 OLD_FILES+=usr/include/g++/bitset
 OLD_FILES+=usr/include/g++/builtinbuf.h
 OLD_FILES+=usr/include/g++/bvector.h
 OLD_FILES+=usr/include/g++/cassert
 OLD_FILES+=usr/include/g++/cctype
 OLD_FILES+=usr/include/g++/cerrno
 OLD_FILES+=usr/include/g++/cfloat
 OLD_FILES+=usr/include/g++/ciso646
 OLD_FILES+=usr/include/g++/climits
 OLD_FILES+=usr/include/g++/clocale
 OLD_FILES+=usr/include/g++/cmath
 OLD_FILES+=usr/include/g++/complex
 OLD_FILES+=usr/include/g++/complex.h
 OLD_FILES+=usr/include/g++/csetjmp
 OLD_FILES+=usr/include/g++/csignal
 OLD_FILES+=usr/include/g++/cstdarg
 OLD_FILES+=usr/include/g++/cstddef
 OLD_FILES+=usr/include/g++/cstdio
 OLD_FILES+=usr/include/g++/cstdlib
 OLD_FILES+=usr/include/g++/cstring
 OLD_FILES+=usr/include/g++/ctime
 OLD_FILES+=usr/include/g++/cwchar
 OLD_FILES+=usr/include/g++/cwctype
 OLD_FILES+=usr/include/g++/defalloc.h
 OLD_FILES+=usr/include/g++/deque
 OLD_FILES+=usr/include/g++/deque.h
 OLD_FILES+=usr/include/g++/editbuf.h
 OLD_FILES+=usr/include/g++/exception
 OLD_FILES+=usr/include/g++/floatio.h
 OLD_FILES+=usr/include/g++/fstream
 OLD_FILES+=usr/include/g++/fstream.h
 OLD_FILES+=usr/include/g++/function.h
 OLD_FILES+=usr/include/g++/functional
 OLD_FILES+=usr/include/g++/hash_map
 OLD_FILES+=usr/include/g++/hash_map.h
 OLD_FILES+=usr/include/g++/hash_set
 OLD_FILES+=usr/include/g++/hash_set.h
 OLD_FILES+=usr/include/g++/hashtable.h
 OLD_FILES+=usr/include/g++/heap.h
 OLD_FILES+=usr/include/g++/indstream.h
 OLD_FILES+=usr/include/g++/iolibio.h
 OLD_FILES+=usr/include/g++/iomanip
 OLD_FILES+=usr/include/g++/iomanip.h
 OLD_FILES+=usr/include/g++/iosfwd
 OLD_FILES+=usr/include/g++/iostdio.h
 OLD_FILES+=usr/include/g++/iostream
 OLD_FILES+=usr/include/g++/iostream.h
 OLD_FILES+=usr/include/g++/iostreamP.h
 OLD_FILES+=usr/include/g++/istream.h
 OLD_FILES+=usr/include/g++/iterator
 OLD_FILES+=usr/include/g++/iterator.h
 OLD_FILES+=usr/include/g++/libio.h
 OLD_FILES+=usr/include/g++/libioP.h
 OLD_FILES+=usr/include/g++/list
 OLD_FILES+=usr/include/g++/list.h
 OLD_FILES+=usr/include/g++/map
 OLD_FILES+=usr/include/g++/map.h
 OLD_FILES+=usr/include/g++/memory
 OLD_FILES+=usr/include/g++/multimap.h
 OLD_FILES+=usr/include/g++/multiset.h
 OLD_FILES+=usr/include/g++/new
 OLD_FILES+=usr/include/g++/new.h
 OLD_FILES+=usr/include/g++/numeric
 OLD_FILES+=usr/include/g++/ostream.h
 OLD_FILES+=usr/include/g++/pair.h
 OLD_FILES+=usr/include/g++/parsestream.h
 OLD_FILES+=usr/include/g++/pfstream.h
 OLD_FILES+=usr/include/g++/procbuf.h
 OLD_FILES+=usr/include/g++/pthread_alloc
 OLD_FILES+=usr/include/g++/pthread_alloc.h
 OLD_FILES+=usr/include/g++/queue
 OLD_FILES+=usr/include/g++/rope
 OLD_FILES+=usr/include/g++/rope.h
 OLD_FILES+=usr/include/g++/ropeimpl.h
 OLD_FILES+=usr/include/g++/set
 OLD_FILES+=usr/include/g++/set.h
 OLD_FILES+=usr/include/g++/slist
 OLD_FILES+=usr/include/g++/slist.h
 OLD_FILES+=usr/include/g++/sstream
 OLD_FILES+=usr/include/g++/stack
 OLD_FILES+=usr/include/g++/stack.h
 OLD_FILES+=usr/include/g++/std/bastring.cc
 OLD_FILES+=usr/include/g++/std/bastring.h
 OLD_FILES+=usr/include/g++/std/complext.cc
 OLD_FILES+=usr/include/g++/std/complext.h
 OLD_FILES+=usr/include/g++/std/dcomplex.h
 OLD_FILES+=usr/include/g++/std/fcomplex.h
 OLD_FILES+=usr/include/g++/std/gslice.h
 OLD_FILES+=usr/include/g++/std/gslice_array.h
 OLD_FILES+=usr/include/g++/std/indirect_array.h
 OLD_FILES+=usr/include/g++/std/ldcomplex.h
 OLD_FILES+=usr/include/g++/std/mask_array.h
 OLD_FILES+=usr/include/g++/std/slice.h
 OLD_FILES+=usr/include/g++/std/slice_array.h
 OLD_FILES+=usr/include/g++/std/std_valarray.h
 OLD_FILES+=usr/include/g++/std/straits.h
 OLD_FILES+=usr/include/g++/std/valarray_array.h
 OLD_FILES+=usr/include/g++/std/valarray_array.tcc
 OLD_FILES+=usr/include/g++/std/valarray_meta.h
 OLD_FILES+=usr/include/g++/stdexcept
 OLD_FILES+=usr/include/g++/stdiostream.h
 OLD_FILES+=usr/include/g++/stl.h
 OLD_FILES+=usr/include/g++/stl_algo.h
 OLD_FILES+=usr/include/g++/stl_algobase.h
 OLD_FILES+=usr/include/g++/stl_alloc.h
 OLD_FILES+=usr/include/g++/stl_bvector.h
 OLD_FILES+=usr/include/g++/stl_config.h
 OLD_FILES+=usr/include/g++/stl_construct.h
 OLD_FILES+=usr/include/g++/stl_deque.h
 OLD_FILES+=usr/include/g++/stl_function.h
 OLD_FILES+=usr/include/g++/stl_hash_fun.h
 OLD_FILES+=usr/include/g++/stl_hash_map.h
 OLD_FILES+=usr/include/g++/stl_hash_set.h
 OLD_FILES+=usr/include/g++/stl_hashtable.h
 OLD_FILES+=usr/include/g++/stl_heap.h
 OLD_FILES+=usr/include/g++/stl_iterator.h
 OLD_FILES+=usr/include/g++/stl_list.h
 OLD_FILES+=usr/include/g++/stl_map.h
 OLD_FILES+=usr/include/g++/stl_multimap.h
 OLD_FILES+=usr/include/g++/stl_multiset.h
 OLD_FILES+=usr/include/g++/stl_numeric.h
 OLD_FILES+=usr/include/g++/stl_pair.h
 OLD_FILES+=usr/include/g++/stl_queue.h
 OLD_FILES+=usr/include/g++/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/g++/stl_relops.h
 OLD_FILES+=usr/include/g++/stl_rope.h
 OLD_FILES+=usr/include/g++/stl_set.h
 OLD_FILES+=usr/include/g++/stl_slist.h
 OLD_FILES+=usr/include/g++/stl_stack.h
 OLD_FILES+=usr/include/g++/stl_tempbuf.h
 OLD_FILES+=usr/include/g++/stl_tree.h
 OLD_FILES+=usr/include/g++/stl_uninitialized.h
 OLD_FILES+=usr/include/g++/stl_vector.h
 OLD_FILES+=usr/include/g++/stream.h
 OLD_FILES+=usr/include/g++/streambuf.h
 OLD_FILES+=usr/include/g++/strfile.h
 OLD_FILES+=usr/include/g++/string
 OLD_FILES+=usr/include/g++/strstream
 OLD_FILES+=usr/include/g++/strstream.h
 OLD_FILES+=usr/include/g++/tempbuf.h
 OLD_FILES+=usr/include/g++/tree.h
 OLD_FILES+=usr/include/g++/type_traits.h
 OLD_FILES+=usr/include/g++/typeinfo
 OLD_FILES+=usr/include/g++/utility
 OLD_FILES+=usr/include/g++/valarray
 OLD_FILES+=usr/include/g++/vector
 OLD_FILES+=usr/include/g++/vector.h
 OLD_FILES+=usr/include/gmp.h
 OLD_FILES+=usr/include/isc/assertions.h
 OLD_FILES+=usr/include/isc/ctl.h
 OLD_FILES+=usr/include/isc/dst.h
 OLD_FILES+=usr/include/isc/eventlib.h
 OLD_FILES+=usr/include/isc/heap.h
 OLD_FILES+=usr/include/isc/irpmarshall.h
 OLD_FILES+=usr/include/isc/list.h
 OLD_FILES+=usr/include/isc/logging.h
 OLD_FILES+=usr/include/isc/memcluster.h
 OLD_FILES+=usr/include/isc/misc.h
 OLD_FILES+=usr/include/isc/tree.h
 OLD_FILES+=usr/include/machine/ansi.h
 OLD_FILES+=usr/include/machine/apic.h
 OLD_FILES+=usr/include/machine/asc_ioctl.h
 OLD_FILES+=usr/include/machine/asnames.h
 OLD_FILES+=usr/include/machine/bus_at386.h
 OLD_FILES+=usr/include/machine/bus_memio.h
 OLD_FILES+=usr/include/machine/bus_pc98.h
 OLD_FILES+=usr/include/machine/bus_pio.h
 OLD_FILES+=usr/include/machine/cdk.h
 OLD_FILES+=usr/include/machine/comstats.h
 OLD_FILES+=usr/include/machine/console.h
 OLD_FILES+=usr/include/machine/critical.h
 OLD_FILES+=usr/include/machine/cronyx.h
 OLD_FILES+=usr/include/machine/dvcfg.h
 OLD_FILES+=usr/include/machine/globaldata.h
 OLD_FILES+=usr/include/machine/globals.h
 OLD_FILES+=usr/include/machine/gsc.h
 OLD_FILES+=usr/include/machine/i4b_isppp.h
 OLD_FILES+=usr/include/machine/if_wavelan_ieee.h
 OLD_FILES+=usr/include/machine/iic.h
 OLD_FILES+=usr/include/machine/ioctl_ctx.h
 OLD_FILES+=usr/include/machine/ioctl_fd.h
 OLD_FILES+=usr/include/machine/ipl.h
 OLD_FILES+=usr/include/machine/lock.h
 OLD_FILES+=usr/include/machine/mouse.h
 OLD_FILES+=usr/include/machine/mpapic.h
 OLD_FILES+=usr/include/machine/mtpr.h
 OLD_FILES+=usr/include/machine/pc/msdos.h
 OLD_FILES+=usr/include/machine/physio_proc.h
 OLD_FILES+=usr/include/machine/smb.h
 OLD_FILES+=usr/include/machine/spigot.h
 OLD_FILES+=usr/include/machine/types.h
 OLD_FILES+=usr/include/machine/uc_device.h
 OLD_FILES+=usr/include/machine/ultrasound.h
 OLD_FILES+=usr/include/machine/wtio.h
 OLD_FILES+=usr/include/msdosfs/bootsect.h
 OLD_FILES+=usr/include/msdosfs/bpb.h
 OLD_FILES+=usr/include/msdosfs/denode.h
 OLD_FILES+=usr/include/msdosfs/direntry.h
 OLD_FILES+=usr/include/msdosfs/fat.h
 OLD_FILES+=usr/include/msdosfs/msdosfsmount.h
 OLD_FILES+=usr/include/net/hostcache.h
 OLD_FILES+=usr/include/net/if_faith.h
 OLD_FILES+=usr/include/net/if_ieee80211.h
 OLD_FILES+=usr/include/net/if_tunvar.h
 OLD_FILES+=usr/include/net/intrq.h
 OLD_FILES+=usr/include/netatm/kern_include.h
 OLD_FILES+=usr/include/netinet/if_fddi.h
 OLD_FILES+=usr/include/netinet/in_hostcache.h
 OLD_FILES+=usr/include/netinet/ip_flow.h
 OLD_FILES+=usr/include/netinet/ip_fw2.h
 OLD_FILES+=usr/include/netinet6/in6_prefix.h
 OLD_FILES+=usr/include/netns/idp.h
 OLD_FILES+=usr/include/netns/idp_var.h
 OLD_FILES+=usr/include/netns/ns.h
 OLD_FILES+=usr/include/netns/ns_error.h
 OLD_FILES+=usr/include/netns/ns_if.h
 OLD_FILES+=usr/include/netns/ns_pcb.h
 OLD_FILES+=usr/include/netns/sp.h
 OLD_FILES+=usr/include/netns/spidp.h
 OLD_FILES+=usr/include/netns/spp_debug.h
 OLD_FILES+=usr/include/netns/spp_timer.h
 OLD_FILES+=usr/include/netns/spp_var.h
 OLD_FILES+=usr/include/nfs/nfs.h
 OLD_FILES+=usr/include/nfs/nfsm_subs.h
 OLD_FILES+=usr/include/nfs/nfsmount.h
 OLD_FILES+=usr/include/nfs/nfsnode.h
 OLD_FILES+=usr/include/nfs/nfsrtt.h
 OLD_FILES+=usr/include/nfs/nfsrvcache.h
 OLD_FILES+=usr/include/nfs/nfsv2.h
 OLD_FILES+=usr/include/nfs/nqnfs.h
 OLD_FILES+=usr/include/ntfs/ntfs.h
 OLD_FILES+=usr/include/ntfs/ntfs_compr.h
 OLD_FILES+=usr/include/ntfs/ntfs_ihash.h
 OLD_FILES+=usr/include/ntfs/ntfs_inode.h
 OLD_FILES+=usr/include/ntfs/ntfs_subr.h
 OLD_FILES+=usr/include/ntfs/ntfs_vfsops.h
 OLD_FILES+=usr/include/ntfs/ntfsmount.h
 OLD_FILES+=usr/include/nwfs/nwfs.h
 OLD_FILES+=usr/include/nwfs/nwfs_mount.h
 OLD_FILES+=usr/include/nwfs/nwfs_node.h
 OLD_FILES+=usr/include/nwfs/nwfs_subr.h
 OLD_FILES+=usr/include/posix4/_semaphore.h
 OLD_FILES+=usr/include/posix4/aio.h
 OLD_FILES+=usr/include/posix4/ksem.h
 OLD_FILES+=usr/include/posix4/mqueue.h
 OLD_FILES+=usr/include/posix4/posix4.h
 OLD_FILES+=usr/include/posix4/sched.h
 OLD_FILES+=usr/include/posix4/semaphore.h
 OLD_DIRS+=usr/include/posix4
 OLD_FILES+=usr/include/security/_pam_compat.h
 OLD_FILES+=usr/include/security/_pam_macros.h
 OLD_FILES+=usr/include/security/_pam_types.h
 OLD_FILES+=usr/include/security/pam_malloc.h
 OLD_FILES+=usr/include/security/pam_misc.h
 OLD_FILES+=usr/include/skey.h
 OLD_FILES+=usr/include/strhash.h
 OLD_FILES+=usr/include/struct.h
 OLD_FILES+=usr/include/sys/_label.h
 OLD_FILES+=usr/include/sys/_posix.h
 OLD_FILES+=usr/include/sys/bus_private.h
 OLD_FILES+=usr/include/sys/ccdvar.h
 OLD_FILES+=usr/include/sys/diskslice.h
 OLD_FILES+=usr/include/sys/dmap.h
 OLD_FILES+=usr/include/sys/inttypes.h
 OLD_FILES+=usr/include/sys/jumbo.h
 OLD_FILES+=usr/include/sys/mac_policy.h
 OLD_FILES+=usr/include/sys/pbioio.h
 OLD_FILES+=usr/include/sys/syscall-hide.h
 OLD_FILES+=usr/include/sys/tprintf.h
 OLD_FILES+=usr/include/sys/vnioctl.h
 OLD_FILES+=usr/include/sys/wormio.h
 OLD_FILES+=usr/include/telnet.h
 OLD_FILES+=usr/include/ufs/mfs/mfs_extern.h
 OLD_FILES+=usr/include/ufs/mfs/mfsnode.h
 OLD_FILES+=usr/include/values.h
 OLD_FILES+=usr/include/vm/vm_zone.h
 OLD_FILES+=usr/share/examples/etc/usbd.conf
 OLD_FILES+=usr/share/examples/meteor/README
 OLD_FILES+=usr/share/examples/meteor/rgb16.c
 OLD_FILES+=usr/share/examples/meteor/rgb24.c
 OLD_FILES+=usr/share/examples/meteor/test-n.c
 OLD_FILES+=usr/share/examples/meteor/yuvpk.c
 OLD_FILES+=usr/share/examples/meteor/yuvpl.c
 OLD_FILES+=usr/share/examples/worm/README
 OLD_FILES+=usr/share/examples/worm/makecdfs.sh
 OLD_FILES+=usr/share/groff_font/devlj4/Makefile
 OLD_FILES+=usr/share/groff_font/devlj4/text.map
 OLD_FILES+=usr/share/groff_font/devlj4/special.map
 OLD_FILES+=usr/share/misc/nslookup.help
 OLD_FILES+=usr/share/sendmail/cf/feature/nodns.m4
 OLD_FILES+=usr/share/syscons/keymaps/lat-amer.kbd
 OLD_FILES+=usr/share/vi/catalog/ru_SU.KOI8-R
 OLD_FILES+=usr/share/zoneinfo/Africa/Timbuktu
 OLD_FILES+=usr/share/zoneinfo/Africa/Asmera
 OLD_FILES+=usr/share/zoneinfo/America/Buenos_Aires
 OLD_FILES+=usr/share/zoneinfo/America/Cordoba
 OLD_FILES+=usr/share/zoneinfo/America/Jujuy
 OLD_FILES+=usr/share/zoneinfo/America/Catamarca
 OLD_FILES+=usr/share/zoneinfo/America/Mendoza
 OLD_FILES+=usr/share/zoneinfo/America/Indianapolis
 OLD_FILES+=usr/share/zoneinfo/America/Louisville
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/ComodRivadavia
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Faeroe
 OLD_FILES+=usr/share/zoneinfo/Europe/Belfast
 OLD_FILES+=usr/share/zoneinfo/Pacific/Yap
 OLD_FILES+=usr/share/zoneinfo/SystemV/YST9
 OLD_FILES+=usr/share/zoneinfo/SystemV/PST8
 OLD_FILES+=usr/share/zoneinfo/SystemV/EST5EDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/CST6CDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/MST7MDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/PST8PDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/YST9YDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/HST10
 OLD_FILES+=usr/share/zoneinfo/SystemV/MST7
 OLD_FILES+=usr/share/zoneinfo/SystemV/EST5
 OLD_FILES+=usr/share/zoneinfo/SystemV/AST4ADT
 OLD_FILES+=usr/share/zoneinfo/SystemV/CST6
 OLD_FILES+=usr/share/zoneinfo/SystemV/AST4
 OLD_FILES+=usr/share/doc/ntp/accopt.htm
 OLD_FILES+=usr/share/doc/ntp/assoc.htm
 OLD_FILES+=usr/share/doc/ntp/audio.htm
 OLD_FILES+=usr/share/doc/ntp/authopt.htm
 OLD_FILES+=usr/share/doc/ntp/biblio.htm
 OLD_FILES+=usr/share/doc/ntp/build.htm
 OLD_FILES+=usr/share/doc/ntp/clockopt.htm
 OLD_FILES+=usr/share/doc/ntp/config.htm
 OLD_FILES+=usr/share/doc/ntp/confopt.htm
 OLD_FILES+=usr/share/doc/ntp/copyright.htm
 OLD_FILES+=usr/share/doc/ntp/debug.htm
 OLD_FILES+=usr/share/doc/ntp/driver1.htm
 OLD_FILES+=usr/share/doc/ntp/driver10.htm
 OLD_FILES+=usr/share/doc/ntp/driver11.htm
 OLD_FILES+=usr/share/doc/ntp/driver12.htm
 OLD_FILES+=usr/share/doc/ntp/driver16.htm
 OLD_FILES+=usr/share/doc/ntp/driver18.htm
 OLD_FILES+=usr/share/doc/ntp/driver19.htm
 OLD_FILES+=usr/share/doc/ntp/driver2.htm
 OLD_FILES+=usr/share/doc/ntp/driver20.htm
 OLD_FILES+=usr/share/doc/ntp/driver22.htm
 OLD_FILES+=usr/share/doc/ntp/driver23.htm
 OLD_FILES+=usr/share/doc/ntp/driver24.htm
 OLD_FILES+=usr/share/doc/ntp/driver26.htm
 OLD_FILES+=usr/share/doc/ntp/driver27.htm
 OLD_FILES+=usr/share/doc/ntp/driver28.htm
 OLD_FILES+=usr/share/doc/ntp/driver29.htm
 OLD_FILES+=usr/share/doc/ntp/driver3.htm
 OLD_FILES+=usr/share/doc/ntp/driver30.htm
 OLD_FILES+=usr/share/doc/ntp/driver32.htm
 OLD_FILES+=usr/share/doc/ntp/driver33.htm
 OLD_FILES+=usr/share/doc/ntp/driver34.htm
 OLD_FILES+=usr/share/doc/ntp/driver35.htm
 OLD_FILES+=usr/share/doc/ntp/driver36.htm
 OLD_FILES+=usr/share/doc/ntp/driver37.htm
 OLD_FILES+=usr/share/doc/ntp/driver4.htm
 OLD_FILES+=usr/share/doc/ntp/driver5.htm
 OLD_FILES+=usr/share/doc/ntp/driver6.htm
 OLD_FILES+=usr/share/doc/ntp/driver7.htm
 OLD_FILES+=usr/share/doc/ntp/driver8.htm
 OLD_FILES+=usr/share/doc/ntp/driver9.htm
 OLD_FILES+=usr/share/doc/ntp/exec.htm
 OLD_FILES+=usr/share/doc/ntp/extern.htm
 OLD_FILES+=usr/share/doc/ntp/gadget.htm
 OLD_FILES+=usr/share/doc/ntp/hints.htm
 OLD_FILES+=usr/share/doc/ntp/howto.htm
 OLD_FILES+=usr/share/doc/ntp/htmlprimer.htm
 OLD_FILES+=usr/share/doc/ntp/index.htm
 OLD_FILES+=usr/share/doc/ntp/kern.htm
 OLD_FILES+=usr/share/doc/ntp/kernpps.htm
 OLD_FILES+=usr/share/doc/ntp/ldisc.htm
 OLD_FILES+=usr/share/doc/ntp/measure.htm
 OLD_FILES+=usr/share/doc/ntp/miscopt.htm
 OLD_FILES+=usr/share/doc/ntp/monopt.htm
 OLD_FILES+=usr/share/doc/ntp/mx4200data.htm
 OLD_FILES+=usr/share/doc/ntp/notes.htm
 OLD_FILES+=usr/share/doc/ntp/ntpd.htm
 OLD_FILES+=usr/share/doc/ntp/ntpdate.htm
 OLD_FILES+=usr/share/doc/ntp/ntpdc.htm
 OLD_FILES+=usr/share/doc/ntp/ntpq.htm
 OLD_FILES+=usr/share/doc/ntp/ntptime.htm
 OLD_FILES+=usr/share/doc/ntp/ntptrace.htm
 OLD_FILES+=usr/share/doc/ntp/parsedata.htm
 OLD_FILES+=usr/share/doc/ntp/parsenew.htm
 OLD_FILES+=usr/share/doc/ntp/patches.htm
 OLD_FILES+=usr/share/doc/ntp/porting.htm
 OLD_FILES+=usr/share/doc/ntp/pps.htm
 OLD_FILES+=usr/share/doc/ntp/prefer.htm
 OLD_FILES+=usr/share/doc/ntp/qth.htm
 OLD_FILES+=usr/share/doc/ntp/quick.htm
 OLD_FILES+=usr/share/doc/ntp/rdebug.htm
 OLD_FILES+=usr/share/doc/ntp/refclock.htm
 OLD_FILES+=usr/share/doc/ntp/release.htm
 OLD_FILES+=usr/share/doc/ntp/tickadj.htm
 OLD_FILES+=usr/share/doc/papers/nqnfs.ascii.gz
 OLD_FILES+=usr/share/doc/papers/px.ascii.gz
 OLD_FILES+=usr/share/man/man3/exp10.3.gz
 OLD_FILES+=usr/share/man/man3/exp10f.3.gz
 OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz
 OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz
 OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz
 OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz
 OLD_FILES+=usr/share/man/man3/mbmb.3.gz
 OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz
 OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz
 .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64"
 OLD_FILES+=usr/share/man/man8/boot_i386.8.gz
 .endif
 .if ${TARGET_ARCH} != "powerpc" && ${TARGET_ARCH} != "powerpc64" && ${TARGET_ARCH} != "sparc64"
 OLD_FILES+=usr/share/man/man8/ofwdump.8.gz
 .endif
 OLD_FILES+=usr/share/man/man8/mount_reiserfs.8.gz
 OLD_FILES+=usr/share/man/man9/VFS_START.9.gz
 OLD_FILES+=usr/share/man/man9/cpu_critical_exit.9.gz
 OLD_FILES+=usr/share/man/man9/cpu_critical_enter.9.gz
 OLD_FILES+=usr/share/info/annotate.info.gz
 OLD_FILES+=usr/share/info/tar.info.gz
 OLD_FILES+=usr/share/bsnmp/defs/tree.def
 OLD_FILES+=usr/share/bsnmp/defs/mibII_tree.def
 OLD_FILES+=usr/share/bsnmp/defs/netgraph_tree.def
 OLD_FILES+=usr/share/bsnmp/mibs/FOKUS-MIB.txt
 OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-MIB.txt
 OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-SNMPD.txt
 OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-NETGRAPH.txt
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.x
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.x
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsc
 OLD_FILES+=usr/libdata/msdosfs/iso22dos
 OLD_FILES+=usr/libdata/msdosfs/iso72dos
 OLD_FILES+=usr/libdata/msdosfs/koi2dos
 OLD_FILES+=usr/libdata/msdosfs/koi8u2dos
 # The following files are *not* obsolete, they just don't get touched at
 # install, so don't add them:
 #  - boot/loader.rc
 #  - usr/share/tmac/man.local
 #  - usr/share/tmac/mm/locale
 #  - usr/share/tmac/mm/se_locale
 #  - var/yp/Makefile
 
 # 20071120: shared library version bump
 OLD_LIBS+=usr/lib/libasn1.so.8
 OLD_LIBS+=usr/lib/libgssapi.so.8
 OLD_LIBS+=usr/lib/libgssapi_krb5.so.8
 OLD_LIBS+=usr/lib/libhdb.so.8
 OLD_LIBS+=usr/lib/libkadm5clnt.so.8
 OLD_LIBS+=usr/lib/libkadm5srv.so.8
 OLD_LIBS+=usr/lib/libkafs5.so.8
 OLD_LIBS+=usr/lib/libkrb5.so.8
 OLD_LIBS+=usr/lib/libobjc.so.2
 OLD_LIBS+=usr/lib32/libgssapi.so.8
 OLD_LIBS+=usr/lib32/libobjc.so.2
 # 20070519: GCC 4.2
 OLD_LIBS+=usr/lib/libg2c.a
 OLD_LIBS+=usr/lib/libg2c.so
 OLD_LIBS+=usr/lib/libg2c.so.2
 OLD_LIBS+=usr/lib/libg2c_p.a
 OLD_LIBS+=usr/lib/libgcc_pic.a
 OLD_LIBS+=usr/lib32/libg2c.a
 OLD_LIBS+=usr/lib32/libg2c.so
 OLD_LIBS+=usr/lib32/libg2c.so.2
 OLD_LIBS+=usr/lib32/libg2c_p.a
 OLD_LIBS+=usr/lib32/libgcc_pic.a
 # 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade
 OLD_LIBS+=lib/libcrypto.so.4
 OLD_LIBS+=usr/lib/libssl.so.4
 OLD_LIBS+=usr/lib32/libcrypto.so.4
 OLD_LIBS+=usr/lib32/libssl.so.4
 # 20060521: gethostbyaddr(3) ABI change
 OLD_LIBS+=usr/lib/libroken.so.8
 OLD_LIBS+=lib/libatm.so.3
 OLD_LIBS+=lib/libc.so.6
 OLD_LIBS+=lib/libutil.so.5
 OLD_LIBS+=usr/lib32/libatm.so.3
 OLD_LIBS+=usr/lib32/libc.so.6
 OLD_LIBS+=usr/lib32/libutil.so.5
 # 20060413: shared library moved to /usr/lib
 OLD_LIBS+=lib/libgpib.so.1
 # 20060413: libpcap.so.4 moved to /lib/
 OLD_LIBS+=usr/lib/libpcap.so.4
 # 20060412: libpthread.so.2 moved to /lib/
 OLD_LIBS+=usr/lib/libpthread.so.2
 # 20060127: revert libdisk to static-only
 OLD_LIBS+=usr/lib/libdisk.so.3
 # 20051027: libc_r discontinued (removed 20101113)
 OLD_LIBS+=usr/lib/libc_r.a
 OLD_LIBS+=usr/lib/libc_r.so
 OLD_LIBS+=usr/lib/libc_r.so.7
 OLD_LIBS+=usr/lib/libc_r_p.a
 OLD_LIBS+=usr/lib32/libc_r.a
 OLD_LIBS+=usr/lib32/libc_r.so
 OLD_LIBS+=usr/lib32/libc_r.so.7
 OLD_LIBS+=usr/lib32/libc_r_p.a
 # 20050722: bump for 6.0-RELEASE
 OLD_LIBS+=lib/libalias.so.4
 OLD_LIBS+=lib/libatm.so.2
 OLD_LIBS+=lib/libbegemot.so.1
 OLD_LIBS+=lib/libbsdxml.so.1
 OLD_LIBS+=lib/libbsnmp.so.2
 OLD_LIBS+=lib/libc.so.5
 OLD_LIBS+=lib/libcam.so.2
 OLD_LIBS+=lib/libcrypt.so.2
 OLD_LIBS+=lib/libcrypto.so.3
 OLD_LIBS+=lib/libdevstat.so.4
 OLD_LIBS+=lib/libedit.so.4
 OLD_LIBS+=lib/libgeom.so.2
 OLD_LIBS+=lib/libgpib.so.0
 OLD_LIBS+=lib/libipsec.so.1
 OLD_LIBS+=lib/libipx.so.2
 OLD_LIBS+=lib/libkiconv.so.1
 OLD_LIBS+=lib/libkvm.so.2
 OLD_LIBS+=lib/libm.so.3
 OLD_LIBS+=lib/libmd.so.2
 OLD_LIBS+=lib/libncurses.so.5
 OLD_LIBS+=lib/libreadline.so.5
 OLD_LIBS+=lib/libsbuf.so.2
 OLD_LIBS+=lib/libufs.so.2
 OLD_LIBS+=lib/libutil.so.4
 OLD_LIBS+=lib/libz.so.2
 OLD_LIBS+=usr/lib/libarchive.so.1
 OLD_LIBS+=usr/lib/libasn1.so.7
 OLD_LIBS+=usr/lib/libbluetooth.so.1
 OLD_LIBS+=usr/lib/libbz2.so.1
 OLD_LIBS+=usr/lib/libc_r.so.5
 OLD_LIBS+=usr/lib/libcalendar.so.2
 OLD_LIBS+=usr/lib/libcom_err.so.2
 OLD_LIBS+=usr/lib/libdevinfo.so.2
 OLD_LIBS+=usr/lib/libdialog.so.4
 OLD_LIBS+=usr/lib/libfetch.so.3
 OLD_LIBS+=usr/lib/libform.so.2
 OLD_LIBS+=usr/lib/libftpio.so.5
 OLD_LIBS+=usr/lib/libg2c.so.1
 OLD_LIBS+=usr/lib/libgnuregex.so.2
 OLD_LIBS+=usr/lib/libgssapi.so.7
 OLD_LIBS+=usr/lib/libhdb.so.7
 OLD_LIBS+=usr/lib/libhistory.so.5
 OLD_LIBS+=usr/lib/libkadm5clnt.so.7
 OLD_LIBS+=usr/lib/libkadm5srv.so.7
 OLD_LIBS+=usr/lib/libkafs5.so.7
 OLD_LIBS+=usr/lib/libkrb5.so.7
 OLD_LIBS+=usr/lib/libmagic.so.1
 OLD_LIBS+=usr/lib/libmenu.so.2
 OLD_LIBS+=usr/lib/libmilter.so.2
 OLD_LIBS+=usr/lib/libmp.so.4
 OLD_LIBS+=usr/lib/libncp.so.1
 OLD_LIBS+=usr/lib/libnetgraph.so.1
 OLD_LIBS+=usr/lib/libngatm.so.1
 OLD_LIBS+=usr/lib/libobjc.so.1
 OLD_LIBS+=usr/lib/libopie.so.3
 OLD_LIBS+=usr/lib/libpam.so.2
 OLD_LIBS+=usr/lib/libpanel.so.2
 OLD_LIBS+=usr/lib/libpcap.so.3
 OLD_LIBS+=usr/lib/libpmc.so.2
 OLD_LIBS+=usr/lib/libpthread.so.1
 OLD_LIBS+=usr/lib/libradius.so.1
 OLD_LIBS+=usr/lib/libroken.so.7
 OLD_LIBS+=usr/lib/librpcsvc.so.2
 OLD_LIBS+=usr/lib/libsdp.so.1
 OLD_LIBS+=usr/lib/libsmb.so.1
 OLD_LIBS+=usr/lib/libssh.so.2
 OLD_LIBS+=usr/lib/libssl.so.3
 OLD_LIBS+=usr/lib/libstdc++.so.4
 OLD_LIBS+=usr/lib/libtacplus.so.1
 OLD_LIBS+=usr/lib/libthr.so.1
 OLD_LIBS+=usr/lib/libthread_db.so.1
 OLD_LIBS+=usr/lib/libugidfw.so.1
 OLD_LIBS+=usr/lib/libusbhid.so.1
 OLD_LIBS+=usr/lib/libvgl.so.3
 OLD_LIBS+=usr/lib/libwrap.so.3
 OLD_LIBS+=usr/lib/libypclnt.so.1
 OLD_LIBS+=usr/lib/pam_chroot.so.2
 OLD_LIBS+=usr/lib/pam_deny.so.2
 OLD_LIBS+=usr/lib/pam_echo.so.2
 OLD_LIBS+=usr/lib/pam_exec.so.2
 OLD_LIBS+=usr/lib/pam_ftpusers.so.2
 OLD_LIBS+=usr/lib/pam_group.so.2
 OLD_LIBS+=usr/lib/pam_guest.so.2
 OLD_LIBS+=usr/lib/pam_krb5.so.2
 OLD_LIBS+=usr/lib/pam_ksu.so.2
 OLD_LIBS+=usr/lib/pam_lastlog.so.2
 OLD_LIBS+=usr/lib/pam_login_access.so.2
 OLD_LIBS+=usr/lib/pam_nologin.so.2
 OLD_LIBS+=usr/lib/pam_opie.so.2
 OLD_LIBS+=usr/lib/pam_opieaccess.so.2
 OLD_LIBS+=usr/lib/pam_passwdqc.so.2
 OLD_LIBS+=usr/lib/pam_permit.so.2
 OLD_LIBS+=usr/lib/pam_radius.so.2
 OLD_LIBS+=usr/lib/pam_rhosts.so.2
 OLD_LIBS+=usr/lib/pam_rootok.so.2
 OLD_LIBS+=usr/lib/pam_securetty.so.2
 OLD_LIBS+=usr/lib/pam_self.so.2
 OLD_LIBS+=usr/lib/pam_ssh.so.2
 OLD_LIBS+=usr/lib/pam_tacplus.so.2
 OLD_LIBS+=usr/lib/pam_unix.so.2
 OLD_LIBS+=usr/lib/snmp_atm.so.3
 OLD_LIBS+=usr/lib/snmp_mibII.so.3
 OLD_LIBS+=usr/lib/snmp_netgraph.so.3
 OLD_LIBS+=usr/lib/snmp_pf.so.3
 # 200505XX: ?
 OLD_LIBS+=usr/lib/snmp_atm.so.2
 OLD_LIBS+=usr/lib/snmp_mibII.so.2
 OLD_LIBS+=usr/lib/snmp_netgraph.so.2
 OLD_LIBS+=usr/lib/snmp_pf.so.2
 # 2005XXXX: not ready for primetime yet
 OLD_LIBS+=usr/lib/libautofs.so.1
 # 200411XX: libxpg4 removal
 OLD_LIBS+=usr/lib/libxpg4.so.3
 # 200410XX: libm compatibility fix
 OLD_LIBS+=lib/libm.so.2
 # 20041001: version bump
 OLD_LIBS+=lib/libreadline.so.4
 OLD_LIBS+=usr/lib/libhistory.so.4
 OLD_LIBS+=usr/lib/libopie.so.2
 OLD_LIBS+=usr/lib/libpcap.so.2
 # 20040925: bind9 import
 OLD_LIBS+=usr/lib/libisc.so.1
 # 200408XX
 OLD_LIBS+=usr/lib/snmp_netgraph.so.1
 # 200404XX
 OLD_LIBS+=usr/lib/libsnmp.so.1
 OLD_LIBS+=usr/lib/snmp_mibII.so.1
 # 200309XX
 OLD_LIBS+=usr/lib/libasn1.so.6
 OLD_LIBS+=usr/lib/libhdb.so.6
 OLD_LIBS+=usr/lib/libkadm5clnt.so.6
 OLD_LIBS+=usr/lib/libkadm5srv.so.6
 OLD_LIBS+=usr/lib/libkrb5.so.6
 OLD_LIBS+=usr/lib/libroken.so.6
 # 200304XX
 OLD_LIBS+=usr/lib/libc.so.4
 OLD_LIBS+=usr/lib/libc_r.so.4
 OLD_LIBS+=usr/lib/libdevstat.so.2
 OLD_LIBS+=usr/lib/libedit.so.3
 OLD_LIBS+=usr/lib/libgmp.so.3
 OLD_LIBS+=usr/lib/libmp.so.3
 OLD_LIBS+=usr/lib/libpam.so.1
 OLD_LIBS+=usr/lib/libposix1e.so.2
 OLD_LIBS+=usr/lib/libskey.so.2
 OLD_LIBS+=usr/lib/libusbhid.so.0
 OLD_LIBS+=usr/lib/libvgl.so.2
 # 200302XX
 OLD_LIBS+=usr/lib/libacl.so.3
 OLD_LIBS+=usr/lib/libasn1.so.5
 OLD_LIBS+=usr/lib/libcrypto.so.2
 OLD_LIBS+=usr/lib/libgssapi.so.5
 OLD_LIBS+=usr/lib/libhdb.so.5
 OLD_LIBS+=usr/lib/libkadm.so.3
 OLD_LIBS+=usr/lib/libkadm5clnt.so.5
 OLD_LIBS+=usr/lib/libkadm5srv.so.5
 OLD_LIBS+=usr/lib/libkafs.so.3
 OLD_LIBS+=usr/lib/libkafs5.so.5
 OLD_LIBS+=usr/lib/libkdb.so.3
 OLD_LIBS+=usr/lib/libkrb.so.3
 OLD_LIBS+=usr/lib/libroken.so.
 OLD_LIBS+=usr/lib/libssl.so.2
 OLD_LIBS+=usr/lib/pam_kerberosIV.so
 # 200208XX
 OLD_LIBS+=usr/lib/libgssapi.so.4
 # 200203XX
 OLD_LIBS+=usr/lib/libss.so.3
 OLD_LIBS+=usr/lib/libusb.so.0
 # 200112XX
 OLD_LIBS+=usr/lib/libfetch.so.2
 # 200110XX
 OLD_LIBS+=usr/lib/libgssapi.so.3
 # 200104XX
 OLD_LIBS+=usr/lib/libdescrypt.so.2
 OLD_LIBS+=usr/lib/libscrypt.so.2
 # 200102XX
 OLD_LIBS+=usr/lib/libcrypto.so.1
 OLD_LIBS+=usr/lib/libssl.so.1
 # 200009XX
 OLD_LIBS+=usr/lib/libRSAglue.so.1
 OLD_LIBS+=usr/lib/librsaINTL.so.1
 OLD_LIBS+=usr/lib/librsaUSA.so.1
 # 200006XX
 OLD_LIBS+=usr/lib/libalias.so.3
 OLD_LIBS+=usr/lib/libfetch.so.1
 OLD_LIBS+=usr/lib/libipsec.so.0
 # 200005XX
 OLD_LIBS+=usr/lib/libxpg4.so.2
 # 200002XX
 OLD_LIBS+=usr/lib/libc.so.3
 OLD_LIBS+=usr/lib/libcurses.so.2
 OLD_LIBS+=usr/lib/libdialog.so.3
 OLD_LIBS+=usr/lib/libedit.so.2
 OLD_LIBS+=usr/lib/libf2c.so.2
 OLD_LIBS+=usr/lib/libftpio.so.4
 OLD_LIBS+=usr/lib/libg++.so.4
 OLD_LIBS+=usr/lib/libhistory.so.3
 OLD_LIBS+=usr/lib/libmytinfo.so.2
 OLD_LIBS+=usr/lib/libncurses.so.3
 OLD_LIBS+=usr/lib/libreadline.so.3
 OLD_LIBS+=usr/lib/libss.so.2
 OLD_LIBS+=usr/lib/libtermcap.so.2
 OLD_LIBS+=usr/lib/libutil.so.2
 OLD_LIBS+=usr/lib/libvgl.so.1
 OLD_LIBS+=usr/lib/libwrap.so.2
 # 199909XX
 OLD_LIBS+=usr/lib/libc_r.so.3
 # ???
 OLD_LIBS+=usr/lib/libarchive.so.2
 OLD_LIBS+=usr/lib/libbsnmp.so.1
 OLD_LIBS+=usr/lib/libc_r.so.6
 OLD_LIBS+=usr/lib32/libarchive.so.2
 OLD_LIBS+=usr/lib32/libc_r.so.6
 OLD_LIBS+=usr/lib/libcipher.so.2
 OLD_LIBS+=usr/lib/libgssapi.so.6
 OLD_LIBS+=usr/lib/libkse.so.1
 OLD_LIBS+=usr/lib/liblwres.so.3
 OLD_LIBS+=usr/lib/pam_ftp.so.2
 
 # 20131013: Removal of the ATF tools
 OLD_DIRS+=etc/atf
 OLD_DIRS+=usr/share/examples/atf
 OLD_DIRS+=usr/share/xml/atf
 OLD_DIRS+=usr/share/xml
 OLD_DIRS+=usr/share/xsl/atf
 OLD_DIRS+=usr/share/xsl
 # 20040925: bind9 import
 OLD_DIRS+=usr/share/doc/bind/html
 OLD_DIRS+=usr/share/doc/bind/misc
 OLD_DIRS+=usr/share/doc/bind/
 # ???
 OLD_DIRS+=usr/include/g++/std
 OLD_DIRS+=usr/include/msdosfs
 OLD_DIRS+=usr/include/ntfs
 OLD_DIRS+=usr/include/nwfs
 OLD_DIRS+=usr/include/ufs/mfs
 # 20011001: UUCP migration to ports
 OLD_DIRS+=usr/libexec/uucp
 
 
 .include "tools/build/mk/OptionalObsoleteFiles.inc"
Index: head/UPDATING
===================================================================
--- head/UPDATING	(revision 276550)
+++ head/UPDATING	(revision 276551)
@@ -1,1104 +1,1109 @@
 Updating Information for FreeBSD current users.
 
 This file is maintained and copyrighted by M. Warner Losh <imp@freebsd.org>.
 See end of file for further details.  For commonly done items, please see the
 COMMON ITEMS: section later in the file.  These instructions assume that you
 basically know what you are doing.  If not, then please consult the FreeBSD
 handbook:
 
     http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html
 
 Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before running portupgrade.
 
 NOTE: FreeBSD has switched from gcc to clang. If you have trouble bootstrapping
 from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to
 the tip of head, and then rebuild without this option. The bootstrap process from
 older version of current across the gcc/clang cutover is a bit fragile.
 
 NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
 	FreeBSD 11.x has many debugging features turned on, in both the kernel
 	and userland.  These features attempt to detect incorrect use of
 	system primitives, and encourage loud failure through extra sanity
 	checking and fail stop semantics.  They also substantially impact
 	system performance.  If you want to do performance measurement,
 	benchmarking, and optimization, you'll want to turn them off.  This
 	includes various WITNESS- related kernel options, INVARIANTS, malloc
 	debugging flags in userland, and various verbose features in the
 	kernel.  Many developers choose to disable these features on build
 	machines to maximize performance.  (To completely disable malloc
 	debugging, define MALLOC_PRODUCTION in /etc/make.conf, or to merely
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20150102:
+	The GNU texinfo and GNU info pages have been removed.
+	To be able to view GNU info pages please install texinfo from ports.
+
 20141231:
 	Clang, llvm and lldb have been upgraded to 3.5.0 release.
 
 	As of this release, a prerequisite for building clang, llvm and lldb is
 	a C++11 capable compiler and C++11 standard library.  This means that to
 	be able to successfully build the cross-tools stage of buildworld, with
 	clang as the bootstrap compiler, your system compiler or cross compiler
 	should either be clang 3.3 or later, or gcc 4.8 or later, and your
 	system C++ library should be libc++, or libdstdc++ from gcc 4.8 or
 	later.
 
 	On any standard FreeBSD 10.x or 11.x installation, where clang and
 	libc++ are on by default (that is, on x86 or arm), this should work out
 	of the box.
 
 	On 9.x installations where clang is enabled by default, e.g. on x86 and
 	powerpc, libc++ will not be enabled by default, so libc++ should be
 	built (with clang) and installed first.  If both clang and libc++ are
 	missing, build clang first, then use it to build libc++.
 
 	On 8.x and earlier installations, upgrade to 9.x first, and then follow
 	the instructions for 9.x above.
 
 	Sparc64 and mips users are unaffected, as they still use gcc 4.2.1 by
 	default, and do not build clang.
 
 	Many embedded systems are resource constrained, and will not be able to
 	build clang in a reasonable time, or in some cases at all.  In those
 	cases, cross building bootable systems on amd64 is a workaround.
 
 	This new version of clang introduces a number of new warnings, of which
 	the following are most likely to appear:
 
 	-Wabsolute-value
 
 	This warns in two cases, for both C and C++:
 	* When the code is trying to take the absolute value of an unsigned
 	  quantity, which is effectively a no-op, and almost never what was
 	  intended.  The code should be fixed, if at all possible.  If you are
 	  sure that the unsigned quantity can be safely cast to signed, without
 	  loss of information or undefined behavior, you can add an explicit
 	  cast, or disable the warning.
 
 	* When the code is trying to take an absolute value, but the called
 	  abs() variant is for the wrong type, which can lead to truncation.
 	  If you want to disable the warning instead of fixing the code, please
 	  make sure that truncation will not occur, or it might lead to unwanted
 	  side-effects.
 
 	-Wtautological-undefined-compare and
 	-Wundefined-bool-conversion
 
 	These warn when C++ code is trying to compare 'this' against NULL, while
 	'this' should never be NULL in well-defined C++ code.  However, there is
 	some legacy (pre C++11) code out there, which actively abuses this
 	feature, which was less strictly defined in previous C++ versions.
 
 	Squid and openjdk do this, for example.  The warning can be turned off
 	for C++98 and earlier, but compiling the code in C++11 mode might result
 	in unexpected behavior; for example, the parts of the program that are
 	unreachable could be optimized away.
 
 20141222:
 	The old NFS client and server (kernel options NFSCLIENT, NFSSERVER)
 	kernel sources have been removed. The .h files remain, since some
 	utilities include them. This will need to be fixed later.
 	If "mount -t oldnfs ..." is attempted, it will fail.
 	If the "-o" option on mountd(8), nfsd(8) or nfsstat(1) is used,
 	the utilities will report errors.
 
 20141121:
 	The handling of LOCAL_LIB_DIRS has been altered to skip addition of
 	directories to top level SUBDIR variable when their parent
 	directory is included in LOCAL_DIRS.  Users with build systems with
 	such hierarchies and without SUBDIR entries in the parent
 	directory Makefiles should add them or add the directories to
 	LOCAL_DIRS.
 
 20141109:
 	faith(4) and faithd(8) has been removed from base system. It
 	has been obsolete for a very long time.
 
 20141104:
 	vt(4), the new console driver, is enabled by default. It brings
 	support for Unicode and double-width characters, as well as
 	support for UEFI and integration with the KMS kernel video
 	drivers.
 
 	You may need to update your console settings in /etc/rc.conf,
 	most probably the keymap. During boot, /etc/rc.d/syscons will
 	indicate what you need to do.
 
 	vt(4) still has issues and lacks some features compared to
 	syscons(4). See the wiki for up-to-date information:
 	  https://wiki.freebsd.org/Newcons
 
 	If you want to keep using syscons(4), you can do so by adding
 	the following line to /boot/loader.conf:
 	  kern.vty=sc
 
 20141102:
 	pjdfstest has been integrated into kyua as an opt-in test suite.
 	Please see share/doc/pjdfstest/README for a more details on how to
 	execute it.
 
 20141009:
 	gperf has been removed from the base system for architectures
 	that use clang. Ports that require gperf will obtain it from the
 	devel/gperf port.
 
 20140923:
 	pjdfstest has been moved from tools/regression/pjdfstest to
 	contrib/pjdfstest .
 
 20140922:
 	At svn r271982, The default linux compat kernel ABI has been adjusted
 	to 2.6.18 in support of the linux-c6 compat ports infrastructure
 	update.  If you wish to continue using the linux-f10 compat ports,
 	add compat.linux.osrelease=2.6.16 to your local sysctl.conf.  Users are
 	encouraged to update their linux-compat packages to linux-c6 during
 	their next update cycle.
 
 20140729:
 	The ofwfb driver, used to provide a graphics console on PowerPC when
 	using vt(4), no longer allows mmap() of all of physical memory. This
 	will prevent Xorg on PowerPC with some ATI graphics cards from
 	initializing properly unless x11-servers/xorg-server is updated to
 	1.12.4_8 or newer.
 
 20140723:
 	The xdev targets have been converted to using TARGET and
 	TARGET_ARCH instead of XDEV and XDEV_ARCH.
 
 20140719:
 	The default unbound configuration has been modified to address
 	issues with reverse lookups on networks that use private
 	address ranges.  If you use the local_unbound service, run
 	"service local_unbound setup" as root to regenerate your
 	configuration, then "service local_unbound reload" to load the
 	new configuration.
 
 20140709:
 	The GNU texinfo and GNU info pages are not built and installed
 	anymore, WITH_INFO knob has been added to allow to built and install
 	them again.
+	UPDATE: see 20150102 entry on texinfo's removal
 
 20140708:
 	The GNU readline library is now an INTERNALLIB - that is, it is
 	statically linked into consumers (GDB and variants) in the base
 	system, and the shared library is no longer installed.  The
 	devel/readline port is available for third party software that
 	requires readline.
 
 20140702:
 	The Itanium architecture (ia64) has been removed from the list of
 	known architectures. This is the first step in the removal of the
 	architecture.
 
 20140701:
 	Commit r268115 has added NFSv4.1 server support, merged from
 	projects/nfsv4.1-server.  Since this includes changes to the
 	internal interfaces between the NFS related modules, a full
 	build of the kernel and modules will be necessary.
 	__FreeBSD_version has been bumped.
 
 20140629:
 	The WITHOUT_VT_SUPPORT kernel config knob has been renamed
 	WITHOUT_VT.  (The other _SUPPORT knobs have a consistent meaning
 	which differs from the behaviour controlled by this knob.)
 
 20140619:
 	Maximal length of the serial number in CTL was increased from 16 to
 	64 chars, that breaks ABI.  All CTL-related tools, such as ctladm
 	and ctld, need to be rebuilt to work with a new kernel.
 
 20140606:
 	The libatf-c and libatf-c++ major versions were downgraded to 0 and
 	1 respectively to match the upstream numbers.  They were out of
 	sync because, when they were originally added to FreeBSD, the
 	upstream versions were not respected.  These libraries are private
 	and not yet built by default, so renumbering them should be a
 	non-issue.  However, unclean source trees will yield broken test
 	programs once the operator executes "make delete-old-libs" after a
 	"make installworld".
 
 	Additionally, the atf-sh binary was made private by moving it into
 	/usr/libexec/.  Already-built shell test programs will keep the
 	path to the old binary so they will break after "make delete-old"
 	is run.
 
 	If you are using WITH_TESTS=yes (not the default), wipe the object
 	tree and rebuild from scratch to prevent spurious test failures.
 	This is only needed once: the misnumbered libraries and misplaced
 	binaries have been added to OptionalObsoleteFiles.inc so they will
 	be removed during a clean upgrade.
 
 20140512:
 	Clang and llvm have been upgraded to 3.4.1 release.
 
 20140508:
 	We bogusly installed src.opts.mk in /usr/share/mk. This file should
 	be removed to avoid issues in the future (and has been added to
 	ObsoleteFiles.inc).
 
 20140505:
 	/etc/src.conf now affects only builds of the FreeBSD src tree. In the
 	past, it affected all builds that used the bsd.*.mk files. The old
 	behavior was a bug, but people may have relied upon it. To get this
 	behavior back, you can .include /etc/src.conf from /etc/make.conf
 	(which is still global and isn't changed). This also changes the
 	behavior of incremental builds inside the tree of individual
 	directories. Set MAKESYSPATH to ".../share/mk" to do that.
 	Although this has survived make universe and some upgrade scenarios,
 	other upgrade scenarios may have broken. At least one form of
 	temporary breakage was fixed with MAKESYSPATH settings for buildworld
 	as well... In cases where MAKESYSPATH isn't working with this
 	setting, you'll need to set it to the full path to your tree.
 
 	One side effect of all this cleaning up is that bsd.compiler.mk
 	is no longer implicitly included by bsd.own.mk. If you wish to
 	use COMPILER_TYPE, you must now explicitly include bsd.compiler.mk
 	as well.
 
 20140430:
 	The lindev device has been removed since /dev/full has been made a
 	standard device.  __FreeBSD_version has been bumped.
 
 20140418:
 	The YES_HESIOD knob has been removed. It has been obsolete for
 	a decade. Please move to using WITH_HESIOD instead or your builds
 	will silently lack HESIOD.
 
 20140405:
 	The uart(4) driver has been changed with respect to its handling
 	of the low-level console. Previously the uart(4) driver prevented
 	any process from changing the baudrate or the CLOCAL and HUPCL
 	control flags. By removing the restrictions, operators can make
 	changes to the serial console port without having to reboot.
 	However, when getty(8) is started on the serial device that is
 	associated with the low-level console, a misconfigured terminal
 	line in /etc/ttys will now have a real impact.
 	Before upgrading the kernel, make sure that /etc/ttys has the
 	serial console device configured as 3wire without baudrate to
 	preserve the previous behaviour. E.g:
 	    ttyu0  "/usr/libexec/getty 3wire"  vt100  on  secure
 
 20140306:
 	Support for libwrap (TCP wrappers) in rpcbind was disabled by default
 	to improve performance.  To re-enable it, if needed, run rpcbind
 	with command line option -W.
 
 20140226:
 	Switched back to the GPL dtc compiler due to updates in the upstream
 	dts files not being supported by the BSDL dtc compiler. You will need
 	to rebuild your kernel toolchain to pick up the new compiler. Core dumps
 	may result while building dtb files during a kernel build if you fail
 	to do so. Set WITHOUT_GPL_DTC if you require the BSDL compiler.
 
 20140216:
 	Clang and llvm have been upgraded to 3.4 release.
 
 20140216:
 	The nve(4) driver has been removed.  Please use the nfe(4) driver
 	for NVIDIA nForce MCP Ethernet adapters instead.
 
 20140212:
 	An ABI incompatibility crept into the libc++ 3.4 import in r261283.
 	This could cause certain C++ applications using shared libraries built
 	against the previous version of libc++ to crash.  The incompatibility
 	has now been fixed, but any C++ applications or shared libraries built
 	between r261283 and r261801 should be recompiled.
 
 20140204:
 	OpenSSH will now ignore errors caused by kernel lacking of Capsicum
 	capability mode support.  Please note that enabling the feature in
 	kernel is still highly recommended.
 
 20140131:
 	OpenSSH is now built with sandbox support, and will use sandbox as
 	the default privilege separation method.  This requires Capsicum
 	capability mode support in kernel.
 
 20140128:
 	The libelf and libdwarf libraries have been updated to newer
 	versions from upstream. Shared library version numbers for
 	these two libraries were bumped. Any ports or binaries
 	requiring these two libraries should be recompiled.
 	__FreeBSD_version is bumped to 1100006.
 
 20140110:
 	If a Makefile in a tests/ directory was auto-generating a Kyuafile
 	instead of providing an explicit one, this would prevent such
 	Makefile from providing its own Kyuafile in the future during
 	NO_CLEAN builds.  This has been fixed in the Makefiles but manual
 	intervention is needed to clean an objdir if you use NO_CLEAN:
 	  # find /usr/obj -name Kyuafile | xargs rm -f
 
 20131213:
 	The behavior of gss_pseudo_random() for the krb5 mechanism
 	has changed, for applications requesting a longer random string
 	than produced by the underlying enctype's pseudo-random() function.
 	In particular, the random string produced from a session key of
 	enctype aes256-cts-hmac-sha1-96 or aes256-cts-hmac-sha1-96 will
 	be different at the 17th octet and later, after this change.
 	The counter used in the PRF+ construction is now encoded as a
 	big-endian integer in accordance with RFC 4402.
 	__FreeBSD_version is bumped to 1100004.
 
 20131108:
 	The WITHOUT_ATF build knob has been removed and its functionality
 	has been subsumed into the more generic WITHOUT_TESTS.  If you were
 	using the former to disable the build of the ATF libraries, you
 	should change your settings to use the latter.
 
 20131025:
 	The default version of mtree is nmtree which is obtained from
 	NetBSD.  The output is generally the same, but may vary
 	slightly.  If you found you need identical output adding
 	"-F freebsd9" to the command line should do the trick.  For the
 	time being, the old mtree is available as fmtree.
 
 20131014:
 	libbsdyml has been renamed to libyaml and moved to /usr/lib/private.
 	This will break ports-mgmt/pkg. Rebuild the port, or upgrade to pkg
 	1.1.4_8 and verify bsdyml not linked in, before running "make
 	delete-old-libs":
 	  # make -C /usr/ports/ports-mgmt/pkg build deinstall install clean
 	  or
 	  # pkg install pkg; ldd /usr/local/sbin/pkg | grep bsdyml
 
 20131010:
 	The rc.d/jail script has been updated to support jail(8)
 	configuration file.  The "jail_<jname>_*" rc.conf(5) variables
 	for per-jail configuration are automatically converted to
 	/var/run/jail.<jname>.conf before the jail(8) utility is invoked.
 	This is transparently backward compatible.  See below about some
 	incompatibilities and rc.conf(5) manual page for more details.
 
 	These variables are now deprecated in favor of jail(8) configuration
 	file.  One can use "rc.d/jail config <jname>" command to generate
 	a jail(8) configuration file in /var/run/jail.<jname>.conf without
 	running the jail(8) utility.   The default pathname of the
 	configuration file is /etc/jail.conf and can be specified by
 	using $jail_conf or $jail_<jname>_conf variables.
 
 	Please note that jail_devfs_ruleset accepts an integer at
 	this moment.  Please consider to rewrite the ruleset name
 	with an integer.
 
 20130930:
 	BIND has been removed from the base system.  If all you need
 	is a local resolver, simply enable and start the local_unbound
 	service instead.  Otherwise, several versions of BIND are
 	available in the ports tree.   The dns/bind99 port is one example.
 
 	With this change, nslookup(1) and dig(1) are no longer in the base
 	system.  Users should instead use host(1) and drill(1) which are
 	in the base system.  Alternatively, nslookup and dig can
 	be obtained by installing the dns/bind-tools port.
 
 20130916:
 	With the addition of unbound(8), a new unbound user is now
 	required during installworld.  "mergemaster -p" can be used to
 	add the user prior to installworld, as documented in the handbook.
 
 20130911:
 	OpenSSH is now built with DNSSEC support, and will by default
 	silently trust signed SSHFP records.  This can be controlled with
 	the VerifyHostKeyDNS client configuration setting.  DNSSEC support
 	can be disabled entirely with the WITHOUT_LDNS option in src.conf.
 
 20130906:
 	The GNU Compiler Collection and C++ standard library (libstdc++)
 	are no longer built by default on platforms where clang is the system
 	compiler.  You can enable them with the WITH_GCC and WITH_GNUCXX
 	options in src.conf.  
 
 20130905:
 	The PROCDESC kernel option is now part of the GENERIC kernel
 	configuration and is required for the rwhod(8) to work.
 	If you are using custom kernel configuration, you should include
 	'options PROCDESC'.
 
 20130905:
 	The API and ABI related to the Capsicum framework was modified
 	in backward incompatible way. The userland libraries and programs
 	have to be recompiled to work with the new kernel. This includes the
 	following libraries and programs, but the whole buildworld is
 	advised: libc, libprocstat, dhclient, tcpdump, hastd, hastctl,
 	kdump, procstat, rwho, rwhod, uniq.
 
 20130903:
 	AES-NI intrinsic support has been added to gcc.  The AES-NI module
 	has been updated to use this support.  A new gcc is required to build
 	the aesni module on both i386 and amd64.
 
 20130821:
 	The PADLOCK_RNG and RDRAND_RNG kernel options are now devices.
 	Thus "device padlock_rng" and "device rdrand_rng" should be
 	used instead of "options PADLOCK_RNG" & "options RDRAND_RNG".
 
 20130813:
 	WITH_ICONV has been split into two feature sets.  WITH_ICONV now
 	enables just the iconv* functionality and is now on by default.
 	WITH_LIBICONV_COMPAT enables the libiconv api and link time
 	compatability.  Set WITHOUT_ICONV to build the old way.
 	If you have been using WITH_ICONV before, you will very likely
 	need to turn on WITH_LIBICONV_COMPAT.
 
 20130806:
 	INVARIANTS option now enables DEBUG for code with OpenSolaris and
 	Illumos origin, including ZFS.  If you have INVARIANTS in your
 	kernel configuration, then there is no need to set DEBUG or ZFS_DEBUG
 	explicitly.
 	DEBUG used to enable witness(9) tracking of OpenSolaris (mostly ZFS)
 	locks if WITNESS option was set.  Because that generated a lot of
 	witness(9) reports and all of them were believed to be false
 	positives, this is no longer done.  New option OPENSOLARIS_WITNESS
 	can be used to achieve the previous behavior.
 
 20130806:
 	Timer values in IPv6 data structures now use time_uptime instead
 	of time_second.  Although this is not a user-visible functional
 	change, userland utilities which directly use them---ndp(8),
 	rtadvd(8), and rtsold(8) in the base system---need to be updated
 	to r253970 or later.
 
 20130802:
 	find -delete can now delete the pathnames given as arguments,
 	instead of only files found below them or if the pathname did
 	not contain any slashes. Formerly, the following error message
 	would result:
 
 	find: -delete: <path>: relative path potentially not safe
 
 	Deleting the pathnames given as arguments can be prevented
 	without error messages using -mindepth 1 or by changing
 	directory and passing "." as argument to find. This works in the
 	old as well as the new version of find.
 
 20130726:
 	Behavior of devfs rules path matching has been changed.
 	Pattern is now always matched against fully qualified devfs
 	path and slash characters must be explicitly matched by
 	slashes in pattern (FNM_PATHNAME). Rulesets involving devfs
 	subdirectories must be reviewed.
 
 20130716:
 	The default ARM ABI has changed to the ARM EABI. The old ABI is
 	incompatible with the ARM EABI and all programs and modules will
 	need to be rebuilt to work with a new kernel.
 
 	To keep using the old ABI ensure the WITHOUT_ARM_EABI knob is set.
 
 	NOTE: Support for the old ABI will be removed in the future and
 	users are advised to upgrade.
 
 20130709:
 	pkg_install has been disconnected from the build if you really need it
 	you should add WITH_PKGTOOLS in your src.conf(5).
 
 20130709:
 	Most of network statistics structures were changed to be able
 	keep 64-bits counters. Thus all tools, that work with networking
 	statistics, must be rebuilt (netstat(1), bsnmpd(1), etc.)
 
 20130629:
 	Fix targets that run multiple make's to use && rather than ;
 	so that subsequent steps depend on success of previous.
 
 	NOTE: if building 'universe' with -j* on stable/8 or stable/9
 	it would be better to start the build using bmake, to avoid
 	overloading the machine.
 
 20130618:
 	Fix a bug that allowed a tracing process (e.g. gdb) to write
 	to a memory-mapped file in the traced process's address space
 	even if neither the traced process nor the tracing process had
 	write access to that file.
 
 20130615:
 	CVS has been removed from the base system.  An exact copy
 	of the code is available from the devel/cvs port.
 
 20130613:
 	Some people report the following error after the switch to bmake:
 
 		make: illegal option -- J
 		usage: make [-BPSXeiknpqrstv] [-C directory] [-D variable]
 			...
 		*** [buildworld] Error code 2
 
 	this likely due to an old instance of make in
 	${MAKEPATH} (${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE})
 	which src/Makefile will use that blindly, if it exists, so if
 	you see the above error:
 
 		rm -rf `make -V MAKEPATH`
 
 	should resolve it.
 
 20130516:
 	Use bmake by default.
 	Whereas before one could choose to build with bmake via
 	-DWITH_BMAKE one must now use -DWITHOUT_BMAKE to use the old
 	make. The goal is to remove these knobs for 10-RELEASE.
 
 	It is worth noting that bmake (like gmake) treats the command
 	line as the unit of failure, rather than statements within the
 	command line.  Thus '(cd some/where && dosomething)' is safer
 	than 'cd some/where; dosomething'. The '()' allows consistent
 	behavior in parallel build.
 
 20130429:
         Fix a bug that allows NFS clients to issue READDIR on files.
 
 20130426:
 	The WITHOUT_IDEA option has been removed because
 	the IDEA patent expired.
 
 20130426:
 	The sysctl which controls TRIM support under ZFS has been renamed
 	from vfs.zfs.trim_disable -> vfs.zfs.trim.enabled and has been
 	enabled by default.
 
 20130425:
 	The mergemaster command now uses the default MAKEOBJDIRPREFIX
 	rather than creating it's own in the temporary directory in
 	order allow access to bootstrapped versions of tools such as
 	install and mtree.  When upgrading from version of FreeBSD where
 	the install command does not support -l, you will need to
 	install a new mergemaster command if mergemaster -p is required.
 	This can be accomplished with the command (cd src/usr.sbin/mergemaster
 	&& make install).
 
 20130404:
 	Legacy ATA stack, disabled and replaced by new CAM-based one since
 	FreeBSD 9.0, completely removed from the sources.  Kernel modules
 	atadisk and atapi*, user-level tools atacontrol and burncd are
 	removed.  Kernel option `options ATA_CAM` is now permanently enabled
 	and removed.
 
 20130319:
 	SOCK_CLOEXEC and SOCK_NONBLOCK flags have been added to socket(2)
 	and socketpair(2). Software, in particular Kerberos, may
 	automatically detect and use these during building. The resulting
 	binaries will not work on older kernels.
 
 20130308:
 	CTL_DISABLE has also been added to the sparc64 GENERIC (for further
 	information, see the respective 20130304 entry).
 
 20130304:
 	Recent commits to callout(9) changed the size of struct callout,
 	so the KBI is probably heavily disturbed. Also, some functions
 	in callout(9)/sleep(9)/sleepqueue(9)/condvar(9) KPIs were replaced
 	by macros. Every kernel module using it won't load, so rebuild
 	is requested.
 
 	The ctl device has been re-enabled in GENERIC for i386 and amd64,
 	but does not initialize by default (because of the new CTL_DISABLE
 	option) to save memory.  To re-enable it, remove the CTL_DISABLE
 	option from the kernel config file or set kern.cam.ctl.disable=0
 	in /boot/loader.conf.
 
 20130301:
 	The ctl device has been disabled in GENERIC for i386 and amd64.
 	This was done due to the extra memory being allocated at system
 	initialisation time by the ctl driver which was only used if
 	a CAM target device was created.  This makes a FreeBSD system
 	unusable on 128MB or less of RAM.
 
 20130208:
 	A new compression method (lz4) has been merged to -HEAD.  Please
 	refer to zpool-features(7) for more information.
 
 	Please refer to the "ZFS notes" section of this file for information
 	on upgrading boot ZFS pools.
 
 20130129:
 	A BSD-licensed patch(1) variant has been added and is installed
 	as bsdpatch, being the GNU version the default patch.
 	To inverse the logic and use the BSD-licensed one as default,
 	while having the GNU version installed as gnupatch, rebuild
 	and install world with the WITH_BSD_PATCH knob set.
 
 20130121:
 	Due to the use of the new -l option to install(1) during build
 	and install, you must take care not to directly set the INSTALL
 	make variable in your /etc/make.conf, /etc/src.conf, or on the
 	command line.  If you wish to use the -C flag for all installs
 	you may be able to add INSTALL+=-C to /etc/make.conf or
 	/etc/src.conf.
 
 20130118:
 	The install(1) option -M has changed meaning and now takes an
 	argument that is a file or path to append logs to.  In the
 	unlikely event that -M was the last option on the command line
 	and the command line contained at least two files and a target
 	directory the first file will have logs appended to it.  The -M
 	option served little practical purpose in the last decade so its
 	use is expected to be extremely rare.
 
 20121223:
 	After switching to Clang as the default compiler some users of ZFS
 	on i386 systems started to experience stack overflow kernel panics.
 	Please consider using 'options KSTACK_PAGES=4' in such configurations.
 
 20121222:
 	GEOM_LABEL now mangles label names read from file system metadata.
 	Mangling affect labels containing spaces, non-printable characters,
 	'%' or '"'. Device names in /etc/fstab and other places may need to
 	be updated.
 
 20121217:
 	By default, only the 10 most recent kernel dumps will be saved.  To
 	restore the previous behaviour (no limit on the number of kernel dumps
 	stored in the dump directory) add the following line to /etc/rc.conf:
 
 		savecore_flags=""
 
 20121201:
 	With the addition of auditdistd(8), a new auditdistd user is now
 	required during installworld.  "mergemaster -p" can be used to
 	add the user prior to installworld, as documented in the handbook.
 
 20121117:
 	The sin6_scope_id member variable in struct sockaddr_in6 is now
 	filled by the kernel before passing the structure to the userland via
 	sysctl or routing socket.  This means the KAME-specific embedded scope
 	id in sin6_addr.s6_addr[2] is always cleared in userland application.
 	This behavior can be controlled by net.inet6.ip6.deembed_scopeid.
 	__FreeBSD_version is bumped to 1000025.
 
 20121105:
 	On i386 and amd64 systems WITH_CLANG_IS_CC is now the default.
 	This means that the world and kernel will be compiled with clang
 	and that clang will be installed as /usr/bin/cc, /usr/bin/c++,
 	and /usr/bin/cpp.  To disable this behavior and revert to building
 	with gcc, compile with WITHOUT_CLANG_IS_CC. Really old versions
 	of current may need to bootstrap WITHOUT_CLANG first if the clang
 	build fails (its compatibility window doesn't extend to the 9 stable
 	branch point).
 
 20121102:
 	The IPFIREWALL_FORWARD kernel option has been removed. Its
 	functionality now turned on by default.
 
 20121023:
 	The ZERO_COPY_SOCKET kernel option has been removed and
 	split into SOCKET_SEND_COW and SOCKET_RECV_PFLIP.
 	NB: SOCKET_SEND_COW uses the VM page based copy-on-write
 	mechanism which is not safe and may result in kernel crashes.
 	NB: The SOCKET_RECV_PFLIP mechanism is useless as no current
 	driver supports disposeable external page sized mbuf storage.
 	Proper replacements for both zero-copy mechanisms are under
 	consideration and will eventually lead to complete removal
 	of the two kernel options.
 
 20121023:
 	The IPv4 network stack has been converted to network byte
 	order. The following modules need to be recompiled together
 	with kernel: carp(4), divert(4), gif(4), siftr(4), gre(4),
 	pf(4), ipfw(4), ng_ipfw(4), stf(4).
 
 20121022:
 	Support for non-MPSAFE filesystems was removed from VFS. The
 	VFS_VERSION was bumped, all filesystem modules shall be
 	recompiled.
 
 20121018:
 	All the non-MPSAFE filesystems have been disconnected from
 	the build. The full list includes: codafs, hpfs, ntfs, nwfs,
 	portalfs, smbfs, xfs.
 
 20121016:
 	The interface cloning API and ABI has changed. The following
 	modules need to be recompiled together with kernel:
 	ipfw(4), pfsync(4), pflog(4), usb(4), wlan(4), stf(4),
 	vlan(4), disc(4), edsc(4), if_bridge(4), gif(4), tap(4),
 	faith(4), epair(4), enc(4), tun(4), if_lagg(4), gre(4).
 
 20121015:
 	The sdhci driver was split in two parts: sdhci (generic SD Host
 	Controller logic) and sdhci_pci (actual hardware driver).
 	No kernel config modifications are required, but if you
 	load sdhc as a module you must switch to sdhci_pci instead.
 
 20121014:
 	Import the FUSE kernel and userland support into base system.
 
 20121013:
 	The GNU sort(1) program has been removed since the BSD-licensed
 	sort(1) has been the default for quite some time and no serious
 	problems have been reported.  The corresponding WITH_GNU_SORT
 	knob has also gone.
 
 20121006:
 	The pfil(9) API/ABI for AF_INET family has been changed. Packet
 	filtering modules: pf(4), ipfw(4), ipfilter(4) need to be recompiled
 	with new kernel.
 
 20121001:
 	The net80211(4) ABI has been changed to allow for improved driver
 	PS-POLL and power-save support.  All wireless drivers need to be
 	recompiled to work with the new kernel.
 
 20120913:
 	The random(4) support for the VIA hardware random number
 	generator (`PADLOCK') is no longer enabled unconditionally.
 	Add the padlock_rng device in the custom kernel config if
 	needed.  The GENERIC kernels on i386 and amd64 do include the
 	device, so the change only affects the custom kernel
 	configurations.
 
 20120908:
 	The pf(4) packet filter ABI has been changed. pfctl(8) and
 	snmp_pf module need to be recompiled to work with new kernel.
 
 20120828:
 	A new ZFS feature flag "com.delphix:empty_bpobj" has been merged
 	to -HEAD. Pools that have empty_bpobj in active state can not be
 	imported read-write with ZFS implementations that do not support
 	this feature. For more information read the zpool-features(5)
 	manual page.
 
 20120727:
 	The sparc64 ZFS loader has been changed to no longer try to auto-
 	detect ZFS providers based on diskN aliases but now requires these
 	to be explicitly listed in the OFW boot-device environment variable. 
 
 20120712:
 	The OpenSSL has been upgraded to 1.0.1c.  Any binaries requiring
 	libcrypto.so.6 or libssl.so.6 must be recompiled.  Also, there are
 	configuration changes.  Make sure to merge /etc/ssl/openssl.cnf.
 
 20120712:
 	The following sysctls and tunables have been renamed for consistency
 	with other variables:
 	  kern.cam.da.da_send_ordered   -> kern.cam.da.send_ordered
 	  kern.cam.ada.ada_send_ordered -> kern.cam.ada.send_ordered
 
 20120628:
 	The sort utility has been replaced with BSD sort.  For now, GNU sort
 	is also available as "gnusort" or the default can be set back to
 	GNU sort by setting WITH_GNU_SORT.  In this case, BSD sort will be
 	installed as "bsdsort".
 
 20120611:
 	A new version of ZFS (pool version 5000) has been merged to -HEAD.
 	Starting with this version the old system of ZFS pool versioning
 	is superseded by "feature flags". This concept enables forward
 	compatibility against certain future changes in functionality of ZFS
 	pools. The first read-only compatible "feature flag" for ZFS pools
 	is named "com.delphix:async_destroy". For more information
 	read the new zpool-features(5) manual page.
 	Please refer to the "ZFS notes" section of this file for information
 	on upgrading boot ZFS pools.
 
 20120417:
 	The malloc(3) implementation embedded in libc now uses sources imported
 	as contrib/jemalloc.  The most disruptive API change is to
 	/etc/malloc.conf.  If your system has an old-style /etc/malloc.conf,
 	delete it prior to installworld, and optionally re-create it using the
 	new format after rebooting.  See malloc.conf(5) for details
 	(specifically the TUNING section and the "opt.*" entries in the MALLCTL
 	NAMESPACE section).
 
 20120328:
 	Big-endian MIPS TARGET_ARCH values no longer end in "eb".  mips64eb
 	is now spelled mips64.  mipsn32eb is now spelled mipsn32.  mipseb is
 	now spelled mips.  This is to aid compatibility with third-party
 	software that expects this naming scheme in uname(3).  Little-endian
 	settings are unchanged. If you are updating a big-endian mips64 machine
 	from before this change, you may need to set MACHINE_ARCH=mips64 in
 	your environment before the new build system will recognize your machine.
 
 20120306:
 	Disable by default the option VFS_ALLOW_NONMPSAFE for all supported
 	platforms.
 
 20120229:
 	Now unix domain sockets behave "as expected" on	nullfs(5). Previously
 	nullfs(5) did not pass through all behaviours to the underlying layer,
 	as a result if we bound to a socket on the lower layer we could connect
 	only to the lower path; if we bound to the upper layer we could connect
 	only to	the upper path. The new behavior is one can connect to both the
 	lower and the upper paths regardless what layer path one binds to.
 
 20120211:
 	The getifaddrs upgrade path broken with 20111215 has been restored.
 	If you have upgraded in between 20111215 and 20120209 you need to
 	recompile libc again with your kernel.  You still need to recompile
 	world to be able to configure CARP but this restriction already
 	comes from 20111215.
 
 20120114:
 	The set_rcvar() function has been removed from /etc/rc.subr.  All
 	base and ports rc.d scripts have been updated, so if you have a
 	port installed with a script in /usr/local/etc/rc.d you can either
 	hand-edit the rcvar= line, or reinstall the port.
 
 	An easy way to handle the mass-update of /etc/rc.d:
 	rm /etc/rc.d/* && mergemaster -i
 
 20120109:
 	panic(9) now stops other CPUs in the SMP systems, disables interrupts
 	on the current CPU and prevents other threads from running.
 	This behavior can be reverted using the kern.stop_scheduler_on_panic
 	tunable/sysctl.
 	The new behavior can be incompatible with kern.sync_on_panic.
 
 20111215:
 	The carp(4) facility has been changed significantly. Configuration
 	of the CARP protocol via ifconfig(8) has changed, as well as format
 	of CARP events submitted to devd(8) has changed. See manual pages
 	for more information. The arpbalance feature of carp(4) is currently
 	not supported anymore.
 
 	Size of struct in_aliasreq, struct in6_aliasreq has changed. User
 	utilities using SIOCAIFADDR, SIOCAIFADDR_IN6, e.g. ifconfig(8),
 	need to be recompiled.
 
 20111122:
 	The acpi_wmi(4) status device /dev/wmistat has been renamed to
 	/dev/wmistat0.
 
 20111108:
 	The option VFS_ALLOW_NONMPSAFE option has been added in order to
 	explicitely support non-MPSAFE filesystems.
 	It is on by default for all supported platform at this present
 	time.
 
 20111101:
 	The broken amd(4) driver has been replaced with esp(4) in the amd64,
 	i386 and pc98 GENERIC kernel configuration files.
 
 20110930:
 	sysinstall has been removed
 
 20110923:
 	The stable/9 branch created in subversion.  This corresponds to the
 	RELENG_9 branch in CVS.
 
 COMMON ITEMS:
 
 	General Notes
 	-------------
 	Avoid using make -j when upgrading.  While generally safe, there are
 	sometimes problems using -j to upgrade.  If your upgrade fails with
 	-j, please try again without -j.  From time to time in the past there
 	have been problems using -j with buildworld and/or installworld.  This
 	is especially true when upgrading between "distant" versions (eg one
 	that cross a major release boundary or several minor releases, or when
 	several months have passed on the -current branch).
 
 	Sometimes, obscure build problems are the result of environment
 	poisoning.  This can happen because the make utility reads its
 	environment when searching for values for global variables.  To run
 	your build attempts in an "environmental clean room", prefix all make
 	commands with 'env -i '.  See the env(1) manual page for more details.
 
 	When upgrading from one major version to another it is generally best
 	to upgrade to the latest code in the currently installed branch first,
 	then do an upgrade to the new branch. This is the best-tested upgrade
 	path, and has the highest probability of being successful.  Please try
 	this approach before reporting problems with a major version upgrade.
 
 	When upgrading a live system, having a root shell around before
 	installing anything can help undo problems. Not having a root shell
 	around can lead to problems if pam has changed too much from your
 	starting point to allow continued authentication after the upgrade.
 
 	ZFS notes
 	---------
 	When upgrading the boot ZFS pool to a new version, always follow
 	these two steps:
 
 	1.) recompile and reinstall the ZFS boot loader and boot block
 	(this is part of "make buildworld" and "make installworld")
 
 	2.) update the ZFS boot block on your boot drive
 
 	The following example updates the ZFS boot block on the first
 	partition (freebsd-boot) of a GPT partitioned drive ada0:
 	"gpart bootcode -p /boot/gptzfsboot -i 1 ada0"
 
 	Non-boot pools do not need these updates.
 
 	To build a kernel
 	-----------------
 	If you are updating from a prior version of FreeBSD (even one just
 	a few days old), you should follow this procedure.  It is the most
 	failsafe as it uses a /usr/obj tree with a fresh mini-buildworld,
 
 	make kernel-toolchain
 	make -DALWAYS_CHECK_MAKE buildkernel KERNCONF=YOUR_KERNEL_HERE
 	make -DALWAYS_CHECK_MAKE installkernel KERNCONF=YOUR_KERNEL_HERE
 
 	To test a kernel once
 	---------------------
 	If you just want to boot a kernel once (because you are not sure
 	if it works, or if you want to boot a known bad kernel to provide
 	debugging information) run
 	make installkernel KERNCONF=YOUR_KERNEL_HERE KODIR=/boot/testkernel
 	nextboot -k testkernel
 
 	To just build a kernel when you know that it won't mess you up
 	--------------------------------------------------------------
 	This assumes you are already running a CURRENT system.  Replace
 	${arch} with the architecture of your machine (e.g. "i386",
 	"arm", "amd64", "ia64", "pc98", "sparc64", "powerpc", "mips", etc).
 
 	cd src/sys/${arch}/conf
 	config KERNEL_NAME_HERE
 	cd ../compile/KERNEL_NAME_HERE
 	make depend
 	make
 	make install
 
 	If this fails, go to the "To build a kernel" section.
 
 	To rebuild everything and install it on the current system.
 	-----------------------------------------------------------
 	# Note: sometimes if you are running current you gotta do more than
 	# is listed here if you are upgrading from a really old current.
 
 	<make sure you have good level 0 dumps>
 	make buildworld
 	make kernel KERNCONF=YOUR_KERNEL_HERE
 							[1]
 	<reboot in single user>				[3]
 	mergemaster -Fp					[5]
 	make installworld
 	mergemaster -Fi					[4]
 	make delete-old					[6]
 	<reboot>
 
 	To cross-install current onto a separate partition
 	--------------------------------------------------
 	# In this approach we use a separate partition to hold
 	# current's root, 'usr', and 'var' directories.   A partition
 	# holding "/", "/usr" and "/var" should be about 2GB in
 	# size.
 
 	<make sure you have good level 0 dumps>
 	<boot into -stable>
 	make buildworld
 	make buildkernel KERNCONF=YOUR_KERNEL_HERE
 	<maybe newfs current's root partition>
 	<mount current's root partition on directory ${CURRENT_ROOT}>
 	make installworld DESTDIR=${CURRENT_ROOT} -DDB_FROM_SRC
 	make distribution DESTDIR=${CURRENT_ROOT} # if newfs'd
 	make installkernel KERNCONF=YOUR_KERNEL_HERE DESTDIR=${CURRENT_ROOT}
 	cp /etc/fstab ${CURRENT_ROOT}/etc/fstab 		   # if newfs'd
 	<edit ${CURRENT_ROOT}/etc/fstab to mount "/" from the correct partition>
 	<reboot into current>
 	<do a "native" rebuild/install as described in the previous section>
 	<maybe install compatibility libraries from ports/misc/compat*>
 	<reboot>
 
 
 	To upgrade in-place from stable to current
 	----------------------------------------------
 	<make sure you have good level 0 dumps>
 	make buildworld					[9]
 	make kernel KERNCONF=YOUR_KERNEL_HERE		[8]
 							[1]
 	<reboot in single user>				[3]
 	mergemaster -Fp					[5]
 	make installworld
 	mergemaster -Fi					[4]
 	make delete-old					[6]
 	<reboot>
 
 	Make sure that you've read the UPDATING file to understand the
 	tweaks to various things you need.  At this point in the life
 	cycle of current, things change often and you are on your own
 	to cope.  The defaults can also change, so please read ALL of
 	the UPDATING entries.
 
 	Also, if you are tracking -current, you must be subscribed to
 	freebsd-current@freebsd.org.  Make sure that before you update
 	your sources that you have read and understood all the recent
 	messages there.  If in doubt, please track -stable which has
 	much fewer pitfalls.
 
 	[1] If you have third party modules, such as vmware, you
 	should disable them at this point so they don't crash your
 	system on reboot.
 
 	[3] From the bootblocks, boot -s, and then do
 		fsck -p
 		mount -u /
 		mount -a
 		cd src
 		adjkerntz -i		# if CMOS is wall time
 	Also, when doing a major release upgrade, it is required that
 	you boot into single user mode to do the installworld.
 
 	[4] Note: This step is non-optional.  Failure to do this step
 	can result in a significant reduction in the functionality of the
 	system.  Attempting to do it by hand is not recommended and those
 	that pursue this avenue should read this file carefully, as well
 	as the archives of freebsd-current and freebsd-hackers mailing lists
 	for potential gotchas.  The -U option is also useful to consider.
 	See mergemaster(8) for more information.
 
 	[5] Usually this step is a noop.  However, from time to time
 	you may need to do this if you get unknown user in the following
 	step.  It never hurts to do it all the time.  You may need to
 	install a new mergemaster (cd src/usr.sbin/mergemaster && make
 	install) after the buildworld before this step if you last updated
 	from current before 20130425 or from -stable before 20130430.
 
 	[6] This only deletes old files and directories. Old libraries
 	can be deleted by "make delete-old-libs", but you have to make
 	sure that no program is using those libraries anymore.
 
 	[8] In order to have a kernel that can run the 4.x binaries needed to
 	do an installworld, you must include the COMPAT_FREEBSD4 option in
 	your kernel.  Failure to do so may leave you with a system that is
 	hard to boot to recover. A similar kernel option COMPAT_FREEBSD5 is
 	required to run the 5.x binaries on more recent kernels.  And so on
 	for COMPAT_FREEBSD6 and COMPAT_FREEBSD7.
 
 	Make sure that you merge any new devices from GENERIC since the
 	last time you updated your kernel config file.
 
 	[9] When checking out sources, you must include the -P flag to have
 	cvs prune empty directories.
 
 	If CPUTYPE is defined in your /etc/make.conf, make sure to use the
 	"?=" instead of the "=" assignment operator, so that buildworld can
 	override the CPUTYPE if it needs to.
 
 	MAKEOBJDIRPREFIX must be defined in an environment variable, and
 	not on the command line, or in /etc/make.conf.  buildworld will
 	warn if it is improperly defined.
 FORMAT:
 
 This file contains a list, in reverse chronological order, of major
 breakages in tracking -current.  It is not guaranteed to be a complete
 list of such breakages, and only contains entries since October 10, 2007.
 If you need to see UPDATING entries from before that date, you will need
 to fetch an UPDATING file from an older FreeBSD release.
 
 Copyright information:
 
 Copyright 1998-2009 M. Warner Losh.  All Rights Reserved.
 
 Redistribution, publication, translation and use, with or without
 modification, in full or in part, in any form or format of this
 document are permitted without further permission from the author.
 
 THIS DOCUMENT IS PROVIDED BY WARNER LOSH ``AS IS'' AND ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 DISCLAIMED.  IN NO EVENT SHALL WARNER LOSH BE LIABLE FOR ANY DIRECT,
 INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 Contact Warner Losh if you have any questions about your use of
 this document.
 
 $FreeBSD$
Index: head/contrib/texinfo/ChangeLog.46
===================================================================
--- head/contrib/texinfo/ChangeLog.46	(revision 276550)
+++ head/contrib/texinfo/ChangeLog.46	(nonexistent)
@@ -1,12516 +0,0 @@
-2003-06-10    <karl@gnu.org>
-
-	* version 4.6.
-
-2003-06-04    <karl@gnu.org>
-
-	* config.sub: update from gnulib.
-
-2003-06-03    <karl@gnu.org>
-
-	* mkinstalldirs: update from gnulib.
-
-2003-06-02 Akim Demaille <akim@epita.fr>
-
-	* util/texi2dvi (tex_envvars): New.
-	Use it to forward -I directories to BIBINPUTS and BSTINPUTS, in
-	addition of INDEXSTYLE and TEXINPUTS.
-
-2003-06-02    <karl@gnu.org>
-
-	* makeinfo/html.c (html_output_head): don't output the <link>, to
-		avoid having mozilla put up a document navigation bar when
-		we don't have anything else to support it yet.  Report from:
-		Per Bothner.
-	* makeinfo/makeinfo.c: no need to declare add_link or
-		add_escaped_anchor_name, since they are not used.
-
-	* doc/texinfo.txi (Contents): recommend @contents at the beginning
-		more strongly.  Suggestions from Kevin Ryde.
-
-2003-06-01    <karl@gnu.org>
-
-	* makeinfo/macro.c (apply): make \\ expand to \ even if the macro
-	has no arguments.  Report from: Jesper Harder <harder@ifa.au.dk>,
-	31 May 2003 02:56:20 +0200.
-
-2003-05-31    <karl@gnu.org>
-
-	* util/dir-example (C++ libraries): new category, suggested by Bruno.
-
-2003-05-29    <karl@gnu.org>
-
-	* configure.ac: pretest version 4.5.93.
-
-2003-05-29  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.12.1.
-
-2003-05-26    <karl@gnu.org>
-
-	* util/texi2dvi: spurious \ in tex_args assignment.
-
-	* doc/texinfo.txi (Contents): trim excess words.
-
-2003-05-25    <karl@gnu.org>
-
-	* util/texi2dvi: extra quotes for the tex_args assignment in
-	--batch mode.
-
-2003-05-19    <karl@gnu.org>
-
-	* lib/xexit.c: translate fflush error messages, add newlines
-	(report from Jim Meyering).
-	* util/{texindex.c,install-info.c},
-	* makeinfo/makeinfo.c,
-	* info/info.c: use xexit again, with redundant return to avoid
-	warnings.
-
-2003-05-18    <karl@gnu.org>
-
-	* lib/xexit.c (xexit): fputs not fprintf, so we get newline;
-	translate the messages, too.  Report from Jim Meyering.
-
-	* util/dir-example: move gcc/automake entries.
-
-	* pretest version 4.5.92.
-
-	* update to automake 1.7.5.
-
-	* makeinfo/html.c (append_char): forgot to increment length, duh.
-	Report from: "Torsten Bronger" <bronger@physik.rwth-aachen.de>,
-	18 May 2003 14:36:23 +0200.
-
-2003-05-17    <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (defining_copying): new fn.
-	(add_char): call it, when testing if we should
-	call html_output_head.
-	Report from: Torsten Bronger <bronger@physik.rwth-aachen.de>,
-	17 May 2003 22:10:42 +0200.
-
-	* configure.ac: pretest version 4.5.91.
-
-2003-05-16    <karl@gnu.org>
-
-	* makeinfo/index.c (sort_index): don't deref NULL.  Report from Jan.
-
-2003-05-13    <karl@gnu.org>
-
-	* makeinfo/html.c (append_char): appease sgi compiler.
-	* makeinfo/html.c (insert_html_tag): remove spurious arg to pop_tag,
-	From: ezra peisach <epeisach@med-xtal.bu.edu>, 13
-	May 2003 12:13:40 -0400.
-
-	Fix a few GCC warnings, reported by Jim Meyering:
-
-	* info/nodes.c: parenthesize assignment used as truth value.
-	* info/nodemenu.c (format_node_info): strcpy instead of sprintf,
-		since there's no format.
-	* makeinfo/makeinfo.c (isolate_nodename): remove spurious decl.
-	* makeinfo/xml.c (xml_insert_indexterm): declare as void.
-	* info/key.c: initialize with 0,0 at end.
-	* info/infokey.c (main): return instead of xexit, and remove
-	unused variable.
-	* makeinfo/html.c (init_buffer): forgot to return buf.
-	* info/info.c (remember_info_program_name): remove spurious
-	declaration.
-
-	* makeinfo/sectioning.c,
-	* info/infomap.c: remove unused variables.
-
-	* makeinfo/makeinfo.c (insert_toplevel_subdirectory),
-	* info/man.c,
-	* info/infodoc.c (info_find_or_create_help_window): parenthesize
-	&& within ||.
-	* info/display.c (display_update_one_window): initialize rep to
-	NULL, parenthesize && within ||.
-
-	* util/install-info.c,
-	* info/info.c (main),
-	* info/makedoc.c (main): return instead of xexit.
-
-2003-05-13  Akim Demaille  <akim@epita.fr>
-
-	* util/texi2dvi (get_xref_files): Pass --file-line-error-style
-	to TeX when supported.
-
-2003-05-12    <karl@gnu.org>
-
-	* configure.ac: pretest version 4.5.90.
-
-	* Makefile.am (EXTRA_DIST): add onceonly.m4.
-
-	* makeinfo/tests/accentenc: must discard stderr since we expect
-	two errors in this case.
-
-	* makeinfo/makeinfo.c (main): new option --css-include.
-	(usage): add to --help message.
-	* makeinfo/makeinfo.h (css_include): new global.
-	* makeinfo/html.c (append_char, process_css_file): new fns
-	implementing it.
-	(html_output_head): call it.
-	* doc/texinfo.txi (HTML CSS): new node describing it.
-	Also split up the Generating HTML node into subnodes.
-
-	* config.{guess,sub}: update from gnulib.
-
-2003-05-10    <karl@gnu.org>
-
-	* makeinfo/index.c (sort_index): allocate the sorted index in new
-	memory, and set the original index to that, to avoid problems with
-	@printindex being called twice on the same index.
-	(cm_printindex): do not free the returned index.
-	Report from: Dumas Patrice <dumas@centre-cired.fr>, 9 May 2003
-	15:12:21 +0200.
-
-2003-05-09    <karl@gnu.org>
-
-	* makeinfo/defun.c (cm_defun): issue error message without extra
-	x's.  Report from: Dumas Patrice <dumas@centre-cired.fr>, 9 May
-	2003 17:24:25 +0200.
-
-2003-05-07  Akim Demaille  <akim@epita.fr>
-
-	* util/texi2dvi (textra_cmd): New.
-        (textra): Escape escapes from sed's evaluation.
-	Use them to support additional TeX/LaTeX commands.
-	Support --command as a synonym for --texinfo.
-
-2003-05-06    <karl@gnu.org>
-
-	* util/dir-example: finish getting rid of GNU packages.
-
-2003-05-04    <karl@gnu.org>
-
-	* doc/texinfo.tex (\itemizey): if no arg to @itemize, default to
-	@bullet.  Fix from: Stepan Kasal <kasal@math.cas.cz> 2 May 2003
-	09:32:11 +0200, report from: Jesper Harder <harder@ifa.au.dk>.
-
-2003-04-30    <karl@gnu.org>
-
-	* makeinfo/.gdbinit: no colon on local variables.
-
-	* doc/texinfo.txi (documentencoding): Document new Info output feature.
-	makeinfo/lang.h (encoding_type): rename `ecname' member to `encname'.
-	makeinfo/html.c, lang.c: change usage.
-	makeinfo/lang.c (cm_documentencoding): fix typo in warning.
-	makeinfo/makeinfo.h (SPLIT_SIZE_THRESHOLD): remove.
-	(info_trailer): declare.
-	makeinfo/makeinfo.c (info_trailer): new fn to generate Local
-		Variables: section if --enable-encoding and
-		@documentencoding are given.
-	(convert_from_loaded_file): call it.
-	* makeinfo/node.c (split_file): write trailer into each split
-		file.  Also, simply split files if file size is less than
-		--split-size, removing SPLIT_SIZE_THRESHOLD.
-
-	* doc/texinfo.tex: remove trailing whitespace.
-
-2003-04-29    <karl@gnu.org>
-
-	* makeinfo/node.c (cm_anchor): normalize_node_name so that an
-	anchor named "TOP" or "top" or whatever is not allowed.  Report
-	from: Dumas Patrice <dumas@centre-cired.fr>, 29 Apr 2003 18:56:51
-	+0200.
-
-2003-04-28    <karl@gnu.org>
-
-	* makeinfo/makeinfo.c: whitespace cleanup.
-
-	* doc/texinfo.tex (\doprintindex): don't \kern-\parindent, it makes
-	the first index entry stick out to the left.
-	Report from: Jesper Harder <harder@ifa.au.dk>,
-	28 Apr 2003 03:10:36 +0200.
-
-	From Akim Demaille  <akim@epita.fr>:
-	* makeinfo/makeinfo.c (cm_value): Warn for undefined flags.
-
-2003-04-27    <karl@gnu.org>
-
-	* doc/texinfo.tex (\footnote, \smartitalicx): use \ptexslash
-	for italic correction instead of \/, since we've redefined \/ now.
-	Report from: Jesper Harder <harder@ifa.au.dk>, 27 Apr 2003
-	23:30:29 +0200.
-
-	* util/dir-example (mailutils): more from Wojciech Polak.
-	(autoconf): align/edit/sort entries.
-
-2003-04-26    <karl@gnu.org>
-
-	* doc/texinfo.txi (Image Syntax): second and following @image args
-	 optional. Report from: Max Techter <mtechter@gmx.de>, 26 Apr 2003
-	15:50:02 +0200.
-
-	* util/dir-example (anubis): request from Wojciech Polak.
-
-2003-04-25    <karl@gnu.org>
-
-	* makeinfo/defun.c (defun_internal): whitespace needed in docbook
-	output for deftype*.  From: José Fonseca
-	<j_r_fonseca@yahoo.co.uk>, 25 Apr 2003 13:07:13 +0100.
-
-2003-04-21    <karl@gnu.org>
-
-	* doc/texinfo.tex (\dofirstparagraphindent): forgot to rename the
-	        \...word's.
-	(\suppressfirstparagraphindent): forgot to rename
-	to \dosuppress...  Reported by Simon.
-
-2003-04-20    <karl@gnu.org>
-
-	* Installed changes from Simon for suppressing indentation on the
-	first paragraph after section headings, and for new @indent command:
-
-	2003-04-12  Simon Law  <sfllaw@engmail.uwaterloo.ca>
-        * doc/texinfo.tex (\firstparagraphindent): implement suppression
-        of the indentation of the first paragraph.
-        (\dofirstparagraphindent): for parsing arguments.
-        (\suppressfirstparagraphindent): suppress, or don't suppress.
-        (\dosuppressfirstparagraphindent): the actual gobbling of indentation.
-        (\footnote): Compensate for the hanging-indent side-effect.
-        (\numhead, \apphead, \unnmhead): call \dosuppress...
-        * makeinfo/cmds.c (command_table): add "firstparagraphindent"
-        (as cm_firstparagraphindent)
-        (set_firstparagraphindent, cm_firstparagraphindent): implement
-        @firstparagraphindent parsing of options.
-        * makeinfo/makeinfo.h: declare "do_first_par_indent".
-        * makeinfo/sectioning.c (sectioning_underscore): suppress
-        indentation if requested.
-        * doc/texinfo.txi: document it.
-
-        * doc/texinfo.tex (\indent): override \indent primitive to
-        clear \everypar.
-        (\ptexindent): for saving/restoring \indent in @tex.
-        (\footnote): Neutralise the effect of @indent
-        within a footnote.
-        * makeinfo/cmds.c (command_table): add "indent" (as cm_indent).
-        (cm_indent): un-inhibit_paragraph_indentation.
-        * doc/texinfo.txi: document it.
-
-        * doc/texinfo.txi (Conventions): remove spurious extra vertical space
-        from bulleted itemize which starts with a quote.
-
-        * makeinfo/cmds.c (command_table): fix @novalidate definition.
-
-
-	* Installed changes from Jan for @image support in Info format:
-
-	2003-04-14  Jan Nieuwenhuizen  <janneke@gnu.org>
-	* info/display.c (display_update_one_window): Skip new style
-	image tag/cookie.
-
-	2003-04-09  Jan Nieuwenhuizen  <janneke@gnu.org>
-	* makeinfo/makeinfo.c (cm_image): Write ^@^H[image ...^@^H] tag.
-
-
-	* makeinfo/html.c (html_output_head): use <style> to get the
-	regular roman font instead of typewriter for @format and @display;
-	likewise to reduce the font size for @small*.  Suggestion from:
-	"Torsten Bronger" <bronger@physik.rwth-aachen.de>, 20 Apr 2003
-	11:03:59 +0200.
-
-2003-04-18    <karl@gnu.org>
-
-	* configure.ac (ncurses/termcap.h): move test to after termlib's
-	definition, of course.  Reported by Norton Allen
-	<allen@huarp.harvard.edu>, 18 Apr 2003 13:31:35 -0400.
-
-	* configure.ac: remove comma from comment in AC_TRY_LINK program,
-	to avoid spurious misinterpretation as an argument delimiter.
-
-2003-04-08    <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (usage): avoid double blank line.
-
-2003-04-05    <karl@gnu.org>
-
-	* Makefile.am (all of them): use $(VAR) instead of @VAR@, since
-	automake now emits definitions for all substituted variables.
-
-	* makeinfo/makeinfo.h (DEFAULT_SPLIT_SIZE): increase to 300,000.
-	(SPLIT_SIZE_THRESHOLD): increase to 500,000.
-	Implicit suggestion via Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>.
-
-2003-04-04    <karl@gnu.org>
-
-	* util/texi2dvi (replace_empty): new variable to do the empty path
-	element detection; don't hardwire path separator as :.
-
-2003-04-02    <karl@gnu.org>
-
-	* doc/txi-pl.tex: new file, from polak@gnu.org.
-	* doc/Makefile.am (TXI_XLATE): add it.
-
-2003-04-01    <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (main): correct wording of html/no-headers/split
-	error message, and don't complain if output is to stdout.
-
-	* makeinfo/insertion.c (end_insertion): for @end menu html output,
-	don't output </ul> if no_headers.  Report from: Jesper
-	Harder <harder@ifa.au.dk>, 01 Apr 2003 00:00:37 +0200.
-
-	* info/infomap.c (fetch_user_maps): don't complain if .info
-		doesn't exist.
-
-2003-03-31    <karl@gnu.org>
-
-	* makeinfo/lang.c (iso8859_2_map): new encoding map.
-	(encoding_table): enable it.
-
-	* info/pcterm.c (pc_up_line): use MAX instead of max (no longer
-	defined).  Reported by Richard Dawes.
-
-	* doc/texinfo.txi (documentencoding): mention that all processors
-	recognize the command.
-
-2003-03-30    <karl@gnu.org>
-
-	* makeinfo/lang.c (cm_special_character): incorrectly added html
-	sequences for @oe and @OE even in info output.
-
-2003-03-25    <karl@gnu.org>
-
-	* util/srclist.txt (COPYING): get from gnulib/doc, not gnulib.
-
-2003-03-24    <karl@gnu.org>
-
-	* TODO: need to write real definition of Info format.
-
-	* makeinfo/node.c (cm_node): use &nbsp; instead of ` ', to avoid
-	line breaks.
-
-2003-03-22    <karl@gnu.org>
-
-	* makeinfo/node.c (cm_node): output a space after the Node: and
-	similar headers, since Bob wants one.
-
-	* info/pcterm.c (MIN,MAX): moved to system.h.
-	* info/session.c (MIN): moved to system.h.
-	* makeinfo/sectioning.c (MIN): move to system.h.
-	* lib/system.h (MIN,MAX): define here.
-
-	* makeinfo/sectioning.c (sectioning_html): don't go smaller than <h3>.
-	Reported by Bob.
-	(MIN): new macro.
-
-	* info/session.c (MIN) [MIN]: #undef first if already #define'd.
-
-	* doc/texinfo.tex (\nodexxx): use a control sequence instead of
-	brackets to parse the parts of @node.  Otherwise node names with
-	brackets cause spurious output.  Reported by Bob.
-	(\xrefprintnodename): separate this out from
-	\xrefX, for easier redefining by Bob.
-
-2003-03-18    <karl@gnu.org>
-
-	* makeinfo/insertion.c (cm_item): ensure we don't go off the end
-	of the string when using strncmp.  From: Peter N Lewis
-	<peter@stairways.com.au>, 13 Mar 2003 16:08:27 +0800.
-
-	* doc/texinfo.txi (Raw Formatter Commands): mention using \gdef
-	within @tex, not \def.
-
-2003-03-12    <karl@gnu.org>
-
-	* doc/texinfo.txi (Preparing for TeX): mention extra colons.
-
-2003-03-07    <karl@gnu.org>
-
-	* doc/texinfo.tex (\/): new command to allow a line break.
-	(\ptexslash): for saving/restoring primitive \/ in @tex.
-	* makeinfo/cmds.c (command_table): add "/" (as cm_no_op).
-	* makeinfo/makeinfo.c (self_delimiting): add /.
-	* doc/texinfo.txi (Line Breaks, Command Summary): document it.
-	Suggestion from wl.
-
-	* doc/texinfo.tex (\hyphenation): time-stamp.
-
-2003-03-06    <karl@gnu.org>
-
-	* info/session.c (nearest_xref): new fn.
-	(info_menu_or_ref_item): call it when we are
-	searching for xrefs, instead of just looking on
-	the current line.
-	* info/info-utils.c (info_copy_reference): new fn.
-	* info/info-utils.h (info_copy_reference): declare.
-	Bug report from: rich@phekda.freeserve.co.uk,
-	04 Mar 2003 17:51:47 +0000.
-
-	* */.gdbinit: set env MALLOC_CHECK_.
-
-	2003-03-06  Ralph Schleicher  <rs@nunatak.allgaeu.org>
-	* makeinfo/files.h (get_file_info_in_path): Declare function.
-	* makeinfo/files.c (get_file_info_in_path): Remove static keyword.
-	* makeinfo/makeinfo.c (cm_image): Lookup image file name in the
-	search path for include files.
-
-2003-03-05    <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): always make
-	subdirectory for html. Before, if the current directory happened
-	to be named `foo' and the @setfilename was foo.info, we would
-	write the split html files into the current directory.  Reported
-	by rich@phekda.freeserve.co.uk, 01 Mar 2003 12:03:13 +0000.
-
-	* makeinfo/files.c (filename_part): simplify assignment.
-
-2003-02-24    <karl@gnu.org>
-
-	* makeinfo/insertion.c (get_item_function): check for @item in
-	argument to @itemize.  Report from: Dumas Patrice
-	<dumas@centre-cired.fr>, 24 Feb 2003 13:13:52 +0100.
-
-	* makeinfo/makeinfo.c (remember_brace): say `braces' instead of
-	`{...}', since often we don't actually expect text inside the
-	braces.
-
-2003-02-21    <karl@gnu.org>
-
-	* aclocal.m4: automake 1.7.3.
-
-2003-02-19    <karl@gnu.org>
-
-	* doc/info-stnd.texi: omit all node pointers.
-
-2003-02-18    <karl@gnu.org>
-
-	* util/texindex.c (maketempname): use already-set `tempdir' instead
-	of half-redoing the logic.
-	(concat): only need two args, not three; change callers.
-	(perror_with_name): really call perror, putting
-	the name first a la gcc.
-	(pfatal_with_name): call perror_with_name.
-
-	* util/texi2dvi (get_xref_files): a file whose first line is
-	\input texinfo is not an index file.  Report from: Anton Ertl
-	<anton@a0.complang.tuwien.ac.at>, 18 Feb 2003 14:41:47 +0100.
-
-2003-02-16    <karl@gnu.org>
-
-	* makeinfo/index.c (init_indices): don't try to free indexes that
-	undefindex already freed.  Report from: Arkadiusz
-	Miskiewicz <misiek@pld.ORG.PL>,
-	15 Feb 2003 13:22:49 +0100.
-
-	* configure.ac (curses): forgot to quote arg to AC_TRY_LINK.
-	From vojta and te, 16 Feb 2003 01:37:09 +0100.
-
-2003-02-13    <karl@gnu.org>
-
-	* makeinfo/insertion.c (begin_insertion): for html cartouche
-	output, add class="cartouche".  Suggestion from Stephen.
-
-2003-02-11    <karl@gnu.org>
-
-	* Installed patch:
-	2003-02-10    Peter Breitenlohner <peb@mppmu.mpg.de>
-	* info/indices.c, info/info.c, info/info.h, info/nodemenu.c,
-	info/session.c, info/window.c, makeinfo/defun.c, makeinfo/html.c,
-	makeinfo/index.c, makeinfo/insertion.c, makeinfo/makeinfo.c,
-	makeinfo/makeinfo.h, makeinfo/node.c: declare all constant
-	strings as such in order to avoid lots of gcc warnings (for
-	--disable-nls and maybe without that as well).
-
-	* doc/texinfo.tex (\registeredsymbol): new command for Arnold.
-
-	* util/dir-example: dc to basics.
-
-	* doc/texinfo.txi (Defining Macros): document new requirements on
-	macro names.  Report from: Alper Ersoy
-	<dirt@gtk.org>, 11 Feb 2003 05:11:35 +0200.
-
-2003-02-07    <karl@gnu.org>
-
-	* makeinfo/insertion.c (begin_insertion): output a table with a border
-	for @cartouche.
-	(end_insertion): end the table.
-	From: Joshua N Pritikin <vishnu@pobox.com>,
-	7 Feb 2003 21:59:49 +0530.
-
-2003-02-05    <karl@gnu.org>
-
-	* info/info.c (short_options): add h.
-	(main): treat -h same as --help.
-        From: rwhron@earthlink.net, 31 Aug 2002 19:56:57 -0400.
-
-	* info/session.c (show_isearch_prompt): compute length of
-	translated "Failing ", don't assume 20 is enough.
-	(It's 21 bytes in UTF-8 Russian.)
-	Report from: varg@thsun1.jinr.ru,
-	25 Jul 2002 15:26:42 +0400.
-
-	* info/display.c (display_update_one_window): don't derefence null
-	`entry' (if the screen is very small).
-	From: Danny Yoo <dyoo@hkn.eecs.berkeley.edu>,
-	8 Jul 2002 15:21:14 -0700.
-
-	* doc/.cvsignore: ignore *.info and texput.log.
-
-2003-02-04    <karl@gnu.org>
-
-	* Version 4.5 (that info bug was a killer).
-
-	* configure.ac (AC_CHECK_HEADERS): test for sys/stream.h.
-	(sys/ptem.h): write separate test since it needs
-	sys/stream.h on Solaris.  From: Lars Hecking
-	<lhecking@nmrc.ucc.ie>, 4 Feb 2003 19:47:54 +0000.
-
-	* doc/texinfo.txi: comment about using @example instead of
-	@verbatim due to automake doesn't apply any more.
-
-2003-02-03    <karl@gnu.org>
-
-	* doc/texinfo.tex (\verbatiminclude): use \other instead of 12.
-
-2003-02-02    <karl@gnu.org>
-
-	* doc/texinfo.tex (\cartouche): explicit \par, as @cartouche does
-	not work inside a paragraph.
-	Bug report from: Stephen Gildea <gildea@intouchsys.com>,
-	15 Oct 1999 09:25:31 EDT.
-
-2003-02-01    <karl@gnu.org>
-
-	* util/fix-info-dir, util/gen-dir-node, util/install-info-html,
-	util/tex3patch, util/txitextest: test && test instead of test -a, etc.
-	From: Paul Eggert <eggert@twinsun.com>,
-	31 Jan 2003 22:59:35 -0800.
-
-2003-01-31    <karl@gnu.org>
-
-	* doc/texinfo.tex (\groupbox): \newbox.
-	(\vfilllimit): new \def.
-	(\group): insert an explicit \page if the group is
-	big, and doesn't fit on the current page.
-	Otherwise, the previous page gets stretched unreasonably.
-	From: Werner LEMBERG <wl@gnu.org>,
-	31 Jan 2003 19:19:33 +0100.
-
-	* doc/texinfo.tex (\defargscommonending): insert \penalty10002.
-	(\parsebodycommon): check for \penalty10002 to
-	allow a breakpoint between @def's, not 10000.
-
-	* doc/texinfo.tex (\defargscommonending): new macro.
-	(\defunargs, etc.): call it, instead of repeating code.
-	(No functional change.)
-
-	* info/filesys.c (extract_colon_unit): return last colon unit
-	before claiming we're done.  Report from: Alexandre Duret-Lutz
-	<duret_g@lrde.epita.fr>, 31 Jan 2003 18:18:22 +0100.
-
-	* Version 4.4.
-
-2003-01-30    <karl@gnu.org>
-
-	* doc/texinfo.tex (\dosubind): need full expansion of the index
-		sort string.
-
-	* doc/texinfo.tex (\startcontents,\contents,\shortcontents):
-	assignments to \pageno must be \global; otherwise
-	if it's run inside a group, as in
-	@ifnothtml
-	@contents
-	@end ifnothtml
-	the rest of the pages in the document get roman numerals.
-	Reported by rlp.
-
-	* doc/texinfo.tex (\dosubind): need space between entry and
-	subentry in printed output.  Bug report from: Robin Lee Powell
-	<rlpowell@digitalkingdom.org>, 30 Jan 2003 15:13:48 -0800.
-	(\defophead, \defcvarhead, \defivarheader): show
-	method name in \code.
-
-	* doc/texinfo.tex (\dosubind): need to \vskip-\skip0, not
-	-\lastskip, since \lastskip gets cleared by the \nobreak.  Bug
-	report from: Werner LEMBERG <wl@gnu.org>, 29 Jan 2003 09:18:16
-	+0100.
-
-2003-01-29    <karl@gnu.org>
-
-	* info/signals.c (initialize_info_signal_handler): initialize the
-	sigaction struct here, not statically, since we can't rely on the
-	ordering of the elements; it's different on IRIX and FreeBSD, at
-	least.  Patch from: ezra peisach <epeisach@med-xtal.bu.edu>, 28
-	Jan 2003 13:09:18 -0500 (EST).
-
-2003-01-28    <karl@gnu.org>
-
-	* util/dir-example: bring emacs section up to date.
-
-2003-01-27    <karl@gnu.org>
-
-	* configure.ac: pretest version 4.3d.
-
-        More changes to use @ fully in the .aux file, otherwise something
-	as simple as:
-          @node foo
-          @section @code{foo}
-        was broken.
-	* doc/texinfo.tex (\setref): call \atdummies.
-	(\atdummies): new macro, based on \indexdummies.
-	(\commondummies): separate out common redefinitions.
-	(\lbraceatcmd,\rbraceatcmd): @{ and @}, as strings.
-
-	* configure.ac (AC_CHECK_FUNCS): add sigaction.
-	* info/signals.c (set_termsig) [HAVE_SIGACTION]: second arg to
-	sigaction is a pointer, not a struct.
-
-	From: AIDA Shinra <aida-s@jcom.home.ne.jp>, 25 Jan 2003 18:53:19 +0900:
-	* info/signals.c (mask_termsig,set_termsig,restore_termsig): new fns.
-	(initialize_info_signal_handler): use sigaction if we have it.
-	(info_signal_proc): reread window size in case it has changed
-	while we were suspended.
-
-	Mon Jan 27 08:09:07 CET 2003 Stepan Kasal <kasal@math.cas.cz>
-	* doc/texinfo.tex (\acuteaccent): the workaround is no longer needed.
-	(\xrefX): \normalturnoffactive changed to \turnoffactive, since
-	we \otherbackslash right afterwards anyway.
-
-2003-01-24    <karl@gnu.org>
-
-	* doc/texinfo.tex: These changes allow ' in node and anchor names:
-	(\internalsetq): use @ instead of ' as the escape
-	character for .aux files.
-	(\xrdef): don't need to play games with \ now.
-	(\readauxfile): don't set catcode' to 0, and do
-	set catcode@ to 0.
-
-	These changes allow \ in node and anchor names
-	(this worked once, but we broke it somewhere along the line):
-	(\setref, \xrefX, \dosetq, \refx): call \otherbackslash.
-	(\otherbackslash): new macro to make an active
-	backslash expand to a literal `\' character with
-	catcode other.
-
-
-	* configure.ac: pretest version 4.3c.
-
-	* doc/texinfo.tex (\smallenvironments): remove, and change callers.
-        (\small...x): rename to just \small...
-	(\smallexamplefonts): set to \smallfonts, not
-	\smallerfonts, at least until people complain again.
-
-	The effect of these changes is to make the
-	@small... commands print in a smaller font (9pt)
-	for all formats, not just @smallbook and @afivepaper.
-
-
-	* info/filesys.c (extract_colon_unit): rewrite so that an empty
-	unit does not stop us from processing the rest.  Report from:
-	Werner LEMBERG <wl@gnu.org>, 24 Jan 2003 07:01:09 +0100.
-
-
-	Date: Mon, 02 Dec 2002 01:06:37 +0900
-	From: AIDA Shinra <aida-s@jcom.home.ne.jp>
-
-	* "info infokey" says key bindings in .info take precedence over
-	the default mapping, but this is not true. Only bindings to
-	undefined keys take effects.
-	* Binding to "invalid" action results crash.
-	* No code to disable prefix keys. Some users might want to bind
-	escape or C-x to a non-prefix key, but this does not allowed.
-	... It always allows '^h' in incremental
-	search. Some terminals map 'backspace' to '^h' by default.
-
-        These are the changes:
-	* info/session.c (incremental_search): check for Control('h') as
-	well as DEL.
-	* info/infomap.c (find_function_keyseq, add_function_keyseq,
-	remove_function_keyseq): new fns.
-	(keymap_copy_keymap, keymap_discard_keymap): take
-	rootmap arg.
-
-Wed Jan 22 14:25:39 CET 2003  Stepan Kasal  <kasal@math.cas.cz>
-
-	* doc/texinfo.tex (\footnotezzz): the very beginning was moved
-	  to \startfootins;
-	  (\startfootins): new macro;
-	  (\multitable, \dotable): redefine \startfootins to get footnotes
-	  saved, use \crcrwithfootnotes;
-	  (\crcrwithfootnotes): check for postponed footnotes each time a row
-	  of a multitable is finished;
-	  (\tab): no longer defined globally, just \let to & inside
-	  @multitable.
-
-2003-01-22    <karl@gnu.org>
-
-	* doc/texinfo.tex: doc fix.
-	* doc/texinfo.tex (\dofootnote): rename from \footnotezzz.
-
-        Wed Jan 22 14:23:51 CET 2003  Stepan Kasal  <kasal@math.cas.cz>
-	* doc/texinfo.tex (\cartouche, \footnotezzz): removed \long, it
-	  has no effect for macros without a parameter;
-        (\fo@t, \f@@t, \f@t, \@foot): removed, local \def has no effect.
-
-2003-01-21    <karl@gnu.org>
-
-	* doc/texinfo.txi (Output Formats): new section.
-
-2003-01-19    <karl@gnu.org>
-
-	* configure.ac: pretest version 4.3b.
-
-	* makeinfo/tests/include-value: need -I $srcdir.
-
-	* util/texindex.c:
-	* util/install-info.c:
-	* info/infokey.c:
-	* info/info.c:
-	* makeinfo/makeinfo.c:
-	* util/texi2dvi: 2003.
-
-2003-01-18    <karl@gnu.org>
-
-	* makeinfo/node.c: add `(perhaps incorrect sectioning?)' to some of
-	the error messages. Unfortunately we can't easily
-	determine when the error stems from actual
-	mistyped node pointers, and when from incorrect
-	menus causing the implicit pointer creation to fail.
-
-2003-01-17    <karl@gnu.org>
-
-	Thu Jan 16 10:28:32 CET 2003  Stepan Kasal  <kasal@math.cas.cz>
-	* doc/texinfo.tex (\refx): Set locally \indexdummies before expanding
-	  the \csname, in case there are macros; foreign accents, for example.
-	Bug report from Dumas Patrice <dumas@centre-cired.fr>.
-
-	* makeinfo/makeinfo.c (COMMAND_CHAR): new macro, and exclude ^ and
-	_ from command names.
-	(read_token): call it.
-
-	* makeinfo/makeinfo.h (command_char): move to makeinfo.c, since
-	it's only used in one place.
-
-2003-01-16    <karl@gnu.org>
-
-	* TODO: @else
-
-2003-01-12    <karl@gnu.org>
-
-	* doc/texinfo.tex (\dounmacro): simplify method for removing from
-	macro list.  From Stepan.  (Also rename from \unmacroxxx.)
-	(\unmacrodo): new macro, called with new method.
-
-	* doc/texinfo.tex (\dotChar, questChar, exclamChar, colonChar,
-	semiChar, commaChar, underChar): names for catcode chars, defined using
-	\chardef.  From Stepan.
-
-	* doc/texinfo.tex (\conditionalsucceed): back to the easy
-	definition, since @set is global now.  From Stepan.
-
-	* doc/texinfo.tex (\doifclear,\doifset): use \let\next instead of
-	\expandafter, so that we'll succeed on no
-	conditional text.  From Stepan.
-	Also rename from \ifclearxxx and \ifsetxxx.
-
-	* doc/texinfo.tex (\expandablevalue): give a \message if the
-	variable is not set.  Based on patch from Stepan.
-
-	* doc/texinfo.tex (\setuptable): insert an actual \space after
-	\unskip.  From Stepan.
-
-	* doc/texinfo.tex (\kbdinputstyle): give error if unknown argument,
-	and call the macro to set the default.  From Stepan.
-
-	* doc/texinfo.tex: typo from Stepan.
-
-	* doc/texinfo.tex (\docenter): rename from \centerzzz and do \hfil
-	instead of using plain's \centerline and \hss.  Also force line
-	breaks before and after in horizontal mode.
-	Based on patch from Stepan, 11 Apr 2000 19:44:31 +0200.
-
-	* doc/texinfo.tex: use \other and \active consistently.
-	From: Stepan Kasal <kasal@suse.cz>, 11 Apr 2000 19:44:31 +0200.
-
-	* makeinfo/cmds.c (handle_include): call text_expansion on the
-	filename, so @value constructs are expanded.
-
-	* doc/texinfo.txi (verbatiminclude, Using Include Files): mention
-	@value expansion.
-	Also, update samples to be copyright 2003.
-
-	* doc/texinfo.tex (\doverbatiminclude, \verbatimzzz): expand
-			@value(but nothing else).
-	Bug from: Alper Ersoy <aersoy@tfz.net>,
-	6 Jan 2003 13:14:28 +0200.
-
-2003-01-11    <karl@gnu.org>
-
-	* doc/texinfo.tex (\definedummyword): new macro.
-	(\indexdummies): call it, instead of defining each
-	command separately; many trailing spaces had been omitted.
-	Alternate implementation of a patch from: Stepan
-	Kasal <kasal@math.cas.cz>, 10 Jan 2003 22:42:05 +0100.
-
-	* doc/texinfo.tex (\acuteaccent): new defn.
-	(\indexdummies): use it instead of \' in the aux file.
-	Variation of a patch from: Stepan Kasal <kasal@math.cas.cz>,
-	10 Jan 2003 21:28:40 +0100.
-
-	* doc/texinfo.tex: doc fix.
-
-2003-01-10    <karl@gnu.org>
-
-	* doc/texinfo.tex (\indexnofonts, \indexdummies): handle more
-		accent commands.
-	(\indexdummyfont): not needed, use \asis instead.
-
-	* doc/texinfo.tex (\indexdummies,\indexnofonts): indent, no other
-		changes.
-
-	* doc/texinfo.tex (\chapter .. \subsubsection): indent the
-	definitions; no other change.
-
-	* doc/texinfo.txi (Macro details): no multiple-line args is
-		another limitation.
-
-	Fri Jan 10 07:12:23 CET 2003 Stepan Kasal <kasal@math.cas.cz>
-        * texinfo.tex (\writetocentry): The
-          common work on building the line for \write\tocfile was
-          moved into the macro itself and thus all callers has been changed.
-
-2003-01-09    <karl@gnu.org>
-
-	* info/session.c (incremental_search): don't interpret the
-	`function' element as an InfoCommand when it's really a Keymap.
-	This caused arrow keys to be inserted literally under Solaris, but
-	not GNU/Linux.  Bug report from: Jeremy Lin
-	<jjlin@OCF.Berkeley.EDU>, 5 Jan 2003 01:59:29 -0800.
-
-	* info/infomap.c: add comment about strange pointer cast.
-
-2003-01-08    <karl@gnu.org>
-
-	* doc/texinfo.tex (\ignoremorecommands): define \Edef... and
-	\def...x for all @def... commands, and use \empty
-	instead of \relax.  Bug report from Paul Eggert
-	<eggert@twinsun.com>, 7 Jan 2003 22:29:07 -0800.
-
-2003-01-06    <karl@gnu.org>
-
-	* doc/texinfo.txi (table): mention @option as a useful indicating
-	command, and need for blank lines before and
-	after.  Suggestion from: Kevin Ryde
-	<user42@zip.com.au>, 03 Jan 2003 10:02:55 +1000.
-
-2003-01-05    <karl@gnu.org>
-
-	* util/texi2dvi: make egrep a variable (EGREP).  Suggestion from:
-	Kurt Hornik <hornik@ci.tuwien.ac.at>.
-	Also, replace fgrep with grep.
-
-	* doc/Makefile.am (TXI_XLATE): include txi-tr.tex from Alper Ersoy
-	<dirt@gtk.org>.
-
-2003-01-02    <karl@gnu.org>
-
-	* makeinfo/insertion.c (end_insertion): in table case, call
-	close_insertion_paragraph.  Bug report from: Kevin
-	Ryde <user42@zip.com.au>, 03 Jan 2003 08:09:54 +1000.
-
-	* doc/texinfo.tex: remove spurious CTRL-G.
-
-	* util/srclist.txt: more m4 files from gnulib now.
-
-2003-01-01    <karl@gnu.org>
-
-	* doc/texinfo.tex (\_): more space afterwards, so __ comes out
-	better.  Noticed in the gcc manual.
-
-2002-12-31    <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (usage): omit all the help message when something
-	goes wrong in argument parsing, as intended.
-
-2002-12-26    <karl@gnu.org>
-
-	* doc/texinfo.tex (\insertcopying): ignore @c, @comment, and
-	@ignore...@end ignore as best we can.  Report from
-	"Joseph S. Myers" <jsm28@cam.ac.uk>, 24 Dec 2002
-	18:08:10 +0000 (GMT), for the gcc manual, which
-	uses these constructs for automatic man page generation.
-
-2002-12-23    <karl@gnu.org>
-
-	* doc/texinfo.txi (example): note that Texinfo commands are
-		expanded, plus other changes.  Suggestion from Nelson Beebe.
-
-2002-12-20    <karl@gnu.org>
-
-	* config.guess: update from prep.
-
-2002-12-17    <karl@gnu.org>
-
-	* makeinfo/texinfo.dtd (indexterm): index not INDEX.
-	(node): only any block, not just para|menu.
-	* makeinfo/xml.c (texinfoml_element_list): format and like can
-		contain para.
-	From: Alper Ersoy <aersoy@tfz.net>.
-
-2002-12-14    <karl@gnu.org>
-
-	* doc/texinfo.txi (makeinfo in Emacs): does not prompt for
-	filename.
-	From: Kevin Ryde <user42@zip.com.au>.
-
-2002-12-13    <karl@gnu.org>
-
-	* doc/texinfo.txi: short sample needs @top (from jas), gnu sample
-	can use @verbatim (automake fix).
-
-2002-12-11    <karl@gnu.org>
-
-	* doc/texinfo.txi: typos.
-
-2002-12-07    <karl@gnu.org>
-
-	* makeinfo/xml.c: use lowercase, allow more chars in id's.  From:
-	Jaime Davila <jdavila@engr.uconn.edu>, 6 Dec 2002 11:00:25 -0500.
-
-2002-12-05    <karl@gnu.org>
-
-	* util/dir-example: alphabetize make.
-
-	* NEWS: change texinfo.tex url.
-
-	* doc/texinfo.tex (\obstexwarn): fix url's to TeX.README and
-	texinfo.tex.
-
-2002-12-02    <karl@gnu.org>
-
-	* doc/texinfo.txi (Line Breaks): fixes.
-
-2002-12-01    <karl@gnu.org>
-
-	* configure.ac: pretest version 4.3a.
-
-2002-11-30    <karl@gnu.org>
-
-	* doc/Makefile.am (texinfo): restore rule since this won't quite
-	be fixed until automake 1.7.2 or later.
-
-2002-11-29 19:19  feloy
-
-	* makeinfo/xml.c: Fix the <para>&lt; bug in XML, reported by K.
-	Ryde
-
-2002-11-29    <karl@gnu.org>
-
-	* lib/strdup.c: gnulib update.
-
-2002-11-29  Alexandre Duret-Lutz  <adl@gnu.org>
-
-	* doc/Makefile.am (.texi.info, texinfo): Remove.  Automake 1.7+
-	no longer output info files in the source tree.
-
-2002-11-26    <karl@gnu.org>
-
-	* makeinfo/insertion.c (cm_insertion_copying): flush_output, so that
-	output_position gets updated, which in turn makes
-	the tag table positions reflect the copying text.
-	Report from: "W. L. Estes" <wlestes@uncg.edu>, 15
-	Nov 2002 15:57:04 -0500.
-
-	* makeinfo/index.c (init_indices): undefindex after we know
-	name_index_alist[i] is not null.
-	From: "Ronald F. Guilmette" <rfg@monkeys.com>, 26 Nov 2002
-	01:08:04 -0800.
-
-	* doc/Makefile.am (texinfo): depend on version
-	files.  Report from: Kevin Ryde
-	<user42@zip.com.au>, 27 Nov 2002 07:52:57 +1000.
-
-2002-11-25    <karl@gnu.org>
-
-	* makeinfo/cmds.c (cm_verb): use <tt> not <pre>, as this is an
-	inline construct.  Also, decrement
-	in_fixed_width_font, else the next paragraph does
-	not get a <p>.
-	Report from: Torsten Bronger <bronger@physik.rwth-aachen.de>
-	26 Nov 2002 00:37:35 +0100.
-
-	* doc/texinfo.tex (\dospecials): must include all other characters
-	that we set active, namely <>|_", or they got
-	mysteriously lost as the first character on a
-	verbatim line.
-	Report from: Torsten Bronger <bronger@physik.rwth-aachen.de>
-	25 Nov 2002 18:26:12 +0100.
-
-	(\doverbatim): ignore everything up to the first
-	^^M, to avoid an extra blank line in the output.
-
-	* lib/getopt*, strdup.c, tempname.c: update from gnulib (bruno
-	changes + gpl).
-
-2002-11-24    <karl@gnu.org>
-
-	* doc/texinfo.txi (Multiple Spaces): xref tie rather w for
-	unbreakable spaces.
-
-2002-11-22    <karl@gnu.org>
-
-	* doc/texinfo.txi: editorial changes from Max's editor.
-
-2002-11-21    <karl@gnu.org>
-
-	* doc/texinfo.txi (Conventions): add item for blank lines as
-	paragraph separator.  Report from: Maxim Masiutin
-	<max@ritlabs.com>, 21 Nov 2002 00:03:07 +0200.
-
-2002-11-19    <karl@gnu.org>
-
-	* util/install-info.c (ensure_dirfile_exists): don't translate the `*
-	Menu' keyword.  Report from: Ingo Krabbe
-	<i.krabbe@dokom.net>, 19 Nov 2002 09:24:45 +0100.
-
-2002-11-18    <karl@gnu.org>
-
-	* po/.cvsignore: exclude *.gmo instead of listing each individually.
-	From: Frédéric L. W. Meunier <0@pervalidus.net>,
-	15 Nov 2002 20:16:09 -0200 (BRST).
-
-	* configure.ac (--enable-multiplatform): new option for teTeX and
-	TeX Live.  From te.
-
-2002-11-14    <karl@gnu.org>
-
-	* configure.ac, util/texi2dvi, NEWS: release version 4.3.
-
-	* util/texi2dvi, mkinstalldirs: use `for var<newline>do"' instead
-	 of  `for var; do', for Solaris.
-
-	* doc/texinfo.txi (math): emphasize that makeinfo does not interpret
-	the arg.
-
-	* config.{guess,sub}: update from prep.
-
-2002-11-13    <karl@gnu.org>
-
-	* configure.ac: pretest version 4.2f.
-
-	* makeinfo/xml.c (INDEX_SEP): define as a string that will never
-	appear, so that we don't try to break index terms
-	at commas.  Idea from: Stepan Kasal
-	<kasal@math.cas.cz>, problem reported by José
-	Fonseca <j_r_fonseca@yahoo.co.uk>.
-
-2002-11-12    <karl@gnu.org>
-
-	* makeinfo/makeinfo.c: make sure command is non-null, for sake of bogus
-	input (\def\x{}).  Report from
-	Neil.Turton@broadcom.com, debian bug#168689.
-
-	* makeinfo/Makefile.am (makeinfo_SOURCES): remove docbook.[ch],
-	per feloy the docbook stuff is in xml.[ch] now.
-
-2002-11-12 19:48  feloy
-
-	* makeinfo/: lang.c, makeinfo.c: (docbook) Entities for accented
-	characters are written correctly
-
-2002-11-12 19:34  feloy
-
-	* makeinfo/xml.c: (docbook) Do not expand @set contents
-
-2002-11-11 18:14  feloy
-
-	* makeinfo/xml.c: Better <bookinfo> support
-
-2002-11-11 13:37  feloy
-
-	* makeinfo/: cmds.c, insertion.c, xml.c, xml.h: Better use of
-	<bookinfo> and <abstract> with docbook output
-
-2002-11-11 01:57  feloy
-
-	* makeinfo/: defun.c, xml.c, xml.h: Removed all references to
-	docbook.[ch] which was the old sources for docbook output, replaced
-	by xml.[ch]
-
-2002-11-10 23:31  feloy
-
-	* makeinfo/: insertion.c, xml.c, xml.h: Some bugfixes in docbook
-	output
-
-2002-11-09 18:47  feloy
-
-	* makeinfo/insertion.c: In Docbook, Copying paragraph is not
-	inserted at @copying/@end copying point.
-
-2002-11-08 21:01  feloy
-
-	* makeinfo/xml.c: take care of indexterm at beginning of table
-
-2002-11-08 20:52  feloy
-
-	* makeinfo/xml.c: Text before first @item in @table is inserted as
-	the <title> of <variablelist>
-
-2002-11-08 20:24  feloy
-
-	* makeinfo/xml.c: subsubheading is simplesect and not sect3
-
-2002-11-08 19:13  feloy
-
-	* makeinfo/: makeinfo.c, xml.c, xml.h: makeinfo/xml.c (xml_id):
-	Added more forbidden characters makeinfo/{xml.c,xml.h,makeinfo.c}:
-	Defined xml_in_xref_token variable
-
-2002-11-07    <karl@gnu.org>
-
-	* makeinfo/sectioning.c: doc.
-	* makeinfo/sectioning.c: revert last change, it breaks gcc.
-
-	* makeinfo/xml.c (xml-add_char): don't insert BOOKINFO and ABSTRACT
-	if executing_string.  From Jos? Fonseca.
-
-	* configure.ac: pretest version 4.2e.
-
-	From: José Fonseca <j_r_fonseca@yahoo.co.uk>,
-              7 Nov 2002 00:31:28 +0000.
-	* makeinfo/index.c (cm_printindex): in docbook case, pass the
-	unexpanded index term.
-	* makeinfo/xml.c (xml_insert_indexterm): execute_string instead of
-		insert_string.
-	(Otherwise, <>& are not escaped in the docbook index output.)
-
-	* util/dir-example: sed.
-
-	* makeinfo/lang.c: copyright.
-	* makeinfo/lang.h: copyright.
-
-2002-11-07  Stephen Gildea
-
-	* makeinfo/sectioning.c (sectioning_html): have A tag enclose
-          section name rather than preceding it.
-
-	* makeinfo/toc.c (contents_update_html): put name attribute into
-          existing A tag rather than making a separate tag for it.
-
-2002-11-07  Stephen Gildea
-
-	* makeinfo/lang.c: support @documentencoding US-ASCII:
-	Put NULL at end of map tables so they can be of varying lengths.
-	(us_ascii_map): new iso_map_type table.
-	(encoding_table): add US_ASCII.
-	(cm_search_iso_map): don't assume all maps are the same length.
-	(cm_documentencoding): don't assume ISO_8859_1 is first table entry.
-	* makeinfo/lang.h (encoding_code_type): add US_ASCII.
-
-2002-11-05    <karl@gnu.org>
-
-	* doc/info-stnd.texi: untabify.
-	* doc/info-stnd.texi: document that.
-	* info/footnotes.c (auto_footnotes_p): turn off by default.
-
-	* info/infodoc.c (info_internal_help_text): had
-	scroll-{forward,backward} twice instead of {next,prev}-line.
-	* info/infodoc.c: untabify.
-
-	* util/texi2dvi: untabify.
-	* doc/texinfo.tex: untabify.
-	* util/texindex.c: untabify.
-	* util/install-info.c: untabify.
-	* makeinfo/makeinfo.c: indentation fix.
-	* makeinfo/cmds.c: doc fix.
-
-2002-11-04    <karl@gnu.org>
-
-	* configure.ac: pretest version 4.2d.
-	* doc/fdl.texi: better line break to avoid overfull hbox.
-
-2002-11-04  Stephen Gildea
-
-        * makeinfo/{footnote.c,cmds.c,html.c,index.c,insertion.c,
-        makeinfo.c,node.c,toc.c,sectioning.c}: add a class attribute
-        to tags generated in special circumstances that wouldn't be
-        obvious to a user agent.
-
-        Quote all attribute values (for XHTML).
-
-2002-11-04    <karl@gnu.org>
-
-	* doc/texinfo.txi (File End): grammar.
-
-        These changes from gildea:
-	* makeinfo/cmds.c (cm_titlepage): new fn, and use it for @titlepage.
-
-	* makeinfo/cmds.h (titlepage_cmd_present): new global.
-	* makeinfo/html.c (html_output_head): check titlepage_cmd_present
-	before outputting the <h1>.
-
-	* makeinfo/html.c (html_output_head): put a class on the <h1> from
-	settitle.
-
-	* makeinfo/cmds.c (cm_titlefont): put the class directly on the h1
-	rather than a separate <span> element.
-
-2002-10-31    <karl@gnu.org>
-
-	* doc/texinfo.tex (\mathactive): new fn.
-	(\math): call it, to change definitions of active characters.
-	(\ptex{gtr,hat,less,plus}): save original characters.
-	Report from wl.
-
-	* doc/texinfo.tex (\itemzzz): \penalty10001 instead of 10000
-        before the putative \parskip.
-        (\aboveenvbreak): insert \parskip if penalty!=10000,
-        rather than <10000. Otherwise, @item some long item label /
-        @example has too little spacing.
-	Report from: Werner LEMBERG <wl@gnu.org>,
-	26 Apr 2002 08:37:41 +0200 (CEST).
-
-	* makeinfo/makeinfo.c (executing_macro): new static.
-	(read_command): set it, if we execute a macro.
-	(add_char): if it is set, call html_output_head.
-	This is so if a macro expansion is first in the document body, the
-	html head gets written before the macro body.
-	Report from: Stephen Gildea <gildea@stop.mail-abuse.org>,
-	10 Jul 2002 13:35:13 -0400.
-
-	* makeinfo/html.c (html_title_written),
-	* makeinfo/html.h (html_title_written): make available.
-	* makeinfo/cmds.c (cm_titlefont): set html_title_written for html
-		output.
-
-	* util/texindex.c: texindex.c (need_initials, first_initial): New
-	globals.
-	(main): Clear them for each index.
-	(parsefile): Set need_initials when there is more than one
-	initial in this index.
-	(indexify): Do not emit \initial commands unless need_initials
-	is set.  Use toupper.
-
-	From: Zack Weinberg <zack@codesourcery.com>
-	Date: Tue, 26 Mar 2002 17:20:06 -0800
-
-	* lib/system.h: doc fix from gildea.
-
-2002-10-30    <karl@gnu.org>
-
-        (Following reported by Bob Wilson.)
-
-	* doc/texinfo.tex (\sectionheading): add either
-	\normalbaselineskip or \parskip after the heading, whichever is
-	larger, instead of hardwiring 10pt.
-
-	* doc/texinfo.tex (\defxbodycommon): new defn, including a
-	potential breakpoint if we have multiple consecutive @def...x commands.
-	(\def*parsebody): use it.
-
-	* doc/texinfo.tex (\singlespace): remove, since we fixed the
-        regular line spacing a long time ago to not be double-spaced.
-        In @smallbook mode, it ironically caused excessive line spacing.
-	(\nonfillstart, \quotation): don't call it.
-
-	* doc/texinfo.tex (\smartslanted, \smartitalic): use \ttsl if in
-	typewriter.
-	From: Bob Wilson <bwilson@tensilica.com>.
-
-	* doc/texinfo.tex (\defmethparsebody): pass \empty to \smallsplit
-	to keep a brace-delimited argument to @deffn from having the braces
-	stripped.
-	(Report from: Han-Wen Nienhuys <hanwen@cs.uu.nl>.)
-
-2002-10-28    <karl@gnu.org>
-
-	* doc/texinfo.tex (\loggingall): rewrite to minimize log file
-	output (ideas from Frank Mittelbach's trace.sty) and explicitly
-	show the etex changes.
-
-	* configure.ac: pretest version 4.2c.
-
-	* NEWS: mention Werner's fixes.
-
-2002-10-27  Werner Lemberg  <wl@gnu.org>
-
-	* makeinfo/html.c (insert_html_tag): Fix handling of nested,
-	identical tags.
-
-2002-10-27    <karl@gnu.org>
-
-	* configure.ac (AM_INIT_AUTOMAKE): add dist-bzip2 option.
-
-2002-10-26    <karl@gnu.org>
-
-	* 2002-10-24  Werner Lemberg  <wl@gnu.org>
-	Fix html font tags, i.e., make the output similar to
-	texinfo.tex.  The main idea is to avoid nested font tags.
-
-	* makeinfo/html.c (push_tag, pop_tag): New functions.
-	(insert_html_tag): Use them.
-	Don't emit more than a single font attribute.
-
-	* makeinfo/html.h (HSTACK): New structure.
-
-	* makeinfo/defun.c: Include cmds.h and html.h.
-	(process_defun_args): Don't apply <i>...</i> to parentheses
-	and brackets.
-	(defun_internal): Use insert_html_tag for emitting font tags.
-
-	* makeinfo/cmds.c (cm_url): Use insert_html_tag for emitting
-	font tag.
-	(cm_r): Simplify.
-
-2002-10-25  Alexandre Duret-Lutz  <adl@gnu.org>
-
-	* util/texi2dvi: Preserve empty components when expansing
-	TEXINPUTS and INDEXSTYLE.
-
-2002-10-24    <karl@gnu.org>
-
-	* doc/info-stnd.texi: missing period.
-
-	* m4/{check-decl.m4,mkstemp.m4,prereq.m4}: new files from gnulib.
-	* lib/mkstemp.c, lib/tempname.c: likewise.
-	* aclocal.m4, configure.ac: support for mkstemp instead of mktemp.
-	* util/texindex.c: use mkstemp instead of mktemp.
-
-        2002-10-24  Alexandre Duret-Lutz  <adl@gnu.org>
-	* util/texi2dvi: Turn relative entries $TEXINPUTS and $INDEXSTYLE
-	into absolute paths.  (Allows --clean to work with relative dirs
-	in TEXINPUTS, etc.)
-
-	* doc/texinfo.tex: update \texinfoversion timestamp.
-
-2002-10-22    <karl@gnu.org>
-
-	2002-10-16  Werner Lemberg  <wl@gnu.org>
-
-	* texinfo.tex (\appendixbox): New macro to compute a
-	fixed-width box for the appendix entry in the TOC.
-	(\appendixzzz, \appendixentry): Use it.
-
-	(\shortconttt): New font.
-	(\summarycontents): Use it to set the font size of the \tt
-	font properly.
-
-	(\authortt): New macro.
-	(\authorfont): Use it to provide a proper font size for
-	@email used within @author.
-
-2002-10-21    <karl@gnu.org>
-
-	* automake 1.7.1.
-
-2002-10-18    <karl@gnu.org>
-
-	* doc/texinfo.tex (\defname): get rid of the unused
-	 \deftypemargin; typeset the function type word flush right, in
-	 brackets.  Partially suggested by bob.
-
-2002-10-16    <karl@gnu.org>
-
-	* makeinfo/html.c: Just > after all on <meta> and <link> to
-	appease HTML 4.01 (and break XHTML).  From Janis.
-
-2002-10-15    <karl@gnu.org>
-
-	* configure.ac: pretest version 4.2b.
-
-	* makeinfo/cmds.c (cm_dots, cm_enddots): don't use small if
-	in_fixed_width_fonts; this violates the html specs, which don't
-	want you to change fonts within <pre>. (Argh.)
-	Report from: Janis Johnson <janis187@us.ibm.com>,
-	14 Oct 2002 15:59:16 -0700.
-
-2002-10-14  Alexandre Duret-Lutz  <adl@gnu.org>
-	* util/texi2dvi (common, txincludes): Fix definitions so that
-	an empty $txincludes doesn't result in a empty path element
-	in TEXINPUTS.
-
-2002-10-14    <karl@gnu.org>
-
-	* info/infokey.c: copyright 2002 not 02.
-	* makeinfo/lang.c: copyright 2001 not 01.
-
-	* makeinfo/insertion.c (begin_insertion): for enumerate, set
-	in_paragraph=0 as we do for itemize.
-	Otherwise a </p> gets inserted at the next @item, which is wrong.
-
-	Report from: Janis Johnson <janis187@us.ibm.com>, 14 Oct 2002
-	12:35:30 -0700.
-
-2002-10-13    <karl@gnu.org>
-
-	* util/install-info.c (longopts): make --infodir a synonym for
-	--info-dir, for some compatibility with the Debian install-info.
-	Reported by Bob Chassell, Yves Codet <ycodet@club-internet.fr>,
-	and many others.
-
-	* doc/texinfo.txi (makeinfo advantages): document various options
-	that have crept in to the source.  (Werner Lemberg noted that
-	--iftex and companions were missing.)
-
-2002-10-10    <karl@gnu.org>
-
-	* makeinfo/cmds.c (cm_tie): new fn for new cmd @tie{}.
-	* doc/texinfo.txi: document it.
-
-2002-10-09    <karl@gnu.org>
-
-	* doc/texinfo.txi: recommend free software directory categories
-	(suggestion from rms),
-        more info about @noindent (fut_nis@d3.dion.ne.jp and ryk@dspwiz.com),
-        version specification (spectorhome@rcn.com).
-
-	* makeinfo/{cmds,footnote,html,insertion,makeinfo,multi,node}.c:
-	use <br /> instead of plain <br>, for the sake of XHTML.  Likewise
-        with <hr /> and <meta />, and quote all <meta> values.
-        Suggestion (and assurance of compatibility) from
-        Janis Johnson <janis187@us.ibm.com>
-        and Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
-        (the gcc web page maintainers).
-
-	* util/infosrch: new contrib script.
-	* util/Makefile.am (EXTRA_DIST): add infosrch.
-
-2002-10-04    <karl@gnu.org>
-
-	* configure.ac: pretest version 4.2a.
-
-	* TODO: more info on dir categories.
-
-2002-10-02    <karl@gnu.org>
-
-	* doc/.cvsignore: ignore tex output files.
-
-	* util/dir-example: remove unused categories, etc.
-
-2002-10-01    <karl@gnu.org>
-
-	* doc/texinfo.tex (\xml,\ifxml): more \doignore's.
-	(\copying,\insertcopying): new implementation to save the uninterpreted
-	tokens instead of typesetting a box, so that the page size, fonts,
-	etc., don't have to be defined before @copying is run.
-
-	These changes from Werner Lemberg <wl@gnu.org>:
-	(\internalpagesizes): take two new arguments for the physical paper
-	height and width.
-	(\smallbook,\afourpaper,\afivepaper,\letterpaper,\afourwide,
- 	 \pagesizes): pass them.
-
-2002-09-30    <karl@gnu.org>
-
-	* util/texi2dvi: doc fixes.
-
-	* README: mention autoreconf.
-
-2002-09-29    <karl@gnu.org>
-
-	* doc/texinfo.tex (\pdfmakeoutlines): call \turnoffactive to handle all special characters
-	except \{}.
-	(\normalturnoffactive): call \turnoffactive instead of repeating all the
-	redefinitions.
-
-	* doc/texinfo.tex (\afourpaper, \afourlatex, \afourwide): new
-		formatting values.
-	From: Eric.Belpaire@equant.com, 30 Aug 2002 19:03:30 +0200.
-
-	* aclocal.m4: $Id now omitted.
-
-	* doc/texinfo.txi: document @xml and @ifxml.
-
-	* makeinfo/makeinfo.c (usage): mention the new options.
-	* info/Makefile.am (BUILT_SOURCES): define this unconditionally,
-		no more TEXINFO_MAINT.  We handle it in the top-level
-		Makefile.am by defining distcleancheck_listfiles.
-
-	* acinclude.m4: can't have $Id, then it gets propagated to
-		aclocal.m4.
-
-    From: Philippe Martin <feloy@free.fr>, 11 Aug 2002 20:17:44 +0200.
-	* makeinfo/cmds.c: new commands @ifnotxml, @ifxml, @xml.
-	* insertion.c: likewise.
-	(cm_ifxml, cm_ifnotxml): new functions.
-	* insertion.h: likewise.
-	* makeinfo.c: new options --ifxml, --no-ifxml.
-	(cm_image): better xml output.
-        * makeinfo.h (process_xml): new global.
-        * xml.c: call xml_close_sections.
-
-2002-09-28    <karl@gnu.org>
-
-	* makeinfo/insertion.c (begin_insertion): only do <pre>, not
-	<br><pre>; suggestion from Werner.
-
-	* info/infodoc.c: document the bug regarding where_is_rep_index,
-	but don't fix it since it's in the [!INFOKEY] code.
-
-   2002-05-18  Eli Zaretskii  <eliz@is.elta.co.il>
-	These changes make @example be indented in HTML output, and make
-	@exdent work inside an @example in HTML.
-
-	* makeinfo/insertion.c (begin_insertion) <example>: Insert spaces
-	after <pre> to produce indentation of the first line in HTML mode.
-
-	* makeinfo/makeinfo.c (indent): Do indent even in HTML mode.
-
-    These patches from: Thierry Vignaud <tvignaud@mandrakesoft.com>,
-	24 Apr 2002 20:52:37 +0200.
-
-	* makeinfo/insertion.c: doc fix.
-
-	* info/infomap.c: had h and l functions reversed in vi mode.
-
-	* util/install-info.c: bzip2 support.
-
-	* util/texi2dvi: don't allow whitespace as one of the ?'s around
-	the o in foo.?o?, that could lead to misparsing.
-
-2002-09-27    <karl@gnu.org>
-
-	* doc/Makefile.am (*.1): call the binary, not the source file.
-
-	* util/texindex.c (sort_in_core): int not off_t.
-	(main): cast argument to sort_in_core to int.
-	(sort_offline): nfiles parameter is not actually passed (or used);
-	need to pass &tempfiles[i] to sort_in_core.
-	From: Christopher League <league@contrapunctus.net>,
-	26 Apr 2002 22:45:45 -0400.
-
-	* doc/texinfo.tex (\unnumb...entry): make analogous to \...entry
-	(except when actually outputting the text, of course), so pdf
-	bookmarks can go to the right level.
-	From: Christopher League <league@contrapunctus.net>,
-	25 Apr 2002 15:29:24 -0400.
-
-	* install-sh: update from gnulib.
-
-	* makeinfo/insertion.c (handle_verbatim_environment): need to
-	quote & and <.
-	From: Philippe Martin <feloy@free.fr>, 18 Aug 2002 15:39:10 +0200.
-
-        2002-06-04  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/cmds.c (cm_exdent): Call start_paragraph to restore
-	previous indentation of text.  (exponent.tex test.)
-
-        2002-05-11  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/node.c (remember_node): If the argument FNAME is NULL,
-	as it happens for "Top", use the basename of current_output_filename.
-
-2002-09-26    <karl@gnu.org>
-
-	* lib/system.h [MIKTEX]: include gnu-miktex.h, define S_ISDIR.
-	[! MIKTEX]: declare substring.
-	From: Stephen Gildea <gildea@stop.mail-abuse.org>,
-	08 May 2002 18:12:58 -0400.
-
-	* doc/texinfo.tex: spurious \let when setting \mainmagstep.
-	From: Stephen Gildea <gildea@stop.mail-abuse.org>,
-	08 May 2002 08:38:39 -0400.
-
-	* doc/texinfo.txi: copyright symbol: use @code{@copyright@{@}},
-	with the braces in the @code.
-	From: Paul Eggert <eggert@twinsun.com>, 1 Apr 2002 11:37:52 -0800.
-
-	* info/infodoc.c (replace_in_documentation): always allocate at
-	least one byte for replen, otherwise things crash when MALLOC_CHECK_=2.
-	From: "Andreas Herrmann" <AHERRMAN@de.ibm.com>.
-
-	* lib/Makefile.am (libtxi_a_SOURCES): include xalloc.h.
-
-	* doc/Makefile.am (EXTRA_DIST): skip macro.texi and userdoc.texi now.
-	(common_mandeps): new var.
-	(*.1): use that, and depend on the source files with the version strings
-	instead of the binaries.  Suggestion from Alexandre.
-
-	* util/Makefile.am (bin_PROGRAMS, ginstall_info_SOURCES,
-	transform): build as ginstall-info, to avoid clashing with the
-	install-info target inserted by Automake.  (Suggestion from Akim.)
-
-	* Makefile.am (distcleancheck_listfiles): new definition so
-	distcheck doesn't complain about our generated files in info/,
-	which are conditionalized on TEXINFO_MAINT.
-
-	* lib/gettext.h: update from gettext 0.11.5.
-
-2002-09-24    <karl@gnu.org>
-
-	* util/srclist.txt: m4 files from aclocal rather than gnulib.
-
-        * Makefile.am, util/Makefile.am, dir-example: move dir-example to util.
-
-2002-09-23    <karl@gnu.org>
-
-	* INSTALL.generic: update from autoconf 2.54.
-
-2002-09-20  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.11.5.
-
-2002-09-12    <karl@gnu.org>
-
-	* util/srclist.txt: INSTALL to INSTALL.generic.
-
-2002-08-04    <karl@gnu.org>
-
-	* doc/texinfo.5:
-	* lib/system.h:
-	* doc/texinfo.tex:
-	* doc/info-fr.texi:
-	* configure.ac: non-copyright notice.
-	* doc/info-fr.texi:
-	* doc/info-stnd.texi:
-	* doc/texinfo.txi: copyright years should be written out in full.
-
-2002-07-23    <karl@gnu.org>
-
-	* doc/texinfo.txi: verbatim license sample per rms and chassell.
-
-2002-07-19    <karl@gnu.org>
-
-	* doc/texinfo.txi:
-
-2002-06-05    <karl@gnu.org>
-
-	* doc/Makefile.am (TXI_XLATE): txi-it.tex from Paolo Bonzini
-		<bonzini@gnu.org>.
-
-2002-06-04    <karl@gnu.org>
-
-	* doc/texinfo.tex (\defparsebodycommon): do \penalty0 if the last
-	item was a \nobreak, since that means we have two function headers
-	in a row.  Report from: Brian Gough <bjg@network-theory.co.uk>.
-
-	(\defparsebody,...): use \defparsebodycommon instead of repeating code.
-
-2002-05-09    <karl@gnu.org>
-
-	* doc/texinfo.5: lowercase NAME to `texinfo' for Solaris man.
-	From gildea.
-
-2002-04-29    <karl@gnu.org>
-
-	* doc/texinfo.txi: mention it.
-	* util/texi2dvi: allow -E as well as -e.
-
-2002-04-10    <karl@gnu.org>
-
-	* doc/texinfo.txi:
-
-2002-04-01    <karl@gnu.org>
-
-	* configure.ac: version 4.2.
-	* util/texi2dvi: 4.2
-
-	* makeinfo/toc.c: doc fix.
-	* util/install-info-html:
-	* makeinfo/texinfo.xsl: Fixes From: Ville Skyttä
-		<ville.skytta@iki.fi>.
-
-	* makeinfo/insertion.c (begin_insertion): (copying case) omit
-		cm_insert_copying if no_headers.
-	Bug report from Stephen Gildea.
-
-2002-03-28    <karl@gnu.org>
-
-	* configure.ac: pretest 4.1d.
-
-	* doc/texinfo.txi:
-	* makeinfo/cmds.c: ignore headings commands.  From Stephen Gildea.
-
-	* doc/texinfo.txi: @ifplaintext
-
-2002-03-26    <karl@gnu.org>
-
-	* doc/texinfo.tex (\ifplaintext,\ifnotplaintext): new output
-		format conditional.
-
-	* makeinfo/cmds.c (cm_settitle):
-	* makeinfo/node.c (cm_node): need to pass output filename arg to
-		* xml_begin_document.
-
-	* makeinfo/cmds.c (cm_sp): need close_single_paragraph instead of
-	close_paragraph to avoid an extra blank line.  Bug report from Stephen Gildea.
-
-	* doc/texinfo.tex (\doignore): can't do c kludge for
-		documentdescription.  Bug report from Stephen Gildea.
-
-	* doc/texinfo.txi: missing t in documentdescription example, from
-	Stephen Gildea.
-
-2002-03-24    <karl@gnu.org>
-
-	* doc/texinfo.txi: invar sec
-
-2002-03-23    <karl@gnu.org>
-
-	* configure.ac: pretest 4.1c.
-
-2002-03-23  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/search.c (skip_non_whitespace): Don't go beyond the
-	terminating null character.
-
-	* info/filesys.c (filesys_read_info_file)
-	(filesys_read_compressed): Null-terminate the contents of the file
-	we've read, so it could be used as a C string.
-
-2002-03-23  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): Fix
-	computation of output_filename's length, to avoid overrunning
-	malloc'ed buffer.  If mkdir returns with EEXIST, assume we can use
-	an existing directory only if the existing file is indeed a
-	directory.  On MS-DOS, allow for EACCES in addition to EEXIST.
-	<max_name_len>: Remove this variable.
-
-	* makeinfo/makeinfo.c (expansion): Protect execute_string from too
-	long strings.
-	(EXECUTE_STRING_MAX): New macro.
-	(execute_string): Use EXECUTE_STRING_MAX, not 4000.
-
-2002-03-23    <karl@gnu.org>
-
-	* doc/texinfo.txi:
-	* makeinfo/insertion.h:
-	* makeinfo/texinfo.dtd:
-	* makeinfo/xml.h:
-	* makeinfo/xml.c:
-	* makeinfo/makeinfo.h:
-	* makeinfo/insertion.c:
-	* makeinfo/html.c:
-	* makeinfo/cmds.c:
-	* doc/info-stnd.texi: @permissions -> @copying.
-	* doc/texinfo.tex: permissions -> copying.
-
-2002-03-22    <karl@gnu.org>
-
-	* configure.ac: pretest 4.1b.
-
-	* info/Makefile.am (BUILT_SOURCES): conditionalize on
-		TEXINFO_MAINT, to appease distcheck.
-
-	* From: Matthew Woodcraft <mattheww@chiark.greenend.org.uk>:
-	* makeinfo/makeinfo.h (next_menu_item_number): New global.
-	* makeinfo/insertion.c (begin_insertion): Initialise it.
-	* makeinfo/makeinfo.c (handle_menu_entry): Emit accesskey attribute
-	in html output, according to next_menu_item_number.
-	* makeinfo/node.c (cm_node): Emit accesskey attributes in html output.
-
-	* doc/texinfo.txi: GNU texts.
-
-	* doc/info-stnd.texi: @syncodeindex, not @synindex.
-
-2002-03-21    <karl@gnu.org>
-
-	* doc/texinfo.txi: @permissions.
-
-2002-03-20    <karl@gnu.org>
-
-	* doc/texinfo.txi: document --no-headers a bit better.
-	* makeinfo/makeinfo.c: better description of --no-headers,
-		suggested by Stephen Gildea.
-
-	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): use
-		command-line specified output name unchanged.
-
-	* makeinfo/makeinfo.c (full_expansion): new routine, separated
-	from expansion, that does not tamper with the formatting parameters.
-	* makeinfo/insertion.c: copying -> permissions.
-	(cm_insert_permissions): insert rather than add.
-	* makeinfo/texinfo.dtd:
-	* makeinfo/xml.h:
-	* makeinfo/xml.c:
-	* makeinfo/cmds.c: copying -> permissions.
-	* makeinfo/makeinfo.h: copying -> permissions.
-	(full_expansion): declare.
-
-	* doc/texinfo.txi: @copying -> @permissions, @include fdl.texi.
-	* doc/info-stnd.texi: @copying -> @permissions, always include the FDL.
-
-	* makeinfo/html.c (html_output_head): copying -> permissions, use
-	insert_string.
-	* makeinfo/insertion.h: copying -> permissions.
-	* doc/texinfo.tex: \copying -> \permissions.
-
-	* doc/Makefile.am (EXTRA_DIST): include fdl.texi.
-
-2002-03-19    <karl@gnu.org>
-
-	* makeinfo/insertion.c (cm_insert_copying): use insert_string in
-		the xml case, sigh.
-
-	* doc/info-stnd.texi: copying
-
-	* dir-example: info standalone.
-
-	* makeinfo/html.c: copyright_text -> copying_text.
-	* makeinfo/texinfo.dtd:
-	* makeinfo/insertion.c:
-	* makeinfo/insertion.h:
-	* makeinfo/makeinfo.h:
-	* makeinfo/xml.c:
-	* makeinfo/xml.h:
-	* makeinfo/cmds.c: copyrighttext -> copying.
-	* doc/info-stnd.texi: copyrighttext -> copying.
-	* doc/texinfo.tex (\copying, \insertcopying): rename from
-		copyrighttext per rms.
-
-	* makeinfo/index.c (index_add_arg): don't emit warning for index
-	entries containing : after all.
-
-	* info/infokey.c: remove non-ansi trailing commas from last items
-	of enums.  From: Albert Chin-A-Young <china@thewrittenword.com>.
-
-2002-03-18    <karl@gnu.org>
-
-	* doc/info-stnd.texi: @include after @setfilename.
-	* doc/texinfo.txi: @insertcopyrighttext, @settitle GNU ...
-
-	* doc/texinfo.txi: mention @setfilename and source filename
-		exceptions at the top.
-
-	* makeinfo/defun.c (scan_group_in_string): handle escaped @{ and @}.
-	Bug report from Werner Lemberg.
-
-	* doc/info-stnd.texi: add version number to title a la Texinfo.
-	* doc/info-stnd.texi: file -> manual.
-	* doc/info-stnd.texi: use @copyrighttext.
-
-	* makeinfo/insertion.c (begin_insertion, end_insertion):
-			copyrighttext case.
-	* makeinfo/makeinfo.h (copyright_text): declare/define.
-	* makeinfo/html.c (html_output_head): output copyrighttext.
-	* makeinfo/texinfo.dtd: Add copyrighttext.
-	* makeinfo/xml.h (xml_element): add COPYRIGHTTEXT.
-	* makeinfo/xml.c (texinfoml_element_list, docbook_element_list):
-			copyrighttext case.
-
-2002-03-17    <karl@gnu.org>
-
-	* makeinfo/insertion.h (insertion_type): include copyrighttext.
-	* makeinfo/cmds.c (command_table): new command copyrighttext.
-
-	* doc/texinfo.tex (\copyrighttext, \insertcopyrighttext): new
-	 Texinfo commands to handle the copyright and permission text cleanly.
-	(\dblarrowbox,\longdblarrowbox,\pushcharbox,\equivbox,\bullbox):
-		remove these definitions that have not been used for ages.
-
-	* configure.ac: call AC_CANONICAL_BUILD before the termcap
-	checking.  Bug report from Eli.
-
-2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/node.c (cm_anchor): When recording the anchor position,
-	account for output_paragraph_offset, since the current paragraph
-	might not be closed yet (happens inside a menu, for example).
-
-	* djgpp/config.sed: Tweak to adapt to the new Automake/Autoconf.
-
-	* djgpp/README: Update.
-
-2002-03-15    <karl@gnu.org>
-
-	* dir-example: GNU organization.
-
-2002-03-14    <karl@gnu.org>
-
-	* makeinfo/cmds.c (cm_titlepage): do not declare nonexistent
-	function.
-
-2002-03-14    <karl@gnu.org>
-
-	* doc/texinfo.txi: don't say specifically html 3.2, since <html
-			lang=...> is not 3.2.
-	Bug reprt from: Matthew Woodcraft <mattheww@chiark.greenend.org.uk>.
-
-2002-03-13    <karl@gnu.org>
-
-	* doc/texinfo.tex (\writetocentry): set \pdfmakepagedesttrue here.
-	(\Etitlepage): instead of here.  In case the document has no
-		@titlepage.  Bug report from Stephen Gildea.
-
-	* util/texi2dvi: be verbose after the definition of cmd, not
-	before.  From Andreas Schwab.
-
-2002-03-12    <karl@gnu.org>
-
-	* pretest 4.1a.
-	* doc/info-stnd.texi: update to FDL.
-
-2002-03-11    <karl@gnu.org>
-
-	* util/texi2dvi:
-	* util/texindex.c:
-	* util/install-info.c:
-	* makeinfo/makeinfo.c:
-	* info/infokey.c:
-	* info/info.c: home page and help message.
-
-	* doc/texinfo.txi (math): document @\ (aka \\) for literal \.
-	regularize index entries.
-	* makeinfo/cmds.c (command_table): \\ -> insert_self.
-
-	* doc/texinfo.tex (\mathbackslash): new definition.
-	(\math): handle \\ too.
-	(\codeunder): handle @code{\} in mmode.
-
-	* makeinfo/html.c: make home page be gnu's.
-
-	* doc/texinfo.txi (Conventions): rewrite description of quotes so
-	as to work in all formats; there was no output for HTML.
-	Report from: David Merrill <david@lupercalia.net>.
-
-2002-03-10    <karl@gnu.org>
-
-	* doc/texinfo.txi (Texinfo Copying Conditions): mention this
-	manual's license specifically.
-
-2002-03-09  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/indices.c (add_index_to_index_nodenames): Fix an off-by-one
-	error when computing the number of the last index entry.
-
-2002-03-08    <karl@gnu.org>
-
-	* doc/texinfo.tex: Rewrite unnumbered toc handling to keep track
-	of their sequence, so they can be handled correctly in
-	the PDF toc (= bookmarks).
-	From: Werner LEMBERG <wl@gnu.org>.
-
-	* configure.ac: AC_MSG_WARN if can't find a term library.  From:
-	Marc.Herbert@ens-lyon.fr.
-
-	* info/info.c: alphabetize.
-	* info/info.c: include short option names.
-
-2002-03-08  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/display.c (display_update_one_window): Dynamically reallocate
-	printed_line[] as needed.  When under -R, ignore ANSI escapes for
-	the purposes of line wrap display.  Clear the line to EOL if it
-	used escape sequences.  Reallocate entry->text if the new
-	printed_line is longer than screenwidth.
-
-	* info/window.c (string_width): Don't count ANSI escape sequences
-	in string width, when under -R..
-	(calculate_line_starts): Don't count ANSI escape sequences in line
-	width, when under -R.
-	(window_get_cursor_column, window_chars_to_goal): When under -R,
-	ANSI escapes don't affect the horizontal position.
-
-	* info/info-utils.c (printed_representation): If -R is in effect,
-	treat ESC as a normal character.
-
-2002-03-08    <karl@gnu.org>
-
-	* util/Makefile.am:
-	* info/Makefile.am:
-	* makeinfo/Makefile.am:
-	* lib/Makefile.am: doc fix.
-
-	* doc/Makefile.am (install-tex): prefix the install directories
-	with $(DESTDIR), because that is what automake does for all
-	generated install rules.  The file pdfcolor.tex should be
-	installed as such (and not as epsf.tex).
-	From: Peter Breitenlohner <peb@mppmu.mpg.de>.
-
-	* configure.ac (AC_INIT): now pass [GNU Texinfo].
-	(AM_INIT_AUTOMAKE): now no args, for automake 1.6.
-
-2002-03-05    <karl@gnu.org>
-
-	* doc/texinfo.txi: history
-
-2002-03-04    <karl@gnu.org>
-
-	* configure.ac: version 4.1.
-	* util/texi2dvi: version.
-
-	* doc/texinfo.txi: @settitle is used in html output (from Eli),
-		various underfull hbox fixes.
-
-2002-03-02    <karl@gnu.org>
-
-	* configure.ac: pretest 4.0k
-
-	* info/info.c: declare add_file_to_directory to avoid warning.
-
-	* doc/info-stnd.texi: info standalone so as not to collide with
-		`standards' in dir.
-
-2002-03-01  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/insertion.c (end_insertion): Insert the /td and /tr
-	directives in lower case.  From Per Bothner <per@bothner.com>.
-
-	* makeinfo/macro.c (cm_alias): Ignore whitespace around the alias
-	name, like the manual promises.
-
-	* doc/texinfo.txi (Invoking Macros, Macro Details): Document that
-	commas in macro arguments don't work in TeX.  Advise texi2dvi -e
-	when macros don't work with TeX.
-
-	* doc/texinfo.txi (Node Line Requirements): Add restrictions about
-	parens and some punctuation characters in node names.
-	(Def Cmd Template): Document that macros are not expanded.
-
-	The following two changes allow to say "info foo" if there's an
-	Info file `foo' somewhere along INFOPATH.
-
-	* info/info.c (add_file_directory_to_path): New function, code
-	moved from `main'.
-	(main): Use add_file_directory_to_path.
-
-	* info/session.c (info_follow_menus): If the first menu entry
-	couldn't be found as an item in DIR's menu, try it as a file name.
-
-	2001-06-19  Mark Montague  <markmont@umich.edu>
-
-	* info/filesys.c: Fix for sparc64 (offsets should be "long"s).
-
-	* info/session.c: Fix typos in function calls.
-
-	2001-08-23  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/footnote.c (cm_footnote): Don't allow footnotes inside
-	footnotes.
-	(output_pending_notes): Increment already_outputting_pending_notes
-	in the HTML case as well, to protect execute_string from
-	recursively entering output_pending_notes.
-
-2002-03-01    <karl@gnu.org>
-
-	* doc/texinfo.tex: fix mismatched $'s for sake of emacs font-lock.
-	From: Stephen Gildea <gildea@stop.mail-abuse.org>.
-
-2002-02-27    <karl@gnu.org>
-
-	* configure.ac: pretest 4.0j.
-
-	* info/infodoc.c: 1scroll-forward typo.
-
-2002-02-26    <karl@gnu.org>
-
-	* lib/system.h [! ENABLE_NLS]: let's not go const.
-
-2002-02-26  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* djgpp/config.sed: Add tweaking of file names in "install-info"
-	and "uninstall-info" targets.
-
-	* doc/inf-stnd.texi (Custom Key Bindings, Invoking infokey):
-          Add footnotes about DOS file names.
-
-	* info/infokey.c (main) [__MSDOS__]: If HOME is not defined,
-	default to the current directory.
-
-2002-02-26    <karl@gnu.org>
-
-	* lib/system.h (LC_MESSAGES) [! LC_MESSAGES]: need this after all.
-
-2002-02-25    <karl@gnu.org>
-
-	* doc/info-stnd.texi: contents at top, avoid overfull hbox.
-	* lib/Makefile.am (libtxi_a_sources): include gettext.h.
-
-	* lib/system.h (LC_MESSAGES): don't need conditional, Bruno says
-		that locale.h or libintl.h does so.
-
-	* configure.ac: pretest 4.0i.
-
-	* dir-example: infokey.
-	* doc/info-stnd.texi: invoking infokey.
-	* info/infokey.c (short_help): reorganize slightly.
-
-	* lib/system.h: use "gettext.h" instead of <libintl.h> per gettext
-	0.11 recommendation.
-
-2002-02-25  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* Makefile.am (SUBDIRS): Add intl.
-	* configure.ac (AC_CONFIG_FILES): Add intl/Makefile.
-
-2002-02-25    <karl@gnu.org>
-
-	* util/Makefile.am (LDADD):
-	* makeinfo/Makefile.am (LDADD):
-	* info/Makefile.am (LDADD): @LIBINTL@ per gettextize.
-
-	* configure.ac: gettextize changes.
-	* Makefile.am: gettextize changes.
-
-2002-02-25  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* Makefile.am (SUBDIRS): Add m4.
-	(SUBDIRS): Remove intl.
-	(ACLOCAL_AMFLAGS): New variable.
-	(EXTRA_DIST): Add config.rpath.
-	* configure.ac (AC_CONFIG_FILES): Add m4/Makefile.
-	(AC_CONFIG_FILES): Remove intl/Makefile.
-
-2002-02-23    <karl@gnu.org>
-
-	* pretest 4.0h.
-
-	* 2002-02-23  Eli Zaretskii  <eliz@is.elta.co.il>
-	* doc/info-stnd.texi (Invoking Info): Add a reference to the
-	description of index-apropos and index-search.  Document the
-	--raw-escapes option.
-	(Searching Commands): Describe index-search and index-apropos.
-
-	* info/man.c (clean_manpage): If raw_escapes_p is not set, remove
-	ANSI escape sequences from the man page.
-
-	* info/info.h: Declare raw_escapes_p.
-
-	* info/info.c: <raw_escapes_p>: New variable.
-	New option --raw-escapes or -R.
-	(main): Handle it.
-	(info_short_help): Document it.
-	(main): Honor --output together with --usage, by dumping the node
-	we found to the named file.
-
-	2002-02-23  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/html.c (nodename_to_filename): Call
-	nodename_to_filename_1 with the last argument 1, not 0.
-
-	* makeinfo/toc.c (shortcontents_update_html)
-	(contents_update_html): Don't omit the entry for the Top node.
-
-	* 2002-01-30  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/node.c (cm_node): Don't condition splitting on
-	top_node_seen being non-zero.  If current_node is NULL, use the
-	current output file name to get at the file name for the previous
-	node.  Don't compute a new file name for a node if we didn't close
-	the current file.
-
-	2002-02-01  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/node.c (cm_node): Call html_output_head whenever we
-	create a new split-HTML file.
-
-	* makeinfo/html.c (html_output_head): Make html_title static.
-	Compute it only once, and don't free it.  Output the <h1> title
-	header only once per run.
-
-	2002-02-02  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/toc.c (contents_update_html): Fix the condition for
-	omitting duplicate TOC entries.  Fix comparison with the TOC entry
-	for "Top".
-
-2002-02-14    <karl@gnu.org>
-
-	* doc/Makefile.am (DISTCLEANFILES): use this variable instead of
-	the distclean-aminfo target, which apparently is no longer used.
-
-	* pretest 4.0g.
-
-	* doc/texinfo.tex (\appendixentry): new macro for typesetting
-	appendix toc entries.
-	(\appendixzzz, \summarycontents, \pdfoutlines): use it, instead of
-	usurping \chapentry.  This allows the bookmarks in the pdf output
-	to come out right.  Report from: Kurt Hornik
-	<Kurt.Hornik@ci.tuwien.ac.at>.
-
-2002-02-13    <karl@gnu.org>
-
-	* configure.ac: ALL_LINGUAS is deprecated as of gettext 0.11.
-	* doc/texinfo.tex (\image): remove spurious \loggingall.
-
-	* doc/texinfo.txi: @math now implies @tex.
-	* doc/texinfo.tex (\math): imply @tex.
-
-2002-02-11    <karl@gnu.org>
-
-	* makeinfo/insertion.c (handle_verbatim_environment): save and
-	restore filling_enabled and inhibit_paragraph_indentation.  Bug
-	report from: Alexandre Duret-Lutz <duret_g@lrde.epita.fr>.
-
-	* makeinfo/makeinfo.c (reader_loop): don't worry about bare braces
-	inside @math.
-
-2002-02-08    <karl@gnu.org>
-
-	* info/infodoc.c: keep underlines with the text they refer to, for
-		translation purposes.
-	Pointed out by Christian Rose <menthos@menthos.com>, 20 nov 2001.
-
-	* doc/info.texi: recommend setting INFOPATH.
-
-	* doc/Makefile.am (install-tex): need $(srcdir) for install.
-	From: istry <istry@mail.ru>.
-
-	* doc/texinfo.tex: replace $$$ delimiter with $.$, for sake of
-	font-lock in Emacs 21.1.  Suggestion from: Stephen Gildea
-	<gildea@stop.mail-abuse.org>.
-
-	2002-01-26  Eli Zaretskii  <eliz@is.elta.co.il>
-	* info/infomap.c (default_emacs_like_info_keys)
-	(default_emacs_like_ea_keys, default_vi_like_info_keys)
-	(default_vi_like_ea_keys): Fix default keybindings to be
-	consistent with non-INFOKEY branch.  Add bindings for Home, End,
-	and Delete keys.
-
-	2002-01-23  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/toc.h <TOC_ENTRY_ELT>: New member html_file.
-
-	* makeinfo/toc.c (toc_add_entry): Compute and set the html_file
-	member.
-	(shortcontents_update_html): Produce the toc_* links correctly,
-	without duplicating the link text.  Fix comparison with "Top".
-	Handle the case when there's @shortcontents, but no @contents.
-	(contents_update_html): Fix the way toc_* anchors are produced
-	from toc_entry_alist[i]->name: take only the node name from the
-	string in toc_entry_alist[i]->name.  Fix comparison with "Top".
-
-	* makeinfo/sectioning.c (sectioning_html): Take the toc_anchor
-	substring before closing the anchor with </a>.  Fix the closing
-	</hN> tag--add 2 to level, not 1.  Use sizeof instead of a magic
-	value of 9.
-
-	* makeinfo/cmds.c: Make @summarycontents call cm_shortcontents, as
-	promised by the docs.
-
-	2002-01-19  Eli Zaretskii  <eliz@is.elta.co.il>
-	* djgpp/config.sed: Fix a problem with AC_CONFIG_LINKS that
-	prevented building from a directory on another drive.
-
-	* djgpp/config.bat: Fix problems with long --srcdir diectory names.
-
-	* djgpp/README: Update.
-
-2002-01-31    <karl@gnu.org>
-
-	* doc/texinfo.txi: mention dvips
-
-2002-01-28    <karl@gnu.org>
-
-	* configure.ac (ALL_LINGUAS): add hr.
-
-2002-01-22    <karl@gnu.org>
-
-	* makeinfo/defun.c (defun.c): only warn about ( immediately
-        following a defun name, since the groff manual needs other
-        characters there where whitespace is incorrect.
-	Reported by Werner Lemberg <wl@gnu.org>.
-
-	* doc/info-stnd.texi: alphabetize variable list.
-
-	* doc/texinfo.txi: no :'s in index entries, index @page/@group
-	some more.
-
-	* makeinfo/index.c (index_add_arg): warn if index entry contains a
-	colon.  From: Kenneth Lorber <keni@his.com>.
-
-2002-01-21    <karl@gnu.org>
-
-	* makeinfo/insertion.c: </pre not /<pre, reported by Mike
-	Benefield <mike@duckbrain.com>.
-
-2002-01-18    <karl@gnu.org>
-
-	* configure.ac: pretest 4.0f.
-
-	* util/texindex.c:
-	* util/install-info.c:
-	* makeinfo/makeinfo.c:
-	* info/info.c: it's 2002.
-
-	* info/session.c: pass right args to info_scroll_half_screen_up.
-	From Eli.
-
-2002-01-18  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/multi.c (multitable_item): Always return a value.
-
-	* util/install-info.c (xmalloc, xrealloc, pfatal_with_name)
-	(open_possibly_compressed_file, parse_input): Call `fatal' with 3
-	arguments, to avoid compiler warnings.
-	(main): Call `fatal', `error', and `warning' with the right number
-	of arguments.
-
-	* makeinfo/makeinfo.c (main): Remove extraneous first arg of
-	usage().
-
-	* info/window.c (build_message_node): Supply a 4th argument to
-	build_message_buffer.
-
-
-2002-01-18  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/sectioning.c (sectioning_html): End the anchor properly
-	with a </a>.
-
-	* info/session.c (info_menu_or_ref_item): If we didn't find a
-	cross-reference on this line, try the one before.
-
-	* info/infomap.c (fetch_user_maps): Provide two different
-	translations for ``file too small'' and ``file too big'' error.
-
-	* info/info.c (info_short_help): Print the --speech-friendly
-	option together with the other options, not at the end of the help
-	screen.
-
-2002-01-18  Andreas Schwab  <schwab@suse.de>
-
-	* makeinfo/html.c (escape_string): When string is empty don't read
-	past end of it.
-
-2002-01-17    <karl@gnu.org>
-
-	* doc/info-stnd.texi: overfull box in table.
-
-2002-01-16    <karl@gnu.org>
-
-	* configure.ac: pretest 4.0e.
-
-	* doc/info.texi: update from emacs.
-
-2002-01-03  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (file_line_error): New function.
-
-	* makeinfo/insertion.c (discard_insertions): Call file_line_error
-	instead of changing global variables.
-
-	* makeinfo/sectioning.c (cm_top): Ditto.
-
-	* makeinfo/node.c (validate_file): Ditto.
-
-	* makeinfo/makeinfo.c (discard_braces, handle_variable_internal):
-	Ditto.
-
-	* makeinfo/macro.c (define_macro): Ditto.
-
-	2001-12-31  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/node.h (TAG_ENTRY): New struct member html_fname.
-
-	* makeinfo/node.c (find_node_by_fname): New function.
-	(remember_node): Accept an additional argument FNAME, the node's
-	file name, and record it in the list of nodes; callers changed.
-	(cm_node): Call find_node_by_fname to see if this node's file name
-	clashes with another node or anchor.  If it clashes with another
-	node, append the new node to the same file instead of erasing the
-	other node.  If it clashes with an anchor, print an error message
-	and overwrite the anchor's file.
-	(cm_anchor): If this anchor's file name clashes with another
-	anchor or node, print an error message and ignore the anchor.
-
-	* makeinfo/files.c (normalize_filename): New function.
-
-	* makeinfo/files.h <normalize_filename>: Add declaration.
-
-	* makeinfo/html.c (nodename_to_filename_1): Call
-	normalize_filename before returning the file name to the caller.
-	Disable the code which adds #Nodified-filename to the file name we
-	produce.
-
-	* makeinfo/makeinfo.c (add_char): Don't replace whitespace with
-	&nbsp; if we are producing an HTML directive.
-	(add_html_elt): New function.
-	(cm_xref, cm_inforef, cm_uref, cm_email, cm_image): Use
-	add_html_elt instead of add_word, where appropriate.
-
-	* makeinfo/html.c (add_link): Ditto.
-
-	* makeinfo/footnote.c (cm_footnote): Ditto.
-
-	* makeinfo/defun.c (defun_internal): Ditto.
-
-	2001-12-27  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/node.c (cm_node): Don't omit links to (DIR) from the
-	navigation bar, add_anchor_name will DTRT now.
-
-	* makeinfo/makeinfo.c (cm_xref): Produce a split-HTML file name
-	from arg1, the node name, not from arg3 or arg2, which are the
-	reference name.  Use arg2 or arg3 for the text to be displayed as
-	a link between ">" and "</a>".  Use add_anchor_name instead of
-	add_nodename_to_filename.
-	(cm_inforef): Use add_anchor_name instead of
-	add_nodename_to_filename.  Handle the case of a missing second
-	argument in @inforef.
-
-	* makeinfo/html.c (add_anchor_name): Always add # and the anchor
-	name, even if we are splitting.  If the node is "(dir)", treat it
-	as if it were "dir".
-	(nodename_to_filename_1): Don't append #Top for the Top node.
-	(add_link): Don't punt if nodename is "(dir)".  Output "</a>"
-	after the link.
-
-	2001-12-25  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (cm_xref, cm_inforef): Output the target
-	file name via add_nodename_to_filename.
-
-	2001-12-20  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/html.c (nodename_to_filename_1): Make references to Top
-	to refer to index.html#Top.
-	(add_nodename_to_filename): Accept additional argument HREF;
-	callers changed.
-
-	* makeinfo/toc.c (rewrite_top): If the filename to rewrite is
-	stdout or the null device, do nothing.
-
-	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): Use
-	FILENAME_CMP instead of strcmp.  Search for a period forward, not
-	backward.  Make index_name[] a static const array, and its len
-	computed at compile time.
-	(convert_from_loaded_file): If output_filename is the null device,
-	turn off HTML splitting.
-	(cm_xref): Use add_anchor_name, rather than add_escaped_anchor_name,
-	in the 5-argument case in HTML mode.
-	(cm_inforef): Fix external references in HTML mode.
-
-	* makeinfo/node.c (cm_node): Use FILENAME_CMP instead of strcmp.
-	Don't open a new file if the new node's name is empty.  Take the
-	directory part of split-HTML files from current_output_filename,
-	not from toplevel_output_filename (the latter doesn't include the
-	manual's subdirectory part).
-
-	* makeinfo/html.c (nodename_to_filename_1): Use FILENAME_CMPN
-	instead of strncmp.  Support *.inf files in references.
-
-2001-12-11  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* djgpp/config.bat, djgpp/config.sed, djgpp/config.site: Update
-	for Texinfo 4.0d.
-
-	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): Use IS_SLASH
-	instead of literal `/'.
-	(convert_from_loaded_file): Flush the output stream before
-	creating the TOC.
-
-
-2002-01-14    <karl@gnu.org>
-
-	* info/info.c: translate --speech-friendly (from Eli).
-	* makeinfo/index.c: formatting.
-
-	2001-12-24  Eli Zaretskii  <eliz@is.elta.co.il>
-	* info/infomap.c (initialize_info_keymaps): Bind the user-defined
-	keys on top of the default ones, not the other way around.
-
-2002-01-11    <karl@gnu.org>
-
-	* info/info.c: can't do #ifdef inside of printf any more.
-	From: Tyler <tyler@zerodivide.cx>
-
-	* configure.ac (ALL_LINGUAS): add he, from Eli.
-
-2002-01-09  Eli Zaretskii <eliz@is.elta.co.il>
-
-	* info/window.c (calculate_line_starts): Cast node->contents[i] to
- 	unsigned char.
-
-2002-01-04    <karl@gnu.org>
-
-	* doc/texinfo.tex (\footnotezzz): \noindent=\relax.
-
-2002-01-03    <karl@gnu.org>
-
-	* doc/texinfo.tex (\imagexxx): handle pdf and dvi cases the same.
-        (\dopdfimage): need \immediate to avoid seg fault when including the
-	same image twice.
-	Bug reports from Alexandre Duret-Lutz <duret_g@lrde.epita.fr>.
-
-2001-12-31    <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (cm_image): check *ext_arg as well as
-		ext_arg when computing length of fullname.
-
-	* makeinfo/defun.c: docbook changes.
-	* makeinfo/docbook.c (docbook_punctuation): remove deprecated
-		default: at end of statement.
-
-	* makeinfo/docbook.c: initial.
-	* makeinfo/docbook.h: initial.
-	* makeinfo/Makefile.am (makeinfo_SOURCES): add docbook.[ch].
-	* makeinfo/makeinfo.c (add_char): use &nbsp; in docbook case.
-
-	* doc/texinfo.tex (\footnotezzz): use \everypar={\hang} instead of
-	just \hang in case a footnote extends for multiple paragraphs.
-
-2001-12-18    <karl@gnu.org>
-
-	* info/Makefile.am (BUILT_SOURCES): include $(EXEEXT) on makedoc
-	dependency since automake doesn't do it.
-
-	2001-12-11  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* djgpp/config.bat, djgpp/config.sed, djgpp/config.site: Update
-	for Texinfo 4.0d.
-
-	* info/infomap.c (fetch_user_maps): Initialize `filename' to NULL
-	and don't try to call `open' if `filename' is NULL.
-	[__MSDOS__]: Try the current directory if neither $INFOKEY nor
-	$HOME are defined.
-
-	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): Use IS_SLASH
-	instead of literal `/'.
-	(convert_from_loaded_file): Flush the output stream before
-	creating the TOC.
-
-	2001-12-10  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/infokey.c (main): Use FOPEN_WBIN instead of "w".
-
-	* info/infokey.h (INFOKEY_SRCFILE, INFOKEY_FILE) [__MSDOS__]:
-	Special definitions for MS-DOS.
-
-	2001-12-09  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* lib/system.h: Condition inclusion of libintl.h on ENABLE_NLS.
-	(gettext, bindtextdomain, textdomain) [!ENABLE_NLS]: Provide
-	trivial definitions for when NLS is not used.
-	(LC_MESSAGES) [!ENABLE_NLS]: Define if undefined by locale.h.
-
-2001-12-18  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/infomap.c (decode_keys): Change the return type to int;
-	callers changed.  Return zero if some of the special keys in SRC
-	are not defined by the terminal; return non-zero otherwise.
-	(section_to_keymaps): If decode_keys returns zero, don't bind the
-	key sequence.
-
-2001-12-18  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/xml.c (xml_insert_element_with_attribute)
-	(xml_insert_element): Rename the argument `element' to `elt'.
-
-	* info/infokey.c (compile): Use \033 instead of (non-standard) \e.
-
-2001-12-17    <karl@gnu.org>
-
-	2001-12-16  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/pcterm.c (pc_initialize_terminal) [INFOKEY]: Store term_kh,
-	term_ke, term_ki, and term_kx sequences.
-	(DJGPP_keytab): Map Home, End, and Insert to escape sequences, not
-	to C-a, C-e, etc.
-
-	* info/infomap.c (default_emacs_like_info_keys)
-	(default_emacs_like_ea_keys, default_vi_like_info_keys)
-	(default_vi_like_ea_keys): Add the leading suppress-default flag,
-	to be consistent with the table which comes from a file.
-
-	* info/session.c (info_do_lowercase_version): Add a doc string.
-
-	* info/infodoc.c (describe_key) [INFOKEY]: If keystroke is bound
-	to do-lowercase-version, but its lower-case variant is undefined,
-	say that keystroke is also undefined.
-
-
-2001-12-12    <karl@gnu.org>
-
-	* makeinfo/files.c (find_and_load): remove conditionals on
-		 VMS|O_BINARY, always just read as many bytes as we can.
-
-        2001-12-11  Eli Zaretskii  <eliz@is.elta.co.il>
-        * new files for djgpp/.
-
-        2001-09-09  Eli Zaretskii  <eliz@is.elta.co.il>
-	* info/echo-area.c (build_completions): Look for a candidate
-	completion which matches user's request including the letter-case,
-	use that as the value of LCD_completion.
-
-        2001-12-06  Eli Zaretskii  <eliz@is.elta.co.il>
-	* info/echo-area.c (build_completions): When looking for the best
-	completion candidate, only compare as much characters as the user
-	typed.
-
-
-2001-12-04    <karl@gnu.org>
-
-	* doc/texinfo.tex (\pdfmkpgn): remove trailing @ in link names
-		again.  Also from Kurt.
-
-	* doc/texinfo.tex (\image): need five commas to ignore additional
-	optional args to @image.  From Kurt.Hornik@ci.tuwien.ac.at.
-
-	* doc/texinfo.tex (\afourlatex): reset \globaldefs=0 explicitly.
-	From Trond Endrestøl <trond@ramstind.gtf.ol.no>.
-
-2001-12-01    <karl@gnu.org>
-
-	* makeinfo/files.c (find_and_load): remove O_BINARY from open
-	call, this messes up under Windows.  From eli.
-
-2001-11-20    <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (cm_image): reword error messages.
-
-2001-11-19    <karl@gnu.org>
-
-	* Pretest 4.0d.
-	* doc/texinfo.txi: index ragged right/left.
-
-	* info/window.c (build_message_buffer): handle %1$s as used in
-	ja.po.  From Fumitoshi UKAI <ukai@debian.or.jp>.
-
-	* configure.ac (ALL_LINGUAS): add sv.
-
-2001-11-16    <karl@gnu.org>
-
-	* Makefile.am (EXTRA_DIST): add COPYING.DOC.
-
-        1999-10-30  Andrew Bettison  <andrewb@zip.com.au>
-
-	All these changes are to implement user-configurable key mapping
-	using the new 'infokey' program.  For the time being, the new
-	code is conditional on [INFOKEY] and the old code is still there
-	in case we want to revert.
-
-	* info/session.c (incremental_search): test for printable chars
-	_before_ isearch command keys -- makes a difference if the
-	isearch commands are bound to printable chars.
-
-	* info/doc.h,
-	* info/infodoc.c,
-	* info/infomap.c,
-	* info/m-x.c,
-	* info/session.c: New typedef InfoCommand, plus a bunch of
-	supporting macros, to abstract a "command" away from being a
-	function pointer.
-
-	* info/doc.h (pretty_keyseq),
-	* info/infodoc.c (pretty_keyseq),
-	* info/session.c (pretty_keyseq): Moved definition from
-	session.c into infodoc.c, and rewrote to recognise special
-	terminal sequences (PgUp, PgDn, etc.).
-
-	* info/infodoc.c (create_internal_info_help_node,
-	replace_in_documentation, info_where_is),
-	* info/m-x.c (info_execute_command): Cleaned up references to
-	hardwired keystrokes.
-
-	* info/infodoc.c (replace_in_documentation):
-	Extended the \\[foo] syntax to recognise \\%-X.Y[foo], which
-	causes the replacement text to be inserted using sprintf("%-X.Ys").
-
-	* info/session.c (_scroll_forward, _scroll_backward,
-	scroll_forward_page_only, scroll_backward_page_only,
-	scroll_forward_page_only_set_window,
-	scroll_backward_page_only_set_window): New functions, eliminating
-	need for SPC and DEL hack.
-
-	* info/session.c (scroll_forward, scroll_backward,
-	scroll_forward_set_window, scroll_backward_set_window): Call
-	_scroll_forward and _scroll_backward to do all the work.
-
-	* info/infomap.c (initialize_info_keymaps)[!INFOKEY]: set 'v'
-	and Control('v') key bindings to info_scroll_backward_page_only
-	and info_scroll_forward_page_only respectively.
-
-	* info/Makefile.am (bin_PROGRAMS): Added new executable `infokey'.
-	(infokey_SOURCES): Defined.
-	(EXTRA_DIST): Added `sample_infokey'.
-	(BUILT_SOURCES): Added `key.c'.
-
-	* info/infokey.h,
-	* info/infokey.c: Created, for new program `infokey' which
-	creates a $HOME/.info file by compiling a text source file with
-	syntax very similar to that used by `lesskey' in less 3.4.0.
-
-	* info/makedoc.c: Generate new file `key.c' defining an array to
-	map command names to codes.
-
-	* info/key.h: Created, to define contents of new `key.c' now
-	created by makedoc.
-
-	* info/info.h (INFOKEY): Define, to enable all following changes.
-	(set_variable_to_value)[INFOKEY]: Declare new function.
-
-	* info/makedoc.c [INFOKEY]: Write '#define A_' numeric command
-	code definitions into `funs.h' to support new key binding system.
-
-	* info/session.c (info_dispatch_on_key, info_numeric_arg_digit_loop)
-	[INFOKEY],
-	* info/infomap.c [INFOKEY],
-	* info/infodoc.c (function_documentation, function_name,
-	describe_key, pretty_keyname, pretty_keyseq_internal,
-	where_is_internal)[INFOKEY],
-	* info/terminal.h (term_kh, term_ke, term_kx, term_ki)[INFOKEY],
-	* info/terminal.c (term_kh, term_ke, term_kx, term_ki,
-	terminal_initialize_terminal)[INFOKEY],
-	* info/variables.c (set_variable_to_value)[INFOKEY],
-	* info/sample_infokey: Added infokey functionality, copied more
-	or less wholesale from 'lesskey' in GNU Less 3.4.0.  Added a new
-	typedef struct FUNCTION_KEYSEQ, and a new element `keys' to
-	typedef struct FUNCTION_DOC, to give the user some control over
-	the keystrokes that appear in the documentation node generated
-	by get-help-window, and to improve efficiency a little.
-
-	* info/infodoc.c (info_internal_help_text,
-	create_internal_info_help_node)[INFOKEY]: Rewrote all code that
-	assumes fixed keystrokes, replacing %10s sequences with \\%10[foo]
-	sequences instead.
-
-	* doc/info-stnd.texi: Documented above changes.
-
-2001-09-19    <karl@gnu.org>
-
-	* makeinfo/cmds.c: </ not /<, duh :).  From janneke.
-
-2001-09-12    <karl@gnu.org>
-
-	* configure.ac (AC_SYS_POSIX_TERMIOS, AC_HEADER_TIOCGWINSZ): use
-	 these new autoconf macros instead of the old automake ones.
-
-	* info/terminal.c: remove unconditional include of sys/ioctl.h.
-	* info/termdep.h: <sys/ioctl.h> [GWINSZ_IN_SYS_IOCTL]: include outside of HAVE_TERMIOS_H,
-	per autoconf manual.
-
-	* doc/Makefile.am (install-info-am): remove override of automake's
-	 target, instead enable looking in . for info files within automake.
-
-	* doc/info-stnd.texi: include separate version-stnd.texi
-	* configure.ac: autoconf 2.52, and rename to configure.ac.
-
-2001-09-11    <karl@gnu.org>
-
-	* doc/texinfo.txi: recommend against using - and _ in @set names,
-		* and rearrange that section.
-
-	* info/infodoc.c (replace_in_documentation): free fun_name to fix
-		memory leak.
-	From: "Art Haas" <ahaas@neosoft.com>, Sat, 4 Aug 2001 08:34:31 -0500.
-
-	* makeinfo/lang.c: encoding support for info output from kama.
-	* makeinfo/lang.h: encoding support for info output from kama.
-
-	* makeinfo/html.c: include document encoding code unless
-	no_encoding.
-	* makeinfo/insertion.c (cm_direntry): don't call begin_insertion
-	if ignoring.
-	(cm_documentdescription): moved here, and likewise.
-	(begin_insertion): don't need output format conditionals here.
-
-	* makeinfo/cmds.c (cm_documentdescription): move to insertion.c.
-	* makeinfo/makeinfo.h (enable_encoding): new global.
-	* makeinfo/makeinfo.c: new option --enable-encoding, rearrange help.
-
-	Sun Oct 31 18:44:24 UTC 1999 Karl Heinz Marbaise <kama@hippo.fido.de>
-
-	    - lang.{c,h}:
-	      o added translation map between HTML markups and 8-Bit
-		(ISO-8859-1 codes; supplemental is Unicode for the future).
-	      o added cm_search_iso_map:
-		search for characters based on HTML markup names for
-		translation 8-Bit code.
-	      o recognizing of @documentencoding improved.
-		now we can recognize things like ISO-8859-{1...15}
-
-	    - makeinfo.{c,h}:
-	      o added two command line switches.
-		+ info-encoding to activate the encoding for info output
-		  which is correctly shown by info. Default is NOT to
-		  encode the output to be compatible with earlier versions.
-		+ no-encoding to suppress encoding e.g. while producing
-		  ASCII output (--no-headers) results in that you get
-		  "A for &Auml; as before.
-	      o help output changed to document the switches.
-
-	    - html.c:
-	      charset encoding in html based on @documentencoding.
-
-
-2001-07-31    <karl@gnu.org>
-
-	* doc/texinfo.txi: mention pdfcolor.tex.
-	* doc/texinfo.tex: doc.
-	* doc/Makefile.am (install-tex): install pdfcolor.tex too.
-	* doc/pdfcolor.tex: new file, since Kurt.Hornik@ci.tuwien.ac.at
-		reports that not all pdftex installations include it.
-
-2001-07-25    <karl@gnu.org>
-
-	* doc/texinfo.tex (\Etitlepage): need \HEADINGSon before the
-	\...aftertitlepage checks to get page numbers. Report from
-	3diff@gnu.org.
-
-2001-07-06    <karl@gnu.org>
-
-	* doc/texinfo.txi: mention http://docbook2X.sourceforge.net/.
-
-2001-06-29    <karl@gnu.org>
-
-	* makeinfo/makeinfo.c: make output to stdout imply --no-split for
-		HTML, too.
-
-	* makeinfo/html.c (html_output_head): use documentdescription if set.
-	* makeinfo/insertion.h (insertion_type): new case documentdescription.
-	* makeinfo/insertion.c (begin_insertion, end_insertion,
-	insertion_type_names): new case for documentdescription.
-	* makeinfo/cmds.c (cm_documentdescription): new fn.
-	* makeinfo/makeinfo.h (document_description): new global.
-	* doc/texinfo.txi: @documentdescription.
-	@documentdescription implementation from patches by Will Estes.
-
-2001-06-26    <karl@gnu.org>
-
-	* doc/texinfo.txi: documentdescription
-	* doc/texinfo.tex: Ignore @documentdescription ... @end
-	documentdescription.
-
-	* doc/texinfo.txi: document sequential punctuation in @footnote is
-	normal, suggested by rms.
-
-2001-06-21    <karl@gnu.org>
-
-	* doc/texinfo.tex (\textfonts): call \setleading here, so that we can
-	switch font sizes back and forth inside @tex with \globaldefs=1
-	and not lose the leading.
-
-	* doc/texinfo.txi: allow @smallbook to run without overfull or
-		underfull boxes.
-
-2001-06-19    <karl@gnu.org>
-
-	* doc/texinfo.tex (\imagexxx): ignore new optional args to @image.
-
-	* makeinfo/html.c (html_output_head): include <h1>title</h1> at
-	beginning of document.
-	* makeinfo/sectioning.c (cm_top): don't include explicit links in
-	HTML output, the regular code for @node will do it.
-	(sectioning_html): use <h2> for chapter instead of <h1>, etc.
-	* makeinfo/node.c (cm_node): do not include code to output the
-	HTML <head>, we do that elsewhere now.
-
-	1999-11-26 W. L. Estes <will@fumblers.org>
-	* makeinfo/insertion.c (begin_insertion): add an explicit <br>
-	before beginning a <pre> block. for flushleft and flushright, use
-	<div> tag with an align attribute set.
-	* makeinfo/insertion.c (end_insertion): for flushleft and
-	flushright, end the </div> block.
-
-	* makeinfo/makeinfo.c (cm_image): new variable, alt_arg now allows
-	user-supplied alt attribute value and
-	ext_arg allows user-supplied extension for image files.
-
-	* makeinfo/toc.c (contents_update_html): add anchors at chapter
-	level entries
-	(shortcontents_update_html): hrefs in shortcontents point to the
-	above anchors in the detailed contents
-
-	* doc/texinfo.txi: document changes to @image and the new behavior
-	of shortcontents entries
-
-2001-06-14    <karl@gnu.org>
-
-	* makeinfo/node.c: no need for size_t.
-
-2001-06-13    <karl@gnu.org>
-
-	* texinfo.tex (\pdfmkdest): \normalturnoffactive, so refs and
-	defs match.
-	(\xrefX): pdf link defs no longer use @, so link refs shouldn't use @
-	either. (All xrefs in pdf were failing.)
-	(\mkpgn): remove redundant second definition.
-
-	* texinfo.tex (\smallerfonts): new font size.
-	(\smallexample, et al.): use it, in all cases, not just @smallbook.
-
-	1999-11-30 Andreas Schwab <schwab@suse.de>
-	* doc/texinfo.tex (\xrefX): Turn off active characters when writing
-	out the link name for pdf.
-
-2001-06-13    <karl@gnu.org>
-
-	* doc/texinfo.txi: document that @smallexample is smaller in all
-		page formats now.
-
-2001-06-11    <karl@gnu.org>
-
-	* 4.0c.
-	* util/Makefile.am: Don't need automake patch any more, with
-		automake 1.4p4.
-
-	* configure.in (AC_FUNC_SETVBUF_REVERSED): only needed on
-	pre-sysvr3 systems that nobody has anymore?  Or so Russ Allbery
-	informs me ...
-
-2001-06-08    <karl@gnu.org>
-
-	* makeinfo/Makefile.am (EXTRA_DIST): include texinfo.{dtd,xsl}.
-
-	* util/Makefile.am: automake-1.4p3 now.
-
-2001-06-07    <karl@gnu.org>
-
-	* util/texi2dvi: comment out conditional text, from Werner LEMBERG
-	       <wl@gnu.org>.
-
-       2001-06-02  Eli Zaretskii  <eliz@is.elta.co.il>
-	* info/echo-area.c (info_read_completing_internal): If there are
-	no completions, say that instead of "Not complete".
-
-	* configure.in (ALL_LINGUAS): add da
-
-	* makeinfo/Makefile.am (pkgdata_DATA): include texinfo.xsl.
-
-	* configure.in: update for autoconf 2.50.
-
-2001-06-04    <karl@gnu.org>
-
-	* util/Makefile.am (EXTRA_DIST): automake-14p2.patch now.
-	* util/automake-14p2.patch: rename from 14p1.
-
-2001-05-22    <karl@gnu.org>
-
-	* changes from feloy for lowercase xml names, etc.
-
-2001-05-21    <karl@gnu.org>
-
-	* util/Makefile.am (EXTRA_DIST): add automake-14p1.patch.
-	* makeinfo/Makefile.am (pkgdata_DATA): define to install
-	        texinfo.dtd.
-
-        2001-05-17  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/makeinfo.c (cm_xref, cm_inforef): Don't allow empty
-	first arguments in cross references.
-
-	* makeinfo/makeinfo.c: redo --help, basic patch from ke@suse.de.
-
-2001-05-03    <karl@gnu.org>
-
-	* doc/info.texi: move help-cross to be subnode of cross-refs,
-	instead dangling out in space.
-	* doc/info.texi: update from eli
-
-2001-05-02    <karl@gnu.org>
-
-	* makeinfo/xml.c (xml_push_current_element): need to select the
-		`name' member.
-
-2001-05-01    <karl@gnu.org>
-
-	* configure.in: 4.0b
-
-	* doc/info.texi (Help-Cross): subsection of Cross-refs.
-
-	* lib/system.h (va_alist, etc.): moved from makeinfo.c.
-	* makeinfo/makeinfo.c (va_alist, etc.): move to system.h
-
-	* makeinfo/xml.[ch]: new files from Philippe Martin <feloy@free.fr>.
-	* pretty much all files also modified for XML/DocBook output.
-	* doc/texinfo.txi: minimally mention --xml and --docbook.
-	* makeinfo/xml.c: convert to K&R until we can do ansi2knr.
-
-	* util/texindex.c,
-	* util/install-info.c,
-	* info/info.c: it's 2001.
-
-2001-04-15    <karl@gnu.org>
-
-	* doc/info.texi: major update from eli.
-
-2001-04-13    <karl@gnu.org>
-
-        1999-10-16  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/node.c (cm_node): Don't generate cross-references to
-	"(DIR)".
-	* makeinfo/html.c (add_link): Likewise.
-
-        1999-10-16  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/makeinfo.c (insert): Don't call html_output_head here.
-	(add_char): Call html_output_head here...
-	* makeinfo/cmds.c (cm_sp): ...and here...
-	* makeinfo/toc.c (cm_contents, cm_shortcontents): ...and here...
-	* makeinfo/node.c (cm_anchor): ...and here.
-
-	* makeinfo/html.c (html_output_head): `free' html_title if
-	expanded.  Make <head> and <body> stand out.
-
-2001-04-12    <karl@gnu.org>
-
-	1999-12-26  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/defun.c (defun_internal): Use execute_string instead
-	add_word_args to expand defined_name, type_name and category (in
-	HTML mode).
-
-2001-03-29    <karl@gnu.org>
-
-	* Makefile.am: simple license.
-
-2001-02-27    <karl@gnu.org>
-
-	1999-12-17  Yoshiki Hayashi  <t90553@mail.ecc.u-tokyo.ac.jp>
-		* info/terminal.h, info/terminal.c (term_kh, term_ke, term_kD):
-		New variables to hold Home, End, Delete key sequences.
-		* info/infomap.c (initialize_emacs_like_keymaps,
-		initialize_vi_like_keymaps): Set them.
-
-	* makeinfo/makeinfo.h,
-	* makeinfo/makeinfo.c: --split-size option from Yoshiki:
-	1999-12-09  Yoshiki Hayashi  <t90553@mail.ecc.u-tokyo.ac.jp>
-		* makeinfo/makeinfo.h (split_size): New option.
-		* makeinfo/makeinfo.c (long_options): Add split_size.
-		(usage): Ditto.	Suggested by Richard Y. Kim.
-
-	* util/texi2dvi: -o support from Akim.
-
-2001-02-02    <karl@gnu.org>
-
-	* dir-example: don't need zsh twice.
-
-	From: Nishio Futoshi <fut_nis@d3.dion.ne.jp>, 02 Apr 2000.
-	* doc/texinfo.txi: capitalization fixes.
-	* doc/info.texi: up pointer fixes.
-	* doc/texinfo.txi: installing an info file.
-
-	* makeinfo/makeinfo.c: --output is for split html, not non-split.
-	From: Karl Eichwalder <keichwa@gmx.net>
-
-2001-01-12    <karl@gnu.org>
-
-	1999-10-15  Eli Zaretskii  <eliz@is.elta.co.il>
-		* makeinfo/cmds.c (cm_sc): Don't print the warning about
-		all-uppercase argument in menus under --no-headers.
-
-	* makeinfo/files.c: pass O_BINARY flag to open, suggested by bfox.
-
-2001-01-11    <karl@gnu.org>
-
-	* info/terminal.c [HAVE_TERMIOS_H && TCOON]: tcflow TCOOFF/TCCON
-	to resume output if user presses CTRL-S at the beginning of
-	things.
-	[HAVE_TERMIO_H && TCXONC]: ditto.
-	From Kevin Ryde <user42@zip.com.au>, 16jun2000;
-	cf. emacs/src/sysdep.c.
-
-2001-01-08    <karl@gnu.org>
-
-	* makeinfo/cmds.c: afivepaper, afourwide, afourlatex.
-	* doc/texinfo.txi: afivepaper
-
-2001-01-05    <karl@gnu.org>
-
-	* doc/info.texi: typo from: Martin Buchholz <martin@xemacs.org>.
-	* doc/info.texi: typo fixes from meyering.
-
-2001-01-02    <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (remember_brace_1): don't assume command is
-	 non-null, an (erroneous) input line like \hbox to7in{ passes in a
-	 null.
-
-	* makeinfo/toc.c: fix from jan
-	* makeinfo/html.c: fix from jan for top-level references.
-
-2000-12-22    <karl@gnu.org>
-
-	* makeinfo/makeinfo.c: --help changes.
-	* doc/texinfo.txi: -o means the directory name for HTML output.
-
-2000-12-21    <karl@gnu.org>
-
-	* doc/texinfo.txi: switch to fdl
-
-	* makeinfo/html.c: doc fix.
-	* makeinfo/insertion.c: no space after _ I guess.
-	* makeinfo/cmds.c: no space after _ I guess.
-
-	* makeinfo/html.c (nodename_to_filename_1): fix up external
-	* top-node references.
-
-2000-12-20    <karl@gnu.org>
-
-* HTML table patch from Jan:
-    2000-12-19  Jan Nieuwenhuizen  <janneke@gnu.org>
-
-	    * makeinfo/multi.c (multitable_item),
-	    (cm_tab): close html table columns.  Also, align cell contents to
-	    top, which is probably the most sensible thing to do for text.
-
-
-2000-12-19    <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): try
-		name.html if just name doesn't work.
-
-	* doc/texinfo.txi: document html output in .html directory
-		sometimes.
-
-	* util/Makefile.am (EXTRA_DIST): add install-info-html.
-
-	* util/texindex.c: 2000
-	* util/install-info.c: 2000
-	* info/info.c: 2000
-	* configure.in: 4.0a
-
-	* lib/system.h: include limits.h
-
-	* Applied HTML splitting changes from Jan:
-    2000-11-10  Jan Nieuwenhuizen  <janneke@gnu.org>
-
-	    * makeinfo: removed code for numbered split HTML output, removed
-	    SPLIT_JCN conditional.
-
-    2000-11-09  Jan Nieuwenhuizen  <janneke@gnu.org>
-
-	    * makeinfo/html.c: prepared nodifying filename functions for
-	    linking not non-spit HTML documents, by adding ``#anchor'' to
-	    external refernces.
-
-	    * doc/texinfo.txi (Installing HTML info): updated doco for --html
-	    option, added node Installing HTML info.
-
-	    * util/install-info-html.in: new script.  The bare minimum
-	    required for generating HTML index.
-
-	    * lib/system.h:	compilation fix.
-
-    2000-11-08  Jan Nieuwenhuizen  <janneke@gnu.org>
-
-	    * makeinfo/makeinfo.c (convert_from_loaded_file): [SPLIT_JCN]:
-	    overloaded already way too hairy function with logic to put split
-	    html output into subdirectory with basename of toplevel output
-	    file.
-
-	    * makeinfo/html.c (fix_filename): new function.
-
-    2000-11-07  Jan Nieuwenhuizen  <janneke@gnu.org>
-
-	    * toc.c (toc_add_entry):
-	    (contents_update_html):
-	    (shortcontents_update_html): [SPLIT_JCN]: use hrefs for nodename based
-	    html files.
-
-	    * node.c (cm_node): [SPLIT_JCN]: create html filename based on
-	    nodename (instead of a numbered node<num>.html filename).
-
-	    * makeinfo/makeinfo.c (main): [SPLIT_JCN]: enable splitting of
-	    html output.
-
-	    * makeinfo/html.c
-	    (add_url_name,add_nodename_to_filename,nodename_to_filename): new
-	    functions.
-
-2000-12-15    <karl@gnu.org>
-
-	* configure.in (AC_CHECK_HEADERS): add limits.h explicitly.
-
-2000-11-10    <karl@gnu.org>
-
-	* dir-example: update
-	* info/nodes.c: doc fixes, etc.
-
-	* incorporated verbatim patch from janneke:
-    2000-04-14    <janneke@gnu.org>
-
-	    * applied texinfo-3.12s.jcn4 patch
-
-    1999-09-02    <janneke@gnu.org>
-
-	    * makeinfo/cmds.c,
-	    * makeinfo/insertion.c: @verbatiminclude file
-	    * doc/texinfo.tex: @verbatiminclude file
-	    * doc/texinfo.txi: @vebatiminclude file doco
-	    * NEWS: added @verbatiminclude to Language section
-
-    1999-09-01    <janneke@gnu.org>
-
-	    * makeinfo/makeinfo.c: bf: @exdent (urg6.texi) -- Rolled into 4.0
-	    * NEWS: added verb* to Language section
-	    * doc/texinfo.txi: @verb, @verbatim doco
-	    * doc/texinfo.tex: tricky tex-fix for @verb{<char>..<char>}
-	    * doc/texinfo.tex: real tab expansion for @verbatim mode
-	    * doc/texinfo.tex: proper start of environment, no indentation
-
-    1999-08-31    <janneke@gnu.org>
-
-	    * makeinfo/cmds.c:
-	    * makeinfo/insertion.{c,h},
-	    * makeinfo/makeinfo.{c,h}: redo of @verbatim, @verb{<char>..<char>}
-	    * doc/texinfo.tex: fixed @verb{<char>..<char>}
-
-    1999-08-30  Jan Nieuwenhuizen <janneke@gnu.org>
-
-	    * makeinfo/cmds.c,
-	    * makeinfo/insertion.{c,h},
-	    * makeinfo/makeinfo.{c,h}: added @verbatim (and preliminary @verb)
-	    support
-	    * doc/texinfo.tex: added @verbatim (and preliminary @verb) support
-
-    1999-08-24  Jan Nieuwenhuizen <janneke@gnu.org>
-
-	    * bf: empty node: makeinfo/node.c:cm_node () -- Rolled into 4.0
-
-
-2000-10-18    <karl@gnu.org>
-
-	* doc/info.texi: eli update
-
-2000-09-22    <karl@gnu.org>
-
-	* makeinfo/defun.c: warn if non-whitespace follows @defun'd name
-	  (suggestion from Akim).
-
-  Installed some patches:
-
-  2000-08-04  Paul Eggert  <eggert@twinsun.com>
-	  * makeinfo/multi.c (find_template_width):
-	  Don't access before start of *PARAMS.
-
-  2000-08-21  Eli Zaretskii  <eliz@is.elta.co.il>
-	  * info/filesys.c (info_file_in_path): Reject FILENAME if it is
-	  empty, or ".", or "..".
-
-  2000-08-23  Eli Zaretskii  <eliz@is.elta.co.il>
-	  * info/session.c (info_menu_or_ref_item): If the user have chosen
-	  menu item or xref that's identical to defentry's label, use
-	  defentry instead of looking for its label.  Otherwise, select the
-	  entry whose position is the closest to the window's point, in
-	  case there's more than a single entry with that label.
-
-2000-09-12    <karl@gnu.org>
-
-	* doc/texinfo.txi: it's 2000 now.
-	* doc/texinfo.txi: document the only real (and rare) reason for not using implicit pointer
-	creation.
-
-2000-09-06    <karl@gnu.org>
-
-	* configure.in: test all termcap variables for existence.  From
-	andy@rz.uni-karlsruhe.de.
-
-	* configure.in (ALL_LINGUAS): include ja.
-	* lib/system.h [HAVE_IO_H]: make #include <io.h> conditional for
-	BeOS.  Reported by Dan Moore, dan@moore.cx.
-	* configure.in (AC_CHECK_HEADERS): add io.h.
-
-2000-06-05    <karl@gnu.org>
-
-	* doc/texinfo.txi: forgot to escape {}.
-
-2000-05-30    <karl@gnu.org>
-
-	* info/filesys.c (is_dir_name): check all info suffixes as well as
-	the compression suffixes.  Fixes segmentation fault on a dir.info
-	file ending after the * Menu.
-
-2000-05-28    <karl@gnu.org>
-
-	* doc/texinfo.txi: Forgot {arg} in @rmacro example.  From Olaf B.
-
-2000-05-27    <karl@gnu.org>
-
-	* doc/txi-cs.tex: update from: Stepan Kasal <kasal@suse.cz>.
-
-	* doc/Makefile.am (install-data-local): reformat warning per
-	François to hopefully make it more noticeable.
-
-	2000-02-08  Eli Zaretskii  <eliz@is.elta.co.il>
-		* info/session.c (incremental_search): Don't retain RET when
-		exiting isearch.  Suggested by Hrvoje Niksic <hniksic@iskon.hr>.
-
-2000-05-22    <karl@gnu.org>
-
-	* doc/texinfo.txi: pageparams -> pagesizes
-
-2000-05-18    <karl@gnu.org>
-
-	* makeinfo/lang.c (cm_accent_tilde): need N in list.
-	From: kama@hippo.fido.de (Karl Heinz Marbaise)
-
-	* makeinfo/files.c (find_and_load): read only the number of bytes
-	available in the buffer.  Also, remove one-byte-at-a-time reading
-	in the WIN32 case.
-	From: "J. David Bryan" <dbryan@bcpl.net>
-
-	* info/man.c: use eli's patch after all, we re-increment j at the
-	top of the loop.
-
-2000-05-16    <karl@gnu.org>
-
-	* info/man.c (clean_manpage): don't write before the beginning of
-	newpage.
-	(based on patch from Eli).
-
-2000-02-03    <karl@gnu.org>
-
-	* doc/texinfo.txi: remove spurious space. from kaja.
-
-1999-10-12  Karl Berry  <karl@gnu.org>
-
-	* doc/Makefile.am (install-tex): install all txi-?? files.
-
-1999-10-01  W. L. Estes  <will@fumblers.org>
-
-	* makeinfo/cmds.c: dont treat @center as separate paragraph,
-	use div element to output center
-
-1999-09-29  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* djgpp/README: Say `dir-example', not DIR.
-
-	* lib/system.h (DEFAULT_INFOPATH) [__DJGPP__]: Define.
-
-1999-09-28  Karl Berry  <karl@gnu.org>
-
-	* configure.in,
-	util/texi2dvi: version 4.0.
-	* doc/texinfo.txi: New isbn.
-
-1999-09-24  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Fixes from Oleg.
-
-1999-09-20  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/node.c: Don't write region at an anchor.
-	From: Thomas Esken <esken@nmlab.informatik.fh-dortmund.de>
-
-	* info/terminal.c: Only set dumb terminal if tgetent returns < 0,
-		not 0.
-	For HP-UP 11.
-	From jeff.hull@state.co.us.
-
-	* makeinfo/footnote.c: Don't translate the `Footnotes' string
-		according to LANG, it should be according to
-		@documentlanguage, which isn't implemented yet.
-	From: Jan Nieuwenhuizen <janneke@gnu.org>
-
-	* doc/texinfo.txi: @end direntry from kama.
-
-1999-09-19  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: \ninett is now \smalltt.
-
-	* doc/texinfo.txi: arnold changes
-
-	1999-09-03  Akim Demaille  <akim@epita.fr>
-	* texi2dvi (getopt): batch has to be assigned `eval', not `echo'.
-	(bibtex): Launch BibTeX also when the LOG file complains that
- 	there are no BBL file.
-
-	* doc/texinfo.txi: Document that @anchor ignores spaces.
-
-	* makeinfo/cmds.c (cm_shyph): remove, &shy; is not supported in
-		browsers.
-	From: Thomas Esken <esken@nmlab.informatik.fh-dortmund.de>
-
-	* makeinfo/makeinfo.c: Don't crash if current_indent = 0.
-	From: Jan Nieuwenhuizen <janneke@gnu.org>
-
-	* makeinfo/makeinfo.c: Avoid blank lines between @menu entries.
-	* configure.in: 3.12t
-
-	1999-08-31  Eli Zaretskii  <eliz@is.elta.co.il>
-	* info/info.c (info_short_help): Document --apropos.
-
-1999-09-18  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/html.c (html_output_head): use text for <title>, not
-		html markup.  From François.
-	* makeinfo/makeinfo.c (text_expansion): new routine.
-	* makeinfo/cmds.c (cm_settitle): don't expand the title here,
-		we'll do it later.
-
-	* makeinfo/makeinfo.h (text_expansion): declare.
-
-	* info/indices.c,
-	* info/infodoc.c,
-	* info/session.c,
-	* info/footnotes.c: translate errors.
-	* info/info.h: Use `' instead of "" in errors.
-
-1999-09-06  Karl Berry  <karl@gnu.org>
-
-	+1999-08-24  Jan Nieuwenhuizen <janneke@gnu.org>
-	* makeinfo/node.c:cm_node: don't compare current_node when null.
-
-	1999-08-23  W. L. Estes  <will@fumblers.org>
-	*  makeinfo/node.c (cm_node): write <a name=> tags even
-           ifusing --no-headers
-
-	* configure.in: ospeedlib -> trylib
-	From: Andreas Schwab <schwab@suse.de>
-
-	* makeinfo/makeinfo.c (read_command): add explicit 0 to return if
-	enclosure command.  From: Andreas Jaeger <aj@arthur.rhein-neckar.de>.
-
-1999-08-19  Karl Berry  <karl@gnu.org>
-
-	* configure.in: add missing quotes, logic in new termcap library
-	check.
-
-1999-08-17  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/multi.c,
-	* makeinfo/sectioning.c,
-	* makeinfo/node.c,
-	* makeinfo/macro.c: omit unused vars
-	* info/session.c (info_goto_invocation_node): omit unused decl.
-
-	* configure.in: Check for extra termlib variable necessary on
-		HP-UX 9.
-	From: Olaf Bachmann <obachman@mathematik.uni-kl.de>
-
-  1999-08-16  Andreas Schwab  <schwab@suse.de>
-	  * info/terminal.c (terminal_initialize_terminal): Try tcgetattr
-	  and cfgetospeed in preference to TIOCGETP.
-	  (original_tchars, original_ltchars): Define them only if needed.
-
-1999-08-16  Karl Berry  <karl@gnu.org>
-
-	* info/infodoc.c (create_internal_info_help_node): rename arg.
-	(info_find_or_create_help_window): avoid deref of null eligible.
-
-	* info/terminal.c (TIOCGETP, TIOCGETC, TIOCGLTC) [alpha && linux]:
-	#undef.  Useless stubs are present.
-
-1999-08-15  Karl Berry  <karl@gnu.org>
-
-	* info/nodes.c: Remove reference to nonexistent RFC for Info
-	files.
-
-1999-08-11  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/nodes.c (info_find_file_internal): If the file's contents
-	were gc'ed since last time it was loaded, reload the file.
-
-Wed Aug 11 06:42:47 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/Makefile.am (EXTRA_DIST): add txi-pt.tex from Lalo.
-
-Mon Aug  9 16:28:18 1999  Karl Berry  <karl@gnu.org>
-
-	* util/texi2dvi: Support preloaded texinfo.tex, from Stephen.
-
-	* makeinfo/makeinfo.c (add_char): restore ugly check for first
- 		character being <.
-
-	* makeinfo/cmds.c (cm_kbd): Increment in_fixed_width_font for
- 		html.
-
-	* doc/texinfo.txi: effect not affect
-
-	* makeinfo/makeinfo.c: Rearrange help.
-
-	* makeinfo/toc.c: Cast %* arguments to (int) to placate gcc
- 		-Wformat.
-
-Fri Aug  6 13:03:14 1999  Karl Berry  <karl@gnu.org>
-
-	* util/install-info.c: Hardwire the File: dir, Node: top part of
-		the skeleton dir file.
-	Report from: Stanislav Brabec <utx@k332.feld.cvut.cz>
-
-	* info/Makefile.am (BUILT_SOURCES): rm -f $(BUILT_SOURCES), a
- 		kludge.
-
-    1999-07-28  Karl Eichwalder  <ke@gnu.franken.de>
-
-	    * makeinfo/makeinfo.c: Fix help string (-o).
-
-    1999-07-30  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	    * makeinfo/makeinfo.c (cm_uref, cm_email): Don't collapse -- and
-	    `` in the URL part of the reference.
-
-    1999-08-03  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	    * util/install-info.c (main): For entries given on command line,
-	    set entry_sections and entry_sections_tail members to NULL, and
-	    set text_len member to the entry length.  After processing the
-	    Info file, update the entry_sections pointers of all entries that
-	    came from the command line.
-
-	* util/texindex.c (sort_offline, sort_in_core): use off_t rather
-		than long.
-	Found on FreedBSD 2.2.8 by "Trond Endrestol" <endrestol@hotmail.com>.
-
-Mon Jul 19 17:16:46 1999  Karl Berry  <karl@gnu.org>
-
-	* configure.in: 3.12n
-
-	* makeinfo/makeinfo.c (add_char): Don't insert <p> if we're in
- 		@html.
-
-	* makeinfo/html.c (add_escaped_anchor_name),
-	* makeinfo/toc.c (toc_add_entry): use URL_SAFE_CHAR.
-	* makeinfo/makeinfo.h (HTML_SAFE, URL_SAFE_CHAR): new macros.
-
-Sun Jul 18 14:47:40 1999  Karl Berry  <karl@gnu.org>
-
-	* dir-example: Add bzip2.
-
-	* configure.in: 3.12m.
-
-	* doc/texinfo.txi (@afourlatex,@afourwide): add to command list.
-
-1999-07-17  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (cm_xref): Don't collapse `` and -- while
-	expanding node names.  Generate a terminating period for
-	@pxref, when it has more than a single argument.
-
-	* makeinfo/index.c (cm_printindex): Don't collapse `` and -- while
-	expanding node names.
-
-Sat Jul 17 16:33:45 1999  Karl Berry  <karl@gnu.org>
-
-	* 3.12l.
-
-	* doc/texinfo.txi: @alias, @definfoenclose, etc.
-
-	* util/texindex.c (indexify): error message instead of abort(2)
- 		when no page number.
-
-Fri Jul 16 18:00:26 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Overfull boxes, help2man, etc.
-
-	* util/Makefile.am (EXTRA_DIST): texi-outline.gawk is really
-	outline.gawk, add fixref.gawk and prepinfo.awk and
-		texi-docstring-magic.el.
-
-Thu Jul 15 18:57:54 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: .fmt, etc.
-	* doc/texinfo.txi: More macro docs, etc.
-
-Wed Jul 14 19:58:47 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Give good quote.
-
-	* util/Makefile.am (EXTRA_DIST): add texi-outline.gawk.
-
-	From: kama@hippo.fido.de (Karl Heinz Marbaise)
-	* makeinfo/toc.c (contents_update_html): go back to start level.
-	* doc/texinfo.txi: deftypeop
-
-	From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>
-	* makeinfo/toc.c (toc_add_entry): don't assume sprintf return type
- 		is int.
-	* makeinfo/sectioning.c (insert_and_underscore): declare more
- 		unsigned char *.
-	* makeinfo/macro.h (itext_info, itext_size): remove declarations,
-		they're defined static.
-	* makeinfo/makeinfo.c: Split up help string even more.
-
-Tue Jul 13 17:16:18 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Document @rmacro.
-	* makeinfo/macro.c (cm_rmacro): new command to do @allow-recursion
- 		by default.
- 	(define_macro): split off from cm_macro.
-
-	* makeinfo/macro.h (cm_rmacro): declare.
-	* makeinfo/macro.h (delete_macro): do not need to export.
-	* makeinfo/cmds.c (rmacro): new command.
-
-	* makeinfo/html.c,
-	* makeinfo/toc.c,
-	* makeinfo/lang.c,
-	* makeinfo/makeinfo.c: Use strchr instead of member.
-
-Mon Jul 12 08:01:19 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: document this.
-	* makeinfo/macro.c (apply): warn if \ in macro body is not
-		followed by a parameter name or \, instead of silently
-		accepting it, for compatibility with TeX.
-
-	* makeinfo/macro.c: Doc fix.
-
-Sun Jul 11 12:49:50 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/macro.c (cm_macro): do @quote-arg implicitly if single
- 		argument to macro.
-	* doc/texinfo.txi: Document this.
-
-	* doc/texinfo.txi (Smallcaps): Document makeinfo warning if arg is
- 		all uppercase.
-	* makeinfo/cmds.c (cm_sc): warn if arg is all upper (suggested by
- 		Jim Meyering).
-
-	* makeinfo/cmds.c (cm_var): warn if argument contains any of ,[]()
-		which are unlikely to be allowable in real variable names.
-		Suggested by rms.
-
-	* makeinfo/makeinfo.h (member): remove weird masking macro.
-
-	* doc/texinfo.txi: Probably ok to indent @example.
-
-	* configure.in: 3.12k.
-
-	* makeinfo/html.c (add_escaped_anchor_name): Cast to unsigned char
-		for 8-bit chars. From Yoshiki.
-
-	* makeinfo/makeinfo.c: complain -> warn for sake of <80 chars.
-
-1999-07-09  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/multi.c (multitable_item): Quote the value of align=
-	property.
-
-	* makeinfo/defun.c (defun_internal): Ditto.
-
-	* makeinfo/cmds.c (cm_center): Ditto.
-
-	* makeinfo/toc.c (toc_add_entry): New argument ANCHOR; all callers
-	changed.  In HTML mode, expand NODE_NAME, or use ANCHOR, if
-	non-NULL, and save it together with the TOC name in the name
-	member of the TOC entry.
-	(toc_add_entry, toc_find_section_of_node): Add a warning in a
-	comment that the NODE argument must be unexpanded.
-	(contents_update_html): Terminate the TOC entry with </a>.
-
-	* makeinfo/sectioning.c (sectioning_html): If the sectioning
-	command is outside any node, generate explicit anchor and pass it
-	to toc_add_entry.
-
-	* makeinfo/node.c (expand_node_name): Now external instead of
-	static.
-	(cm_node): Output expanded node name in the navigation bar.
-
-	* makeinfo/node.h: Declare expand_node_name.
-
-	* makeinfo/index.c (cm_printindex): Produce valid HTML links, even
-	if index->node is NULL or empty.  Fix format of index under
-	--no-headers.
-
-Fri Jul  9 18:09:28 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Pair @end html properly.  From Olaf B.
-
-	* doc/Makefile.am (EXTRA_DIST): add txi-nl.tex from Marcel van der Boom
-	<marcel@virtualprojects.org>.
-
-	* doc/txi-en.tex: Doc fix.
-
-Wed Jul  7 16:07:44 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/Makefile.am: Doc fix.
-
-	* configure.in (txi_CHECK_DECLS): call this new macro (in
- 		acinclude.m4).
- 	* acinclude.m4: new file.
-
-Tue Jul  6 19:12:37 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/insertion.h,
-	* makeinfo/insertion.c,
-	* makeinfo/cmds.c,
-	* makeinfo/defun.c: new command @deftypeop.
-	Suggestion from: booth@us.ibm.com.
-
-1999-07-05  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (cm_value): Don't convert quotes and dashes
-	in the argument of @value, since @set doesn't.
-
-Mon Jul  5 16:43:23 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/insertion.c (get_item_function): return "@ " rather
- 		than "@".	(command_needs_braces): new fn.
-	(cm_item): handle @itemize markers that don't take braces.
-	Bug reported by Stephen, prototype fix from Yoshiki.
-
-	* doc/texinfo.txi (Contents): @contents ignored at beginning when
- 		outputting to stdout.
-	Installed this.
->1999-05-02  Eli Zaretskii  <eliz@is.elta.co.il>
->	* makeinfo/toc.c (cm_contents, cm_shortcontents): If writing to
->	stdout, output the contents and short contents immediately, and
->	assign NULL to contents_filename and shortcontents_filename, so
->	that toc_update won't try to rewrite stdout.
-
-
-	* makeinfo/sectioning.c (sectioning_html): declare starting_pos
-		and ending_pos as unsigned char * since they're based on
-		output_paragraph.
-
-	* makeinfo/insertion.c: Cast output_paragraph to char * for sake
-		of strncmp prototype (on IRIX 4).
-	From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>
-
-
-	* info/man.c (get_manpage_contents): restore previous (default)
- 		SIGCHLD handler so the pclose when gunzipping info files
- 		doesn't fail with `No child processes' (because
- 		reap_children reaped it).
- 	From: Josip Rodin <jrodin@public.srce.hr>
- 	njs@uclink4.berkeley.edu, 38063-forwarded@bugs.debian.org
-
-Fri Jul  2 14:26:22 1999  Karl Berry  <karl@gnu.org>
-
-	From gildea:
-	* info/terminal.c (TIOCGETC) [M_XENIX && TIOCGETC]: #undef.
-	* info/session.c (strncasecmp) [M_XENIX]: declare.
-
-Thu Jul  1 19:25:12 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (cm_value): erroneous capitalization in
- 		error message.
-
-	* makeinfo/insertion.c (end_insertion): @end html should turn html
- 		escaping back on. From esr.
-
-	* makeinfo/makeinfo.c (cm_pxref): No period needed to terminate
- 		cross-reference.
-
-Sun Jun 13 16:12:41 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Remove some more node links.
-
-Sat May  1 16:01:36 1999  Karl Berry  <karl@gnu.org>
-
-	* info/info.c: Single space for option indent to match others.
-
-	* makeinfo/makeinfo.c,
-	* util/texindex.c,
-	* util/install-info.c: Must indent option list for help2man.
-
-	* info/infodoc.c [HELP_NODE_GETS_REGENERATED]: set to true.
-	(info_internal_help_text): put moving cmds first so they know how to go
-	forward in the help window.
-	(create_internal_info_help_node): can't always quit help with C-x 0.
-	(info_find_or_create_help_window): pass !one_window_p.
-
-1999-04-29  Yoshiki Hayashi  <g740685@komaba.ecc.u-tokyo.ac.jp>
-
-	* makeinfo/makeinfo.c (cm_xref): Don't collapse --- to -- etc.,
-	in references.
-
-Mon Apr 26 16:41:55 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/node.c (validate): arrange to translate the reference type.
-	Report from Sergio.
-
-	* makeinfo/makeinfo.c (validate): should not be declared here.
-
-	* makeinfo/index.c (cm_printindex): <ul compact> is not
- 		translatable.  From Yoshiki.
-
-	* doc/Makefile.am (EXTRA_DIST): include new txi-es.tex from Adrian
- 		Perez Jorge <alu1415@csi.ull.es>.  And new txi-en.tex.
-
-Sun Apr 25 16:08:27 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/cmds.c (cm_settitle): don't output html head here.
-
-	* makeinfo/makeinfo.c: Move html routines to html.c.
-	* makeinfo/Makefile.am (makeinfo_SOURCES): add html.[ch].
-	* makeinfo/html.[ch]: new files.
-
-	* makeinfo/makeinfo.c: Restore -- in --output line.  From Sergio.
-
-1999-04-23  Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp>
-
-	* makeinfo/cmds.c (cm_center): Recover the previous state when
-	called with --html.
-
-1999-04-24  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/cmds.c (cm_bye): Flush the output, in case some command
-	produced it immediately before @bye.
-
-	* makeinfo/toc.h (TOC_ENTRY_ELT): New member: containing_node.
-
-	* makeinfo/toc.c (lots_of_stars): New variable.
-	(toc_add_entry): Add a new parameter node_name; all callers
-	changed.  Record the name of the node containing the section.
-	(toc_find_section_of_node): New function.
-	(toc_free): Free the new containing_node member.
-	(contents_update_info, shortcontents_update_info): Underline the
-	title with stars.  Output two empty lines after the TOC.
-	(contents_update): Fix off-by-one error in writing the rest of the
-	file after updating the TOC.
-
-	* makeinfo/index.c (cm_printindex): Save and restore line_number
-	and input_filename.  Don't output the "* Menu" header when
-	--no-headers is in effect.  Make the fake node name for index
-	entries that are outside any node be more explanatory, and emit an
-	error for such index entries.  Under --no-headers, output a
-	reference to the section name, as returned by a call to
-	toc_find_section_of_node, instead of a node name.
-
-1999-04-24  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/index.c (struct index_elt): Add a new member
-	entry_text.
-	(free_index, make_index_entries_unique): Free the entry_text
-	member.
-	(index_add_arg): Don't HTML-escape the index entry here.
-	(index_add_arg): Initialize the entry member to NULL.  Put the
-	entry text into the entry_text member.
-	(sort_index): Expand the index entries as if in non-HTML mode.
-	Put the expansion into the entry member of struct index_elt.
-	(cm_printindex): Allocate the line[] array in Info mode only.
-	In HTML mode, escape and expand the original index entry text,
-	don't use the results of expansion inside sort_index.
-
-	* makeinfo/cmds.c (cm_r): Undo the effect of @code while printing
-	one of the "code"-style indices in HTML mode.
-
-1999-04-23  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/infomap.c (initialize_vi_like_keymaps): Bind DEL in echo
-	area to ea_rubout, except for __MSDOS__.
-
-	* doc/info-stnd.texi (Node Commands): Document that `I' only
-	produces its effect for programs documented in the current Info
-	file.  Tell them to invoke `I' from DIR if it doesn't work from
-	current place.
-
-Thu Apr 22 09:59:02 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c,
-	* info/info.c: Rewrite help string a little more.
-
-	* doc/info-stnd.texi: Change chapter name to match node name,
-		* other changes.
-
-	* makeinfo/cmds.c (cm_bye): call discard_braces.
-
-	* makeinfo/cmds.c (cm_settitle): output more meta and link tags.
-
-	* configure.in (ALL_LINGUAS): add eo.
-
-	* util/install-info.c [STRIP_DOT_EXE]: #if not #ifdef
-
-Wed Apr 21 19:40:51 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c: Doc fix.
-
-	* makeinfo/sectioning.c (insert_and_underscore): do not output
- 		html anchor here.
-	* makeinfo/node.c (cm_node): do anchor at node name not sectioning
- 		title.
-
-	* makeinfo/node.c: Newlines on node lines.
-
-Tue Apr 20 13:02:46 1999  Karl Berry  <karl@gnu.org>
-
-	* info/man.c (get_manpage_contents): freopen stdin and stderr to
-        /dev/null rather than closing them. http://bugs.debian.org/14787
-
-Mon Apr 19 14:12:09 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Document possibility of `titlepage' stuff for
-		plain text output using @ifinfo.
-	Report from: Kurt Hornik <Kurt.Hornik@ci.tuwien.ac.at>.
-
-	* makeinfo/cmds.c: Screw that.
-	* doc/texinfo.txi: Fix up frontmatter a bit.
-
-	* dir-example: Spaces not tabs.
-	* dir-example (R FAQ): add.
-
-	* makeinfo/makeinfo.c: Lowercase makeinfo in first line.
-
-	* doc/info.texi (The node reached...): is a @subsection not a
- 		@subsub.
-
-	* doc/texinfo.txi: Document option rename.
-	* makeinfo/makeinfo.c: Rename option to commands-in-node-names.
-
-	* makeinfo/index.h (index_compare_fn): declare.
-	* makeinfo/index.c (index_element_compare): call through new
- 		variable index_compare_fn, and set it to strcoll if
-	 	@documentlanguage was used and LANG != en.
-	 	#include lang.h.
-
-Sat Apr 17 14:46:47 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/insertion.c (current_item_function, cm_item): rewrite
- 		to skip all conditionals.
- 	(cm_item): use current_item_function rather than current_insertion_type
-	to check what to use for @item, so @ifset etc. can be used around
-		@items.
-	Report from: "W. L. Estes" <wlestes@br20920.uncg.edu>.
-
-	* makeinfo/makeinfo.c (current_insertion_type): no need to
- 		declare.
-
-	* makeinfo/makeinfo.c: Add examples to help message.
-
-	* util/texindex.c (usage): Rearrange --help, avoid extra newline.
-
-	* info/info.c: Sort --help in the usual place.
-
-	* makeinfo/makeinfo.c: Reindent help message, rename
-	       --expensive-validation to --commands-in-nodes.
-
-Fri Apr 16 17:53:48 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/cmds.c (cm_ignore_arg): new routine.
-	(cm_ignore_line_no_op): remove, can use cm_ignore_line.
-
-Tue Apr 13 16:45:39 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/info-stnd.texi: Frontmatter changes.
-
-	* doc/info.texi: Remove advanced remark in first node.
-
-	* doc/texinfo.txi: Texinfo.tex does macros now. From Eli.
-
-	* doc/texinfo.txi: Document @w{ } to produce an unbreakable space.
-
-	* util/texi2dvi: Update from Akim, avoid Solaris ucb echo weirdness.
-
-	* info/infodoc.c: Parenthesize function calls, don't depend on
- 		gettext being there.  Report from: Doug Semler
- 		<doug@seaspace.com>.
-
-1999-04-12  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/infomap.c (initialize_vi_like_keymaps): Initialize the echo
-	are keymap *before* it is filled up with keys.
-
-1999-04-10  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/macro.c (execute_macro): Reset the line number to where
-	the macro argumenst begin, before executing its expansion.
-
-	* makeinfo/makeinfo.c (cm_xref): Expand the name of arguments
-	before writing them in HTML mode.
-	(handle_menu_entry): Expand the name of the gleaned node before
-	writing it in HTML mode.
-
-	* makeinfo/sectioning.c (sectioning_html): Expand the name of the
-	current node when producing the <a name=... anchor.
-
-	* makeinfo/node.c (cm_node): Expand the name of node and its links
-	before outputting them in HTML mode.
-
-	* makeinfo/index.c (cm_printindex): Expand node names to which the
-	index points.
-
-	* makeinfo/footnote.c (cm_footnote): Call execute_string instead
-	of add_word_args, since current_node needs to be expanded.  Expand
-	the name of the Footnotes node before calling
-	remember_node_reference.
-
-	* makeinfo/tests/node-expand.txi: New test, for testing how node
-	names are expanded in @node, @menu, cross-references, and
-	indices.
-
-	* makeinfo/makeinfo.c (add_char): If we output <p>, adjust the
-	affected brace positions by 3, so cm_xxx functions get what they
-	expect in START and END.
-	(insert_html_tag): Likewise.
-
-	* makeinfo/cmds.c (cm_sc): Remove the kludge that looks for the
-	beginning of <small>, it is no longer needed.
-
-	* makeinfo/macro.c (cm_definfoenclose): Don't stop at the first
-	blank after the second comma: the blank may belong to the second
-	delimiter.
-
-	* makeinfo/tests/htmlpara.txi: New test, for the commands affected
-	by the <p> output at paragraph beginning.
-
-	* makeinfo/makeinfo.h (expensive_validation): New option.
-
-	* makeinfo/makeinfo.c (long_options): Add expensive_validation.
-	(usage): Likewise.
-
-	* makeinfo/node.c (find_node): If NAME isn't found verbatim, try
-	expanding it and every node name in tag table, before comparing
-	them, but only if expensive_validation is non-zero.
-	(find_node_reference): Likewise.
-	(cm_node): Don't expand node name and its links here.
-	(validate_file): If direct comparisons fail, try expanding the
-	comparees before giving up, unless expensive_validation is zero.
-	Switch the order of NODE and UP in error message about a lacking
-	menu item.
-
-1999-04-07  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/index.c (cm_printindex): Don't output "Menu" header.
-
-	* makeinfo/node.c (get_node_token): Collapse whitespace in node
-	names.
-	(glean_node_from_menu, expand_node_name): Likewise.
-
-	* info/infomap.c (initialize_vi_like_keymaps): Bind all the 256
-	keys to ea_insert, like the Emacs-like case does.
-
-	* doc/info-stnd.texi (Invoking Info): Document support for files
-	compessed with bzip2, and the --vi-keys option.
-	(Many places): Document key bindings under --vi-keys.
-
-1999-04-06  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/session.c (info_last_node, info_first_node): With a numeric
-	argument, go to ARGth node counting from the beginning.  Skip
-	anchor tags when looking for the target node--the last tag can be
-	an anchor, for example.
-	(last_search_direction, last_search_case_sensitive): New
-	variables.
-	(last_search_for_string): Remove variable.
-	(info_search_internal): Always move point by one notch before
-	beginning the search, to avoid complications in repeated search
-	commands.  When looking for the next node tag, skip any anchor
-	tags.
-	(info_search_1): Accept a 5th argument ASK_FOR_STRING, and only
-	prompt for search string if it's non-zero.  All callers changed.
-	Look for the COUNTth occurence of the string.
-	(info_search, info_search_backward, info_search_case_sensitively):
-	Set last_search_direction and last_search_case_sensitive.
-	(info_search_next, info_search_previous): New commands, repeat
-	last search in the same or reverse direction without prompting the
-	user for the string.
-
-	* info/infomap.c (initialize_emacs_like_keymaps): Bind `C-x n' to
-	info_search_next and `C-x N' to info_search_previous.
-	(initialize_vi_like_keymaps): Bind `n' to info_search_next and `N'
-	to info_search_previous.
-
-1999-04-04  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (get_rest_of_line): Don't expand non-macros,
-	so that macro-expanded output will still have them.
-
-1999-04-03  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/node.c (cm_node): Expand the node name and its links
-	completely before using them, so that they could use e.g. @value{}
-	etc.
-
-	* makeinfo/makeinfo.c (replace_with_expansion): Don't
-	remember_itext if we are executing_string.
-
-	* makeinfo/sectioning.c (sectioning_html): Remove #ifdef
-	HAVE_MACROS.  Don't call me_execute_string if already
-	executing_string.
-
-	* makeinfo/toc.c (toc_add_entry): Expand macros in TOCNAME right
-	here, since the macro can be later redefined.
-	(contents_update_html, contents_update_info,
-	shortcontents_update_html, shortcontents_update_info): Use stdio
-	functions for output instead of add_word etc.
-	(rewrite_top, contents_update, shortcontents_update, toc_update):
-	New functions, replace the TOC placebo with the actual TOC.
-	(cm_contents): Output a placebo instead of writing the TOC.
-	(cm_shortcontents): Output a placebo instead of writing the short
-	TOC.
-
-	* makeinfo/makeinfo.c (convert_from_loaded_file): Call toc_update
-	if appropriate.
-
-	* makeinfo/sectioning.c (cm_top): Don't output the HTML header
-	here, since the Top node might be preceeded by other commands,
-	like @contents.
-
-	* makeinfo/cmds.c (cm_settitle): Output the HTML header here.
-
-	* makeinfo/node.c (set_current_output_filename): New function,
-	saves the name of the actual file we are now writing, including in
-	the case of split-HTML output.
-	(cm_node): Call it to record the name of output file.
-
-	* makeinfo/footnote.c (free_pending_notes): Re-initialize
-	current_footnote_number to 1.
-
-	* makeinfo/index.c (index_add_arg): Remove redundant xstrdup.
-	(cm_printindex): Don't free index->entry: it is freed in
-	free_index, if, e.g., there's more than one file to convert.
-
-	* makeinfo/makeinfo.c (init_internals): Call toc_free.
-
-Mon Apr  5 16:53:33 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/Makefile.am: Texmf_{texinfo,dvips}: dirs not files.  From
- 		Kurt Hornik.
-
-Wed Mar 31 13:50:09 1999  Karl Berry  <karl@gnu.org>
-
-	* Pretest 3.12h.
-
-	* makeinfo/node.c (last_node_p): new fn.
-	(split_file): call it, instead of assuming no more entries means
-		no more nodes.  (Loses with anchors.)
-	Report from: "Oleg S. Tihonov" <ost@benetnash.ffke-campus.mipt.ru>.
-
-	* makeinfo/index.c (sort_index): whether an entry is @code or not
-		depends on the element, not the index, because of synindex.
-
-	* doc/Makefile.am (install-tex): Must use $(TEXMF), do
-		$(mkinstalldirs) on tex dirs.
-	From: Nathan Sidwell <nathan@acm.org>.
-
-	* doc/texinfo.txi: Document need for blank line before @image if
- 		you want space.
-
-	* Install changes from Eli:
-
-	1999-03-09  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/infodoc.c (info_internal_help_text): Remove hard-wired key
-	names, use %-10s instead.
-	(info_help_keys_text): New variable, holds two variants of keys
-	that invoke basic commands, indexed by vi_keys_p.
-	(create_internal_info_help_node): Use info_help_keys_text[].
-
-	* info/window.c (build_message_buffer): Support more general
-	format strings, like %-10.15s, %+4d etc.
-
-	* info/infomap.c (initialize_vi_like_keymaps): Bind ESC-h, ESC-t,
-	C-x LFD and C-x RET.
-
-	1999-03-08  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* util/install-info.c (output_dirfile): Sort the entries and
-	output them in alphabetic order.  Output each entry only in those
-	sections where it belongs.
-	(parse_input): New function, code moved from main.  Process
-	sections and entries in a single loop, and record with each entry
-	the list of sections where that entry belongs.  Record each entry
-	separately, not all of them together as a single block.
-	(parse_dir_file): New function, code moved from main.
-	(main): Move code to parse_input and parse_dir_file.  Put the new
-	entries only into sections where they belong.
-	(compare_entries_text): New function, called when sorting new
-	entries.
-
-	* info/infomap.c (initialize_vi_like_keymaps): New function.  Bind
-	keys a-la Less, including new functions from session.c below.
-	(initialize_emacs_like_keymaps): New function, with the guts of
-	initialize_info_keymaps.
-
-	* info/session.c (info_scroll_forward, info_scroll_backward): If
-	default_window_size is non-negative, use it as the default number
-	of lines to scroll.
-	(info_scroll_forward_set_window, info_scroll_backward_set_window,
-	info_down_line, info_up_line, info_scroll_half_screen_down,
-	info_scroll_half_screen_up, info_search_backward): New functions,
-	for Less-like look and feel.
-
-Tue Mar 30 16:44:53 UTC 1999 Karl Heinz Marbaise <kama@hippo.fido.de>
-
-        * doc/txi-de.tex:
-            - added additional putwordin
-        * doc/texinfo.txi:
-            - changed defivar into deftypeivar
-        * makeinfo/sectioning.c:
-            - changed output of anchors based on problems with ie.
-        * makeinfo/defun.c:
-            - output in HTML mode changed to be on previous state.
-        * makeinfo/insertion.c:
-            - fixed up HTML output for deftypeivar.
-
-1999-03-30  Akim Demaille  <demaille@inf.enst.fr>
-
-        * texi2dvi ($tmpdir): Avoid security holes.
-
-Fri Mar 26 17:06:55 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/cmds.c (cm_exdent): rewrite to preserve blank lines.
-	Bug from: "Oleg S. Tihonov" <ost@benetnash.ffke-campus.mipt.ru>.
-
-	* makeinfo/cmds.c (cm_exdent): arg is in `roman'.
-
-Thu Mar 25 16:21:27 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/insertion.c,
-	* makeinfo/defun.c,
-	* makeinfo/insertion.h (insertion_type): add deftypeivar.
-	* makeinfo/defun.h (cm_defun): declare here.
-	* makeinfo/cmds.c (defun.h): include.
-	* doc/texinfo.txi (deftypeivar[x]): new commands.
-	* makeinfo/cmds.c (deftypeivar[x]): new commands.
-
-	* makeinfo/cmds.c (cm_exdent): save, set and restore
- 		in_fixed_width_font.
-
-	* doc/texinfo.txi (uref): rewrite.
-
-	* info/info.c (info_short_help): more spaces for new help2man.
-
-	* makeinfo/node.c (cm_node): output node name in html, change
- 		navbar punctuation.
-
-	* doc/texinfo.5: Fix URL.
-
-	* Finally installed this:
-	1998-05-01  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-	* makeinfo/makeinfo.c (convert_from_loaded_file): When the file
-	contains no @setfilename then always look for \input (not
-	\include) in the first line and skip that.  Don't skip the first
-	line if no \input was found.
-
-1999-03-24  Akim Demaille  <demaille@inf.enst.fr>
-
-	* configure.in (AC_HEADER_STAT): Added.
-	* util/texindex.c (main): Check infiles are not directories.
-
-1999-03-24  Akim Demaille  <demaille@inf.enst.fr>
-
-	* texi2dvi (index_files): Don't use `!' to run sed -e "s!foo$!!"
-        since the shell will interpret `$!'.
-
-Tue Mar 23 16:41:08 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (uref): rewrite to make HTML output read more
- 		nicely.  From Tim S.
-
-	* info/info.c (info_short_help): include examples.
-
-	* makeinfo/makeinfo.c (close_paragraph_with_lines): move earlier
- 		so can be static.
-
-	* makeinfo/sectioning.c,
-	* makeinfo/node.c,
-	* makeinfo/makeinfo.h,
-	* makeinfo/makeinfo.c,
-	* makeinfo/macro.c,
-	* makeinfo/insertion.c,
-	* makeinfo/cmds.c,
-	* makeinfo/files.c,
-	* makeinfo/footnote.c (size_of_input_text): rename to
- 		input_text_length.
-
-	* makeinfo/makeinfo.c (cm_xref): make wrong-char-following a warning.
- 	(replace_with_expansion): remove bogus conditional that was duplicated
-	unconditionally.
-	From: Hans-Bernhard Broeker <broeker@physik.rwth-aachen.de>
-
-Mon Mar 22 14:39:59 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/Makefile.am (install-tex): parenthesize.
-
-	* Makefile.am (dist-hook): remove, it uses hard links so we chmod
- 		all our sources.
-
-	* makeinfo/toc.c,
-	* makeinfo/defun.c,
-	* makeinfo/sectioning.c: Use _, not N_.
-
-	* info/Makefile.am (ginfo_SOURCES): include $(BUILT_SOURCES)
- 		explicitly.
-
-	* makeinfo/lang.c,
-	* makeinfo/lang.h: ISO-639 updates.
-
-	* makeinfo/cmds.c: exampleindent changes.
-
-	* info/info.c (info_short_help): reformat somewhat, and don't say
-		info info options any more.
-
-	* doc/info-stnd.texi (Invoking): make description format somewhat
- 		more standard.
-
-	* info/infomap.c (Initialize_info_keymaps): do ea_insert bindings
-		first so subsequent bindings (e.g., for ESC) override.
-
-Sun Mar 21 17:31:00 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/multi.c (output_multitable_row): remove unnecessary
-	trailing whitespace from output, output blank row for blank @item.
-
-	* doc/texinfo.txi: Remove extra @item in language multitable.
-
-Sat Mar 20 12:30:25 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Update language table from ISO 639:
-	http://www.iro.umontreal.ca/contrib/po/iso-639.  From kama.
-
-	* doc/texinfo.txi (exampleindent): document.
-
-	* doc/texinfo.txi (Creating an Info File): use this for the node name.
-
-	* doc/info.texi: Make Texinfo references consistent, etc.
-
-1999-03-18  Yoshiki Hayashi  <g740685@komaba.ecc.u-tokyo.ac.jp>
-
-	* makeinfo/makeinfo.c (set_default_indentation_increment): new
-	routine.
-	* makeinfo/insertion.c (cm_exampleindent): new routine.
-	Call set_default_indentation_increment.
-
-Mon Mar 15 17:06:15 1999  Karl Berry  <karl@gnu.org>
-
-	* info/Makefile.am (ginfo_SOURCES): Remove doc.c and funs.h in
-		hopes they then won't be distributed.  Report from Andreas.
-
-	* makeinfo/cmds.c (cm_sp): close paragraph and disable filling to
-		produce blank lines in info.
-	Report from: Michael Vanier <mvanier@bbb.caltech.edu>.
-
-	* doc/texinfo.txi: Attempt to get Edition info on one line.
-
-	* makeinfo/makeinfo.h (cr_or_whitespace): use whitespace and check
- 		for \r.	(skip_whitespace_and_newlines, command_char): use it.
- 	Report from bonzini@gnu.org.
-
-	* makeinfo/cmds.c (cm_center): save and restore filling_enabled,
- 		so @center can be used inside an @example.  Bug from kama.
-
-1999-03-13  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/footnote.c (cm_footnote): In separate footnote style,
-	generate a reference to "foo-Footnote-NN" for each footnote.
-	(output_pending_notes): In separate footnote style, generate an
-	anchor "foo-Footnote-NN" for each footnote, so that the link in
-	the parent node would lead directly to the footnote.
-
-	* info/footnotes.c (make_footnotes_node): Recognize the new
-	"foo-Footnote-NN" style of footnote references.
-
-1999-03-09  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
-
-	* configure.in (AC_OUTPUT): Remove command to create po/Makefile,
-	already done by AM_GNU_GETTEXT.
-
-Tue Mar  9 17:48:46 1999  Karl Berry  <karl@gnu.org>
-
-	* Makefile.am (dist-hook): make distribution directory writable.
-
-	* Installed these changes:
-
-  1999-03-04  Akim Demaille  <demaille@inf.enst.fr>
-
-	    * texi2dvi (bibtex): Allow several runs of bibtex, this can be
-	    used if bibentries reference other bibentries.  Moreover, looking
-	    for `Citation' in the LOG should be enough to avoid uneless runs.
-
-  Sun Mar  7 15:15:00 1999 UTC Karl Heinz Marbaise <kama@hippo.fido.de>
-
-      * makeinfo/sectioning.{c,h}:
-	      - using defines instead of literals.
-	      - cleaned up some stylistic matters like Karl Berry
-		suggested. Handling of things like:
-		@unnumbered ..
-		@section ...
-		now it works correct.
-
-      * makeinfo/toc.{c,h}
-	      - addTocEntry, freeToc changed into toc_add_entry
-		toc_free. stylistics changed.
-
-      * makeinfo/iso2cht.pl,iso-639: script, table from the web.
-	      - perl script converting the iso-639 table from the web
-		into the appropiate files (isoenum.h, isotab.c and
-		iso.texi) which can be inserted directly into
-		lang.c, lang.h and texinfo.txi.
-
-Tue Mar  9 17:47:59 1999  Karl Berry  <karl@gnu.org>
-
-	* configure.in: Bump to 3.12g.
-
-Sun Mar  7 07:01:19 1999  Karl Berry  <karl@gnu.org>
-
-	* info/infomap.c: Don't do isprint, just bind everything.
-
-Fri Mar  5 14:31:42 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi,
-	* makeinfo/makeinfo.c: Document that --no-headers writes to stdout
- 		by default.
-
-	* doc/texinfo.txi: @setchapternewpage doesn't change
-	\bindingoffset, just headers. Recommend not including it in the
-		manual source at all.
-
-	* makeinfo/node.c (write_tag_table_internal): set
- 		in_fixed_width_font while constructing this so --- doesn't
- 		collapse to --, etc.  Bug report from Sergio.
-
-	* dir-example: Add a2ps stuff.
-
-	* info/session.c: Allow any character in search string.
-
-	* info/infodoc.c (describe_key): don't assume non-latin1
- 		characters are undefined.
-
-	* info/infomap.c (initialize_info_keymaps): make all characters
-		insertable by default in echo area.  From Eli.
-
-	* Installed these changes:
-
-  Wed Feb 23 22:00:00 1999  Karl Heinz Marbaise <kama@hippo.fido.de>
-
-      * makeinfo/sectioning.{c,h}:
-	      - added to hold complete handling of sectioning
-		a little step towards modularization ;-)
-
-      * makeinfo/cmds.c:
-	      - sectioning_alist moved to sectioning.c and
-		added information about enumerated chapter,
-		section ..., appendix or not. Everything
-		which has any relationship with sectioning
-		moved to sectioning.{c,h} I hope I have found
-		all.
-
-      * makeinfo/toc.{c,h}:
-	      - added for complete handling of "table of contents"
-		"short contents". Better ASCII only support
-		(--no-headers) so no Text "Menu" is printed.
-		May be we can do more.
-
-      * makeinfo/makeinfo.{c,h}:
-	      - added new command line switch --number to enumerate
-		chapter, sections etc.
-
-      * doc/texinfo.txi:
-	      - --number option documented.
-
-  1999-02-28  Yoshiki Hayashi  <g740685@komaba.ecc.u-tokyo.ac.jp>
-
-	  * makeinfo/insertion.c (in_paragraph): New variable.
-	  (cm_item): Add </p> only if <p> is open.
-	  * makeinfo/makeinfo.c (handle_menu_entry): Ditto.
-
-	  * makeinfo/insertion.c (begin_insertion),
-	  * makeinfo/makeinfo.c (handle_menu_entry): If commentary
-	  precedes first menu item, put them outside of <ul>.
-	  Put <p> and </p> correctly.
-
-  1999-02-27  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	  * info/info.c (info_short_help): Document --show-options and
-	  --usage.
-
-  1999-02-26  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	  * info/makedoc.c (main) [STRIP_DOT_EXE]: Strip the .exe suffix, so
-	  that doc.c says "./makedoc.c", not "./makedoc.exe.c".
-
-	  * info/info.c (goto_invocation_p): New variable.
-	  (long_options): New options --show-options and its alias --usage.
-	  (main): Don't update the display until we find the first node to
-	  be displayed, to avoid flushing incorrect display.  If user wants
-	  to see the command-line options node right away, display whatever
-	  info_intuit_options_node finds.
-
-	  * info/session.c (info_intuit_options_node): New function, uses
-	  heuristics to find the node which describes program's invocation.
-	  (info_goto_invocation_node): New command, asks for a program's
-	  name and displays the invocation node of that program.
-	  (entry_in_menu): New function, fuzzily looks for a menu entry in a
-	  node's menu.
-	  (program_name_from_file_name): New function, suggests a program
-	  name given a name of its Info file.
-	  (info_search_in_node): Accept an additional argument: a flag to
-	  search case-sensitively; all callers changed.  If case-sensitive
-	  search is required, don't turn on the case-fold flag in the search
-	  binding.
-	  (info_search_internal): Accept an additional argument: a flag to
-	  search case-sensitively; all callers changed.  Share the last
-	  search string between normal and case-sensitive search commands.
-	  (info_search_1): New function, with the guts that previously
-	  belonged to info_search.  If the search is case-sensitive,
-	  mentions that in the prompt for the search string.  If the search
-	  string includes upper-case characters, searches case-sensitively.
-	  (info_search): Calls info_search_1 with zero case-sensitivity
-	  flag.
-	  (info_search_case_sensitively): New command, calls info_search_1
-	  with non-zero case-sensitivity flag.
-	  (incremental_search): If the search
-	  string includes upper-case characters, searches case-sensitively.
-
-	  * info/search.c (search_backward): Fix bug in case-sensitive
-	  search.
-
-	  * info/infomap.c (initialize_info_keymaps): `-' in info window map
-	  produces negative arguments.  `S' invokes case-sensitive search.
-	  `O' and `I' invoke goto-invocation.
-
-	  * doc/info-stnd.texi (Invoking Info): Document --show-options.
-	  (Node Commands): Document `O', goto-invocation.
-	  (Searching Commands): Document `S' and the case-sensitive search
-	  when the search string includes upper-case letters.  Document `/'
-	  as a synonym for `s'.
-	  (Miscellaneous Commands): Document `M--' and `-'.
-
-  1999-02-25  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	  * info/info.c (main): Under --index-search, search indices *after*
-	  following menus, so that we don't look for an index in DIR.
-
-
-Wed Mar  3 17:20:07 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/cmds.c: Do not output <small> in info mode.
-	From: Eli Zaretskii <eliz@is.elta.co.il>.
-
-	* makeinfo/insertion.c (enum_html): Remove unused var temp.
-	From: Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp>
-
-	* info/infodoc.c: Avoid translation of blank lines.
-
-	* info/tilde.c,
-	* info/man.c,
-	* makeinfo/index.c (index_add_arg): avoid use of alloca.
-
-	* info/echo-area.c: Don't pause for an additional 75 microseconds.
-	Noted by Eli.
-
-	* configure.in: Bump to 3.12f.
-
-	* doc/texinfo.txi: findex enddots.  From Eli.
-
-1999-03-01  Yoshiki Hayashi  <g740685@komaba.ecc.u-tokyo.ac.jp>
-
-	* makeinfo/makeinfo.c (insert_html_tag): Add <p> when
-	paragraph is not opened.
-	(sectioning_html): Call close_paragraph so that paragraph
-	will be started.
-
-1999-02-26  Akim Demaille  <demaille@inf.enst.fr>
-
-        * texi2dvi (get_xref_files): Take $filename_noext as $1.
-        (get_xref_files): Look for $1.idx only, not *.idx.
-        (get_xref_files): Look for $1.cb files (\usepackage{changebar}).
-        * texi2dvi: Look for rerun requests in LOG files in addition to
-        xref files comparison.
-        (bibtex): Remove useless `./' (already added in
-        command_line_filename).
-        (filename_dir): Smarter sed expression that handles file names
-        with no directory part.
-        (txiversion): Removed useless () (`` already guarantee a subshell).
-
-1999-02-25  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
-
-	* makeinfo/multi.c (find_template_width): Fix operator precedence.
-
-Tue Feb 23 10:35:53 1999  Karl Berry  <karl@gnu.org>
-
-	* dir-example: ccmode not cc-mode.  From hds.
-
-Mon Feb 22 07:34:00 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/lang.c,
-	* doc/texinfo.txi: Fix kazakhkh typo.
-
-1999-02-21  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* djgpp/config.sed: Add pcterm.c to terminal.o dependencies.
-
-1999-02-21  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
-
-	* makeinfo/lang.c (cm_accent_generic): Emit the accent character
-	only once, after the argument.
-
-Sun Feb 21 16:36:14 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (handle_menu_entry): new routine.
-	(reader_loop): call it, allowing for comments in menus.
-
-	* makeinfo/node.c: Rearrange functions to make static, etc.
-
-	* doc/Makefile.am (EXTRA_DIST, install-tex): Add txi-cs and txi-no.
-
-1999-02-20  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* util/install-info.c (open_possibly_compressed_file): Output
-	explicit message about empty input files.
-	(insert_entry_here): Insert multiple entries in alphabetical order.
-
-Fri Feb 19 09:13:28 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/insertion.c (enum_html): new routine.
-	(begin_insertion): call it.
-	Based on code from: Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp>.
-
-	* lib/xexit.c (EXIT_FAILURE) [!defined EXIT_SUCCESS && VMS]: weird
-		long value.
-	From: Lars Hecking <lhecking@nmrc.ucc.ie>
-
-Thu Feb 18 16:42:10 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/node.h (remember_node_reference): decl.
-	* makeinfo/makeinfo.c (find_unused_reference): dump unused decl.
-
-1999-02-18  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/cmds.c (cm_dots, cm_enddots): Don't produce &#133; for
-	HTML, as too many browsers don't support it; use "..." in a
-	smaller font (with <small>).
-	(cm_top): Output the lang= attribute inside <html>.
-
-	* makeinfo/node.c (cm_node): Output the lang= attribute inside
-	<html>.
-
-	* makeinfo/footnote.c (output_pending_notes): Generate <ol>
-	instead of <dl compact>.  Make the text of each footnote start a
-	new paragraph.
-
-1999-02-17  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/insertion.c (cm_item): Remove <dd> when immediately
-	followed by a <dt>.  Add a <br> before every <dt>, except if we
-	are converting @itemx, or in the first item after <dl>.
-	(begin_insertion): Use <dl> for tables, to make it look closer to
-	the Info output.  Don't output a newline after a <pre>.
-
-1999-02-17  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (handle_variable): Don't backup input
-	pointer if we hit the end of text (usually, inside
-	execute_string).
-	* makeinfo/insertion.c (get_item_function): Likewise.
-
-Wed Feb 17 15:09:06 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Better indexing of space entries.
-
-	* makeinfo/multi.c (find_template_width): new routine to really
- 		parse @multitable {...} templates.
- 	(setup_multitable_parameters): call it.
-	Bug report from: Sergio Pokrovskij <pok@nbsp.nsk.su>.
-
-	* lib/system.h (substring): declare.
-
-	* lib/Makefile.am (libtxi_a_SOURCES): add substring.c.
-
-	* makeinfo/defun.c: Move substring to lib.
-
-	* util/texindex.c (tempcopy): no longer used.
-      	(maketempname): make static.
-
-	* Installed these changes:
-
-1999-02-13  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/cmds.c (cm_acronym): New function, makes @acronym
-	produce a smaller font size in HTML mode.
-	(cm_sc): Produce smaller font size in HTML mode.
-
-	* makeinfo/footnote.c (cm_footnote): In HTML output, make the
-	footnote number be a superscript; remove [] around the link.
-
-	* makeinfo/cmds.c (cm_var_sc): Separated into two functions:
-	cm_var and cm_sc, since @var and @sc have different effects in
-	HTML output.
-
-	* makeinfo/makeinfo.c (cm_xref, cm_inforef): Don't put "[]" around
-	HTML links.
-
-	* info/pcterm.c (DJGPP_keytab): Add translation for Alt-PgUp and
-	Alt-PgDn, to support the new M-prior key.
-
-Wed Feb 17 11:50:46 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Don't mention texi2roff so prominently.
-
-	* makeinfo/makeinfo.c: Pass enclose_expand to remember_brace
- 		rather than enclose_command.  From Eli.
-
-	* makeinfo/macro.c (cm_alias, cm_definfoenclose): Expand macros in
-		first call to get_until_in_line.  From Eli.
-
-	* info/makedoc.c,
-	* info/session.c,
-	* info/man.c,
-	* info/tilde.c,
-	* info/info.c,
-	* makeinfo/files.c,
-	* makeinfo/multi.c,
-	* makeinfo/node.c,
-	* makeinfo/makeinfo.c: Use xexit.
-	* makeinfo/makeinfo.h (NO_ERROR, FATAL, SYNTAX): remove.
-
-	* info/terminal.c: Avoid sleep unless on sun-cmd terminal.
-
-	* lib/xexit.c (EXIT_FAILURE) [!EXIT_FAILURE]: #define to 1 to fix
-		Sony NEWS-OS 4.0C lossage.  From Akim.
-
-	* info/infodoc.c: Translate where is doc string, underline lines
- 		in help.
-	From: Trond Endrestol <trond@agamemnon.gtf.ol.no>
-
-	* makeinfo/cmds.c (cm_dots, cm_enddots): go back to ... and ....,
-		&#133; apparently doesn't work widely enough.
-
-Tue Feb 16 07:37:54 1999  Karl Berry  <karl@gnu.org>
-
-	* configure.in (ALL_LINGUAS): add de_AT.
-
-	* util/texi2dvi: Redirect cd output to /dev/null when determining
- 		txiversion.
-
-Mon Feb 15 13:43:37 1999  Karl Berry  <karl@gnu.org>
-
-	* util/install-info.c,
-	* util/texindex.c: Call xexit instead of exit.
-
-	* lib/system.h (xexit): Declare.
-
-	* lib/Makefile.am (libtxi_a_SOURCES): Add xexit.c.
-
-	* doc/texinfo.txi: Document that @documentencoding is used in the
- 		HTML output.
-
-	* makeinfo/cmds.c (cm_top): use document_encoding if set.
-	(command_table): call cm_documentencoding instead of no-op.
-	* makeinfo/lang.c (document_encoding, cm_documentencoding): define.
-	* makeinfo/lang.h (document_encoding, cm_documentencoding): declare.
-
-	* makeinfo/insertion.c: Restore </p> before <li>.
-
-	* util/texi2dvi: If texinfo.tex version is too low for macros, use
- 		makeinfo.
-
-	* makeinfo/cmds.c (cm_center): save and restore value of
-	       indented_fill, otherwise @center within an @enumerate (say)
-	       also closes the indentation.
-	Bug from: Sergio Pokrovskij <pok@nbsp.nsk.su>.
-
-Sun Feb 14 15:25:02 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c: Doc fix.
-
-	* doc/texinfo.txi: Be enthusiastic if people want to implement
-		more output formats, but use makeinfo to do the job.
-
-	* makeinfo/index.c (index_element_compare): Use strcoll if it's
- 		available.
-	* configure.in: Call AC_FUNC_STRCOLL.
-	* makeinfo/makeinfo.c (main): Use LC_CTYPE and LC_COLLATE
- 		categories.  Suggestion from Oleg.
-
-	* lib/system.h (setlocale) [!HAVE_SETLOCALE]: #define away.
-	Suggestion from Akim.
-
-	* doc/texinfo.txi: Document @paragraphindent working in TeX now.
-
-	* doc/texinfo.txi,
-	* makeinfo/lang.c,
-	* makeinfo/lang.h (language_code_type): abbrev changes from Oleg.
-
-	* makeinfo/cmds.c,
-	* makeinfo/node.c: Only translate `Next:', `Previous:', and `Up:',
- 		not the whole href.  From Eli.
-
-	* doc/texinfo.txi: Document that only unsplit html output is
- 		supported in this release.
-
-Sat Feb 13 17:55:30 1999  Karl Berry  <karl@gnu.org>
-
-	* configure.in: Check for termlib before termcap for sake of
- 		Solaris (judging from less-332 configure.in) and maybe
- 		HP-UX 11.
-
-	* doc/texinfo.txi (Footnote commands): incoherency reported by Aharon.
-	Language vs country fixes from Oleg.
-
-1999-02-13  Karl Eichwalder  <ke@gnu.franken.de>
-
-	* makeinfo/node.c (cm_node): Tag navigation links as translatable.
-	* makeinfo/cmds.c (cm_top): Ditto.
-
-Wed Feb 10 22:00:00 1999  Karl Heinz Marbaise <kama@hippo.fido.de>
-
-    * makeinfo/defun.h:
-            - new because we need get_base_type-function
-              accessible in insertion.c
-
-    * makeinfo/defun.c:
-            - complete HTML handling of the @def... things.
-
-    * makeinfo/Makefile.am:
-            - defun.h added as part of makeinfo.
-
-    * makeinfo/makeinfo.c:
-            - define looking_at moved into header-file, because
-              we need it in defun.c
-
-    * makeinfo/insertion.c:
-            - some minor changes made to support the @def...
-              things in HTML.
-
-    * makeinfo/lang.c: (cm_accent_generic)
-            - bug fixed. Using umlaut (accent ...)
-              would produce &A only if an umlaut follows
-              an empty line.
-            - bug fixed. Because things like &tilde; &grave;
-              and &circ; do not exist as standalone characters
-              in HTML.
-            - cm_special_char now produce correct HTML for
-              @O{} and @o{}.
-            - warning using _("Text") instead "Text" (gettext).
-
-    * makeinfo/cmds.c:
-            - @url fixed. Display the given Text.
-
-    * doc/texinfo.txi:
-            - corrected the references for @uref, because
-              they were given as "url" instead of "uref".
-              @uref has three arguments, so show them in
-              command list.
-
-Wed Feb 10 17:27:58 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Rewrite for overfull box.
-
-Tue Feb  9 19:03:16 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Document more HTML output stuff.  Based on esr
- 		changes.
-	* makeinfo/macro.c,
-	* makeinfo/macro.h,
-	* makeinfo/makeinfo.c: Do alias and definfoenclose expansion.
-  		From esr.
-
-Mon Feb  8 14:41:07 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/cmds.c: New commands @alias and @definfoenclose.
-	From: "Eric S. Raymond" <esr@snark.thyrsus.com>.
-
-	* doc/texinfo.txi: Document @documentlanguage and
- 		@documentencoding.
-
-	* makeinfo/cmds.c: Move accent support to lang.c.
-
-	* makeinfo/makeinfo.c (add_char): add &nbsp; rather than an 8-bit
- 		char for html.
-
-	* makeinfo/Makefile.am (makeinfo_SOURCES): add lang.[ch].
-
-	* doc/texinfo.txi: Be even more emphatic that @url is not
-		typically what you want.
-	* doc/texinfo.txi: Document that macro calls must use empty
- 		braces.
-
-	* info/session.c: Do not translate node pointers.  From Karl E.
-
-	* makeinfo/cmds.c (cm_dfn): Use <dfn>.  Suggestion from Eli.
-
-Sun Feb  7 07:00:08 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c: Make --html imply --no-split.
-
-	* makeinfo/cmds.c (cm_top): don't core dump if the top node has no
- 		next.
-
-	* makeinfo/makeinfo.c (replace_with_expansion): compare length
-		after expansion with length of full input text before
-		expansion, not just the length of the expanded text.
-                Bug (contents2) reported by kama.
-
-	* info/infodoc.c (create_internal_info_help_node): gettext calls
-		to help msg strings. From Ulrich.
-
-Fri Feb  5 17:35:13 1999  Karl Berry  <karl@gnu.org>
-
-	* util/texi2dvi: set makeinfo= for latex case.
-
-	* doc/texinfo.txi (@deftp summary): ref Data Types node that
-		actually describes it.  From kama.
-
-Thu Feb  4 07:39:10 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c: Take it back.  Emacs info needs that text
- 		before the CTRL-_.
-	* makeinfo/makeinfo.c: Don't bother to output the header (This is
- 		-, produced ...) to stdout.
-
-	* doc/texinfo.txi (Other Info Directories): Mention that dir files
- 		must be named dir.
-
-	* makeinfo/makeinfo.c (cm_uref): implement optional third
- 		argument.
-	* doc/texinfo.txi (uref): document it.
-	Suggestion from: Charles Karney <karney@pppl.gov>
-
-	* doc/Makefile.am (info_TEXINFOS): put texinfo.txi first so
-		UPDATED reflects its modtime, rather than info-stnd's.
-
-	* makeinfo/files.c (full_pathname) [!WIN32]: #endif in wrong place.
-	From: Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp>
-
-	* makeinfo/cmds.c (cm_url): Remove URL: from output.  It's ugly.
-
-Wed Feb  3 16:05:03 1999  Karl Berry  <karl@gnu.org>
-
-	* info/infodoc.c: Doc fix, zero not oh.
-
-	* makeinfo/makeinfo.c (add_char): don't ignore if
-		only_macro_expansion, even in no_headers case.
-		Otherwise menu items don't get remembered and defaulting
-		doesn't work.  Macros suck!
-
-	* util/texi2dvi (common): include orig_pwd.
-	(language): reguess for each file if not explicitly set.
-
-Tue Feb  2 16:22:32 1999  Karl Berry  <karl@gnu.org>
-
-	* configure.in: Bump to 3.12d now.
-
-Mon Feb  1 14:46:45 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/insertion.c (cm_item): For itemize and enumerate, do
-		</p> before the <li> for html. Bug from Eli.
-
-	* makeinfo/index.c: Installed change in index.c:
-	Mon Dec 28 12:50:14 1998  Matthew Fredette  <fredette@mit.edu>
-		* makeinfo.c (index_add_arg): Use xstrdup on input_filename
-		when saving it in the new index entry.
-
-	* util/texi2dvi: cd / before cd $orig_pwd in case of DOS drive
- 		change.
-
-Sun Jan 31 16:39:01 1999  Karl Berry  <karl@gnu.org>
-
-	* util/texi2dvi: Used sed to expand only the @{if,}tex parts of
-	the source since makeinfo's conditional options aren't ready yet
-		(from Akim).
-	Also use ${1+"$@"} for Digital Unix "$@" expansion bug (from Noah).
-
-	* util/install-info.c: Doc fix from Eli.
-
-	* doc/texinfo.txi: Oops, said we looked for .png twice.
-
-Sat Jan 30 17:18:14 1999  Karl Berry  <karl@gnu.org>
-
-	* info/session.c (forward_move_node_structure): remove tangled
-	code to merely print words instead of numbers; too hard to translate.
-
-	* info/session.c: Missing _'s for more i18n.  From Trond.
-
-	* doc/Makefile.am (EXTRA_DIST): Include txi-no.tex from Trond.
-
-Sun Jan 24 09:28:12 1999  Karl Berry  <karl@gnu.org>
-
-	* Makefile.am (EXTRA_DIST): Use djgpp by itself instead of listing
-		each file separately (new feature in automake 1.4).
-
-	* makeinfo/insertion.c (begin_insertion): for quotation, always
-		increment current_indent even if html output, why not.
-		(Otherwise must not decrement current_indent in end_insertion.)
-
-	* doc/texinfo.txi: More overfull box fixes.
-
-	* makeinfo/insertion.c: Add some assertions and the beginnings of
- 		handling @tex.
-
-	* doc/texinfo.txi: Fix overfull boxes, but tables of contents at
- 		the front.
-
-	* util/texi2dvi: Can't pass --no-ifinfo --iftex to makeinfo yet,
- 		it's not ready.
-
-Sat Jan 23 10:22:16 1999  Karl Berry  <karl@gnu.org>
-
-	* util/texi2dvi: Pass --no-ifinfo --iftex to makeinfo.
-
-Fri Jan 22 19:09:49 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Include version.texi before @settitle so
- 		@value{VERSION} gets expanded in the html title.  From kama.
-
-	* These patches from Tim Singletary <talon@clark.net>.
-	* makeinfo/makeinfo.c: Simplify and improve html menus.
-	* makeinfo/insertion.c (begin_insertion): simplify html menu case
- 		and set had_menu_commentary.
-	* makeinfo/insertion.h (had_menu_commentary): declare new global.
-	* makeinfo/node.h (glean_node_from_menu): declare.
-	* makeinfo/node.c (glean_node_from_menu): new arg to specify what
- 		type of reference to remember as.
-
-	Date: Sun, 29 Nov 1998 09:21:01 -0500 (EST)
-	From: Tim Singletary <tsingle@talon.clark.net>
-	To: texinfo-pretest@tug.org
-	Subject: explanation of previous patches
-
-	> These diffs introduce some non-trivial changes into very
-	> sensitive parts of makeinfo, and it is hard to judge them without
-	> knowing what exactly do they solve.
-
-	At a high level, these patches fix (or at least significantly improve)
-	the html conversion of menus.  Specifically, they fix bugs in the
-	conversion of menu commentary and detailmenu entries.
-
-	The menu commentary fixes require some justification:  The unpatched
-	makeinfo attempts, with many bugs, to place menu commentary outside
-	the <menu> by adding </ul> and <ul> tags.  While I understand the
-	motivation for this, that there might be browsers that don't support
-	<p> within <menu>, I'm not aware of any such browser and don't see any
-	compelling reason to continue the </ul> kludge.
-
-	Certainly
-			<menu>
-			<li>First paragraph.
-			 <p>Second paragraph.
-			<li>Second item.
-			</menu>
-	is valid html!
-
-	Anyway, here's what my patches do:
-
-	1) Deleted the `<h4>Menu</h4>' at the beginning of each menu.  Using
-	   `<h4>' is wrong since menus don't usually come after an `h3'
-	   header.  `<b>' looks the same on most browsers, but my opinion is
-	   that there's no need for any header at all!
-
-	2) Deleted the `<li>' kludge at the begining of each menu.  It's no
-	   longer needed since I'm deleting the </ul> kludge.
-
-	3) Replace `in_menu_para', declared static in makeinfo.c:add_char()
-	   with `had_menu_commentary', declared globally.  Modified
-	   insertion.c:begin_insertion() to initialize had_menu_commentary to
-	   1 when beginning a menu.  Now there's enough state information for
-	   menu commentary to be processed within <menu> ... </menu>; the
-	   commentary can be seperated from the rest of the menu by bracketing
-	   it between <p>'s.
-
-	   Note that the first patch had a bug initializing
-	   had_menu_commentary; the second patch fixes this bug.
-
-	4) Changed the semantics of the argument to
-	   node.c:glean_node_from_menu().  Previously, glean_node_from_menu()
-	   only called remember_node_reference() when the argument was
-	   non-zero.  But add_char() didn't call `glean_node_from_menu(1)'
-	   when processing detailmenu entries.  In other words, detailmenu
-	   entries didn't get registered as references, which lead to the html
-	   conversion of detailmenu entries not producing proper hrefs!
-
-	   The new semantics are that glean_node_from_menu always calls
-	   remember_node_reference(), but calls it with `menu_reference' when
-	   the first arg to glean_node_from_menu() is 1 and with
-	   `followed_reference' otherwise.  Now, detailmenu entries get
-	   registered as `followed_reference' (normal menu entries still get
-	   registered as `menu_reference') and the html conversion produces
-	   proper hrefs.
-
-	5) The above changes made it possible to streamline the section of
-	   add_char() that deals with html menu text.
-
-	6) In an otherwise unrelated change, rewrote a section of
-	   glean_node_from_menu to no longer use `goto save_node;'.
-
-
-Thu Jan 21 12:55:42 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/info-stnd.texi: OK, let's try restoring the @include
- 		version.texi with the new automake.
-
-	* makeinfo/cmds.c: Improve HTML @pounds, @bullet, etc.
-
-	* doc/Makefile.am (install-tex): new target.
-	(EXTRA_DIST): Include txi-??.tex.
-	txi-de.tex: new file from kama.
-
-	* Makefile.am (AUTOMAKE_OPTIONS): Bump to 1.4.
-	(install-tex): new target.
-
-	* util/texi2dvi: Restore "$@" for explicitness in main loop.
-
-	* doc/Makefile.am (*.1) [TEXINFO_MAINT]: Conditionalize.
-
-	* configure.in (AC_PREREQ): Bump to 2.13.
-	(TEXINFO_MAINT): Define this AM_CONDITIONAL.
-
-	* doc/texinfo.txi: Document that the HTML output name is derived
- 		from @setfilename.
-
-	* makeinfo/makeinfo.c (convert_from_loaded_file): Use @setfilename
-		for basename of html output.
-
-	* doc/texinfo.txi (url): Use example.org for the example.
-
-	* makeinfo/cmds.c (cm_url): @url should not produce a link, sorry
- 		to say.
-
-Wed Jan 20 16:31:55 1999  Karl Berry  <karl@gnu.org>
-
-	* util/texindex.c,
-	* util/install-info.c,
-	* makeinfo/makeinfo.c,
-	* info/info.c: It's 1999.
-
-	* doc/info.texi (Advanced info commands): Fix typos from Gildea.
-
-	* makeinfo/makeinfo.c (end_of_sentence_p): don't check negative
-		array offset.
-	From: Enrico Scholz <enrico.scholz@wirtschaft.tu-chemnitz.de>
-
-Sun Jan 17 16:42:16 1999  Karl Berry  <karl@gnu.org>
-
-	* util/texi2dvi: Restore --batch, handle changing escape character
-		more cleanly.  From Akim (as always).
-
-Thu Jan 14 16:47:41 1999  Karl Berry  <karl@gnu.org>
-
-	* configure.in (ALL_LINGUAS): Add no.
-	From: Trond Endrestol <trond@agamemnon.gtf.ol.no>
-
-	* util/texi2dvi: Doc fix from Akim and do not always exit 1 from trap.
-	And it's 1999.
-
-	* doc/texinfo.txi (image): Document imagename.pdf.
-
-	* Apply this change from Eli:
-
-  1998-11-20  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	  * makeinfo/makeinfo.h (meta_char_pos): New variable.
-	  * makeinfo/makeinfo.c (init_paragraph): Initialize it.
-	  (add_char): Use META to create a non-breakable space character.
-	  (add_meta_char): New function.
-	  (end_of_sentence_p): Don't handle characters at meta_char_pos as
-	  normal sentence enders.
-	  (flush_output): Only unMETA the non-breaking space character.
-	  Reset meta_char_pos to zero.
-	  (do_flush_right_indentation): Call adjust_braces_following.
-	  (indent): Likewise.
-	  (cm_value): Save and restore the value of meta_char_pos.
-	  (expansion): Likewise.
-	  * makeinfo/macro.c (me_execute_string_keep_state): Save and
-	  restore the value of meta_char_pos.
-	  * makeinfo/node.c (cm_node): Save and restore the value of
-	  meta_char_pos.
-	  * makeinfo/cmds.c (cm_accent): Make the dot we add due to
-	  @dotaccent be a meta-character.
-	  (cm_code, cm_dfn): Call add_meta_char to insert the closing
-	  quote.
-	  (cm_cite): Call add_char instead of add_word.
-
-Thu Jan  7 18:04:26 1999  Karl Berry  <karl@gnu.org>
-
-	* util/texi2dvi: Handle pdf files more cleanly.  From Akim.
-
-Wed Jan  6 17:49:11 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (cm_image): Check for .png also.
-
-Sun Dec 20 07:54:47 1998  Karl Berry  <karl@gnu.org>
-
-	* util/texi2dvi: Add --pdf.
-
-	* util/texi2dvi: New option -@ to use @input and @nonstopmode, in
-		case texinfo is preloaded.
-	From: Khimenko Victor <khim@sch57.msk.ru>
-	Date: Sun, 20 Dec 1998 02:04:12 +0300 (EET)
-
-Sat Dec 19 17:37:37 1998  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Multitable Column Widths): leading zero ok for
- 		@columnfractions.
-
-	* util/texi2dvi: New version from Akim, plus --quiet is like
- 		--batch, etc.
-
-Fri Dec 18 17:22:44 1998  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Document that the Texinfo source can't be
-	arbitrarily ordered (for print) even if all pointers are supplied.
-
-	* makeinfo/insertion.c (end_insertion): In itemize case,
-		close_insertion_paragraph so @end itemize cause a line break.
-        Report from: Sergei Pokrovsky <pok@nbsp.nsk.su>
-        Date: Sun, 22 Nov 1998 19:45:21 +0700 (GMT)
-
-Tue Dec 15 16:21:51 1998  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: More fixes from Oleg.
-
-	* configure.in: Bump version to 3.12c for next pretest.
-
-	* util/install-info.c (open_possibly_compressed_file)
-		[STRIP_DOT_EXE]: logic for compression_program assignment
-		was reversed.
-	From: wlestes@wlestes.uncg.edu
-
-Sat Dec 12 18:02:48 1998  Karl Berry  <karl@gnu.org>
-
-	* Merged these changes from Andreas:
-
-1998-12-06  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
-
-	* makeinfo/node.c (cm_node): When searching for @menu don't
-	require a space after it.
-
-1998-12-06  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
-
-	* makeinfo/cmds.c (cm_top): free top_name only after done using it.
-
-Sat Dec 12 15:40:13 1998  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Various typos and fixes from Oleg.
-
-	* doc/texinfo.txi: Move @node's outside of @ifinfo for the sake of
- 		HTML processing.
-
-	* doc/texinfo.txi (titlepage): @pxref was not in parens.  From Oleg.
-
-Sun Dec  6 16:49:09 1998  Karl Berry  <karl@gnu.org>
-
-	* dir-example: Amd is now am-utils.
-
-	* doc/Makefile.am: Reinstate help2man invocations for development.
-
-	* doc/texinfo.txi: Document @set...contentsaftertitlepage (from kama).
-	Fix incorrect sense for @image and Hungariam typo (from Oleg).
-
-	* lib/system.h: #include libintl.h here instead of acconfig.h, so
-		the system include files have a chance to #define NULL
-		before it does.
-	* acconfig.h: Remove libintl.h and #defines from here.
-	From: "Philippe De Muyter" <phdm@macqel.be>
-	Date: Fri, 4 Dec 1998 00:56:25 +0100 (CET)
-
-	* info/signals.c: Start #ifdef's in column one for cc on sysv68
-		(m68k-motorola-sysv).
-	From: "Philippe De Muyter" <phdm@macqel.be>
-	Date: Fri, 4 Dec 1998 00:56:25 +0100 (CET)
-
-	* info/filesys.c (is_dir_name): use strcpy instead of automatic
-		array initialization.
-	From: "Philippe De Muyter" <phdm@macqel.be>
-	Date: Fri, 4 Dec 1998 00:56:25 +0100 (CET)
-
-	* configure.in (ALL_LINGUAS): add ru.
-
-Fri Dec  4 08:12:11 1998  Karl Berry  <karl@gnu.org>
-
-	* info/infodoc.c: Gettextize the help buffer string.
-
-Sun Nov 29 17:12:35 1998  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Use @ifnottex rather than @ifinfo for @top.
-	(makeinfo top): document this.
-
-	* doc/info-stnd.texi,
-	* doc/info.texi: Use @ifnottex rather than @ifinfo for @top.
-
-	* makeinfo/insertion.c (cm_menu): Implicitly insert @top command
-        so we can construct the node tree as usual when we see @menu
- 	before @node.  Probably this is when the input uses
- 	@ifinfo instead of @ifnottex, as virtually all existing
- 	manuals do.
-
-	* makeinfo/insertion.c (discard_insertions): Let any conditional
-	cross node boundary.  (So the @top node can be wrapped
-	in @ifnottex, for example.)
-
-	* Installed these:
-
-1998-11-21  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (expansion): Save and restore
-	last_inserted_character and last_char_was_newline.
-
-	* makeinfo/cmds.c (cm_dircategory): Kill any indentation before
-	INFO-DIR-SECTION.  install-info relies on this.
-
-1998-11-20  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/multi.c (struct env): Add meta_char_pos member.
-	(select_output_environment): Save and restore meta_char_pos.
-	(out_char): Output characters by switching environment to #0 and
-	calling insert.  Call flush_output when a newline is output.
-	(output_multitable_row): Update the current environment's
-	output_paragraph_offset as well, after removing trailing
-	whitespace.  Fix typo in loop index.
-	(do_multitable): Call close_single_paragraph.
-	(end_multitable): Call close_insertion_paragraph.  Don't output
-	an extra newline.
-
-1998-11-20  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.h (meta_char_pos): New variable.
-	* makeinfo/makeinfo.c (init_paragraph): Initialize it.
-	(add_char): Use META to create a non-breakable space character.
-	(add_meta_char): New function.
-	(end_of_sentence_p): Don't handle characters at meta_char_pos as
-	normal sentence enders.
-	(flush_output): Only unMETA the non-breaking space character.
-	Reset meta_char_pos to zero.
-	(do_flush_right_indentation): Call adjust_braces_following.
-	(indent): Likewise.
-	(cm_value): Save and restore the value of meta_char_pos.
-	(expansion): Likewise.
-	* makeinfo/macro.c (me_execute_string_keep_state): Save and
-	restore the value of meta_char_pos.
-	* makeinfo/node.c (cm_node): Save and restore the value of
-	meta_char_pos.
-	* makeinfo/cmds.c (cm_accent): Make the dot we add due to
-	@dotaccent be a meta-character.
-	(cm_code, cm_dfn): Call add_meta_char to insert the closing
-	quote.
-	(cm_cite): Call add_char instead of add_word.
-
-Sun Nov 29 16:30:06 1998  Karl Berry  <karl@gnu.org>
-
-	* info/info.h,
-	* info/footnotes.h (FOOTNOTE_LABEL),
-	* info/indices.c (APROPOS_NONE): Use N_ rather than _.
-
-	* info/infodoc.c (create_internal_info_help_node,
-	function_documentation): Do not translate the empty string.
-	Date: Fri, 25 Sep 1998 15:09:42 +0400
-	From: "Oleg S. Tihonov" <tihonov@ffke-campus.mipt.ru>
-
-	* doc/info-stnd.texi: Mention PRIOR as another alias for
- 		PREVIOUS/PageUp.
-
-	* doc/texinfo.txi: @emph produces _emph_ not *emph*.  Spurious
-		junk before makeinfo bison example.
-	From: tihonov@ffke-campus.mipt.ru.
-
-1998-11-16  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/defun.c (defun_internal): Don't expand the arguments to
-	@defun and its ilk.
-
-	* makeinfo/makeinfo.c (expansion): Copy the name of the currently-
-	executing command and restore it after expansion.
-
-Sun Nov 15 17:40:51 1998  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c: Rearrange usage, allow -v for verbose, only
-		output `Making' line when verbose.
-	* makeinfo/makeinfo.h (process_html, process_info, process_tex):
- 		declare.
-	* makeinfo/cmds.c: Use conditional commands.
-	* makeinfo/insertion.c (find_type_from_name): Handle rawhtml and
- 		rawtex.
-	(conditional commands): Allow individual switching on and off.
-
-	* makeinfo/insertion.h: Declare conditionals.
-
-1998-11-14  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/insertion.c (begin_insertion, end_insertion): Use <pre>
-	to convert @display and @smalldisplay into HTML.
-
-	* makeinfo/cmds.c (cm_asterisk): Don't insert an extra newline in
-	HTML mode, since input includes a newline right after the @*.
-	(cm_sp): Output "<br><p>\n" as many times as the argument says.
-	(cm_url): Don't include "<a href=" in the anchor text in HTML
-	output.
-
-	* makeinfo/makeinfo.c (cm_pxref): Don't add a period after @pxref
-	if in HTML mode.
-	(get_rest_of_line): Accept an additional argument EXPAND, and
-	expand the rest of line if it's non-zero.  All callers changed.
-	(close_paragraph): When in HTML mode, honor the formatting of the
-	source paragraphs by generating "<p>" for every closed paragraph;
-	follow it by as many "<p>"'s as paragraph_spacing specifies.
-
-Sat Nov 14 17:38:27 1998  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/insertion.c: Use <ul compact> instead of deprecated <menu>.
-	Omit extra <li> after the menu beginning.
-
-	* makeinfo/index.c: Use <ul compact> instead of deprecated <menu>.
-
-Thu Nov 12 16:33:09 1998  Karl Berry  <karl@gnu.org>
-
-	* Makefile.am (EXTRA_DIST): add djgpp/config.sed.
-
-	* info/terminal.c: #include <sys/ioctl.h> to define TIOCGWINSZ
- 		under LynxOS.  From: Marius Groeger <mag@sysgo.de>.
-
-1998-11-06  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
-
-	* makeinfo/insertion.c (begin_insertion): Correctly handle
-	ifnottex and ifnothtml.
-	(end_insertion): Likewise.
-
-Sun Nov  8 17:30:23 1998  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/index.c,
-	* makeinfo/insertion.c: Menu is special to Info.
-	* makeinfo/node.c: Top is a special name, don't translate it.
-	* info/session.c (info_top_node): Top is a special name, don't
-		translate it.
-	From: "Oleg S. Tihonov" <tihonov@ffke-campus.mipt.ru>.
-
-Fri Nov  6 17:18:43 1998  Karl Berry  <karl@gnu.org>
-
-	* configure.in: Version 3.12b.
-
-	* util/texi2dvi: Fixes from Eli and Christoph Martin.
-
-	Mon Oct  5 13:58:53 1998  Dave Glowacki  <dglo@ssec.wisc.edu>
-	* util/install-info.c: Fix off-by-one error in findlines()
-
-	* util/texindex.c (usage): avoid trigraph until Ulrich fixes
- 		po2tbl.sed.in.  From Paul Eggert.
-
-1998-11-03  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (cm_xref): Don't bypass the test that an
-	xref ends with a period or a comma if the reference has a single
-	argument.
-
-1998-10-31  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/insertion.c (end_insertion): Don't decrement
-	in_fixed_width_font when leaving a menu, the previous value is
-	restored by pop_insertion.
-
-	* makeinfo/makeinfo.c (add_char): Don't increment output_column
-	twice when a newline is inserted into the output.
-
-	* doc/texinfo.txi (emph & strong): Document the use of underscores
-	for @emph in the Info output.
-
-1998-10-30  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* djgpp/config.bat: Make sure intl/po2tblsed.in exists before we
-	begin the configure boogie.
-	* djgpp/config.sed: Sed script, to be run by config.bat.
-
-	* doc/info-stnd.texi (Node Commands): Document the new G command.
-
-	* info/session.c (info_follow_menus): Step over a possible leading
-	space in a menu entry in menus[].
-	(split_list_of_nodenames): Renamed from split_words.  Split the
-	string on commas, not on spaces, since a menu entry can have
-	embedded whitespace.  Get past the null byte after inserting it.
-	(info_menu_sequence): Don't crash if there's no DIR node; try
-	using Top of the current Info file, and if that doesn't work
-	either, throw an error.
-
-	* util/texi2dvi: Use $path_sep in TEXINPUTS.  Don't include any
-	dots in $tmpdir, 8+3 filesystems won't like that.
-
-	* makeinfo/makeinfo.c (reader_loop): Expand any macros in a menu
-	entry when creating a <menu> item for HTML.  Fix an off-by-one
-	error in counting input lines.
-
-	* makeinfo/files.c (expand_filename): Don't treat .foo/bar as
-	absolute file name.
-
-	* makeinfo/makeinfo.c (add_char): Use strncpy instead of memcpy,
-	since the buffers overlap.  If the line being refilled includes
-	nothing but the indentation and the word being added, do NOT add
-	an extra newline.
-
-	* util/install-info.c (strip_info_suffix, menu_item_equal,
-	open_possibly_compressed_file) [__MSDOS__]: Allow .inz and .igz as
-	suffuxes for compressed files.
-	(open_possibly_compressed_file): Return an indication whether we
-	opened a file or a pipe.  Use FOPEN_RBIN from system.h.
-	[STRIP_DOT_EXE]: Use gzip.exe with an explicit .exe extension.
-	[O_BINARY]: If the file is not compressed, switch its stream to
-	text mode.
-	(readfile): Close the file or the pipe.
-	(output_dirfile): Call pclose to actually run the compressor.
-
-Thu Nov  5 08:33:06 1998  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: effect -> affect
-	From: Eric Hanchrow <offby1@blarg.net>
-
-Tue Nov  3 14:26:59 1998  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (cm_image): Allocate enough space for the
- 		zero byte.
-
-	* doc/texinfo.txi: Document epsf.tex standard location.
-
-Tue Oct 27 10:45:47 1998  Karl Berry  <karl@gnu.org>
-
-	* Makefile.am (TEXINFO_TEX): add definition.
-
-	* doc/info-stnd.texi: Avoid unnecessary overfull boxes from
- 		examples.
-
-	* doc/Makefile.am (install-data-local): missing ".
-
-	* doc/Makefile.am: Don't try to run help2man in distribution.
-
-Mon Oct 26 13:43:53 1998  Karl Berry  <karl@gnu.org>
-
-	* configure.in (TEXMF): lose this whole block.  It is too painful
-		to maintain with the different tex installations out there.
-
-	* util/Makefile.am (EXTRA_DIST): update-info renamed to
- 		fix-info-dir.
-
-	* makeinfo/footnote.h: Doc fix.
-
-	* makeinfo/multi.c: #include "insertion.h"
-	* makeinfo/cmds.c: #include "node.h"
-	* makeinfo/makeinfo.h,
-	* makeinfo/makeinfo.c: Move globals, functions for insertions and
- 		nodes.
-	* makeinfo/defun.c: #include "insertion.h"
-	* makeinfo/Makefile.am: Add insertion.[ch], node.[ch].
-	* node.[ch], insertion.[ch]: New files.
-
-	* makeinfo/makeinfo.c,
-	* makeinfo/makeinfo.h: Move globals for cmds.h.
-	* makeinfo/index.h: Include cmds.h.
-	* makeinfo/Makefile.am (makeinfo_SOURCES): Add cmds.h, cmds.c.
-	* cmds.c, cmds.h: New files.
-
-Sat Oct 24 17:28:14 1998  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c,
-	* makeinfo/makeinfo.h: Globals for files.c.
-	* makeinfo/Makefile.am (makeinfo_SOURCES): add files.[ch].
-
-Tue Oct 20 17:03:10 1998  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/Makefile.am (makeinfo_SOURCES): add macro.c and
- 		macro.h.
-	* makeinfo/makeinfo.c: Move macro code to macro.h and macro.c.
-	* makeinfo/makeinfo.h: Move macro stuff to macro.h, expose global
-		last_char_was_newline for macro.c.
-	* makeinfo/index.c,
-	* makeinfo/footnote.c: #include macro.h.
-
-Wed Oct  7 16:24:07 1998  Karl Berry  <karl@gnu.org>
-
-	* doc/info-stnd.texi: For now don't include version.texi due to
- 		automake error.
-
-	* makeinfo/index.h: #include makeinfo.h for sake of COMMAND type.
-	* makeinfo/index.c: No need to include makeinfo.h, index.h does
- 		now.
-
-	* makeinfo/makeinfo.c: Move footnote code to footnote.c.
-	* makeinfo/makeinfo.h: Globals for footnote.c.
-	* makeinfo/Makefile.am (makeinfo_SOURCES): add footnote.[ch].
-
-	* makeinfo/makeinfo.c: Move defun code to defun.c, necessary
- 		global to makeinfo.h.
-	* makeinfo/makeinfo.h (default_indentation_increment): move here
- 		for defun.c.
-	* makeinfo/Makefile.am (makeinfo_SOURCES): add defun.c.
-
-	* Makefile.am: Doc fix.
-
-	* configure.in (AC_OUTPUT): generate makeinfo/tests/Makefile.
-
-	* makeinfo/makeinfo.c,
-	* makeinfo/makeinfo.h,
-	* makeinfo/Makefile.am (makeinfo_SOURCES): add index.[ch].
-
-Fri Oct  2 17:42:26 1998  Karl Berry  <karl@gnu.org>
-
-	* lib/system.h (STREQ): new macro.
-
-Thu Oct  1 09:26:57 1998  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Delete spare copy since out of date,
-	add makeinfo html to menu,
-	detailmenu doesn't take braces in summary.
-
-Wed Sep 30 14:38:21 1998  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c: Remove != NULL comparisons,
-	xmalloc/xrealloc casts, assignments in if statements.
-
-Wed Sep 30 14:16:01 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c: Remove NULL casts and parentheses in return
- 		statements.
-
-	* makeinfo/makeinfo.c (add_link): Don't add a link if the node is null.
- 	(reader_loop): don't glean_node_from_menu if detailmenu, even if html.
-	Various formatting changes.
-
-	* doc/help2man: Always exit successfully.
-
-	* makeinfo/Makefile.am (SUBDIRS): add.
-	(makeinfo_SOURCES): no more html.h.
-
-Fri Sep 11 18:47:15 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c: Fiddle with html output.
-
-1998-09-07  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (maybe_update_execution_strings): Only
-	reallocate TEXT if the existing storage is too small, otherwise
-	leave TEXT alone.
-	(replace_with_expansion): Call maybe_update_execution_strings to
-	reallocate input_text if we are executing_string, since storage
-	for execution_string is assumed to be large enough to hold every
-	possible string.
-	(me_execute_string): xstrdup the argument, so callees could freely
-	relocate it as needed.
-
-1998-09-06  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (replace_with_expansion): Don't remember
-	macro-expansion pointers if we are executing_string.
-
-1998-09-05  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/filesys.c (info_suffixes): Put the empty suffix last in the
-	list, so that `foo.info' is found before `foo', if both exist.
-
-1998-09-05  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (maybe_update_execution_strings): New
-	function, updates an entry in execution_strings[] array after
-	input_text is relocated by replace_with_expansion.
-	(replace_with_expansion): Call it.
-
-1998-09-04  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (expand_macro): If a macro is called with
-	too many arguments, return NULL and print the line number where
-	the call begins.
-	(execute_macro): If expand_macro returns NULL, return
-	immediately.
-
-Sun Sep  6 19:11:28 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c,
-	* makeinfo/makeinfo.h,
-	* makeinfo/multi.c: Html output.  Specifically, these changes:
-
-    Fri Jul  4 22:58:29 1997  Dave Love  <d.love@dl.ac.uk>
-
-	     * doc/makeinfo.texi: Document HTML output.
-
-	     * makeinfo/makeinfo.c: Wrap strings in _() in bits changed for
-	     HTML.
-	     (cm_image): Generate <img> for HTML.
-
-    Sun Jun 22 22:50:07 1997  Dave Love  <d.love@dl.ac.uk>
-
-	    * makeinfo/makeinfo.c (NAMED_NODE_ANCHORS): New define.
-	    (title, outstanding_node, node_number, node_node_references,
-	     escape_html, ifinfo_as_html): New variables.
-	    (tentry.number, node_ref.number, fn.number): New fields.
-	    (CommandTable): Various additions and alterations for HTML.
-	    (long_options): Add html and no-info-as-html.
-	    (main): Extra code for HTML.
-	    (usage): Add HTML stuff.
-	    (expand_filename): Deal with .html.
-	    (escape_string): New procedure.
-	    (convert_from_loaded_file): Extra code for HTML.
-	    (init_internals): Call free_node_references, initialize
-	    node_number.
-	    (reader_loop): Process menu items for HTML hyperlinks.  Escape
-	    HTML special characters.
-	    (add_char): Code for line breaks and paragraph insertions in
-	    HTML.
-	    (flush_output): Don't UNMETA for HTML.
-	    (indent): Do nothing for HTML.
-	    (current_item_function): Case for ifhtml.
-	    (begin_insertion): Deal with HTML in various cases.
-	    (insert_html_tag): new procedure.
-	    (cm_asterisk, cm_copyright, cm_accent, cm_code, cm_kbd,
-	    cm_angle_brackets, cm_var, cm_defn, cm_var, cm_emph, cm_string,
-	    cm_cite, cm_top, cm_xref, cm_inforef, cm_uref, cm_direntry,
-	    cm_ifinfo, cm_item, process_defun_args, defun_internal, cm_sp,
-	    cm_dircategory, cm_center, cm_result, cm_expansion, cm_error,
-	    cm_exdent, index_add_arg, make_index_entries_unique,
-	    cm_printindex, cm_footnote, output_pending_notes,
-	    me_execute_string): Code for HTML.
-	    (cm_shyph): New procedure.
-	    (cm_special_char): Add start, end args.  Code for HTML.
-	    (cm_email, cm_url, cm_i, cm_b, cm_r): New procedures.
-	    (sectioning_html): New procedure.
-	    (sectioning_underscore): Use it.
-	    (add_link): New procedure.
-	    (remember_node): Add number field and update node_number.  Note
-	    next, etc. nodes for HTML.
-	    (add_escaped_anchor_name, add_anchor_name): New procedures.
-	    (cm_node): New code for HTML.  Move some other code to more
-	    useful place.
-	    (remember_node_reference): Add number field and update
-	    node_number.
-	    (remember_node_node_reference, free_node_node_references,
-	    number_of_node): New procedures.
-	    (cm_ifhtml, cm_html): New procedures.
-	    (expansion): Take care of HTML escaping.
-	    (cm_settitle): New procedure.
-	    (remember_note): Set number field.
-
-	    Declare various procedures in advance.
-
-	* doc/texinfo.txi: Makeinfo --html documentation from Dave Love.
-	Typo fixes from: Paul DuBois <dubois@primate.wisc.edu>.
-
-Thu Sep  3 11:11:01 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/Makefile.am (makeinfo_SOURCES): add html.[ch].
-
-1998-08-28  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (cm_uref, cm_email): Use get_xref_token to
-	gather arguments.
-	(get_xref_token): Keep track of input line number when expanding
-	xref arguments.
-
-Tue Aug 25 14:36:44 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* util/texi2dvi: Exit the script if TeX exits with bad status.
-
-1998-08-16 Eli Zaretskii <eliz@is.elta.co.il>
-
-	* info/indices.c (info_index_apropos): In the *Apropos*
-	menu, print the label first, then the Info file name and
-	the node name.  Make the Info file name part of the menu
-	entry, so that all entries are distinct.
-	(apropos_in_all_indices): Scan each Info file only once, thus
-	avoiding multiple identical entries in the *Apropos* menu.
-	Free xstrdup'ed buffer, to avoid leaking memory.
-
-Thu Aug 13 12:54:58 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* configure.in: Set version to 3.12a.
-
-	* Makefile.am (AUTOMAKE_OPTIONS): bump required version to 1.3,
- 		add readme-alpha option.
-
-	* util/texindex.c (program_name),
-	* util/install-info.c (progname),
-	* info/info.c (program_name),
-	* makeinfo/makeinfo.c (progname): hardwire per coding standards.
-	* doc/help2man: Remove ginfo special case.
-
-Tue Aug 11 17:41:15 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* util/gen-dir-node: New version from drk@sgi.com.
-
-Mon Aug 10 13:55:37 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* dir-example: Add entries from Linux.
-
-	* info/info-utils.c (get_window_of_node): New fn.
-	* info/info-utils.h (get_window_of_node): New fn.
-	* (strchr,...) [!HAVE_STRCHR]: remove these #defines.
-	* info/infodoc.c (info_find_or_create_help_window): Call
-		get_window_of_node instead of get_internal_info_window.
-	This is so pressing ? repeatedly will always get to the same Help
-		window instead of popping up new ones.
-	From: "Brian J. Fox" <bfox@prospero.datawave.net>
-
-	* info/signals.c: Ignore SIGWINCH if we're in the midst of it.
-	We might get a whole lot of them.  Noticed on Afterstep.
-	From: "Brian J. Fox" <bfox@prospero.datawave.net>
-
-1998-07-25  Bruno Haible  <bruno@linuix.math.u-bordeaux.fr>
-
-        * install-info.c (findlines): Allocate room for one more line,
-        to avoid crash if dir file has exactly 512 lines.
-
-Tue Aug  4 07:14:35 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* info/info.c: Improve help message.
-
-	* dir-example: Add mtools.
-
-Fri Jul 31 13:29:52 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/help2man: Various hacks for texinfo.
-
-	* doc/texinfo.txi: Make dir entries more consistent.
-
-	* doc/Makefile.am: Generate man pages with help2man.
-
-	* util/texi2dvi,
-	* util/install-info.c,
-	* makeinfo/makeinfo.c,
-	* util/texindex.c: Improve help message.
-
-	* doc/info.5: Initial.
-	* doc/texinfo.5: Section 5.
-
-Thu Jul 30 17:31:42 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/info-stnd.texi,
-	* doc/texinfo.txi: Use Automake-standard VERSION and UPDATED.
-
-Wed Jul 29 17:34:41 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.txi: Describe macro limitations a bit more.
-
-	* dir-example: Correct makeinfo link.
-
-Tue Jul 28 16:44:06 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (remember_brace_1): xstrdup command, since
- 		we free it later.
-
-Mon Jul 27 16:27:30 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* info/session.c (node_printed_rep): New fn.
-	Change calls.
-
-	* info/session.c (info_set_node_of_window): Simplify by taking new
-		argument to say whether to call
-		set_remembered_pagetop_and_point.  Change calls.
-	* info/indices.c: Change call.
-
-	* info/info.c: Rewrite initial menu-sequence following stuff as a
-		function in session.c, and call it.
-
-	* info/infomap.c: Define `G' as info_menu_sequence.
-	* info/session.h (info_menu_sequence, info_follow_menus): declare
- 		new fns.
-	* info/session.c (info_follow_menus, split_words,
-		* info_menu_sequence): New functions for new command.
-
-Thu Jul 23 16:44:42 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* info/session.c (info_scroll_other_window_backward): new command.
-	* info/infomap.c (initialize_info_keymaps): bind M-DEL and M-prior to
-	scroll-other-window-backward.
-	Report from: Vladimir Alexiev <vladimir@cs.ualberta.ca>
-	Date: 	Tue, 2 Dec 1997 14:54:30 -0700
-
-	* info/info-utils.c (printed_representation): If ISO_Latin_p, show
-		characters as-is.  Don't assume iscntrl(x) returns false
-		for meta characters.
-        Report from: Francois Pinard <pinard@iro.umontreal.ca>
-	Date: 15 Jan 1998 17:48:51 -0500
-
-	* info/pcterm.c (pc_initialize_terminal): now no need to set it
- 		here.
-	* info/info-utils.c (ISO_Latin_p): set to 1 by default.
-
-	* doc/info-stnd.texi: Document SPC, add goto-node anchor.
-
-Wed Jul 22 18:58:38 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* info/window.c (message_buffer_to_node),
-	* info/session.c (kill_node),
-	* info/nodes.c (info_get_node_of_file_buffer,
- 		info_node_of_file_buffer_tags),
-	* info/man.c (manpage_node_of_file_buffer),
-	* info/footnotes.c (make_footnotes_node): set display_pos member
- 		in new node.
-
-Tue Jul 21 14:04:52 1998  Karl Berry  <karl@cs.umb.edu>
-
-        (all of this is to make SPC/DEL not move outside the current
-	        document, i.e., not up through dir)
-	* info/info-utils.h (info_label_was_found): Move from here.
-	* (info_prev_label_of_node): Don't use it any more.
-	* info/session.c (INFO_LABEL_WAS_FOUND): Move to here, add test
- 		for filename not dir.
- 	(forward_move_node_structure): Change calls, notice if no more nodes.
-	(backward_move_node_structure): Check for moving outside current
-	document to dir.
-	* info/filesys.c (compression_suffixes): Add bz2 for bunzip2.
-	(is_dir_name): New fn.
-	* info/filesys.h: Declare it.
-	* info/nodes.c (info_get_node, info_find_file_internal): Use it.
-
-	* makeinfo/makeinfo.c: Set in_fixed_width_font to avoid munging
- 		node names.
-
-Sat Jul 18 17:14:10 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* info/man.c (reap_children): Call wait (NULL), since we don't
-		actually use the return status for anything.  NEXTSTEP 3.3
-		doesn't like an int * even though that is the POSIX
-		specification.
-	Date: Fri, 22 Aug 1997 13:55:42 +0200
-	From: "Felix H. Gatzemeier" <fxg@imib.rwth-aachen.de>
-	Via: Thomas Esser <te@informatik.uni-hannover.de>
-
-	* info/session.c (kill_node): Restore point when we go back.
-
-Thu Jul 16 18:54:04 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (BRACE_ELEMENT): Add `command' to the save
- 		stack.
- 	(MAYBE_BRACE_ARGS): New possibility, somewhat like TeX's
-	  next-token-as-argument.
-	(command_table): Use cm_accent and MAYBE_BRACE_ARGS for all accents.
-	(read_command): Implement MAYBE_BRACE_ARGS.
-	(init_brace_stack): save current command.
-	(pop_and_call_brace): restore current command.
-	(cm_accent): move almost all accent characters to after the argument.
-	Suggested by Fran,cois.
-
-	* info/info.c (version_string): Remove defn.
-	Change call for --version option.
-	* info/session.c (display_startup_message_and_start): Just use
- 		VERSION.
-	* info/info.h (version_string): Remove decl.
-
-Tue Jul 14 16:46:58 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.h: Doc fix.
-
-	* makeinfo/makeinfo.c (validate_file): Don't complain about
- 		unreferenced anchors.
-
-	* doc/texinfo.txi: Document @anchor.
-
-Sun Jul 12 14:14:50 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (remember_node): Only set `current_node' if
- 		this is not an anchor.
-
-	* info/nodes.c (get_tags_of_indirect_tags_table): Don't set
-	nodelen to -1 when fixing up the subfile entries, it might be 0
-	from an anchor.
-
-	* info/nodes.c (find_node_of_anchor): Offset display_pos for
-	anchor tags by the amount that node references are off by (- 1).
-
-Sat Jul 11 17:37:18 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (cm_anchor): Add output_column for anchors
- 		embedded in a line.
-
-Fri Jul 10 16:28:21 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* info/session.c (info_menu_or_ref_item): Don't search for the
-		xref text if it's an anchor.
-	* info/nodes.h (N_FromAnchor): New NODE flag.
-	* info/nodes.c (find_node_of_anchor): New fn.
-	(info_node_of_file_buffer_tags): Handle anchor case.
-
-Wed Jul  8 17:48:59 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* info/window.c (window_set_node_of_window): Set window->point to
-		node->display_pos.
-	Remove unneeded casts.
-
-Tue Jul  7 08:06:14 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (add_word_args) [!VA_SPRINTF]: Use buffer,
-		not the undeclared temp_string.
-	From:     Tobias Naehring <naehring@eeetw3.et.tu-dresden.de>
-	To:       egcs-bugs@cygnus.com
-	Date:     Mon, 6 Jul 98 13:51:55 +0200
-
-Mon Jul  6 17:43:25 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* info/nodes.h (NODE): Add display_pos member.
-
-Sun Jul  5 08:17:43 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* info/nodes.h (INFO_REF_LABEL): Define.
-
-	* util/texi2dvi: Rationalize use of `index' vs. more general
- 		`xref'.
-
-Thu Jul  2 18:53:43 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c: Don't translate -Footnotes, it's a magic
- 		cookie.  From Eli.
-
-Wed Jul  1 08:42:41 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.txi (url): Missing word `command'.
-
-Tue Jun 30 10:35:48 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* info/info.c: Missing \n in try --help msg.
-
-	* makeinfo/makeinfo.c (cm_anchor): New fn for new cmd.
-	(TAG_FLAG_ANCHOR): New flag for tag entries.
-	(write_tag_table_internal): Handle anchor case.
-	(TAG_FLAG_{{PREV,NEXT,UP}_ERROR,NO_WARN,IS_TOP}): Add TAG_FLAG_ prefix
-	for clarity, change uses.
-
-	* doc/texinfo.txi: Remove warning about footnotes with @item, that
- 		works now.
-
-Mon Jun 29 10:17:50 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* configure.in (AM_CONFIG_HEADER): Use second argument to be 8.3
-		compliant.
-	* config.h.in: Rename to config.in.
-
-	* info/Makefile.am (EXTRA_DIST),
-	* info/terminal.c [__MSDOS__]: Change #include to pcterm.c and
-		rename file.
-
-Sun Jun 28 14:29:27 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* info/Makefile.am (EXTRA_DIST): Add pc_term.c.
-
-	* makeinfo/makeinfo.c (HAVE_MACROS): Remove this conditional, we
- 		always want macros now.
-
-	* info/indices.c: Copyright.
-
-1998-06-26  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c: (only_macro_expansion): New variable,
-	suppresses all expansions except macros.
-	(replace_with_expansion): New function, replaces a portion of
-	input text with its expansion.  Avoids moving the text around if
-	we are positive it will expand into itself.  If the length of the
-	expanded text is the same as the length of the original text, just
-	replaces the original text without moving the rest.  Resyncs the
-	remembered text pointers with the realloc'ed input_text, when it
-	is realloc'ed.
-	(reader_loop): When only_macro_expansion is non-zero, only handle
-	macros, but leave the rest of input intact.
-	(read_command): Now returns an int, zero means no known command or
-	macro is found after the prefix character; all callers changed.
-	Support operation under non-zero only_macro_expansion.
-	(cm_node): Expand only the macros in the @node line.  Allocate and
-	generate the macro-expanded @node line in one swell whoop.
-	(glean_node_from_menu): Expand macros in menu entries.
-	(get_xref_token): A new argument EXPAND, when non-zero, means
-	expand macros in the entire brace-delimited argument before
-	looking for the next comma; all callers changed.
-	(expansion): Save and restore additional state variables important
-	for output generation machinery.  Disable indentation and filling
-	during the recursive expansion, so that the output buffer offset
-	is not invalidated by filling.
-	(me_execute_string_keep_state): New function, calls
-	me_execute_string, but saves and restores state variables
-	important for output generation, so that -E doesn't change the
-	generated Info output.
-	(index_add_arg, cm_footnote): Call me_execute_string_keep_state.
-	(expand_macro): New function, returns the macro expansion as a
-	malloc'ed string.
-	(execute_macro): Call expand_macro.
-	(me_execute_string): Avoid memory leak by freeing input_filename.
-	(get_until_in_braces, replace_with_expansion, add_char,
-	cm_footnote, cm_macro, cm_unmacro, get_brace_args,
-	extract_colon_unit): Use the faster memcpy/memmove instead of
-	strncpy.
-
-Sat Jun 27 14:18:54 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/info.texi: Use @subsubsection instead of
-		@unnumberedsubsubsection, since it's in a numbered chapter.
-
-	* Started installation of following DOS patches from Eli.
->1998-05-16  Eli Zaretskii  <eliz@is.elta.co.il>
->
->	* info/session.c (info_goto_node): Don't show the nodes of the
->	current Info file twice in *Completions*.
->	* info/echo-area.c (ea_possible_completions): Actually pass the
->	number of completions to printf_to_message_buffer.
->
->	* info/man.c (manpage_node_of_file_buffer): xstrdup the nodename
->	member of manpage nodes, since the tags are freed and recomputed
->	when a new man page is added to *manpages* file_buffer.
->	(get_manpage_node): Recompute info_windows[]->nodes[] for all
->	windows showing the man pages after nodes[]->contents are
->	invalidated by reallocation of file_buffer->contents.
->
->1998-05-15  Eli Zaretskii  <eliz@is.elta.co.il>
->
->	* lib/system.h (DEFAULT_INFO_PRINT_COMMAND) [__MSDOS__]: Define to
->	">PRN".
->	* info/session.c (print_node): Support ">printer" in
->	INFO_PRINT_COMMAND, to mean write to the named file/device insead
->	of piping to it as a program.
->	(kill_node): Compare window in addition to the nodename, when
->	looking for the node to kill.
->
->1998-05-09  Eli Zaretskii  <eliz@is.elta.co.il>
->
->	* lib/system.h (SET_SCREEN_SIZE_HELPER) [__MSDOS__]: Define a new
->	macro.
->	* info/m-x.c (set_screen_height): Use SET_SCREEN_SIZE_HELPER, if
->	defined.  If the screen size did'n change, redisplay the previous
->	screen contents.
->
->	* info/infomap.c (initialize_info_keymaps) [__MSDOS__]: Bind DEL
->	to ea_delete in the echo-area keymap.
->	* info/session.c (incremental_search): If the key is
->	isearch_terminate_search_key, but buffered input is pending, don't
->	gobble the ESC key.
->
->	* info/info.c (main): Switch the order thet terminal_prep_terminal
->	and terminal_clear_screen are called, to make it consistent with
->	what initialize_info_session does when called with non-zero second
->	argument.  Call terminal_unprep_terminal last, after moving the
->	cursor to the bottom of the screen.  If user_filename is of the
->	form "d:foo", add "d:." to the INFOPATH, not "d:".
->
->	* info/signals.c (initialize_info_signal_handler): Save old
->	SIGUSR1 handler.
->	(info_signal_handler): Handle SIGUSR1.
->
->	* info/indices.c (info_apropos): Print the results to stdout.
->
->1998-05-02  Eli Zaretskii  <eliz@is.elta.co.il>
->
->	* makeinfo/makeinfo.c (ALSO_NULL_DEVICE): New macro, for alternate
->	null device name.
->
->	* info/man.c (get_manpage_contents): Redirect stderr of the man
->	page formatter to the null device.
->	(executable_file_in_path): Use IS_SLASH.
->
->	* info/session.c (info_gather_typeahead) [__DJGPP__]: Call
->	pc_term_chars_avail to get the number of pending characters.
->
->	* info/filesys.c (convert_eols): New function, converts DOS-style
->	EOLs to a single Newline.
->	(filesys_read_info_file, filesys_read_compressed): Call it.
->	(filesys_read_compressed) [STRIP_DOT_EXE]: Use explicit .exe
->	suffix.
->	(filesys_read_compressed): Check return status of `pclose'.
->
->1998-05-01  Eli Zaretskii  <eliz@is.elta.co.il>
->
->	* info/filesys.c (filesys_read_info_file): Add additional
->	parameter: is_compressed.  All callers changed.
->
->	* makeinfo/makeinfo.c (convert_from_loaded_file): Compare file
->	names with FILENAME_CMP.  Use NULL_DEVICE.
->	(cm_node): Compare file names with FILENAME_CMP.
->	* info/tilde.c (tilde_find_suffix, tilde_expand_word): Use
->	IS_SLASH.
->
->	* info/pc_term.c: New file, handles the PC terminal on MS-DOS and
->	MS-Windows.
->	* info/terminal.c [__MSDOS__]: Include pc_term.c.
->	* info/Makefile.in (ginfo_SOURCES): Add pc_term.c
->	Add pc_term.c to dependencies of terminal.o.
->
->	* info/session.c (info_get_input_char): Reassign tty after EOF
->	from a non-stdin input stream.
->
->1998-04-30  Eli Zaretskii  <eliz@is.elta.co.il>
->
->	* info/session.c (info_set_input_from_file): Use binary input.
->	(info_gc_file_buffers): Compare file names with FILENAME_CMP.
->	* info/search.c (skip_whitespace_and_newlines): Use
->	whitespace_or_newline macro instead of reinventing the wheel.
->	* info/nodes.c (info_find_file_internal): Use IS_ABSOLUTE and
->	FILENAME_CMP.
->	(info_load_file_internal): Call filename_non_directory to find out
->	where the basename begins.
->	(get_tags_of_indirect_tags_table): Call filename_non_directory.
->	containing_dir of "d:foo" is "d:.", not "d:".
->	(forget_info_file): Compare file names with FILENAME_CMP.
->	* info/nodemenu.c (get_visited_nodes): Use FILENAME_CMP to find
->	duplicate lines.
->
->	* lib/system.h (PIPE_USE_FORK): New macro.
->	* info/man.c (get_manpage_contents): Use it to determine whether
->	to call pipe/fork/exec or popen/pclose to run the man page
->	formatter.
->	(executable_file_in_path): Search for the file with several known
->	extensions such as .exe, where appropriate.
->
->	* lib/system.h (NULL_DEVICE): A new macro.
->	* info/makedoc.c (main): Use it.
->	(maybe_dump_tags): Switch output strem to binary mode when
->	appropriate.
->	(process_one_file): Update file_size after reading the file.
->
->	* info/infodoc.c: Add TAB, RET, and `i' to the list of important
->	commands in info_internal_help_text.
->
->	* info/info.c (main): Support the --speech-friendly option.  Use
->	PATH_SEP to separate directories.
->	(info_short_help) [__MSDOS__]: Mention the --speech-friendly
->	option.
->
->	* info/info-utils.c (filename_non_directory): Use HAVE_DRIVE and
->	IS_SLASH.
->	* info/indices.c (do_info_index_search, index_entry_exists): Use
->	FILENAME_CMP to compare file names.
->	* info/filesys.c: Add ".inf" to the list of known extensions.
->	Look for .z before .Z, for the sake of case-insensitive
->	filesystems.  Add DOS-specific extensions to work around 8+3
->	namespace restrictions.
->	(info_absolute_file): New function.
->	(info_find_fullpath): Call it for candidates which are absolute
->	file names.  Use IS_SLASH and IS_ABSOLUTE.
->	(info_file_in_path): Use IS_SLASH.
->	(extract_colon_unit, info_add_path): Use PATH_SEP instead of ":".
->	(lookup_info_filename): Compare file names with FILENAME_CMP.
->	(filesys_read_info_file): Read Info files in binary mode.
->	(filesys_decompressor_for_file): Read Info files in binary mode.
->	Compare file names with FILENAME_CMP.  On MS-DOS, allow files
->	whose names end with a `z' be decompressed with gunzip.
->	* info/dribble.c (open_dribble_file): Open dribble file in
->	FOPEN_WBIN mode.
->	* info/dir.c (maybe_build_dir_node): Use IS_SLASH.
->	* util/texindex.c (maketempname): Put the numeric suffix after the
->	dot, to salvage 3 more characters on 8+3 filesystems.
->
->1998-04-29  Eli Zaretskii  <eliz@is.elta.co.il>
->
->	* util/texindex.c (main): Use IS_SLASH to find the basename of
->	argv[0].  Lose the .exe suffix, if any.
->	(decode_command): Look at $TEMP and $TMP in addition to $TMPDIR.
->	Use DEFAULT_TMPDIR.
->	* util/texi2dvi: Use either `:' or `;' as directory separator in
->	TEXINPUTS, computed at run time.  Save previous versions of index
->	files in a separate backup directory.
->	* util/install-info.c (main): Support backslashes in file names by
->	using IS_SLASH.  Avoid recomputing length of infile_basename
->	unnecessarily.  Use FILENAME_CMP for comparing file names
->	case-insensitively, where appropriate.  Allow foo.inf as well as
->	foo.info to be an Info file name.
->	* lib/system.h (PATH_SEP, STRIP_DOT_EXE, FILENAME_CMPN,
->	DEFAULT_TMPDIR): New macros.
->
->1998-04-25  Eli Zaretskii  <eliz@is.elta.co.il>
->
->	* lib/system.h (O_BINARY, SET_BINARY, FOPEN_RBIN, FOPEN_WBIN,
->	IS_SLASH, HAVE_DRIVE, IS_ABSOLUTE, FILENAME_CMP, PATH_SEP,
->	HAVE_LONG_FILENAMES): New macros.
->	* makeinfo/makeinfo.c (find_and_load): Use O_BINARY to decide when
->	read returning a value different from what st_size says is not an
->	error.  Realloc the buffer after we've read the file.
->	(skip_directory_part): New function, skips leading directory in a
->	way that works on DOSISH systems.
->	(filename_non_directory, pathname_part): Call it.
->	(filename_part): Call filename_non_directory.
->	(expand_filename, full_pathname): Use IS_ABSOLUTE and IS_SLASH.
->	(convert_from_file): Check .txi extension first.
->	(split_file): Support splitting output files on 8+3 filesystems.
->	(main, extract_colon_unit): Use PATH_SEP instead of ':'.
->	(get_file_info_in_path): Use IS_ABSOLUTE and IS_SLASH.
-
-
-	* doc/texinfo.txi: Changes from Eli for MS-DOS stuff.
-	* doc/info-stnd.texi: Fixes from Eli: he documented all the
- 		missing keys and command-line options, corrected
- 		inaccuracies (probably left-overs from previous versions),
- 		and added some clarifications where I thought the manual
- 		was not clear enough.
-	* Makefile.am (EXTRA_DIST): Add djgpp files.
-
-	* makeinfo/makeinfo.c: New no-op commands @setcontentsaftertitlepage
-	and @setshortcontentsaftertitlepage.
-	* doc/texinfo.txi: Document the new @set{,short}contentsaftertitlepage
-	commands and the possibility of putting @contents and
-        @shortcontents after @end titlepage.
-
-	* util/texi2dvi: Check that the toc file has not changed (as well
- 		as .aux and .??).
-
-Thu Jun 25 16:58:46 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.txi: Document new commands @env, @command, @option.
-
-	* makeinfo/makeinfo.c (option, command, env): New markup commands, same
- 		as @code in info.
-
-Wed Jun 24 15:39:38 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c: New no-op command @acronym.
-
-	* doc/texinfo.txi: Document new command @acronym.
-
-	* util/install-info.c (strip_info_suffix, menu_item_equal): New fns.
- 	(main): Call them instead of doing the filename test inline; all the
-	.info variations are too confusing to write out twice.
-
-Tue Jun 23 18:01:40 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.txi: Fix some overfull boxes.
-
-Mon Jun 22 19:22:17 1998  Karl Berry  <karl@north>
-
-	* configure.in: Remove AC_LINK_FILES call, that was an old gettext
- 		thing, no longer necessary, and causes problems with Autoconf.
-
-Sun Jun 14 07:00:15 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* util/texi2dvi: Indent options so help2man will work.  From Akim.
-
-Sat Jun 13 10:45:25 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* configure.in (ALL_LINGUAS): Add nl.
-
-	* util/texi2dvi: Avoid tabs.
-
-Wed Jun 10 17:38:21 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (gen_defindex): Use xmalloc instead of alloca.
-	This was our only use of alloca, so also remove all the #if junk
-	at the beginning to define it.
-
-	* makeinfo/makeinfo.c: Fix grammar in multiply-defined-node error
-		message.
-
-Tue Jun  9 17:53:54 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.txi: Document new commands @smallformat,
- 		@smalldisplay.
-
-	* makeinfo/makeinfo.c: New commands @smalldisplay and @smallformat.
-	Suggestion from: Eli Zaretskii <eliz@is.elta.co.il>.
-
-	* makeinfo/makeinfo.h (insertion_type, insertion_type_names):
-	Declare smalldisplay and smallformat.
-
-Mon Jun  8 07:57:52 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.txi: Document possibility of combining @titlefont
- 		and @title.  From Eli.
-
-	* util/texi2dvi: Set verbose to : instead of false by default.
-
-	* util/texi2dvi: Missing \\ for sed with -t text.  From Akim.
-
-Sun Jun  7 13:02:13 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.txi: Document @pagesizes and texidvi -t.
-
-	* makeinfo/makeinfo.c: Define no-op @pagesizes and @afourpaper.
-	(major_version, minor_version): Remove these globals, just use the
-	Texinfo package version.
-	(print_version_info): Ditto.
-
-Fri Jun  5 17:54:16 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.txi: Change texi2dvi documentation a bit.
-
-	* util/texi2dvi: Handle --option=argument style of specifying
- 		arguments.
-
-Sat May 30 14:01:37 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.txi: More.
-
-	* util/install-info.c (open_possibly_compressed_file): Finish
- 		implementation.
-
-	* doc/texinfo.txi: Document install-info compression support.
-
-Fri May 29 08:01:43 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* util/install-info.c (open_possibly_compressed_file): Initial
- 		implementation.
-
-	* util/install-info.c (output_dirfile): Attempt to write dir.gz if
- 		that's what we read.
- 	(readfile): Pass back the actual opened filename, too.
-
-	* info/indices.c: Check in Eli's patch.
-
-Thu May 28 17:09:45 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* util/install-info.c (readfile): Set up to handle compressed
-	input (and output) files. Change callers.
-	Rearrange function order to avoid forward declarations.
-
-	* configure.in: Remove check for libz, we'll fork gzip instead.
-
-Tue May 26 18:01:13 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* util/install-info.c (print_help): Missing \n\ in help string.
-
-	* makeinfo/makeinfo.c (POST_SENTENCE): Rename from post_sentence.
-  	Change calls.
-	(flush_output): Strip 8th bit if post_sentence char as well as space.
-	(cm_code, etc.): Change add_char calls for post_sentence chars to set
-	8th bit.
-
-1998-05-23  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/indices.c (info_next_index_match): Call
-	info_set_node_of_window to display the node, so that footnotes are
-	displayed as well.
-
-Thu May 21 11:05:50 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* util/install-info.c (output_dirfile): New function, extracted
- 		from the end of main.
-
-	* makeinfo/makeinfo.c (begin_insertion): Ignore @group in all the
-	example-like environments, not just @example.  Otherwise the first
-	line in the environment is not indented correctly. Reported by rms.
-
-Wed May 20 17:44:38 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* util/install-info.c: Doc fixes.
-
-	* util/install-info.c: Handle XEmacs-style dir entries:
-	* FILENAME::PROGRAM  DESCRIPTION.
-	Date: Wed, 13 May 1998 13:58:28 +0900
-	From: KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
-
-	Also, do not set something_deleted on continuation lines; they are only
-	deleted if the entry was deleted.
-
-Tue May 19 17:22:50 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* util/install-info.c: Do not read the dir file if we are only
-	deleting -- it might not exist, and we don't actually need it.
-	From: David Kaelbling <drk@sgi.com>
-	Date: Tue, 12 May 1998 11:05:26 -0400
-
-	* util/gen-dir-node:
-	From: David Kaelbling <drk@sgi.com>
-	Date: Tue, 12 May 1998 16:05:16 -0400 -
-	- The "dir" moobler header is slightly different from the default
-		dir file.
-	- If all files in ${infofiles} appear in the skeleton the last one
- 		is processed twice.
- 	- INFO-DIR-SECTION data is ignored.
-  	- Don't generate entries for directories.
-
-Sat May 16 17:16:56 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (cm_novalidate): New fn for new command
- 		@novalidate, like --no-validate.
-
-Thu May 14 18:02:31 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.txi: Document the @novalidate command.
-
-Wed May 13 17:47:20 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.txi: Document limitation on @set/@value names in
- 		index commands.
-
-Fri May  1 14:12:15 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.txi (Command List): @deftypevar out of order.
-
-	* configure.in (ALL_LINGUAS): Add cs.
-
-Tue Apr 28 09:33:41 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (strcasecmp): This is in lib now.
-
-1998-04-26 Richard Stallman <rms@psilocin.gnu.org>
-
-	* util/install-info.c (print_help): Doc clarifications.
-
-Sun Apr 19 15:55:10 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* lib/system.h (strcasecmp, strncasecmp) [!HAVE_STR[N]CASECMP]:
- 		Declare these.
-
-	* info/search.h (str[n]casecmp): Remove decl from here.
-
-	* configure.in (AC_REPLACE_FUNCS): Check for strcasecmp and
- 	strncasecmp here.
-	(AC_CHECK_FUNCS): Instead of just strcasecmp here.
-
-	* configure.in (texconfig): Use TEXMFMAIN in preference to TEXMF
- 		for post-0.4 teTeX.
-
-Wed Apr 15 17:20:31 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.txi (Reporting Bugs): New section.
-	Suggestion from: Andrew Shapira <shapiraa@cs.rpi.edu>
-	Date: Mon, 4 Aug 1997 19:06:06 -0400 (EDT)
-
-	* info/infomap.c: Define / to be info_search.
-	Suggestion from: Egil Kvaleberg <egil@kvaleberg.no>
-	Date: Fri, 1 Aug 1997 08:16:45 +0200 (MET DST)
-
-	* doc/texinfo.txi (uref): Document reason for not using <URL: format.
-	Also use ftp.gnu.org instead of ftp.gnu.ai.mit.edu throughout.
-
-Tue Apr 14 10:43:39 1998  Karl Berry  <karl@cs.umb.edu>
-
-	1998-04-05 Karl Eichwalder <ke@suse.de>
-	* makeinfo/makeinfo.c (begin_insertion): No need to
- 	gettext; it's a keyword.  From carl-friedriech.spilcke-liss@ensae.fr.
- 	(cm_printindex): ditto.
-
-	* util/texi2dvi: Always remove the $tmp_dir's.
-	From: Dean Gaudet <dgaudet@arctic.org>
-	Date: Tue, 14 Apr 1998 00:55:36 -0700 (PDT)
-
-Mon Apr 13 18:02:57 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* configure.in: Include
-	AM_SYS_POSIX_TERMIOS
-	AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
-	to avoid window resizing being ignored under glibc2 systems,
-	e.g., Red Hat Linux 5.0.  Actually any system where the ioctls are not
-	defined in <termios.h>.
-	See also http://www-gnats.gnu.org:8080/cgi-bin/wwwgnats.pl/full/206.
-	* acconfig.h (GWINSZ_IN_SYS_IOCTL): New #undef for autoheader.
-	* info/termdep.h [GWINSZ_IN_SYSIOCTL]: #include <sys/ioctl> if
- 		this is defined.
-	From: Mark Jefferys <mjeffery@cse.ogi.edu>
-	Date: Thu, 9 Apr 1998 12:38:27 -0700 (PDT)
-
-Fri Apr  3 01:18:22 1998  Philippe De Muyter  <phdm@macqel.be>
-
-	* info/info.c (main): Use 0, not NULL, as ? : alternative.
-
-Tue Mar  3 13:29:17 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* configure.in: Version 3.12.
-
-	* po/de.po: New version.
-
-	* po/POTFILES.in: Do not include doc.c; that gets built at
-	runtime, thus causing texinfo.pot to try to get rebuilt.  Besides,
-	it doesn't have any translatable strings.
-
-Sun Mar  1 10:38:47 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* util/install-info.c: No need for i18n on version message.  From
- 		ke@suse.de.
-
-Fri Feb 27 16:06:23 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* configure.in: Run texconfig conf instead of confall.
-
-	* doc/Makefile.am (INSTALL_INFO): New variable.
-	(install-info-am): Use install-info from our distribution.
-
-	* info/info.c (info_minor_version): Increment.
-	* (info_patch_level),
-	* info/info.h (info_patch_level): Remove.
-
-	* info/info.c (program_name): Move decl.
-
-	* util/install-info.c (ensure_dirfile_exists): Use commas and \t
-	 instead of an explicit tab, which make dist expands.
-
-	* doc/texinfo.txi: @prep.ai.mit.edu -> @gnu.org.
-
-	* info/info.c: Make help messages consistent with others.
-
-	* util/install-info.c (print_help): Format consistently.
-
-	(readfile): Support gzipped files via libz.
-	From: Elliot Lee <sopwith@redhat.com>
-	Date: Mon, 1 Sep 1997 23:37:14 -0400 (EDT)
-
-Thu Feb 26 16:13:14 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* info/echo-area.c: Whoops, _ might not start with parens.
-
-	* configure.in: Check for libz.
-	Do not output emacs/Makefile.
-
-	* Makefile.am (AUTOMAKE_OPTIONS): Set to 1.2f.
-
-	* util/texi2dvi: Always remove temporary directories. (From Akim.)
-	Formatting changes.
-
-Wed Feb 25 15:26:26 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* util/texi2dvi: New options --batch, --clean.
-	From: Akim Demaille <demaille@inf.enst.fr>
-	Date: 15 Aug 1997 18:05:33 +0200
-	* doc/texinfo.txi (Format with texi2dvi): Mention --help.
-
-	Applied this:
-1997-08-09  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* makeinfo/makeinfo.c (me_executing_string): New variable.
-	(me_execute_string): Use it instead of executing_string.
-	(popfile): Check for me_executing_string as well as
-	executing_string.
-	(get_until_in_line): Likewise.
-	(insert_and_underscore): Do not write any expansion output if
-	executing a string.
-	(cm_node, cm_include, index_add_arg, cm_footnote, execute_macro,
-	cm_macro, cm_unmacro): Likewise.
-	(cm_footnote): Include the footnote marker in the expansion
-	output.
-	(append_to_expansion_output): Do nothing if the input_text wasn't
-	a remembered text.
-	(defun_internal): Make the index entry even if expanding macros.
-	(expansion): Don't reset macro_expansion_output_stream around call
-	to execute_string.
-	(apply): Fix typo.
-
-Tue Feb 24 17:33:44 1998  Karl Berry  <karl@cs.umb.edu>
-
-	1997-11-10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
-	* makeinfo/makeinfo.c (get_until_in_line): Don't use xstrdup on
-		the unterminated input_text.
-
-	* makeinfo/makeinfo.c: Don't assume all \'s in macro bodies are
-		arguments.
-	From: Mathias.Herberts@irisa.fr (Mathias Herberts)
-	Date: Tue, 6 Jan 1998 18:54:26 +0100
-
-	* configure.in: Check for sigblock in libc before libbsd.
-	* From: hjl@lucon.org (H.J. Lu)
-	* Date: Fri, 23 Jan 1998 21:50:25 -0800 (PST)
-
-Mon Feb 23 16:26:31 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* info/window.c (character_width): If ISO_Latin_p is set, make
-		printable_limit 255, not 160.  ISO Latin 1 uses
-		essentially all of the 256 characters.
-	Reported by: Marius Groeger <mag@sysgo.de>
-	Date: Wed, 17 Dec 1997 16:05:27 +0100
-
-	* info/info.c: Improve help message.
-
-Sun Feb 22 17:38:32 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* Makefile.am (SUBDIRS): Remove emacs; we'll just distribute the
-		Elisp files with Emacs.
-
-	* doc/Makefile.am (info_TEXINFOS, texinfo): Rename manual to
-		texinfo.txi to avoid DOS filename clash with texinfo.tex.
-
-	* info/tilde.c: Copy slightly updated alloca stuff from makeinfo.
-
-	* util/texindex.c (main): Declare as returning int to placate
- 		warnings.
-
-	* info/Makefile.am: Uncomment BUILT_SOURCES stuff and add missing _.
-	From: "Joel N. Weber II" <devnull@gnu.org>
-	Date: Fri, 30 Jan 1998 17:21:38 -1000
-
-	* util/texindex.c,
-	* util/install-info.c,
-	* makeinfo/makeinfo.c,
-	* info/info.c: Change help address to @gnu.org.
-
-	1998-01-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
-	* makeinfo/makeinfo.c (usage): Fix order of arguments to help
-		format string.
-
-	* makeinfo/makeinfo.c (cm_top): Error message wording.
-
-	* doc/texinfo.texi (Functions in Typed Languages): Remove
-		duplicate description of @deftypemethod.
-	From: KHMarbaise@p69.ks.fido.de (Karl Heinz Marbaise)
-	Date: Wed, 07 Jan 1998 11:11:50 +0100
-
-	* info/session.c (info_get_input_char) [EINTR]: Keep reading if we
-		get EINTR.
-	From: Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
-	Date: 22 Dec 1997 10:32:53 +0100
-
-Sat Feb 21 17:41:26 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (find_and_load): Malloc enough room for the
-		null as well as the newline.
-	From: "John W. Eaton" <jwe@bevo.che.wisc.edu>
-	Date: Tue, 30 Sep 1997 21:12:01 -0500
-
-	* util/texindex.c (--version),
-	* makeinfo/makeinfo.c (cm_today),
-	* makeinfo/makeinfo.c (print_version_info): Version strings etc. do not
-		need translation.
-	From: Karl Eichwalder <ke@suse.de>
-	Date: 13 Sep 1997 16:20:02 +0200
-
-	* info/echo-area.c: Rewrite pluralization to be translatable.
-	From: Karl Eichwalder <ke@suse.de>
-	Date: 13 Sep 1997 16:20:02 +0200
-
-	* util/texindex.c,
-	* info/info.c,
-	* makeinfo/makeinfo.c,
-	* util/install-info.c: --version: Give year as argument to printf,
-		to reduce the number of translations needed.
-	From: Ulrich Drepper <drepper@ipd.info.uni-karlsruhe.de>
-	Date: 02 Sep 1997 18:01:26 +0200
-
-	* util/texindex.c: Remove the fnctl.h and sys/file.h conditional #includes, they are
-	already in lib/system.h.
-	From: "Philippe De Muyter" <phdm@macqel.be>
-	Date: Thu, 21 Aug 1997 20:16:49 +0200 (MET DST)
-
-	* info/terminal.c (terminal_begin_using_terminal,
- 	  terminal_end_using_terminal): #ifdef SIGWINCH settings for
-	 	  m68k-motorola-sysv.
-	From: "Philippe De Muyter" <phdm@macqel.be>
-	Date: Thu, 21 Aug 1997 20:16:49 +0200 (MET DST)
-
-	* info/filesys.c (info_suffixes): Add /index as a possibility for
-		subdirectories.
-	From: Matthew Wilcox <willy@odie.barnet.ac.uk>
-	Date: Wed, 6 Aug 1997 15:55:16 +0100 (BST)
-
-	* configure.in: Redirect texconfig input from /dev/null to avoid
-		stoppage.
-	From: Thomas Esser <te@informatik.uni-hannover.de>
-	Date: Mon, 4 Aug 1997 18:15:49 +0200
-
-	* makeinfo/makeinfo.c (find_and_load): Null-terminate the input text.
-	From: Kenneth Stailey <kstailey@disclosure.com>.
-
-	* info/Makefile.am (INCLUDES): Add -I.. -I$(srcdir).
-
-Fri Aug 22 16:24:59 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi: Adjust ISBN, edition number for print run.
-
-Mon Aug  4 16:12:42 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* info/info.c (main) [INFODIR]: Add this to infopath, if set.
-	* info/Makefile.am (DEFS): New define, include -DINFODIR.
-	From: Larry Schwimmer <rosebud@cyclone.Stanford.EDU>.
-
-	* util/install-info.c (ensure_dirfile_exists): Use tabs instead of
- 		spaces on the File: dir line.
- 	Bug from: Dave Love <d.love@dl.ac.uk>.
-
-Sat Aug  2 12:43:57 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (cm_value, cm_email, cm_uref): Have to cast
- 		from unsigned char * to char * or IRIX cc complains.
-	From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>.
-
-Fri Aug  1 14:05:10 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* Makefile.am (EXTRA_DIST): Remove README-alpha.
-	From: "ir. Mark M._Kettenis" <kettenis@phys.uva.nl>.
-
-1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
-
-	* configure.in: Use AC_CHECK_HEADERS, not AC_CHECK_HEADER.
-
-Thu Jul 31 11:57:46 1997  Karl Berry  <karl@cs.umb.edu>
-
-	*  Version 3.11.
-
-	* info/man.c (reap_children): Declare status as int, not unsigned,
-		since that's what POSIX says the arg to wait should be.
-
-	* makeinfo/makeinfo.c (cm_uref, cm_email): Rewrite to do macro
- 		expansion in the arguments.
-
-	* makeinfo/makeinfo.c (main): setlocale LC_MESSAGES and LC_TIME,
-		instead of LC_ALL.
-	From: Akim Demaille <demaille@inf.enst.fr>.
-
-	* makeinfo/makeinfo.c (cm_today): Let the %d %s %d be translated,
-		so other languages can change the order of day/month/year.
-	From: Akim Demaille <demaille@inf.enst.fr>.
-
-	* info/infomap.c: Doc fix.
-
-	* lib/system.h [!O_RDONLY]: Prefer <fcntl.h> to <sys/fcntl.h>.
-
-	* configure.in (AC_CHECK_HEADERS): Check for fcntl.h.
-
-	* doc/Makefile.am (install-data-local): Suggest tex/generic/dvips
-		for epsf.tex.
-	From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>.
-
-	* configure.in (TEXMF): Move check to block with other program
- 		checks.
-
-Wed Jul 30 11:20:37 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (defun_internal): Allow extra text after
-		most @def... commands, for tzname[2] in libc.texinfo.
-
-	* info/info.c: Include indices.h.
-	* configure.in (AC_CHECK_HEADERS): Test for sys/wait.h, info/man.c
- 		uses it.
-	From: Erick Branderhorst <Erick.Branderhorst@asml.nl>.
-
-Tue Jul 29 15:55:19 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* configure.in: Version 3.9j.
-
-	* info/terminal.c (output_character_function): Return int (the
- 		arg), not void.
-
-	* info/infomap.c: Don't define term_kP as 'v', since that's undefined.
-	From: Tom Hageman <tom@basil.icce.rug.nl>.
-
-	* makeinfo/makeinfo.c: Parameterize some messages to avoid
- 		duplicate translations.
-
-	* info/terminal.c: Only try to declare ospeed, PC, tputs, etc. if
-		we don't have <ncurses.h/termcap.h> or <termcap.h>.
-
-	* makeinfo/makeinfo.c (cm_email): New function, like cm_uref.
-
-Sun Jul 27 17:09:20 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* configure.in: Only check for <ncurses/termcap.h> if we're using
-		-lncurses.
-	From: Bo Johansson <bo.johansson@mbox2.swipnet.se>.
-
-	* info/dir.c (new_dir_file_p): Avoid automatic struct
-		initialization, SunOS 4 etc. cc can't handle it.
-	From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>.
-
-Sat Jul 26 15:08:13 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* Version 3.9i.
-
-	* configure.in: Check for termcap.h and ncurses/termcap.h.
-	From: bo.johansson@mbox2.swipnet.se.
-
-Fri Jul 25 14:09:05 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi: Document new second optional arg to email.
-
-	* info/infodoc.c: Document CTRL-x 0 as the way to get out of help.
-
-	* info/dir.c (maybe_build_dir_node): Really check for the same dir
-		file twice, not just by name.
-	(new_dir_file_p): New function.
-
-	* util/install-info.c: Tell them about --help in doc strings.
-
-Thu Jul 24 14:25:44 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* util/texindex.c (memory_error): Move to avoid incorrect implicit
- 		decl.
-
-	* makeinfo/makeinfo.c,
-	* makeinfo/multi.c,
-	* util/install-info.c,
-	* util/texindex.c,
-	* info/tilde.c,
-	* info/man.c,
-	* info/gc.c,
-	* info/session.c (info_replace_key_to_typeahead): Remove unused
-         function,
-	* info/nodemenu.c,
-	* info/man.c,
-	* info/m-x.c,
-	* info/footnotes.c
-	* info/info.c
-	* info/indices.c,
-	* info/filesys.c: Parenthesize to avoid -Wall warnings
-	remove unused variables,
-	make return types explicit,
-	printf type corrections.
-
-	* lib/system.h: <ctype.h>: Include this.
-	* util/texindex.c,
-	* makeinfo/makeinfo.c,
-	* info/echo-area.c,
-	* info/display.c: ctype.h: Included in system.h now.
-
-	* info/echo-area.c: Parenthesize to avoid -Wall warnings.
-        (ctype.h): #include for isprint.
-	(echo_area_stack_depth): Remove unused function.
-	* info/display.c: Parenthesize to avoid -Wall warnings.
-        (ctype.h): #include for isprint.
-	* info/dir.c: Parenthesize to avoid -Wall warnings.
-	(build_dir_node_internal): Remove declaration of nonexistent function.
-	From: Erick Branderhorst <Erick.Branderhorst@asml.nl>.
-
-	* configure.in (TEXMF): Call texconfig to discover the default value,
-	for the sake of the warning in doc/Makefile.
-	From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>.
-
-	* doc/Makefile.am (TEXMF): New variable.
-        (install-data-local): Use it in warning.
-	From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>.
-
-	* info/session.c (initialize_info_session): Only call
-	terminal_prep_terminal if clear_screen is true.  Otherwise, failed
-        --index-searches prep the terminal but do not unprep it.
-	From: William Edward Webber <wew@yallara.cs.rmit.EDU.AU>.
-
-	* info/nodemenu.c: Doc fix.
-
-Mon Jul 21 17:11:09 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi: Comment out @smallbook and @set smallbook so
- 		people at other sites can print it the way they want.
-	From: Thomas Walter <walter@pctc.chemie.uni-erlangen.de>
-
-Sun Jul 20 07:52:25 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* configure.in: 3.9h.
-
-	* doc/Makefile.am (install-info-am, distclean-aminfo): New targets
-		to avoid assuming info files are in srcdir.
-
-	* lib/system.h (xstrdup): Returns char *, not void *.
-
-	* doc/Makefile.am (.texi.info),
-	* doc/Makefile.am (texinfo): Don't run in $(srcdir).
-
-	* util/install-info.c (main): Remove unnecessary decl of strrchr.
-
-	* info/tilde.c: Include info.h (for config.h) before alloca stuff.
-
-	* makeinfo/makeinfo.c (validate_file): Rename `valid' to `valid_p'
-		to avoid conflict with SunOS 4 header files.
-	From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>.
-
-	* info/session.c (initialize_info_session): Call
-          terminal_prep_terminal here (before calling terminal_clear_screen).
-	(info_session): Instead of here.
-	From: William Edward Webber <wew@yallara.cs.rmit.EDU.AU>.
-
-	* Makefile.am (EXTRA_DIST): Add README-alpha.
-
-Sat Jul 19 13:50:27 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* info/terminal.c: Use `keypad transmit' sequence if it's defined:
-	(term_keypad_on, term_keypad_off): New statics.
-	(terminal_begin_using_terminal): If term_keypad_on, send it.
-	(terminal_end_using_terminal): If term_keypad_off, send it.
-	(terminal_initialize_terminal): Look up ks and ke termcap strings.
-	From: William Edward Webber <wew@yallara.cs.rmit.EDU.AU>.
-
-	* info/infomap.c (initialize_info_keymaps): Initialize hardwired
- 		cases for arrow keys a la readline.  Found by John Eaton,
- 		jwe@bevo.che.wisc.edu.
-
-	* makeinfo/makeinfo.c (output_pending_notes): Remove footnote
-        macro expansion code I #if 0'd out some time ago.  And doc fixes.
-
-	* Applied this patch:
-
-Sat Jul 19 16:29:01 1997  Karl Eichwalder  <ke@suse.de>
-
-	* info/info.c (main): setlocale, bindtextdomain, and textdomain.
-
-Fri Jul 18 10:02:18 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/Makefile.am (install-data-local),
-	* emacs/Makefile.am (install-data-local): Give subdir in warning.
-
-	* configure.in: Version 3.9f.
-
-	* doc/texinfo.texi: Correct \^ to @^.
-	From Andreas S.
-
-	* Merged these changes:
-
-1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* info/display.c (display_cursor_at_point): Flush ouput.
-
-1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* info/session.c (remember_window_and_node): Don't crash when the
-	current window has no current node.
-
-1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* util/texindex.c (usage): Translate the doc strings.
-	* makeinfo/makeinfo.c (cm_today): Translate the month names.
-	* info/variables.c (describe_variable): Translate the doc strings.
-	* info/nodes.h: Don't translate the strings defining the info format.
-
-1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* makeinfo/makeinfo.c (get_item_function): Remove superfluous call
-	to canon_white after get_rest_of_line.
-	(cm_end): Likewise.
-	(handle_variable): Likewise.
-	(cm_item): Likewise.
-	(cm_unmacro): Likewise.
-
-1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* info/nodemenu.c (list_visited_nodes): Don't clear the internal
-	flag, this and other functions depend on it.  Don't insist on
-	displaying the menu below the current window.
-
-1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* makeinfo/makeinfo.c (cm_uref): Fix memory leaks.
-	(cm_inforef): Likewise.  Handle empty cross reference name.
-
-1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* info/echo-area.c (ea_possible_completions): Check that the
-	current window can actually be split.
-
-Thu Jul 17 17:19:34 1997  Karl Berry  <karl@cs.umb.edu>
-
-
-	* emacs/Makefile.am (*clean-lisp): Define, as Automake didn't.
-	From: Kenneth Stailey <kstailey@disclosure.com>.
-
-	* doc/Makefile.am: Do not distribute info.1.
-	* makeinfo/macros: Do not distribute this directory, it's merged
-		into the main documentation.
-	* doc/makeinfo.texi: Don't distribute this either, it's in the
-		main manual.
-
-	* util/install-info.c: Use \n\ for multiline string constant.
-  		From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>.
-
-Wed Jul 16 15:29:50 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi: @set must be after @setfilename, I guess.
-	Noted by Erick Branderhorst.
-
-	* Applied this change:
-
-Tue Nov 12 22:20:22 1996  John Eaton  <jwe@bevo.che.wisc.edu>
-
-	* makeinfo.c (INDEX_ALIST): Use two indices, read_index and
-	write_index, instead of just one.
-	(find_index_offset): If a match is found, return index to the
-	current INDEX_ALIST struct, not the index pointing to the list of
-	index entries.
-	(translate_index): Return read_index from the matching
-	INDEX_ALIST.
-	(undefindex): Delete the list of index elements pointed to by
-	read_index from the INDEX_ALIST that matches name.
-	(defindex): Initialize read_index and write_index.
-	(index_add_arg): Add entries to the list pointed to by write_index
-	from the INDEX_ALIST matching name.
-	(index_append): Delete unused function.
-	(cm_synindex): Don't merge indcies, just make the write_index for
-	redirectee the same as the write_index for redirector.
-
-Tue Jul 15 09:32:04 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi: Bump edition number for 2.24.
-
-	* util/Makefile.am (localedir): Define.
-
-	* info/window.h: Rename __window__ to window_struct.
-
-	* info/window.h,
-	* info/variables.h,
-	* info/search.h,
-	* info/man.h,
-	* info/info-utils.h,
-	* info/gc.h,
-	* info/footnotes.h,
-	* info/filesys.h,
-	* info/echo-area.h,
-	* info/display.h: Avoid leading _ in #define for #include protection.
-
-	* makeinfo/makeinfo.c: Version 1.68.
-	* info/info.c: Version 2.17.
-
-	* Most all files: Untabify.
-
-	* doc/Makefile.am (texinfo): Add explicit target.
-
-	* emacs/Makefile.am (noinst_LISP): Remove the obsolete
-		detexinfo.el (makeinfo --no-headers is better) and
-	        texnfo-tex.el (now handled by TeX modes in general).
-
-Mon Jul 14 15:21:03 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* util/texi2dvi: Update RCS file from 3.9 distribution.
-
-	* util/Makefile.am (EXTRA_DIST): Add update-info, from
- 		rhawes@dmapub.dma.org
-
-Sun Jul 13 17:05:03 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* info/signals.c: Use RETSIGTYPE instead of hardwiring void.
-	From: "Jeffery L. JT Vogt" <lfm@atw.earthreach.com>.
-
-	* info/session.c (info_history_node): Rewrite as
-  	      info_kill_node (current_node).
-        (kill_node, read_nodename_to_kill): New functions from info_kill_node.
-	(info_kill_node): Now this just calls them.
-
-Fri Jul 11 11:56:58 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi: Fix `Conditionals' xref.
-
-Thu Jul 10 17:58:12 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/info.texi: Don't say SPC clears ? screen.
-
-Sun Jul  6 16:26:41 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/info-stnd.texi: Document --index-search.
-
-	* info/tilde.c,
-	* info/session.c: Remove redundant getenv decl.
-
-	* Installed following change:
-Tue Nov 12 14:44:00 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
-
-	* info/info.c (main): Handle new option, --index-search STRING.
-	(index_search_p, index_search_string): New static variables, used
-	to handle --index-search option.
-
-	* info/session.c (initialize_info_session): New arg,
-	clear_screen.  Change all callers.
-
-	* info/indices.h (do_info_index_search, index_intry_exists):
-	Provide declarations here.
-
-	* info/indices.c (do_info_index_search): New function, extracted
-	from info_index_search.
-	(info_index_search): Simply call do_info_index_search() with
-	search_string set to NULL.
-	(index_entry_exists): New function.
-
-Sat Jul  5 17:17:14 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi: Document @kbdinputstyle.
-
-	* makeinfo/makeinfo.c (kbdinputstyle): New command.
-	(cm_no_op_line_arg): New function.
-
-	* info/termdep.h (HAVE_TERMIOS_H) [NeXT]: #undef.
-	From: Gregor Hoffleit <flight@mathi.uni-heidelberg.de> et al.
-
-Fri Jul  4 14:18:08 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* info/Makefile.am (EXTRA_DIST),
-	* util/Makefile.am (EXTRA_DIST),
-	* makeinfo/Makefile.am (EXTRA_DIST),
-	* lib/Makefile.am (EXTRA_DIST): Include README.
-
-	* doc/texinfo.texi (makeinfo options): Document --paragraph-indent
- 		values more completely.
-	* makeinfo/makeinfo.c (set_paragraph_indent): Allow translated
- 		asis or none, improve doc.
- 	From ke.
-
-	* doc/Makefile.am (dist-info): New empty target so that we do not
- 		distribute info files.
- 	From Erick Branderhorst.
-
-	* doc/texinfo.texi (Invoking install-info): Document that the dir
-		file is created now if need be.
-	* Makefile.am (EXTRA_DIST): No longer need dir.
-	* util/install-info.c (ensure_dirfile_exists): New routine.
-	(main): Call it before trying to open dirfile for reading.
-
-	* doc/texinfo.texi: Document install-info --delete a little better.
-	* util/install-info.c: Set something_deleted when we delete a
- 		normal line.
-	Bug from: Denis Kosygin <dkosygin@math.Princeton.EDU>.
-
-	* util/install-info.c: If no info dir entry, give warning and exit 0.
-
-Wed Jul  2 06:35:17 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* configure.in (ALL_LINGUAS): Add fr.
-
-	* makeinfo/makeinfo.h (insertion_type, insertion_type_names): Add
-		ifnot... entries. Alphabetize.
-
-Tue Jul  1 17:21:54 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (sort_index): Set defining_line and
-		input_filename so errors in index entries are reported at
-		the correct location.  From rms.
-
-	* makeinfo/makeinfo.c (cm_ifnothtml, etc.): Routines for new
- 		commands.
-
-Sun Jun 29 09:44:01 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi: Document new @ifnot... commands, etc.
-	* doc/texinfo.texi: Document @image, etc.
-
-Thu Jun 26 17:57:37 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (cm_image): New routine for new command @image.
-	(cm_end): Move to better place, doesn't need its own page.
-	Doc fixes.
-
-Mon Jun 23 16:54:03 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* Makefile.am (SUBDIRS): Do intl first.
-
-	* doc/Makefile.am (EXTRA_DIST): Include epsf.tex.
-	(install-data-local): Suggest possible installation directory.
-	* epsf.tex: New file.
-
-Wed Jun 18 17:51:52 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi: Document texinfo.cnf.
-
-Sun Jun 15 14:37:58 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi (Command List): Various commands missing or
-		erroneous.
-	From: Karl_Heinz_Marbaise@p69.ks.fido.de.
-
-	* makeinfo/makeinfo.c: Oops, failed to break out of loop.
-
-	* util/texindex.c: Use <getopt.h> not "getopt.h".
-
-	* All source files: Merge gettext changes from Karl E.;
-	his ChangeLog entries below.
-
-Sat Jun 14 17:04:28 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* Makefile.am,
-	* makeinfo/Makefile.am: Doc fix.
-	* util/Makefile.am (EXTRA_DIST): Add texi2dvi.  From Karl E.
-
-Fri Jun 13 17:39:34 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c [WIN32]: Handle read bogosity and c:\
-		absolute paths.
-	From: Eric Hanchrow <erich@MICROSOFT.com>.
-
-	* configure.in (AC_CHECK_HEADERS): Check for pwd.h.
-	* info/tilde.c (pwd.h): Move #include to system.h.
-
-	* makeinfo/makeinfo.c (main): New option -P to prepend to search path.
-	From: Kenneth Stailey <kstailey@cvs.openbsd.org>.
-
-	* doc/texinfo.texi (Invoking makeinfo),
-	* doc/makeinfo.texi: Mention -P.
-
-Thu Jun 12 16:25:40 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* info/signals.h (SIGCHLD): #define as SIGCLD if undefined, for sysV68.
-	From: "Philippe De Muyter" <phdm%labauto1@ulb.ac.be>.
-
-	* util/install-info.c (O_RDONLY): Remove this stuff, it's in system.h.
- 	(main): Handle existing entry in dir file having .info extension.
-	From: "Bradley C. Kuszmaul" <bradley@GRANITE.SYSTEMSX.CS.YALE.EDU>.
-
-	* makeinfo/makeinfo.c (get_char_len): Don't count 8-bit characters
-		as two chars in the output.
-	From: Sung-Hyun Nam <namsh@amuna.rms.lgic.co.kr>.
-
-Wed Jun 11 16:36:51 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi (Other Info Directories): Document new trailing
- 		: in INFOPATH feature.
-
-	* info/info.c (main): Have trailing : in INFOPATH expand to the
- 		default path.
-
-Fri Jun  6 13:22:02 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi (uref): New node for new command.
-
-Thu Jun  5 18:13:48 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (cm_uref): New function to accept optional
-		second argument.  Call it in command table.
-
-Sat Jun 14 10:54:16 1997  Karl Eichwalder  <ke@suse.de>
-
-	* mkinstalldirs: Update from automake-1.1p.
-
-	* configure.in: Touch po/ChangeLog (gettext needs it).
-
-Thu Jun 12 08:37:52 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* util/texindex.c: Include system.h, remove config.h.
-
-	* po/POTFILES.in: Fill it.
-
-	* makeinfo/multi.c: Include system.h.
-
-	* info/Makefile.am:
-	* makeinfo/Makefile.am:
-	* util/Makefile.am:
- 	(localedir): Set.
-	(INCLUDES): Add intl/ and LOCALEDIR.
-	(LDADD): Add @INTLLIBS@.
-
-	* makeinfo/makeinfo.c (main):
-	* util/texindex.c (main):
-	* util/install-info.c (main):
- 	setlocale, bindtextdomain, and textdomain.
-
-	* lib/system.h: Include locale.h and libintl.h.
-
-	* acconfig.h: Include libintl.h.
-	(_, N_): Define.
-	Add ENABLE_NLS, HAVE_CATGETS, HAVE_GETTEXT, HAVE_LC_MESSAGES,
-	HAVE_STPCPY for libintl.
-	Add @TOP@ and @BOTTOM@.
-
-	* configure.in (AM_GNU_GETTEXT): Add.
-	(AC_OUTPUT): Process Makefiles in intl/ and po/.
-	(ALL_LINGUAS): Available languages.
-
-	* Makefile.am (AUTOMAKE_OPTIONS): Now use 1.1p.
-
-Wed Jun 11 17:05:37 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* Makefile.am (SUBDIRS): Add intl/ and po/ for NLS.
-
-	* run `gettextize -c' to get the i18n skeleton.
-
-Wed Jun  4 17:51:08 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (uref): New command, another alias for @code
- 		for now.
-
-Wed Jun  4 02:02:33 1997  Miles Bader  <miles@gnu.ai.mit.edu>
-
-        * doc/texinfo.texi (email): { and } need @ escapes.
-
-Sun Jun  1 16:34:12 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi (itemx): @itemx should always follow @item.
-
-	* makeinfo/makeinfo.c (cm_item): Insert blank line if two
-		consecutive @item's.
-	From: Karl Eichwalder <ke@ke.central.de>.
-	Also various doc fixes.
-
-Tue May 27 17:20:44 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi (various): Document @deftypemethod.
-	(email): @ should have been @@ in the example.
-	From: Mate Wierdl <mw@wierdlmpc.msci.memphis.edu>
-
-Mon May 26 16:56:26 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/multi.c (setup_multitable_parameters): Avoid use of %n
-		for sake of m68k-hp-bsd.
-	From: Derek L Davies <ddavies@world.std.com>.
-
-	* info/terminal.c (terminal_begin_using_terminal,
-        terminal_end_using_terminal): Call fflush and sleep to handle
-	cmdtool/shelltool with scrollbars.  Also ignore
- 	SIGWINCH so we do not prematurely exit.  Move call.
-	(terminal_prep_terminal): Disable LNEXT (CTRL-V).
-	From: strube@physik3.gwdg.de (Hans Werner Strube).
-
-	* configure.in (AC_TYPE_SIGNAL): Check this.
-
-Sun May 25 16:49:58 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (discard_insertions): Take arg saying
- 		whether ifinfo/ifset/etc. are ok.
-        (convert_from_loaded_file): At `finished', call discard_insertions.
-	(handle_variable_internal): Complain if we reach eof before the
-		@end for a false condition.
-	From: HERBERT@boevm4.vnet.ibm.com.
-
-	* info/Makefile.am (ginfo_SOURCES): Add doc.h.
-	* lib/Makefile.am (libtxi_a_SOURCES): Add system.h.
-
-Sat May 24 18:08:27 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c: Check that we have macro_expansion_filename
- 		before using strcmp.
-
-Thu May 22 17:59:46 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/makeinfo.texi: Minimally document --force.
-
-	* makeinfo/makeinfo.c (--force): New option.
-	(-E): Allow stdout via `-'.
-	(convert_from_loaded_file): Unlink output files if errors and !force.
-
-Tue May 20 17:48:42 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c: Change all strdup calls to xstrdup.
-	(xmalloc, xrealloc, memory_error): Remove these functions, they're
-		in lib.
-	(set_paragraph_indent, cm_paragraph_indent): Move to misc page.
-	(cm_footnote): Expand macros in the arg for the macro expansion output.
-
-Fri May 16 17:26:59 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (cm_macro): Allocate an empty body if the
- 		macro was empty.
- 	(cm_unmacro): Allocate one more byte for the null.
-	From: Robert Hoehne <robert.hoehne@Mathematik.TU-Chemnitz.DE>.
-
-Sun May 11 17:51:21 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* makeinfo/makeinfo.c (cm_printindex): Fix calculation of the
-	length of an index line.
-
-Sun May 11 14:47:42 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* makeinfo/makeinfo.c (main): Don't unconditionally run usage when
-	-e specified.
-
-Sun May 11 17:47:42 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (init_indices): Free the source for an @synindex.
-	(undefindex): Do not go further if the target was already freed.
-	(free_index): Do not free the node names, as init_tags already did.
-	(cm_synindex, index_add_arg): Improve error message.
-	(program_index, function_index, etc.): Remove these unused #defines.
-
-Tue May  6 17:53:37 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (init_internals): Do not free current_node,
-        it already is, at least when multiple input files are specified.
-	From: Karl Eichwalder <ke@ke.central.de>.
-
-Mon May  5 16:14:39 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi: Mention both alignment and non-alignment of
- 		continuation description lines in menus (Arnold).
-
-Sun Apr 27 16:12:44 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (apply): Handle body being `\string'.
-	Also, avoid dereferencing a null pointer when a macro has no named
-	parameters.
-	From: Eli Zaretskii <eliz@is.elta.co.il>.
-
-	* makeinfo/makeinfo.c: Wording changes/fixes in warnings.
-
-	* info/session.c (info_get_input_char): Do not mix stdio with raw I/O.
-	From: Egil Kvaleberg <egilk@sn.no>.
-
-	From Tom Hageman <tom@basil.icce.rug.nl>.  These changes make
-        arrow keys work:
-	* info/infomap.c: Add arrow key bindings.
-        (keymap_bind_keyseq): New support function.
-	(initialize_info_keymaps): Use it.
-	(term_ku,term_kd,term_kl,term_kr): Remove explicit declarations;
-	use #include "terminal.h" instead.
-	* info/session.c (initialize_info_session): Unbuffer stdin.
-	(info_get_another_input_char): Fix bug in `ready' logic.
-	* info/terminal.h,
-	* info/terminal.c (term_kP, term_kN): New variables to hold
- 		PageUp, PageDown key sequences.
-	  (terminal_initialize_terminal): Set them.
-
-	* util/texindex.c (main),
-	* util/install-info.c (main),
-	* makeinfo/makeinfo.c (print_version_info),
-	* info/info.c (main): Use PACKAGE and VERSION from Automake for
- 		printing version number.
-
-Sat Apr 26 19:19:46 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (get_until_in_line): Do not expand if
-		executing_string.
-	Also, free temporary strings.
-	Also, untabify entire file.
-
-	* doc/texinfo.texi: Many corrections from Arnold.
-
-Thu Apr 24 16:31:09 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/multi.c (draw_horizontal_separator): Account for indent
- 		here also.  From Ulrich.
-
-Wed Apr 23 15:15:34 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (cm_today): Use time_t instead of long;
- 		everyone else does.
- 	(LOCALTIME_CAST): Remove kludge, we'll always use time_t now.
-
-	* info/Makefile.am (ginfo_SOURCES): Remove general.h, that got
- 		merged into system.h.
-
-Mon Apr 21 17:13:25 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/multi.c (output_multitable_row): Account for
- 	column_indent, both the global one and for each column.
-	(setup_multitable_parameters): Account for column_indent in the table
-	width in the columnfrac case, but don't bother with the template
- 		case for now.
-
-Sun Apr 20 16:32:00 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (output_stream): Remove redundant
-        definition; it's in makeinfo.h,
-	and a vaxstation-ultrix4.3 fails to link because of the two defns.
-	From: Anders Olofsson <anders@kid025.ericsson.se>.
-
-	* makeinfo/makeinfo.c (expansion): Inhibit appending to the macro
- 		expansion stream.
- 	(get_until_in_line): Possibly expand the text.
-	Change caller in get_node_token to do the expansion,
-	all other calls to remain the same.
-
-	* makeinfo/makeinfo.c (cm_node): No need to call strlen to check
- 		for the empty string.
-
-	* doc/texinfo.texi: Restore missing @c for initial comment.
-
-Fri Apr 18 17:41:36 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi: Mention that .info is unnecessary in the info
-		file name argument of an xref.
-
-	* doc/texinfo.texi: Mention texi2dvi -t instead of embedding
- 		@smallbook or @afourpaper in the document source.
-
-Sun Apr 13 15:19:08 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* lib/system.h (_GNU_SOURCE): #define.
-
-Mon Apr  7 16:30:11 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/info.texi,
-	* doc/info-stnd.texi,
-	* doc/texinfo.texi: Do not make (dir) the previous ptr from the top node,
-	and tell people not to do that in the manual.
-	From: rmedina@kanojo.ivic.ve (Rodrigo Medina),
-	confirmed by rms.
-
-Fri Apr  4 16:30:33 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c: Move error page to top to avoid
-	prototypes, and do add prototypes for add_word_args and execute_string,
-	so we can use <stdarg.h>.
-
-	* info/makedoc.c,
-	* info/nodemenu.c: Use %ld instead of %d for file offsets.
-	* makeinfo/makeinfo.c (delete_macro): Decrement macro_list_len.
-	(get_macro_args): Decrement line number if see \n.
-	* utils/texindex.c (indexify): Use fputs instead of fprintf
-	for constant string.
-	From: Eli Zaretskii <eliz@is.elta.co.il>.
-
-Thu Apr  3 17:40:52 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* configure.in (AC_CHECK_HEADERS): No need to check for vararg.h
-	here, AC_FUNC_VPRINTF does it.
-	(AC_CHECK_FUNCS): Likewise for vsprintf and vfprintf.
-	* makeinfo/makeinfo.c (add_word_args, execute_string): Rewrite
-	like the error functions.
-
-Wed Apr  2 17:46:28 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* configure.in: Add AC_FUNC_VPRINTF.
-	* makeinfo/makeinfo.c (error, line_error, warning): Rewrite a la
-        error.c from the *utils to use <stdarg.h> if available.
-
-Tue Apr  1 11:48:40 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi: Tabs are a bad idea.
-
-	* doc/userdoc.texi,
-	* doc/info.texi: Untabify.
-
-Sun Mar 30 17:36:47 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (end_of_sentence_p): New function.
-	(add_char): Call it, instead of simply sentence_ender.
-	(post_sentence): New macro.
-	Also, remove some #include's now in system.h.
-	* lib/system.h [VMS]: #include <perror.h>, from makeinfo.
-
-Thu Mar 27 17:41:03 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* info/search.c (skip_node_characters): Do not arbitrarily
-	strip trailing period from end of node name; this is valid.
-
-Mon Mar 24 16:44:42 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* configure.in (AC_OUTPUT): Don't need to create stamp-h here,
-	tromey says AM_CONFIG_HEADER will do it.
-
-	* info/Makefile.am, util/Makefile.am, makeinfo/Makefile.am (INCLUDES):
-        Don't need -I.. (for config.h) or -I$(srcdir), says tromey.
-        Automake includes those already.
-
-Fri Mar 14 15:05:17 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* info/Makefile.am: Build as ginfo, install as info,
-	to avoid conflict with the standard info target.
-
-	* lib/system.h: New file.
-	* makeinfo/makeinfo.c (strerror): Remove declaration,
-	include system.h, remove other redundant #if stuff.
-	* info/general.h: Include system.h instead of doing common stuff.
-	* util/install-info.c (my_strerror): Remove this, use strerror,
-	include system.h.
-
-	* info/terminal.c (terminal_prep_terminal): Only use OCRNL and
-		ONLCR if they are defined.  Reported by many people.
-
-	* Installed:
-
-	Sun Dec  1 19:23:54 1996  Karl Eichwalder  <ke@ke.Central.DE>
-
-		* configure.in (TERMLIBS): Add ncurses.
-
-Thu Mar 13 13:59:45 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* lib/Makefile.am (libtxi_a_SOURCES): Add xstrdup.c.
-	* info/*.c: Use xstrdup instead of strdup everywhere.
-
-	* info/tilde.c: Do not include clib.h, move stdlib.h include to
-	* info/general.h: here.
-
-	* configure.in (AC_CONFIG_HEADER): Use this,
-	to avoid hugely long compile line with all the -D's.
-	* info/general.h: Include <config.h>.
-
-	* emacs/Makefile.am (install, install-data): Do @echo
-	to tell the user to compile/install the elisp manually.
-
-	* configure.in (AC_REPLACE_FUNCS): Move strerror check to here.
-	(AC_CHECK_FUNCS): From here.
-
-	* lib/strerror.c: New file, from enscript (et al.) distribution.
-
-Tue Mar 11 16:36:25 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* info/Makefile.am (info_SOURCES): Add doc.c, dribble.c, infodoc.c.
-	(LDADD): Add @TERMLIBS@.
-
-	* info/info.h: HANDLE_MAN_PAGES, NAMED_FUNCTIONS: Define these.
-
-	* info/filesys.h: Spurious ! when DEFAULT_INFOPATH is not defined.
-
-	* configure.in (AC_OUTPUT): Do lib first and doc last.
-
-	* info/echo-area.c,
-	* info/echo-area.h,
-	* info/info.h: Rename echo_area to echo-area.
-
-Mon Mar 10 17:59:05 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* */Makefile.am: Write Makefile.am files for Automake.
-	* doc: New subdirectory, move all manuals and texinfo.tex there.
-	* AUTHORS, THANKS, config.guess, config.sub, mkinstalldirs: New files,
-	required by Automake.
-	* lib/xmalloc.c: Move from info/.
-
-Fri Oct  4 07:49:49 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* Version 3.9.
-
-	* Makefile.in (install): Say to install texinfo.tex manually.
-
-	* util/texi2dvi,
-	* util/texindex.c,
-	* makeinfo/makeinfo.c,
-	* info/info.c: Include only the current year in the copyright message.
-
-	* util/texi2dvi: Exit successfully.
-	From: Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>.
-
-Thu Oct  3 12:58:32 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* Rename install.sh to the preferred install-sh.
-
-	* Makefile.in (VERSION),
-	* util/texi2dvi,
-	* util/texindex.c,
-	* util/install-info.c,
-	* makeinfo/makeinfo.c (minor_version, print_version_info),
-     	* info/info.c: Update version number.
-
-	* util/texi2dvi: Only show diff if verbose.
-
-	* util/install-info.c (main): Check for a missing dir file as well
- 	as a missing info files.
-	(main): At start of a node, completely initialize the newly-malloced
-	node structure.
-
-	* texinfo.texi: Fix incorrect uses of @key,
-	insert missing newline in Installing Dir Entries' @menu item,
-	document install-info invocation.
-
-	* Makefile.in (DISTFILES): Do not put .gdbinit's in distribution.
-	(dist): Use || instead of && (and invert sense) so make doesn't think
-	the command failed.
-	(dist): Exclude more junk.
-
-	* makeinfo/makeinfo.c (cm_xref): Back out patch from Tom T., since
-        we generate a good-enough error message that is suppressible
-        without it.
-
-	* util/gen-dir-node: The recommended name for the top-level info
- 	file is dir, not dir.info.
-
-	* util/install-info.c (main): At `Mark the end of the Top node',
-        make sure the node name is non-NULL before comparing it. From
-        lvirden@cas.org.
-
-	* configure.in (AC_REPLACE_FUNCS): Use this for memcpy, memmove,
-	and strdup.
-        (AC_CHECK_FUNCS): Instead of this.
-	Because both bcopy and memmove are missing on the 3b2, as reported by
-	Gaylen Miller <gaylen@proaxis.com>, hence we must provide our own.
-	* libtxi/Makefile.in (LIBOBJS): New variable.
-	(OBJS): Include it.
-	* libtxi/memcpy.c, libtxi/memmove.c, libtxi/strdup.c: New files,
-	taken from fileutils 3.13.
-	* makeinfo/makeinfo.c,
-	* info/clib.c (strdup): Move to libtxi.
-
-Wed Oct  2 18:23:30 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* info/info-utils.h (memcpy) [!HAVE_MEMCPY],
-	* info/termdep.h (memcpy) [!HAVE_MEMCPY],
-	* makeinfo/makeinfo.c (memmove) [!HAVE_MEMMOVE]: Remove this
-        #ifdef, as we now include it in libtxi if missing.
-
-Tue Oct  1 17:41:52 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/Makefile.in (install),
-	* info/Makefile.in (install),
-	* Makefile.in (install): Use new option name --info-dir instead of
- 	--infodir.
-
-	* makeinfo/multi.c (out_char): New fn.  Replace all calls to
-	putc/fprintf with calls to this.
-
-	* util/install-info.c: Rename --infodir to info-dir.
-
-Mon Sep 30 10:07:21 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* Version 3.8.
-
-	* texinfo.tex: Untabify.
-
-	* texinfo.tex (\ptexl, \ptexL): Do not save, we have our own
-	commands now.
-	(\onepageout): Reformat for readability, and call \indexdummies
-	to avoid expansion of Texinfo commands (e.g., accents) in \write's.
-	(\,, \dotaccent, \ringaccent, \tieaccent, \ubaraccent, udotaccent,
-	\questiondown, \exclamdown, \dotless): New macros.
-	(\l): Let plain TeX definition remain, instead of switching
-	to ``lisp'' font.
-	(\multitable): Ensure space between the columns,
-	insert struts to make interline spacing constant,
-	use real strut instead of a box containing `Xy'.
-	(\indexdummies): Do not define \rm, \char, but
-	do define \@, \{, \}, \dotless, and \,.  And \t should generate
-	\t, not \r.
-	(\indexnofonts): Define \, and \dotless as \indexdummyfont,
-	and let \@ be @.
-	(\doind): Reformat for readability, and use temp control sequence
-	names that actually make sense.
-	(\doublecolumnout, \pagesofar, \enddoublecolumns): Restore
-	Knuth's original code to avoid spurious overfull vbox messages.
-	(No boxes are actually overfull).
-	(\shortcontents): Do not allow hyphenations.
-	(\dochapentry, \tocentry): Make glue above and below flexible, to allow
-	better page breaks.
-	(\tex): Reset \, to its plain TeX meaning,
-	and do not reset \l.
-
-	* COPYING: Update for new FSF address (from gcc dist).
-
-	* libtxi/Makefile.in: Various simplifications.
-
-Sun Sep 29 12:58:44 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* util/texi2dvi: Use $progname instead of $0 for --version.
-
-	* util/install-info.c (xmalloc, xrealloc): Declare malloc and
-	realloc as returning void *,
-	to avoid ptr/int problems on Digital Unix.
-
-	* info/tilde.c (tilde_expand_word): Declare getenv as returning char *,
-	to avoid warning on Digital Unix.
-
-	* makeinfo/multi.c (multitable_active): Declare extern here to
- 	avoid ld warning on rs6000.
-
-	* util/texindex.c (usage): Avoid ??' trigraph.
-
-	* util/install-info.c: Include <sys/fcntl.h> or <fnctl.h>,
-	according to HAVE_SYS_FCNTL_H,
-	and only include <sys/file.h> if HAVE_SYS_FILE_H.
-	(readlines): Oops, had NULL's and 0's reversed for ptr/int members.
-
-	* info/terminal.c (terminal_goto_xy): Remove spurious extra ;.
-
-	* util/install-info.c: Untabify.	(input_sections): Initialize.
-	(find_lines): Initialize the terminating element of the array.
-	(print_help): Document --infodir.
-	(main): Compare the basename of infile sans .info to the dir entry,
-	not infile itself.
-	* util/Makefile.in (clean): Remove the install-info binary.
-
-	* info/Makefile.in (distclean): Remove *.info* files.
-
-	* Makefile.in (install),
-	* info/Makefile.in (install),
-	* makeinfo/Makefile.in (install): Use --infodir instead of --info-file.
-
-	* info/info.c,
-	* makeinfo/makeinfo.c: Avoid newlines in string constants for the
- 		sake of SunOS cc.
-
-	* makeinfo/multi.c: Do not assume ANSI C.
-
-	* info/info.texi: Oops, need @end vtable for a @vtable.
-
-Sat Sep 28 16:31:28 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* Makefile.in (texinfo): Do not depend on sub-all, as then
-        makeinfo is always run.  Instead, depend on texinfo.texi.
-
-	* makeinfo/Makefile.in (info, dvi): New targets.
-	makeinfo.info, makeinfo.dvi: Do not depend on macro.texi for now.
-
-	* info/Makefile.in (install): Must call install-info twice.
-
-	* info/info-stnd.texi,
-	* info/info.texi,
-	* makeinfo/makeinfo.texi: Include direntry.
-
-	* emacs/Makefile.in: Use && after cd, etc.
-
-	* texinfo.texi: Kludges so makeinfo -E will not create spurious
-        differences.  Add new direntries.
-
-	* util/install-info.c,
-	* util/texindex.c,
-	* makeinfo/makeinfo.c,
-	* info/info.c: Standardize --version output.
-
-	* makeinfo/makeinfo.c (defun_internal): Don't insert index command
- 	if expanding macros.
-	(cm_footnotestyle): Don't change the footnote style if it was set
-	on the command line.
-
-	* util/texi2dvi: Recompute original index files each time through loop.
-	Make indentation uniform.
-	Use same basename for the temp input files.
-	Standardize --version output.
-
-	* info/Makefile.in (install),
-	* makeinfo/Makefile.in (install): Insert $(POST_INSTALL).
-
-Fri Sep 27 13:27:30 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.texi (Format with texi2dvi): Rewrite now that the script
- 	runs in a loop.
-
-	* info/Makefile.in (MAKEINFO): Simplify to ../makeinfo/makeinfo.
-
-Fri Sep 27 00:26:03 1996  Miles Bader  <miles@gnu.ai.mit.edu>
-
-	* info/terminal.c [HAVE_TERMIOS_H] (terminal_prep_terminal,
-	terminal_unprep_terminal): Add code for termios.
-	[HAVE_TERMIOS_H] (original_termios, ttybuff): New variables.
-	* info/termdep.h: [HAVE_TERMIOS_H]: Add include of <termios.h>.
-	* configure.in: Add check for <termios.h>.
-
-Thu Sep 26 10:46:34 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* emacs/texnfo-upd.el,
-	* emacs/texinfo.el,
-	* emacs/texinfmt.el: Update from bob for new Texinfo commands, etc.
-
-	* emacs/info.el, emacs/informat.el, emacs/makeinfo.el,
-	emacs/texnfo-tex.el: Update from Emacs 19.34 dist.
-
-	* emacs/elisp-comp: Use TMPDIR if set.
-
-	* util/Makefile.in (libdir): Remove.
-
-	* makeinfo/Makefile.in (install),
-	* Makefile.in (install),
-	* info/Makefile.in (install): Run install-info.
-	(libdir): Remove.
-
-	* texinfo.texi: Various fixes as I make this go through TeX.
-
-	* util/install-info.c: Quote newlines in help message.
-
-	* util/texi2dvi (texi2dvi): Run TeX until the aux/index files
-        stabilize, instead of just twice.  From: David Shaw
-        <daves@gsms01.alcatel.com.au>.
-
-Tue Sep 24 14:43:03 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* dir: Blank dir file for installation on new systems.
-
-Mon Sep 23 12:18:43 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (args_from_string): Do not back up at a };
- 		that leads to an infinite loop.
-
-Sat Sep 21 17:48:04 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (cm_xref): Do not seg fault if outside of
- 	any node.  From: Tom Tromey <tromey@creche.cygnus.com>.
-	(cm_ctrl): Make obsolete.
-
-Tue Sep 17 13:30:08 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\inforef): Move to more appropriate place.
-	(\pounds): Remove spurious extra $.
-	(\email): Typeset argument in angle brackets.
-	(\macro): Use \doignore for robustness, instead of just letting TeX
-	parse the argument.
-	(\unmacro): Define.
-
-Sat Sep 14 16:17:35 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.texi: Document multitables, new ISBN number.
-
-Wed Sep 11 18:01:24 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/multi.c (struct env): Remove unused output_position
-        field; this needs to be global.
-        (setup_multitable_parameters): Implement template-defined multitables.
-	(output_multitable_row): Remove trailing whitespace.
-
-	* makeinfo/makeinfo.c (_READ_BUFFER_GROWTH, struct _defines):
-	Remove leading underscore for POSIX/ANSI pedants.
-	(init_conversion): Initialize output_position here.
-	(init_paragraph): Instead of here, where it loses with the
-	multitable calls, eventually resulting in negative counts to the
-	write call when the output file is split.
-
-	* texinfo.texi: First cut at macro documentation.
-	Change accent doc to use tables.
-	Remove whitespace experiments, they are now the default.
-
-Mon Sep  9 14:16:24 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c: Use putc instead of fprintf where possible.
-        (cm_accent): Put _ from @ubaraccent after argument.
-
-	* util/texindex.c (strerror) [!strerror]: Conditionalize
- 		declaration.
-
-Sat Sep  7 14:13:24 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (commandTable): Obsolete @setchapterstyle.
-
-Thu Sep  5 15:45:11 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (convert_from_loaded_file): Oops, fix
- 		wording of initial output comment.
-
-	* makeinfo/makeinfo.c (cm_angle_brackets): Rename from cm_key.
-        (commandTable): @email should produce angle brackets.
-	@key: Change name.
-
-Tue Sep  3 14:52:17 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\hsize): Decrease.
-        (\hoffset): Increase.
-	(\setleading): Decrease dramatically.
-	This change affects 8.5x11 format only.
-
-	* texinfo.texi: Document accent commands.
-
-Mon Sep  2 11:10:49 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (commandTable): Deprecate @ichapter and
-	@titlespec.
-	Move all the deprecated @i<section> commands to the end of the list.
-
-	* texinfo.texi: Document @pounds{} and @centerchap{}.
-
-	* texinfo.tex (\centerchfplain): Rewrite to use \chfplain, and to
- 	actually center.
-	(\unnchfplain): Just call \chfplain.
-	(\chfplain): Rewrite to be generally callable.
-	(\centerparametersmaybe): Hook, a no-op except with @centerchap.
-
-Sun Sep  1 15:01:49 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.texi: Document @<whitespace>, rearrange spacing section.
-
-	* makeinfo.c (commandTable): Make @. @? @! insert themselves,
- 	not be sentence-non-enders.  They are sentence *enders*.  Also,
- 	make @\t and @\n insert a normal space character, not themselves.
-  	Also, define @hyphenation.
-	(insert_space): New function.
-	(cm_ignore_sentence_ender): Remove this.
-	(flush_output): Check only for META-SPC, not META-<sentence-ender>.
-
-Fri Aug 30 18:55:30 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.texi: Document @- and @hyphenation{}.
-	Miscellanous fixes.
-
-	* makeinfo/makeinfo.c (commandTable): Define @- as cm_no_op, since
- 	makeinfo doesn't do hyphenation.
-
-Thu Aug 29 13:05:38 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\key): Do not uppercase the argument; key names
-	can be mixed case, e.g., `Control'.
-
-	* makeinfo/makeinfo.c: @infotop, @infounnumbered,
-	@infounnumberedsec, @infounnumberedsubsec,
-	@infounnumberedsubsubsec, @infoappendix, @infoappendixsec,
-	@infoappendixsubsec, @infoappendixsubsubsec, @infochapter,
-	@infosection, @infosubsection, @infosubsubsection:
-	  Remove these long-since obsolete commands.
-	@iappendix, @iappendixsection, @iappendixsec, @iappendixsubsec,
-	@iappendixsubsubsec, @ichapter, @isection, @isubsection,
-	@isubsubsection, @iunnumbered, @iunnumberedsec, @iunnumberedsubsec,
-	@iunnumberedsubsubsec:
- 	  Deprecate these.
-	@infoinclude:
-	  Obsolete this.
-	@,: Have to take an argument, since have to do @,{c} not c@,; can't
-	feasibly implement the latter in TeX.
-
-	* makeinfo/makeinfo.c: Rename @d to @udotaccent, since this is
- 		relatively infrequently used.
-
-Tue Aug 27 14:58:56 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* info/info.c (print_short_help),
-	* util/install-info.c (print_help),
-	* util/texi2dvi,
-	* makeinfo/makeinfo.c (usage) Include bug reporting address.
-
-Mon Aug 26 15:27:17 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (commandTable): Remove @input, @medbreak,
- 		@smallbreak, @overfullrule, @br.
-
-Sun Aug 25 17:25:48 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (commandTable): Unify commands that perform
-        the same operation, such as cm_file, cm_samp, cm_email,
-        etc., which all do cm_code.
-
-	* texinfo.texi: Document @ifhtml ... @end ifhtml.  Change
-	`PlainTeX' to `plain TeX'.
-
-Fri Aug 23 16:03:16 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\pounds): New Texinfo command @pounds{}.
-	(\parskip): New smaller value.
-	(\chapheadingskip, \secheadingskip, \subsecheadingskip): New smaller
-	values, both for 8.5x11 and @smallbook formats. From Bob.
-
-	* makeinfo/makeinfo.c (cm_special_char): @pounds{} prints a #.
-	(commandTable): Add new command @pounds.
-
-Tue Aug 20 13:47:20 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (CommandTable): Restore "!", accidentally
-        removed previously.
-
-	* texinfo.tex (\key): Typeset a lozenge around the argument (from
-	gildea@intouchsys.com).
-	* makeinfo/makeinfo.c (cm_key): Surround arg with <...> to match
-        new lozenge style in TeX.
-
-Wed Aug 14 16:59:23 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.texi: Propagate change from rms.
-
-Tue Aug 13 11:33:27 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.texi: Propagate change from rms.
-
-	* texinfo.texi: Document other @headings options.
-
-Sun Aug 11 13:19:42 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (cm_accent, cm_special_char, cm_dotless):
-	New functions.
-	(CommandTable): Add new commands for all of plain.tex's
-	accents and non-English characters.
-
-Fri Aug  9 14:12:07 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (convert_from_loaded_file): Say we're making
- 	``text'' file if no_headers.  Also, use `input_filename' instead
- 	of just `name' for clarity.
-	(suffixes): Check for no suffix last, i.e., prefer `foo.texi' as an
-	input file to `foo'.  (The latter is probably a binary.)
-
-Mon Aug  5 13:52:39 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\heading, \subheading, \subsubheading): Can no
- 	longer call the nonexistent \*secheadingi series. Instead, call
- 	\plain*secheading.
-	(\plainsubsecheading, \plainsubsubsecheading): New macros, by analogy
-	with \plainsecheading.
-	(\unnumberedsubseczzz, \unnumberedsubsubseczzz): Call them.
-
-Sun Aug  4 16:46:10 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (flush_output): Mask out eighth bit, that we
- 	turned on in non-sentence enders.
-
-Sat Aug  3 14:03:10 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\HEADINGSdouble, \HEADINGSsingle,
- 	HEADINGSdoubleafter, \HEADINGSsingleafter, \CHAPPAGoff,
- 	\CHAPPAGon, \CHAPPAGodd): Set \contentsalignmacro, analogous to
- 	\pagealignmacro.
-	(\startcontents): Call \contentsalignmacro instead of \pagealignmacro.
-
-Mon Jul 29 14:44:33 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\indexfonts): Make leading be 12pt. Otherwise, it's
- 	too crammed.
-	(\smalllispx): Remove \setleading{10pt}. That was too small.
-	(\doprintindex): Do not call \tex ... \Etex.  Index files are Texinfo
-	source, not TeX source, except for using \ instead of @ as the
- 	escape character (for now).
-
-Sun Jul 28 13:37:05 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (paragraphindent): Move to more reasonable place in
-        the source file.
-        (chapfonts, secfonts, subsecfonts, indexfonts): Call \setleading.
-	(\chfplain, \secheading, \plainsecheading, \subsecheading,
-	 \subsubheading): Rewrite to properly \hangindent the title.
-     	(\sectionheading): New generic macro to print section titles.
-
-	* texinfo.texi: Update the `Obtaining TeX' node.
-
-Fri Jul 26 14:11:48 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* util/texi2dvi: Do macro expansion with makeinfo before running TeX.
-	Various expansion safety measures added for test; avoid use of -o.
-
-	* makeinfo/makeinfo.c (usage): More usage message tweaks.
-
-Fri Jul 26 11:55:37 1996  Karl Berry  <karl@laurie>
-
-	* util/texi2dvi: Format usage message to conform to the other *utils.
-
-Thu Jul 25 17:05:47 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* emacs/Makefile.in: Do not compile the Elisp by default.  We
-	don't install it, so it confuses people to compile it.
-
-Sun Jul 21 07:20:09 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* util/Makefile.in (install-info): Dependency should be
- 	  install-info.o, not install-info. Also, update copyright years.
-
-	* makeinfo/makeinfo.c (cm_printindex): Don't call execute_string
-        to print index entries, we've already done the expansion now.
-
-	* makeinfo/makeinfo.h: Add copyright.  Finish merge of rms changes.
-	* makeinfo/makeinfo.c: Finish merge, add my expansion changes again.
-	* makeinfo/multi.c: Add copyright message.
-
-Fri Jul 19 10:35:22 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* info/info.c: Update copyright date.
-
-	* info/info.texi,
-	* util/install-info.c,
-	* emacs/Makefile.in,
-	* emacs/texnfo-tex.el,
-	* emacs/Makefile.in: Change FSF address.
-
-	* Merged changes from bfox -- below, plus multitable changes, plus
-	lots more.
-
-	    Sun Apr 14 08:49:50 1996  Brian J. Fox  <bfox@nirvana.samsara.com>
-
-		    * makeinfo/makeinfo.c (remember_node_reference): Numerous commands
-		    call remember_node_reference.  If a node has not yet been defined,
-		    use the empty string as the current node for those cases.
-
-	    Mon Feb 12 17:35:38 1996  Brian J. Fox  <bfox@nirvana.samsara.com>
-
-		    * makeinfo/makeinfo.c (push_node_filename): Clean up calls to
-		    xmalloc and xrealloc.  Only have to call xrealloc.
-
-	    Fri Jan 26 08:00:38 1996  Brian J. Fox  <bfox@nirvana.samsara.com>
-
-		    * info/session.c (info_input_buffer_space_available): Fix typo
-		    which forced the limitation of the sizeof (int) instead of sizeof
-		    (buffer).
-
-		    * Makefile.in (PACKVER): now at 3.8.  Add TERMIOS support to
-		    Info.  Minor bugs fixed in Makeinfo.
-
-Sat Jul 13 11:58:57 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.texi (ftable vtable): Mention example.
-
-Sun Jun 30 14:59:51 1996  Karl Berry  <karl@goldman.gnu.ai.mit.edu>
-
-        * makeinfo/makeinfo.c (cm_email): New function for new @email command.
-	* texinfo.texi (email): New node documenting it.
-
-Wed Apr 17 18:07:34 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* makeinfo/makeinfo.c (cm_kbd): Do nothing if in @example or @code.
-	(struct brace_element): New field in_fixed_with_font.
-	(remember_brace_1): Save in_fixed_with_font.
-	(pop_and_call_brace): Restore in_fixed_with_font.
-	(cm_code): Don't decrement in_fixed_with_font at end of construct.
-	(struct istack_elt): New field in_fixed_with_font.
-	(push_insertion, pop_insertion): Save and restore in_fixed_with_font.
-	(end_insertion): Don't decrement in_fixed_with_font here.
-	(not_fixed_width): New function.
-	(cm_sc, cm_var, cm_italic, cm_roman, cm_titlefont):
-	Use not_fixed_width.
-
-Sat Apr 13 23:22:05 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* util/install-info.c (main): Fatal error if no input file spec'd.
-	Look for START-INFO-DIR-ENTRY, not BEGIN-INFO-DIR-ENTRY.
-
-Thu Apr 11 18:21:50 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* makeinfo/makeinfo.c (cm_enddots): New function.
-	(self_delimiting): Accept -, ^ and ".
-	(CommandTable): Add commands -, ^, ", enddots, centerchap.
-
-Sun Mar 24 12:18:32 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* makeinfo/makeinfo.c (enum insertion_type): Add `direntry'.
-	(insertion_type_names): Add "direntry".
-	(cm_dircategory): New function.
-	(cm_direntry): New function.
-	(CommandTable): Add "dircategory" and "direntry".
-	(insert_string): New function.
-	(end_insertion): Handle direntry.
-	(begin_insertion): Handle direntry.
-
-Sun Mar 24 11:10:05 1996  Karl Berry  <karl@spiff.gnu.ai.mit.edu>
-
-        * makeinfo/makeinfo.c (cm_url): New function for new @url command.
-
-Fri Feb 23 21:14:40 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* info/Makefile.in (install, uninstall): Use manprefix.
-
-Fri Feb 23 19:50:18 1996  Richard Stallman  <rms@whiz-bang.gnu.ai.mit.edu>
-
-	* util/Makefile.in (install-info, install-info.o): New targets.
-	(all): Depend on install-info.
-	(install, uninstall): Operate on install-info.
-
-	* install-info.c: New file.
-
-Wed Jan  3 10:01:45 1996  Brian J. Fox  <bfox@nirvana.datawave.net>
-
-        * makeinfo/makeinfo.c (make_index_entries_unique): Be a little bit
-	stricter about what makes two index entries identical.
-
-Fri Dec 29 13:00:24 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* makeinfo/makeinfo.c (Whole File): Add @detailmenu for allowing
-	detailed menu listings to appear while still defaulting nodes.
-
-Wed Dec 27 13:54:30 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
-
-	* makeinfo/makeinfo.c (cm_code): Always notice that we are in
-	fixed_width_font, even if other formatting changes are not to take
-	place.
-
-Sat Dec 23 11:48:43 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* info/man.c: (clean_manpage) Remove ^L's from page.
-
-	* makeinfo/makeinfo.c (get_brace_args): Change some memcpy's to
-	memmoves.
-
-	* info/info.c (main): Prefer caseless matches over partial
-	matches.
-
-	* Makefile.in (All Subdir Targets): Change suggested by Debian
-	people which allows errors in recursive makes to kill the
-	top-level make.
-
-	* makeinfo/Makefile.in (makeinfo.dvi): New target.
-
-	* info/info.c (main): Print version of containing texinfo package.
-
-	* makeinfo/makeinfo.c (flush_output): Don't strip high-bit from
-	sentence_enders.
-	Print the version number of the containing texinfo package.
-
-	* info/man.c (locate_manpage_xref): Count the 0th entry.
-
-	* makeinfo/makeinfo.c (cm_menu): If a menu is seen before a node
-	has been defined, warn, and create the node `Top'.
-
-Wed Jun 21 03:19:39 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
-
-	* makeinfo/makeinfo.c (cm_infoinclude): Clean up after printing
-	error if the file couldn't be included.
-	(discard_braces): Print errors only for those unmatched open
-	braces that belong to a texinfo command.
-
-	* */Makefile.in: Use @CFLAGS@ and @LDFLAGS@.
-
-	* makeinfo/makeinfo.c: End `node_search_string' and friends with a
-	terminating null character.
-
-Wed Jun 21 01:23:49 1995  Jim Meyering (meyering@comco.com)
-
-	* makeinfo/makeinfo.c: Close comment after #endif.
-
-Tue Jun 20 04:58:26 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
-
-	* emacs/Makefile.in (install): Fix typo: "fle" -> "file".
-
-	* Makefile.in (VERSION): Bump to 3.6
-
-	* info/clib.c: Include general.h for `info_toupper' and friends.
-
-	* info/clib.h: strncmp and strncascmp return an int.  What kind of
-	drugs was I on?
-
-Mon Jun 19 23:34:47 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
-
-	* makeinfo/makeinfo.c (make_index_entries_unique): Copy the last
-	index entry.
-
-Mon Jun 19 21:55:49 1995  Noah Friedman  <friedman@prep.ai.mit.edu>
-
-        * util/texi2dvi (--version): New option.
-        Cosmetic changes.
-
-Mon Jun 19 16:06:40 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
-
-	* makeinfo/makeinfo.c (cm_macro): Fix typo.  `x != y' is not the
-	same as `x |= y'.
-
-	* info/Makefile.in (exec_prefix): Use @exec_prefix@ not $(prefix).
-	* makeinfo/Makefile.in (exec_prefix): Use @exec_prefix@ not $(prefix).
-	* util/Makefile.in (exec_prefix): Use @exec_prefix@ not $(prefix).
-	* libtxi/Makefile.in (exec_prefix): Use @exec_prefix@ not $(prefix).
-
-	* emacs/Makefile.in (uninstall): New target.
-	(install): Use the definition of $(lispdir), don't dynamically
-	find it.  Use INSTALL_DATA not cp.
-	(exec_prefix): use @exec_prefix@ not $(prefix).
-
-	* makeinfo/makeinfo.c (apply): If there isn't an actual argument
-	for a named argument, default it to "".
-
-	* Makefile.in (VERSION): Now at 3.5.
-	(texinfo): Make ./makeinfo/makeinfo depend on sub-all for parallel
-	makes.
-
-	* emacs/Makefile.in (ELISP_OBJS): Explictly declare .el and .elc
-	in the SUFFIXES list.
-
-	* makeinfo/makeinfo.c (cm_today): Special case for losing alpha.
-	* (minor_version): Increase to 63.
-
-	* info/info.c (version_string): Now at 2.14.
-	* info/tilde.c: Declare getenv to return (char *).
-	* info/window.c (build_message_buffer): Jump through hoops to keep
-	DEC Alpha's happy.
-
-	* info/xmalloc.c: Declare malloc and realloc as (void *) returning
-	functions.
-
-Sun Jun 18 12:47:21 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* emacs/detexinfo.el (detexinfo-line-cmds-without-arg):
-	Handle ifhtml.
-
-Fri Jun 16 13:48:14 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
-
-	* util/texindex.c: Update TEXINDEX_VERSION_STRING for texinfo 3.4
-
-	* (All *.c *.h *.in): Change FSF old address to new.
-	* texinfo.texi (Obtaining TeX): Change FSF old address to new
-	address.  Change Old phone numbers to new phone numbers.
-
-	* Makefile.in (VERSION): Change to 3.4.
-
-Thu Jun 15 22:49:07 1995  Robert J. Chassell  <bob@hill.gnu.ai.mit.edu>
-
-        * texinfo.texi, emacs/=development/cover.texi: update
-          Texinfo distribution package version number
-
-Thu Jun 15 09:23:02 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* info/info.c: (minor_version): Set to 13.
-
-	* info/clib.c,h: New files gather together replacement functions
-	for those POSIX-style C library functions that are not present on
-	the target system.
-
-	* info/Makefile.in (SRCS): Add clib.c and clib.h.  makedoc now
-	needs clib.o to build on systems missing various string.h stuff.
-
-	* info/variables.c (whole file): Call strdup, not savestring.
-	* info/tilde.c (whole file): Call strdup, not savestring.
-	* info/search.c (whole file): Call strdup, not savestring.
-	* info/nodes.c (whole file): Call strdup, not savestring.
-	* info/nodemenu.c (whole file): Call strdup, not savestring.
-	* info/man.c (whole file): Call strdup, not savestring.
-	* info/makedoc.c (whole file): Call strdup, not savestring.
-	* info/m-x.c (whole file): Call strdup, not savestring.
-	* info/info.c (whole file): Call strdup, not savestring.
-	* info/indices.c (whole file): Call strdup, not savestring.
-	* info/echo_area.c (whole file): Call strdup, not savestring.
-	* info/session.c (whole file): Call strdup, not savestring.
-	* info/filesys.c (whole file): Call strdup, not savestring.
-
-	* makeinfo/makeinfo.c (minor_version): Change to 1.62.
-	* makeinfo/makeinfo.c (get_execution_string): Initialize `i' to 0
-	in case there are no execution_strings.
-
-Wed Jun 14 17:48:06 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* texinfo.texi: include "texinfo.tex", not "texinfo".
-	* info/session.c (forget_window_and_nodes): Place a sequence point
-	in between "info_windows[i] = info_windows[++i];" as per various
-	compiler experts.
-
-	* makeinfo/makeinfo.c (strdup): Create this function if the system
-	doesn't have it.
-	(discard_insertions): Use the insertion's filename, not the
-	current input file.
-	(push_insertion): Remember the current input file with each
-	insertion.
-	(pop_insertion): Free storage used by remembered input file.
-
-	* makeinfo/makeinfo.c (whole file): Use `strdup' instead of
-	`savestring'.
-	* configure.in: Check for `strdup'.
-
-Wed Jun 14 15:58:51 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
-
-        * libtxi/Makefile.in (prefix): Use @prefix@, not /usr/local/
-
-Wed Jun 14 10:50:57 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* Makefile.in (DISTFILES): Don't include *.elc files in the list
-	  of files to distribute.
-	  (installdirs): Include `emacs' in the list of sub-dirs with
-	  Makefile.in's.
-
-	* emacs/elisp-comp: Shell script which batch compiles the *.el files.
-	* emacs/Makefile.in: New file contains targets to build the elc files.
-	* configure.in: Add `emacs/Makefile' to the list of created makefiles.
-	* makeinfo/makeinfo.c (whole file): Give every function a return
-	  type.  All cm_xxx functions are now void.  Add declarations for
-	  functions to top of file.
-
-Mon Jun 12 12:00:57 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* info/man.c (reference_section_starters): Add versions of "SEE
-	ALSO" and "RELATED INFORMATION" with tabs instead of spaces as
-	well.
-
-	* util/texindex.c: Back out changes for OFF_T.  Explicity coerce
-	the result of lseek to a long, and use longs everywhere.
-
-	* texinfo.texi: Change "@end shorttitlepage" to "@end titlepage".
-	* makeinfo/makeinfo.c: Make @shorttitlepage ignore the rest of the
-	line.
-
-	* util/texindex.c (strrchr): Create if not present.
-	Test for HAVE_STRCHR and HAVE_STRING_H.
-	(main): Make PROGRAM_NAME be just the last path componenet of argv[0].
-	(decode_command): Rewrite.
-	(usage): Rewrite.  Now texindex handles --version.
-
-	* makeinfo/makeinfo.c (make_index_entries_unique): Rewrite from
-	scratch.
-
-	* Don't distribute created info files with texinfo.  After all,
-	the user will have the tools necessary to create them, yes?
-
-	* Makefile.in (distclean): Remove *.log
-
-	* info/man.c (read_from_fd): Change timeout value for select to 15
-	seconds.  Some systems (e.g., albert.ai.mit.edu) actually need
-	more than 10 seconds to format a man page.
-
-	* info/tilde.c: Fix typo in declaration for
-	`tilde_expansion_failure_hook'.
-
-Wed Jun  7 13:36:53 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
-
-	* info/tilde.h: Change type of tilde_expansion_failure_hook to
-	a pointer to a function returning a (char *).
-	* info/tilde.c: Change type of tilde_expansion_failure_hook to a
-	pointer to function returning a (char *).
-
-	* makeinfo/makeinfo.c (get_execution_string): Don't use `i' in the
-	latter assignment, use `execution_strings_index' instead.
-
-	* info/man.c (read_from_fd): Change logic to avoid using FIONREAD.
-
-	* info/xmalloc.c (xrealloc): Use (void *), not (caddr_t *).
-	* info/xmalloc.c (xmalloc): Use (void *), not (caddr_t *).
-
-	* Makefile.in (DISTFILES): Don't find RCS no "=" directories.
-
-	* util/Makefile.in (prefix): Use @prefix@ as the value.
-	* info/Makefile.in (prefix): Use @prefix@ as the value.
-	* makeinfo/Makefile.in (prefix): Use @prefix@ as the value.
-
-Wed Jun  7 12:29:28 1995  Robert J. Chassell  <bob@hill.gnu.ai.mit.edu>
-
-        * texinfo.texi: Correct minor typos.
-
-        * emacs/texinfmt.el:  Don't require @shorttitlepage to be inside
-          of @iftex ... @end iftex
-
-Mon May  8 18:33:52 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* info/nodes.c: #include "man.h" if HANDLE_MAN_PAGES.
-	(info_get_node_of_file_buffer): If the file buffer is one
-	associated with manpages, call the manpage node finding
-	function instead.
-	(info_find_file_internal): If the file buffer is one associated
-	with manpages, avoid doing any file I/O.
-	(info_reload_file_buffer_contents): Ditto.
-	(info_find_file_internal): Call create_manpage_file_buffer instead
-	of info_load_file_internal.
-
-	* info/info.c: #include "man.h" if HANDLE_MAN_PAGES.
-	(main): If the initial node cannot be found, perhaps find it as a
-	manpage.
-	* info/info-utils.c: #include "man.h" if HANDLE_MAN_PAGES.
-	(info_xrefs_of_node): If handling man pages, and this is a manpage
-	node, use xrefs_of_manpage.
-
-	* info/session.c (info_set_input_from_file): Only fclose (stream)
-	if it is non-null and not stdin.
-	#include "man.h" if HANDLE_MAN_PAGES.
-	(info_menu_or_ref_item): If handling man pages, and this is a
-	manpage node, get the xrefs from manpage_xrefs_in_binding.
-	(info_man): Compile in for M-x man if handling man pages.
-	(info_move_to_xref): If handling man pages, and the current node
-	is a manpage node, use locate_manpage_xref to get xrefs.
-
-Thu May  4 08:55:23 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* info/info.c (main): If the output device is not a terminal, and
-	no output filename has been specified, make user_output_filename
-	be "-", so that the info is written to stdout, and turn on the
-	dumping of subnodes.
-
-Thu Apr 13 18:05:06 1995  Daniel Hagerty  <hag@churchy.gnu.ai.mit.edu>
-
-	* texinfo.texi: Fixed @end titlepage/@end shorttitlepage
-
-Sat Apr  8 12:51:49 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
-
-	* makeinfo/makeinfo.c [! HAVE_STRERROR] (strerror): New function,
- 	snarfed from ../info/filesys.c.
-	(cm_infoinclude): Use strerror instead of sys_errlist.
-
-Tue Apr  4 18:44:00 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* util/texindex.c (sort_offline): Change TOTAL to be an off_t.
-	* util/texindex.c (sort_in_core): Change TOTAL to be an off_t.
-	* util/texindex.c (MAX_IN_CORE_SORT): Cast to off_t.
-
-Sun Apr  2 16:20:13 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* info/Makefile.in: Define DEFAULT_INFOPATH in case we are
-	compiling in the current directory.
-	* info/Makefile.in (info.o): Add filesys.h because of DEFAULT_INFOPATH.
-	* info/(search.c,h, nodes.c info-utils.c) Use strcasecmp and
-	strncasecmp instead of stricmp and strnicmp.  Define strcasecmp
-	and strncasecmp in search.c if !HAVE_STRCASECMP.
-	* info/search.c: If HAVE_STRING_H include it.
-	* info/nodes.c: If HAVE_STRING_H include it.
-	* info/info-utils.c: If HAVE_STRING_H include it.
-	* info/info.h: If HAVE_STRING_H include it.
-	* configure.in (AC_HAVE_FUNCS): Check for strcasecmp.
-	* makeinfo/makeinfo.c (strcasecmp): Define if !HAVE_STRCASECMP.
-	* makeinfo/makeinfo.c (entire file): Use `strcasecmp' instead of
-	`stricmp'.
-	* makeinfo/makeinfo.c (cm_ifeq): New command takes three args.
-	Compares first two, executes remainder if the first two are
-	string-wise eq.
-	* makeinfo/makeinfo.c (ifhtml): Add to command list.  Shouldn't be
-	used, but it is by people who don't want to hack macros.
-
-Sat Apr  1 09:20:14 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* makeinfo/makeinfo.c (begin_insertion): Fix reversed arguments to
-	line_error.
-
-	* info/info-stnd.texi: Use "end" footnote style instead of "separate".
-
-	* info/Makefile.in: Change "rm -f" to $(RM).
-
-	* info/general.h: Define zero_mem in terms of memset if we have
-	it, else in terms of bzero if we have that, else as inline code.
-
-	* info/NEWS: Updated to reflect changes in 2.11.
-
-Fri Mar 31 22:38:31 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* Makefile (DISTFILES): Don't include *.a, *orig, nor *.e
-	files.
-	(DISTFILES):
-
-Sat Mar  4 12:16:29 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* Makefile.in: Use @prefix@ instead of hardwired `/usr/local'.
-	  Clean up makefile rules which make in subdirs.
-	  (ALL_SUBDIRS): Add makeinfo/macros to list of subdirectories.
-
-	* configure.in (AC_CHECK_FUNCS): Add `bcopy' to list of things to
-	check for.
-
-Fri Mar  3 13:54:10 1995  Robert J. Chassell  <bob@hill.gnu.ai.mit.edu>
-
-        * texinfo.texi: Minor changes for incremental new edition 2.20.
-
-Fri Mar  3 19:01:36 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* filesys.c (filesys_read_info_file): Local variable ST_SIZE is a
-	long which has the value of finfo->st_size casted to it.
-	* nodes.c (whole file): Similar changes.
-
-	These changes and the following for makedoc.c were required for
-	proper operation on HPm68k NetBSD.
-
-Mon Feb 27 15:16:27 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* makedoc.c (process_one_file): Local variable FILE_SIZE is a long
-	which has the value of finfo.st_size casted to it.
-
-
-Fri Mar  3 18:58:38 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* makeinfo.c (find_and_load): Cast fileinfo.st_size to a long for
-	internal use.  This makes things work on NetBSD.
-
-
-Fri Mar  3 13:54:10 1995  Robert J. Chassell  <bob@hill.gnu.ai.mit.edu>
-
-        * texinfo.texi: Minor changes for incremental new edition 2.20.
-
-Fri Mar  3 09:41:39 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* configure.in (TERMLIBS): Use AC_CHECK_LIB instead of
-	AC_HAVE_LIBRARY.
-
-Mon Jan  9 16:55:31 1995  Brian Fox  <bfox@churchy.gnu.ai.mit.edu>
-
-	* Makefile.in (DISTFILES): Add the directory EMACS-BACKUPS to the
-	list of things to avoid distributing.
-
-Tue Nov 29 17:48:37 1994  David J. MacKenzie  <djm@duality.gnu.ai.mit.edu>
-
-	* configure.in: Check for off_t.
-	* util/texindex.c (main): Use it.
-
-Fri Nov 11 14:46:28 1994  David J. MacKenzie  <djm@duality.gnu.ai.mit.edu>
-
-	* configure.in: Update for Autoconf v2.
-
-Thu Oct 13 02:17:38 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* emacs/detexinfo.el (detexinfo): Handle @!, @?, @^, @".
-
-Mon Aug  1 03:26:13 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texindex.c: Move the memset define down past string.h include.
-
-Tue Jun 28 14:21:43 1994  David J. MacKenzie  (djm@churchy.gnu.ai.mit.edu)
-
-	* makeinfo/makeinfo.c: Add --help option.
-	(usage): Take args for stream and error code.
-	Change callers.
-	(print_version_info): Write to stdout, not stderr.
-
-Wed May 18 18:55:24 1994  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* info/session.c (forget_window_and_nodes): Negate test for
-	internal_info_node_p.  We only want to free the text if it is
-	not an internal node.
-
-Thu Mar 10 03:07:18 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texindex.c (memset): Fix invalid parm name (was 0).
-
-Thu Feb 10 12:56:52 1994  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * makeinfo/makeinfo.c (current_item_function): Don't loop if elt
-        is NULL.
-
-Wed Feb  9 12:21:09 1994  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* makeinfo/makeinfo.c (minor_version): Release now at 1.60.
-
-	* makeinfo/makeinfo.c (expand_filename): Additional fixes.  Now
-	when called with NULL filename, makes an output filename from the
-	input filename.
-	(convert_from_loaded_file): If REQUIRE_SETFILENAME is #defined (no
-	longer the default case) then error if no @setfilename was found
-	in the file.  If REQUIRE_SETFILENAME is not #defined, the input
-	file starts either at the first line, or at the second line if the
-	first line contains the text "\input", and the output filename is
-	the input file name without directory and with ".info" replacing
-	any extension found.
-	(convert_from_loaded_file): Fixed bug in search for first
-	occurence of "@setfilename".
-
-Tue Feb  8 14:16:58 1994  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * configure.in: Check for sys/file.h.
-        info/dir.c, info/filesys.c, info/makedoc.c, info/nodes.c,
-        info/session.c, info/termdep.h, makeinfo/makeinfo.c
-        [HAVE_SYS_FILE_H]: Include <sys/file.h>.
-
-        * makeinfo/makeinfo.c (convert_from_loaded_file): Print
-        real_output_filename instead of output_filename, so user knows
-        exactly where output file is going.
-
-        Fri Jun 11 14:34:30 1993  Ian Lance Taylor  (ian@cygnus.com)
-       	* configure.in: Check for sigprocmask and sigsetmask.
-	* info/signals.h (HAVE_SIGSETMASK): Don't define.
-	(HAVE_SIGPROCMASK): Use instead of _POSIX_VERSION.
-	(BLOCK_SIGNAL, UNBLOCK_SIGNAL): If neither HAVE_SIGPROCMASK nor
-	HAVE_SIGSETMASK is defined, define these to do nothing.
-	* info/signals.c (sigprocmask): Don't compile if HAVE_SIGSETMASK
-	is not defined.
-
-	* info/terminal.c (terminal_prep_terminal): Don't clobber VINTR
-	and VQUIT in conditionals.
-
-Mon Feb  7 18:10:22 1994  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* makeinfo/makeinfo.c (full_pathname): Correct to really return
-	the full pathname of the input argument.  Now makeinfo
-	/foo/bar.texi, where /foo/bar.texi contains "@setfilename
-	bar.info", correctly leaves the output file in "./bar.info".
-	Note that "@setfilename ../bar.info" still works; this is already
-	an absolute pathname.
-
-Sat Feb  5 13:04:05 1994  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* makeinfo/makeinfo.c: Version 1.59 released.
-
-	* makeinfo/makeinfo.c (whole file):  Large number of changes allow
-	the "-E filename" option to be used to write a macro expanded
-	output file.  On a file which contains no @include's and no
-	@macro's, the output file is identical to the input file.
-
-	* makeinfo/makeinfo.c (declarations): Remove cm_tex ().  It is
-	never used since it is implemented with `command_name_condition'.
-
-	* makeinfo/makeinfo.c (add_char): Shift braces following the
-	current break point if we have deleted any characters.
-	(adjust_braces_following): New function adjusts all of the markers
-	in the brace stack which follow HERE by AMOUNT.  This fixes a bug
-	where (for example) @var{} immediately following a line break
-	which is the end of a sentence modified the output incorrectly.
-
-Wed Feb  2 14:14:03 1994  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* makeinfo: Version 1.58.
-
-	* makeinfo/makeinfo.c (cm_node): Add extra hair to allow
-	backtracking through execution strings.  Add extra hair to allow
-	the first node seen after a @top node is seen to adjust the
-	sectioning level of the @top node and associated menus.
-	Fix a few typos.
-	Add facility for macros to invoke the original definition.  This
-	works by not allowing a single macro to recurse.  Mutual recursion
-	is also disallowed with this plan.
-
-	* makeinfo/macros: New directory contains shippable macros.
-	* makeinfo/macros/simpledoc.texi: Macros which simplify the most
-	common uses of TeXinfo.  See the example file.
-	Macros are now a reasonable way to get people started using
-	TeXinfo.
-
-Mon Jan 31 12:54:36 1994  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* makeinfo/makeinfo.c (minor_version): Increase to 57.
-
-	* makeinfo/makeinfo.c (cm_node): Call execute_string on the node,
-	next, prev, and up pointers.
-	(reader_loop): Change logic for `@bye'.  No longer required at the
-	ends of executed strings.
-	(execute_string): Do not append `@bye' to the string to execute.
-
-	* makeinfo/makeinfo.c (whole file): Use COMMAND_PREFIX instead of
-	hardcoding `@' character in strings and searches.
-
-	* makeinfo/makeinfo.c (read_command): If HAVE_MACROS is defined,
-	then recognize and execute macros here.
-	(CommandTable): Add "macro" and "unmacro" to table if HAVE_MACROS
-	is defined.
-
-	* makeinfo/makeinfo.c (cm_macro, cm_unmacro, execute_macro)
-	  makeinfo/makeinfo.c (get_macro_args, find_macro, add_macro)
-	  makeinfo/makeinfo.c (delete_macro, array_len, apply):
-	  New functions implement macro facility if HAVE_MACROS is
-	  defined.
-
-	* makeinfo/macro.texi (new file): Examples of using the new macro
-	facility.
-
-Mon Jan 31 10:24:52 1994  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * makeinfo/makeinfo.c (executing_string): Restore global
-        declaration.
-
-Mon Jan 24 23:48:26 1994  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * texinfo.texi: Various typo fixes from Bob Chassell
-        <bob@gnu.ai.mit.edu>.
-
-Thu Jan  6 13:34:21 1994  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * texinfo.texi: Turned on smallbook format and @set smallbook.
-
-Wed Dec 15 20:08:43 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * info/filesys.h (DEFAULT_INFOPATH): Added /usr/local/info,
-        /opt/gnu/info, /usr/share/info, and /usr/local/share/info.
-
-Tue Dec 14 19:10:20 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * libtxi/Makefile.in (ALLOCA): Define from configure.
-
-Fri Dec 10 04:33:12 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * util/texi2dvi: Put under RCS control.
-
-Sun Dec 26 11:55:46 1993  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* info/session.c (info_numeric_digit_arg_loop): Fix doc string.
-
-	* info/infodoc.c (create_internal_info_help_node): Print out list
-	of functions which have to keystroke equivalent if we support
-	NAMED_FUNCTIONS.
-
-	* info/filesys.c (compress_suffixes): Add ".gz" for "gunzip" to
-	alist.
-
-	* info/footnotes.c (make_footnotes_node): If refs[i] doesn't have
-	a nodename, then it couldn't be a reference to a footnote.
-
-	* info/nodemenu.c (get_visited_nodes): Handle the case where
-	filter_func has left no possible buffers to select.
-
-Sat Dec 25 10:35:56 1993  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* info/infodoc.c (create_internal_info_help_node): Conditionalize
-	generation of the help node based on the #define
-	HELP_NODE_GETS_REGENERATED.  When this is not set (the default)
-	the help node is generated exactly once, and is not gc'able.
-	Otherwise, a new node is always created for the help window, and
-	the old node gets garbage collected by the gc system.
-	(info_find_or_create_help_window): Conditionalize window node
-	selected based on the #define HELP_NODE_GETS_REGENERATED.
-
-	* info/dir.c (add_menu_to_file_buffer): Place exactly one blank
-	line between directory entries.
-
-	* info/info.c (version_string): Update minor version to "11".
-
-	* info/info.h: Update comment to "2.11".
-
-	* info/dir.c (maybe_build_dir_node): Only add the contents of a
-	new file if it is not identical to the file of the DIR buffer.
-
-	* info/nodes.c (info_get_node): Call `maybe_build_dir_node' on
-	"dir" as well as "localdir" to mimic emacs-19.22 "dir" merging
-	behaviour.
-
-Fri Dec  3 13:41:44 1993  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* info/info-utils.c (canonicalize_whitespace): Suppress whitespace
-	found at the start of STRING.
-
-Sat Nov 20 14:00:50 1993  Brian J. Fox  (bfox@hippie)
-
-	* info/indices.c (DECLARE_INFO_COMMAND): Fix typo in assignment to
-	`old_offset' (= instead of ==).
-
-Tue Nov  2 12:22:40 1993  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* makeinfo/makeinfo.c (make_index_entries_unique): New function
-	makes a sorted array have all unique entries by appending numbers
-	to the ends of strings.
-	(sort_index): Call `make_index_entries_unique'.
-
-Mon Sep 20 12:04:05 1993  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* makeinfo/makeinfo.c (get_execution_string): New Function returns
-	a pointer to an  EXECUTION_STRING structure.
-	(execute_string): No longer uses a static string; call
-	`get_execution_string' instead in order to get a free buffer for
-	consing.
-
-Sun May 23 07:00:20 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * Texinfo 3.1 released.
-
-Sat May 22 18:21:27 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * info/info.c (info_patch_level): Increment constant to 1.
-
-        * info/Makefile.in (DEFAULT_INFOPATH): Default definition deleted.
-        Makefile.in: Put it here instead.
-        * Makefile.in (MDEFINES): Add DEFAULT_INFOPATH.
-
-        * configure.in: check for vfprintf and vsprintf.
-
-        * makeinfo/makeinfo.c: Version 1.55.
-
-        * makeinfo/makeinfo.c (add_word_args, execute_string) [HAVE_VARARGS_H]:
-        Don't use this definition unless HAVE_VSPRINTF is also defined.
-        (error, line_error, warning) [HAVE_VARARGS_H]: Don't use this
-        definition unless HAVE_VFPRINTF is also defined.
-        Remove indentation of all cpp directives, except for #pragma.
-
-Fri May 21 14:34:24 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * texinfo.texi: Rename to texi.texi.
-        Change @setfilenname and START-INFO-DIR-ENTRY to `texi.info'.
-
-        * Makefile.in (MDEFINES): Pass LDFLAGS to sub-makes.
-        (realclean): Delete `configure'.
-        Changed all references to texinfo.info to texi.info
-
-        * configure.in: Add AC_PROG_RANLIB, and AC_CONST.
-        Check for `rindex' function.
-        Check for varargs.h.
-        Clean up symbol names for header files so a single AC_HAVE_HEADERS
-        can be used.
-        (AC_INIT): Use texi.texi instead of makeinfo/makeinfo.c
-
-        * info/info-utils.h: Copy definitions of bcopy, index, and rindex
-        (with appropriate #ifdef wrappers) from termdep.h.  These are
-        included by a mutually exclusive set of files.
-
-        * info/termdep.h [HAVE_SYS_PTEM]: Use HAVE_SYS_PTEM_H instead.
-
-        * info/terminal.c, info/termdep.h [HAVE_TERMIO]: Use HAVE_TERMIO_H
-        instead.
-
-        * info/makedoc.c, info/filesys.c [!O_RDONLY]: Include fcntl.h or
-        sys/fnctl.h, depending on whether HAVE_SYS_FCNTL_H is set.
-
-        * info/termdep.h: Remove all indentation in #-exprs.
-        Remove old assumptions about bcopy, index, and rindex.
-        [HAVE_BCOPY]: Define bcopy.
-        [HAVE_RINDEX]: Define index and rindex.
-
-        * info/nodes.c (info_get_node): Don't call stricmp if nodename is
-        NULL. Remove indentation in #-exprs.
-
-        * info/echo_area.c (echo_area_stack_depth): Declare static.
-
-        * info/Makefile.in (DEFAULT_INFOPATH): Make separate Makefile
-        variable so it can be overridden more easily by the user.  Add `.'
-        to beginning of path.
-        (clean): Delete core.* (386bsd core files).
-        (MAKEDOC): Variable removed.  Refer to `makedoc' explicitly.
-        (funs.h): Add `:' commands after if, to avoid spurious nonzero
-        exit statuses.
-
-        * info/userdoc.texi: Improved comments explaining its purpose.
-
-        * makeinfo/makeinfo.c [HAVE_VARARGS_H]: Include varargs.h.
-        (error, line_error, warning, add_word_args,
-          execute_string)[HAVE_VARARGS_H]: New versions that
-        use varargs.  From bfox.
-
-        * makeinfo/Makefile.in (clean): Delete core.* (386bsd core files).
-
-        * util/Makefile.in (clean): Remove core.* (386bsd core files).
-
-        * libtxi/Makefile.in: Remove all references to $(common).
-        (RANLIB): New variable, set from autoconf.
-        (libtxi.a): Use $(RANLIB) instead of `ranlib' in target rules.
-        (clean): Delete core.* (386bsd core files).
-
-Tue May 18 12:08:24 1993  Robert J. Chassell (bob at grackle.stockbridge.ma.us)
-
-        * emacs/texinfmt.el (texinfo-format-refill): Do not fill a section
-        title line with the asterisks, hyphens, etc. that underline
-        it in any circumstance.
-
-Sun May 16 13:53:43 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * util/mkinstalldirs: handle relative pathnames.
-
-Fri May 14 20:18:49 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * util/mkinstalldirs: initialize IFS if unset.
-
-Tue May 11 06:33:14 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * makeinfo/makeinfo.c (cm_item): don't dereference item_func if NULL.
-
-Mon May 10 14:50:31 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * Texinfo 3.0 released.
-
-        * Makefile.in (ALLOCA): Provide for substitution.
-
-Mon May 10 10:12:53 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * emacs/texinfmt.el (texinfmt-version): Updated year.
-
-Fri Apr 16 04:48:03 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * makeinfo/makeinfo.c: Version 1.54 from bfox.
-
-        * util/fixfonts: Replace instances of `[..]' with `test'.
-        Use more portable `test' arguments: `z$foo = z' instead of `! $foo'.
-        Robustify quoting in eval assignments.
-        (textfmdir, texpkdir, texgfdir): Don't override definition from
-        environment, if any.
-        Trap EXIT, SIGHUP, SIGINT, SIGQUIT, SIGTERM to delete temp files
-        instead of trying to remove them explicitly before calling exit.
-        When changing cwd, do so in subshell, in case various tex*dir
-        variables are relative.
-        Don't use `head', `dirname', or `basename'.  These don't behave
-        consistently and/or don't even exist on some systems.  They can
-        all be emulated with `sed' anyway.
-        (tempfile2_line1): New variable.  Use it instead of running
-        process to extract first line out of tempfile2 multiple times.
-        Eliminate some gratuitous uses of $tempfile2, such as in for loops.
-
-Fri Mar 26 23:25:13 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * texinfo.texi: @setfilename texinfo.info.
-
-        * makeinfo/makeinfo.c (reader_loop, end_insertion): Fix typos in
-        comments.
-        (handle_variable_internal): Handle the case that there further
-        menu text after a false ifset/ifclear.
-
-        * util/texi2dvi: Version 0.4
-        Replace all instances of `[ ... ]' with `test'.
-        Updated bug-reporting address.
-
-Thu Mar 25 12:31:30 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * info/Makefile.in (install): Install info.1 man page.
-        (uninstall): Remove installed info.1 man page.
-
-        * info/infoman.texi: Standalone manual renamed to info-stnd.texi.
-        Makefile.in: Targets updated appropriately.
-
-        * info/Makefile.in (LDEFS): New variable.  Use it for info-local
-        macros, since DEFS will be inherited from parent make and any
-        local definitions will get clobbered.
-
-        * info/RELEASE: Renamed to info/NEWS.
-
-        * README: New file.
-
-        * Makefile.in (topclean): New target.
-
-        * Getting-started: Renamed to INTRODUCTION.  Former name is too
-          long (over 14 chars).
-
-        * New-features: Renamed to NEWS.
-
-        * Makefile.in (MDEFINES): Set it.
-
-        * Makefile.in (dist): Use --gzip option to tar to make sure
-          resulting file is compressed with gzip.  Change tar file
-          extension from `.Z' to `.z'.
-
-        * Makefile.in (DISTFILES): Filter out any file or directory names
-          starting with `='.
-
-        * fixfonts: Moved to util/fixfonts.
-
-        * RELEASE: Deleted.
-
-        * makeinfo/Makefile.in (VPATH): Use $(srcdir), not @srcdir@.
-        (common): Use ../libtxi, not ../common.
-        (makeinfo.in): Run makeinfo with --no-split.
-
-        * makeinfo/makeinfo.texi: Changes from bob.
-
-        * util/Makefile.in (VPATH): Use $(srcdir), not @srcdir@.
-        (common): Use ../libtxi, not ../common.
-
-        * util/fixfonts: Moved from top-level directory.
-
-Wed Mar 24 10:21:31 1993  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-format-region): Do not require
-        `@setfilename' line; delete `\input texinfo' line if part of
-        region.
-
-        * emacs/texinfmt.el (texinfo-raise-lower-sections): Raise or lower the
-        hierarchical level of chapters, sections, etc. according to
-        `@raisesections' and `@lowersections' commands.
-
-Thu Mar 18 16:02:27 1993  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfo.el (texinfo-show-structure): Indent *Occur* buffer
-        according to the structure of the file.
-
-Sat Mar  6 05:16:44 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * util/texi2dvi: use ${1+"$@"}, not just "$@".
-
-Tue Feb  2 08:38:06 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * info/Makefile.in: Replace all "--nosplit" arguments to makeinfo
-        with "--no-split"
-
-Sun Jan 31 18:16:58 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * util/texi2dvi: Don't put .dvi and related auxillary files in same
-        directory as source files.  Put them in current directory instead.
-        (TEXINPUTS_orig): New variable.
-        (file_texi): Variable removed.
-        (filename_texi): New variable.
-        (command_line_filename): Use this wherever references to file_texi
-        occured except in setting filename_noext.
-        (TEXINPUTS): Current directory and source directory where input
-        file resides prepended to standard path before invoking TeX.
-
-Wed Jan 27 16:24:37 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * util/Makefile.in: overhauled.
-
-Tue Jan 26 21:04:23 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * Makefile.in, info/Makefile.in, makeinfo/Makefile.in: Overhauled.
-
-        * configure.in: Renamed from texinfo.in.
-          Incorporated makeinfo/makeinfo.in, info/info.in, and
-          util/util.in.  Create all child Makefiles.
-
-        * makeinfo/makeinfo.in, info/info.in: Deleted (incorporated into
-        top configure.in).
-
-        * util/util.in: Deleted (incorporated into ../configure.in).
-
-Mon Jan 25 10:59:49 1993  Brian Fox  (bfox@cubit)
-
-        * info/info.c: New version 2.9; new variable INFO_PATCH_LEVEL
-        appears in the version string if it is non-zero.  New function
-        version_string () produces the current version string, as in 2.8-p1.
-
-        * info/dir.c: New file implements Gillespies `localdir' hacks.
-
-        * info/nodes.c (info_get_node): Now calls maybe_build_dir_node ()
-        if the file name to look for is "dir".
-
-        * info/nodes.h: New flag N_CannotGC unconditionally prevents garbage
-        collection of a file buffer's contents.  Used when "dir" is made
-        from at least one "localdir".
-
-Fri Jan 22 11:36:42 1993  Brian Fox  (bfox@cubit)
-
-        * info/footnotes.c: Do not declare auto_footnotes_p as "extern" in
-        this file.
-
-Thu Jan 21 08:57:08 1993  Brian Fox  (bfox@cubit)
-
-        * info/info.c: New version 2.8.
-
-        * info/userdoc.texi, info/infoman.texi, info/info.texi: Fully
-        document Info; create both online and printed manual versions.
-        "userdoc.texi" contains exactly the documentation for GNU Info 2.x.
-        "infoman.texi" is a wrapper for that file; it is meant to produce
-        printed documentation. "info.texi" has the user documentation as a
-        complete chapter within itself, but continues to contain the Info
-        tutorial.
-
-        * info/makedoc.c: Convert "ea_" into "echo_area_" when creating the
-        command name.
-
-Fri Jan 15 16:50:35 1993  Brian Fox  (bfox@cubit)
-
-        * info/search.c (skip_node_characters): New argument NEWLINES_OKAY if
-        non-zero says that newlines should be skipped over during parsing.
-
-        * info/info-utils.c (info_parse_node): New argument NEWLINES_OKAY if
-        non-zero says that newlines should be skipped while parsing out
-        the nodename specification.
-
-Wed Jan 13 14:42:33 1993  Brian Fox  (bfox@cubit)
-
-        * info/makedoc.c: Remove "info_" from the front of the command name
-        before installing it.
-
-        * info/session.c (info_menu_or_ref_item): A label of "Menu" is okay if
-        the builder is not info_menu_of_node ();
-
-        * info/m-x.c: New function replace_in_documentation () replaces \\[foo]
-        with the keystrokes you type to get that command.  Now used in
-        indices.c, info.c, infodoc.c.
-
-Mon Jan 11 10:27:41 1993  Brian Fox  (bfox@cubit)
-
-        * info/variables.c, h: New files contain describe-variable and stuff
-        moved out of m-x.c.
-
-        * info/m-x.c: Move VARIABLE_ALIST and variable functions into
-        variables.c.  Add documentation string to variable definition.
-
-        * info/echo_area.c (push_echo_area): Zero the contents of
-        echo_area_completion_items after pushing the vars.
-
-Sat Jan  9 11:59:47 1993  Brian Fox  (bfox@cubit)
-
-        * info/Makefile.in: Add footnotes.c,h,o to the appropriate Makefile
-        variables.
-
-        * info/window.c (window_tile_windows): New function divides the
-        available space among the visible windows.
-
-        * info/session.c (info_tile_windows): New function calls
-        window_tile_windows.
-
-        * info/footnotes.c, footnotes.h: New file implements functions for
-        aiding automatic footnote display when entering a node which has
-        footnotes.
-
-        * info/m-x.c: New user-variable "automatic-footnotes".
-
-        * info/window.c (window_physical_lines) New function counts the
-        carriage returns found in NODE.
-
-Wed Jan  6 11:24:19 1993  Brian Fox  (bfox@cubit)
-
-        * info/general.h: #include <unistd.h> if we have it.
-
-Tue Jan  5 11:12:33 1993  Brian Fox  (bfox@cubit)
-
-        * info/info-utils.c (info_concatenate_references): If either arg is
-        NULL, return the other arg.
-
-        * info/indices.c (info_indices_of_file_buffer): Simplified and
-        corrected loop through tags/nodes of file buffer looking for
-        indices.
-
-        * info/search.c (skip_node_characters): Rewrite "if" statement for
-        clarification and conciseness.
-
-Fri Jan  1 03:18:26 1993  Brian Fox  (bfox@cubit)
-
-        * info/info.in: Check for setvbuf (), and check to see whether the args
-        are reversed.
-
-        * info/dribble.c (open_dribble_file) Check HAVE_SETVBUF and
-        SETVBUF_REVERSED when setting the buffering on info_dribble_file.
-
-Thu Dec 31 20:14:13 1992  Brian Fox  (bfox@cubit)
-
-        * info/session.c (info_select_reference) If the node couldn't be found,
-        look for the label as a filename (i.e., "(LABEL)Top").
-
-Wed Dec 30 01:57:50 1992  Brian Fox  (bfox@cubit)
-
-        * New Version 2.7 Beta.
-
-        * info/echo_area.c: Numerous functions now do something with the
-        numeric argument.  Kill ring implemented, as well as yank and
-        yank_pop.  Also transpose-chars.
-
-        * info/window.c (window_make_modeline): Check node->flags for
-        N_IsCompressed and display "zz" in the modeline if the node comes
-        from a file which is compressed on disk.
-
-Mon Dec 28 17:33:12 1992  Brian Fox  (bfox@cubit)
-
-        * info/filesys.c, info/nodes.c: New member of FILE_BUFFER "FILESIZE"
-        contains the size of file_buffer->contents.  finfo.st_size is no
-        longer relied upon to read the contents of files, since the new
-        function (filesys_read_info_file) can read compressed files.
-
-        * info/filesys.c (info_find_fullpath) If a file starts with a slash (or
-        tilde expansion causes it to start with a slash) still call
-        info_find_file_in_path () on it so that we can find files with
-        compression suffixes.
-
-        * info/m-x.c: New variable "gc-compressed-files".
-
-Tue Dec 22 03:45:28 1992  Brian Fox  (bfox@cubit)
-
-        * info/info.c: Version 2.6 Beta.
-
-        * info/indices.c (info_index_next): Improve the final search for the
-        matched index entry.
-
-        * info/session.c (move_to_screen_line): New function implements `M-r'.
-        Given a numeric argument, move point to the start of that line in
-        the current window; without an arg, move to the center line.
-        * infomap.c: Put move_to_screen_line () on `M-r'.
-
-        * info/nodes.c (adjust_nodestart): Don't set N_UpdateTags unless the
-        node came from a tags table.
-
-        * info/nodes.c (info_find_file_internal): If the filename being looked
-        for doesn't start with a `/', then additionally compare the
-        filename against the fullpath of the file buffer sans the
-        directory name.  This can happen when selecting nodemenu items.
-
-Mon Dec 21 10:07:18 1992  Brian Fox  (bfox@cubit)
-
-        * info/session.c, info/display.c: Remove all references to
-        active_window_ch, active_window_cv, cursor_h, and cursor_v.  The
-        single function display_cursor_at_point () is used for all cursor
-        movement, and to place the terminal's cursor at the right location
-        on the screen.
-
-Sat Dec 19 12:01:33 1992  Brian Fox  (bfox@cubit)
-
-        * info/nodemenu.c: New file implements a few functions for manipulating
-        previously visited nodes.  `list-visited-nodes' produces a menu of
-        the nodes that could be reached by info_history_node () in some
-        window.  `select-visited-node' is similar to `list-visited-node'
-        followed by `info-menu-item', but doesn't display a window with
-        the visited nodes menu.
-
-        * info/session.c (info_numeric_arg_digit_loop): If redisplay had been
-        interrupted, then redisplay all of the windows while waiting for
-        input.
-
-        * info/display.c (display_was_interrupted_p): New variable keeps track
-        of interrupted display.  Used in
-        info/session.c:info_numeric_arg_digit_loop ().
-
-        * info/session.c (info_global_next, info_global_prev): Use the numeric
-        argument passed to determine how many nodes to move.
-
-        * info/session.c (info_scroll_forward, info_scroll_backward): If the
-        invoking key is not SPC or DEL only do Page Only scrolling.
-
-Thu Dec 17 01:34:22 1992  Brian Fox  (bfox@cubit)
-
-        * info/display.c (display_update_one_window): Allow W_NoWrap to affect
-        window display.
-
-        * info/window.c (calculate_line_starts): Now takes a WINDOW * as an
-        argument, and simply does the calculation, placing the results
-        into window->line_starts and window->line_count.  It also handles
-        W_NoWrap in window->flags.
-
-Mon Dec 14 02:18:55 1992  Brian Fox  (bfox@cubit)
-
-        * info/session.c (info_backward_scroll): Don't try to get previous node
-        if the top of the node isn't currently being displayed.
-
-        * info/window.c (window_adjust_pagetop) Use new variable
-        "window_scroll_step" to attempt to control the amount which the
-        window scrolls.
-
-        * info/m-x.c (info_variables) Add "scroll-step" to the list.
-
-Thu Dec 10 08:52:10 1992  Brian Fox  (bfox@cubit)
-
-        * info/m-x.c: New variable entry show-index-matches.  When set to
-        non-zero the matched portion of the search string is indicated
-        with ` and '.  Perhaps I should use `|' inst|ea|d?
-
-        * info/echo_area.c (ea_possible_completions): Always build completions
-        before checking to see how many there were.
-
-        * info/info-utils.c: (info_concatenate_references): New utility
-        function concatenates references.
-
-        * info/Makefile.in: Add indices.c and indices.h to SRCS and HDRS.
-          Add indices.c to CMDFILES.
-
-        * info/indices.c, info/indices.h: New file implements `i' and `,'
-        commands of info, and provides index searching capabilities.
-
-        * info/echo_area.c (info_read_completing_in_echo_area):  Split off into
-        separate callable function info_read_completing_internal ().
-
-        * info/echo_area.c (info_read_maybe_completing): New function calls
-        info_read_completing_internal () with non-forcing argument.
-
-        * info/session.c: Rename down_next_upnext_or_error () and
-        prev_up_or_error () to forward_move_node_structure (), and
-        backward_move_node_structure ().  Implement new commands
-        info_global_next () and info_global_prev ().
-
-        * info/infomap.c (initialize_info_keymaps): Bind `[' and `]' to
-        backward_, forward_move_node_structure () respectively.
-
-        * info/session.c (info_menu_digit): Called with "0" as arg, select the
-        last menu item.
-
-        * info/infomap.c (initialize_info_keymaps): "0" calls
-        info_menu_digit ().
-
-        * info/session.c (info_move_to_xref): Take dir into account when there
-        are xrefs and menu items in the node and we are wrapping
-        backwards.
-
-Tue Dec  8 09:57:58 1992  Brian Fox  (bfox@cubit)
-
-        * info/info.c: Version 2.5 Beta.
-
-        * info/terminal.c (terminal_insert_lines, terminal_delete_lines) Do not
-        expect tgoto to return a new string; it returns the address of a
-        static buffer.
-
-        * info/infodoc.c (info_find_or_create_help_window) Correct check for
-        prior existing help node.
-
-        * info/m-x.c (set_variable): Allow variables to have a list of choices.
-        Add new variable scroll-behaviour.
-
-        * info/session.c (down_next_upnext_or_error, prev_up_or_error) New
-        functions implement user-controlled behaviour when attempting to
-        scroll past the bottom or top of a node.  New variable
-        info_scroll_behaviour is user visible as "scroll-behaviour".
-
-        * info/session.c (info_scroll_forward, info_scroll_backward) Call new
-        functions for user-controlled scroll behaviour.
-
-        * info/terminal.c (terminal_initialize_terminal) Set PC from BC not
-        from BUFFER.
-
-Mon Dec  7 11:26:12 1992  Brian Fox  (bfox@cubit)
-
-        * util/texindex.c: Change EXIT_SUCCESS and EXIT_FATAL to TI_NO_ERROR
-        and TI_FATAL_ERROR respectively.  This avoids namespace conflicts
-        on NeXT 2.0.
-
-Sat Dec  5 00:07:59 1992  Brian Fox  (bfox@cubit)
-
-        * info/info.c: New option "--subnodes" says to recursively dump the
-        menus of the nodes that you wish to dump.  Menu items which point
-        to external nodes are not dumped, and no node is dumped twice.
-
-Thu Dec  3 16:11:02 1992  Brian Fox  (bfox@cubit)
-
-        * info/session.c (info_error) Don't ring the bell if
-        info_error_rings_bell_p is zero.  (info_abort_key) Ring the bell
-        if printing "Quit" in the echo area wouldn't do it.
-
-        * info/m-x.c (set_variable) New functions allows setting of
-        variables in the echo area.  Currently, only visilble-bell and
-        errors-ring-bell are implemented.
-
-Wed Dec  2 13:11:37 1992  Brian Fox  (bfox@cubit)
-
-        * info/nodes.c, info/makedoc.c: If O_RDONLY is not defined by
-        sys/file.h, include sys/fcntl.h.
-
-        * info/filesys.c (info_file_in_path): Expand leading tildes found
-        within directory names.
-
-        * info/terminal.c (terminal_initialize_terminal) Set ospeed to 13 if
-        not settable any other way.  It is an index into an array of
-        output speeds.
-
-        * info/display.c (free_display) Do not free a NULL display.
-
-        * info/display.c (string_width): New functions returns the width of
-        STRING when printed at HPOS.
-
-Sun Nov 29 01:24:42 1992  Brian Fox  (bfox@cubit)
-
-        * info/info.c: New version 2.4 beta.
-
-        * info/general.h: #define info_toupper and info_tolower which check
-        their arguments before performing any conversion.
-
-        * info/search.c, info/echo_area.c: Use info_toupper.
-
-Sat Nov 28 14:23:24 1992  Brian Fox  (bfox@cubit)
-
-        * info/session.c (info_scroll_forward, info_scroll_backward) If at
-        last/first page of the node, and the last command was
-        forward/backward, do info_next/prev/_node.
-
-        * info/session.c: New function info_select_reference_this_line gets
-        menu or cross reference immediately.
-
-        * info/infomap.c (initialize_info_keymaps): Add info_keymap[LFD] to
-        invoke info_select_reference_this_line ().
-
-        * info/session.c (info_last_reference) Rename to
-        info_history_reference.  Wrote info_last_reference, and
-        info_first_reference which go to the last or first node of an info
-        file.
-
-Fri Nov 27 00:59:02 1992  Brian Fox  (bfox@cubit)
-
-        * info/info.c: New version 2.3.  Completed implementing contents of
-        TODO file.
-
-        * info/session.c (info_redraw_display): Fix C-l with numeric arg.
-
-Thu Nov 26 20:14:18 1992  Brian Fox  (bfox@cubit)
-
-        * info/m-x.c: New file implements reading named commands in the echo
-        area, along with a new function "info-set-screen-height".
-        Compilation of this file and some code in others controlled by the
-        Makefile variable NAMED_COMMANDS (set to -DNAMED_COMMANDS).
-
-        * info/window.c (window_new_screen_size) Rewrite from scratch, allowing
-        clean growth and shrinkage of the screen.  New variable
-        window_deletion_notifier is a pointer to a function to call when
-        the screen changes size, and some windows have to get deleted.
-        The function is called with the window to be deleted as an
-        argument, and it should clean up dangling references to that
-        window.
-
-        * info/session.c (initialize_info_session): Set
-        window_deletion_function to forget_window_and_nodes.
-
-        * info/display.c (display_update_one_window): If the first row of the
-        window to display wouldn't appear in the_screen, don't try to
-        display it.  This happens when the screen has been made
-        unreasonably small, and we attempt to display the echo area.
-
-Tue Nov 24 00:47:20 1992  Brian Fox  (bfox@cubit)
-
-        * Release Info 2.2.
-
-        * info/session.c: New functions implement reading typeahead and
-        implement C-g flushing typed ahead characters.
-        (info_search_internal): allows C-g to exit multi-file searches.
-
-Mon Nov 23 01:53:35 1992  Brian Fox  (bfox@cubit)
-
-        * info/nodes.c: Remove calls to sscanf (), replacing them with calls to
-        atol (), since that is much faster.
-        (get_nodes_of_tags_table) Only check for "(Indirect)" if we
-        haven't parsed any nodes out of the tags table.  Increase the
-        amount that file_buffer->nodes grows to 100 from 50.  These two
-        together sufficiently speed up the parsing process.
-
-        * info/nodes.c: info_get_node_of_file_buffer_tags (),
-        info_get_node_of_file_buffer_nodes (): Search the appropriate list
-        and return a node.  This was simply a cut and paste edit to
-        functionalize the code.
-
-        * info/TODO: Remove suggestion for partial tag parsing, since tag
-        parsing is much faster now.
-
-Sat Nov 21 02:48:23 1992  Brian Fox  (bfox@cubit)
-
-        * info/makedoc.c: New File replaces makedoc.sh shell script.
-
-        * info/infomap.c: Install info_isearch (on C-s) and
-        info_reverse_isearch (on C-r) for Info windows.
-
-        * info/session.c (incremental_search, info_isearch,
-        info_reverse_isearch) New functions implement incremental
-        searching.
-
-Fri Nov 20 00:01:35 1992  Brian Fox  (bfox@cubit)
-
-        * info/terminal.c (terminal_initialize_terminal): Declare and set up
-        `ospeed'.  Turn off C-s and C-q processing.
-
-        * info/session.c (info_show_point) When this function is called, the
-        desired result is to show the point immediately.  So now it calls
-        set_window_pagetop () if the new pagetop is not the same as the
-        old one.  This means that info_prev_line (), info_next_line (),
-        info_forward_word (), and info_backward_word () can all scroll the
-        window if they have to.
-
-Thu Nov 19 12:27:07 1992  Brian Fox  (bfox@cubit)
-
-        * info/session.c (set_window_pagetop): Add scrolling to make this
-        faster.
-
-        * info/echo_area.c (push/pop_echo_area): Remember the list of items to
-        complete over.
-
-        * info/session.c (info_forward_char): Don't let point get equal to
-        nodelen, only to nodelen - 1.
-
-        * info/display.c: New function display_scroll_display () scrolls the
-        rmembered display as well as the text on the actual display.
-
-        * info/terminal.c: New functions terminal_scroll_terminal (),
-        terminal_scroll_down (), and terminal_scroll_up ().  All
-        implemented using "al" and "dl" termcap capabilities. (i.e.,
-        insert and delete line).
-
-Wed Nov 18 15:05:14 1992  Brian Fox  (bfox@cubit)
-
-        * info/termdep.h: Only define HAVE_FCNTL_H if !aix and !ultrix.
-
-Tue Nov 17 20:35:08 1992  Brian Fox  (bfox@cubit)
-
-        * First Beta Release of Info 2.0.
-
-Sun Nov  1 02:21:05 1992  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * util/texi2dvi (--force): Option removed.  Always run tex at least
-        once, don't bother checking if .dvi file is newer than source.
-
-Fri Oct 30 02:16:28 1992  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * util/texi2dvi (-D): debugging option renamed from '-d'.
-        Made check to enable debugging more terse.
-        When checking if index files have changed, use
-        variable $this_file instead of $file in for loop.
-        (file_texi): wherever the variable $file was used to reference
-        the texinfo file, substituted $file_texi.
-
-Sat Oct 17 07:30:34 1992  Brian J. Fox  (bfox@helios)
-
-        * util/texindex.c: Remove references to USG replacing them with a
-        define declaring the actual feature required or missing.
-
-Thu Oct 15 16:17:47 1992  Robert J. Chassell  (bob@nutrimat.gnu.ai.mit.edu)
-
-        * emacs/texinfmt.el (texinfo-format-setfilename): Remove date from
-        Info file header so regression testing is easier.
-
-Tue Sep 15 16:28:35 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfmt-version): New variable.
-        (texinfo-format-setfilename): Include date and
-        version in Info file header.
-        Better documentation for @definfoenclose
-        Handle whitespace after @end iftex, etc.
-
-Thu Sep  3 09:25:37 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texnfo-upd.el: Fix typo re `texinfo-sequential-node-update.'
-
-Tue Aug 18 08:56:24 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-value): Revise syntax.
-
-        * emacs/texnfo-upd.el (texinfo-start-menu-description):
-        New function to insert title as description in a menu.
-        (texinfo-make-menu-list): Remove automatic title insertion.
-
-        * emacs/texinfo.el (texinfo-mode-map): Add keybinding for
-        texinfo-start-menu-description.
-
-Wed Jul 29 11:58:53 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-set): Revise to set a string to the flag.
-        (texinfo-value): @value{flag}: New command which inserts the
-        string to which the flag is set.
-
-Tue Jul  7 15:10:52 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texnfo-upd.el (texinfo-master-menu): Error message if file
-        contains too few nodes for a master menu.
-        (texinfo-insert-master-menu-list): Only attempt to insert detailed
-        master menu if there is one.
-
-Wed Jun 10 15:26:18 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-append-refill): Refill properly when lines
-        begin with within-paragraph @-commands.
-
-Tue Jun  9 12:28:11 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el: Add `texinfo-deffn-formatting-property' and
-        `texinfo-defun-indexing-property' to @deffn commands.
-
-Mon Jun  8 11:52:01 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texnfo-upd.el: Replace `(mark-whole-buffer)' with
-        `(push-mark (point-max) t) (goto-char (point-min))'
-        to avoid `Mark set' messages.
-
-Fri Jun  5 15:15:16 1992  Robert J. Chassell  (bob@kropotkin.gnu.ai.mit.edu)
-
-        * emacs/texnfo-upd.el (texinfo-check-for-node-name): Offer section
-        title as prompt.
-        (texinfo-copy-next-section-title): Copy title correctly.
-
-Thu May 28 20:34:17 1992  Robert J. Chassell  (bob@hill.gnu.ai.mit.edu)
-
-        * emacs/texinfmt.el: @vtable defined, parallel to @ftable, for
-        variables.
-        (texinfo-append-refill): set case-fold-search nil so @TeX is not
-        confused with @tex.
-
-Thu Mar 26 21:36:41 1992  Robert J. Chassell  (bob@kropotkin.gnu.ai.mit.edu)
-
-        * emacs/makeinfo.el: Rename temp buffer from `*Makeinfo*' back to
-        `*compilation*' so `next-error' works; unfortunately,
-        `*compilation*' is written into the code as the name
-        `next-error' needs.
-        Rename `makeinfo-recenter-makeinfo-buffer' back to
-        `makeinfo-recenter-makeinfo-buffer'
-
-Thu May 14 21:14:25 1992  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * util/fixfonts: Enclosed most variable references with "" to prevent
-        potential globbing and other weirdness.  Eliminated uses of
-        ${var-value}, which unfortunately isn't portable.
-
-        * util/texi2dvi: rewritten from scratch.
-
-Sat Apr 18 23:46:25 1992  Charles Hannum  (mycroft@hal.gnu.ai.mit.edu)
-
-        * util/fixfonts: Re-evaluate prefix and libdir if inherited (to resolve
-        variable references from make).
-        (texlibdir): Don't add '/tex', since it's already there.
-
-Fri Apr 10 14:51:23 1992  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * util/fixfonts: set prefix and libdir only if they are not already
-        defined (i.e. not inherited from the environment).
-        Changed default path for libdir to be consistent with Makefile.
-
-Tue Mar  3 13:17:42 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texnfo-upd.el (texinfo-insert-master-menu-list): Insert a
-        master menu only after `Top' node and before next node.
-        (texinfo-copy-menu): Error message if menu empty.
-
-Mon Feb 24 15:47:49 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-format-region): Make sure region ends in a
-        newline.
-        (texinfo-itemize-item): Recognize all non-whitespace on same line
-        as @item command.
-
-Sat Feb 22 02:15:00 1992  Brian Fox  (bfox at gnuwest.fsf.org)
-
-        * util/texindex.c: New version 1.45 has cleanups, should compile under
-        VMS quietly.
-
-Wed Feb 12 10:50:51 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/makeinfo.el: Rename temp buffer as *Makeinfo*.
-        Rename `makeinfo-recenter-compilation-buffer'.
-        (makeinfo-buffer): Offer to save buffer if it is modified.
-        (makeinfo-compile): Do not offer to save other buffers.
-        (makeinfo-compilation-sentinel): Switch to Info file.
-
-Tue Feb  4 13:07:39 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-print-index): Format so that node names in
-        the index are lined up.
-
-Mon Feb  3 09:08:14 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-itemize-item): Format entry when text
-        is on the same line as @item command.  Also, handle @-commands.
-        (texinfo-format-region, texinfo-format-buffer-1): Set fill column
-        to local value of Texinfo buffer.
-
-        * emacs/texnfo-upd.el (texinfo-pointer-name):  Find only those
-        section commands that are accompanied by `@node' lines.
-
-Tue Jan 14 16:10:16 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texnfo-upd.el: Ensure that no commands depend on the value of
-        case-fold-search.
-
-Fri Jan 10 15:13:55 1992  Robert J. Chassell  (bob at kropotkin)
-
-        * emacs/texinfmt.el (texinfo-append-refill): Replace use of
-        unsupported function `looking-at-backward' with
-        `re-search-backward'.
-
-Mon Dec 23 23:46:42 1991  David J. MacKenzie  (djm at wookumz.gnu.ai.mit.edu)
-
-        * util/texindex.c: Change POSIX ifdefs to HAVE_UNISTD_H and
-        _POSIX_VERSION.
-
-Mon Dec 16 15:01:36 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-append-refill): New function appends
-        @refill to all appropriate paragraphs so you no longer need to
-        append @refill command yourself.
-        (texinfo-format-region, texinfo-format-buffer-1,
-        texinfo-format-include): Call `texinfo-append-refill'.
-
-Fri Dec  6 01:25:09 1991  David J. MacKenzie  (djm at wookumz.gnu.ai.mit.edu)
-
-        * util/texindex.c: Conditionalize on _AIX (which is predefined) instead
-        of AIX, just like makeinfo does.
-
-Tue Nov 26 10:21:04 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texnfo-upd.el (texinfo-section-types-regexp): `@subtitle' no
-        longer treated as subsection.
-
-Sat Nov 16 08:27:42 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-        * util/fixfonts: New file, from Karl Berry.
-
-Tue Nov 12 16:13:24 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el: Create @end smalllisp.
-
-Mon Nov 11 16:50:13 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfo.el (texinfo-environment-regexp): Add all other block
-        enclosing Texinfo commands.
-
-Thu Nov  7 10:23:51 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfo.el (texinfo-insert-@end): Attempt to insert correct end
-        command statement, eg, @end table.  Fails with nested lists.
-         (texinfo-insert-*): Accept prefix arg to surround following N
-         words with braces for command.
-
-Thu Oct 31 21:31:41 1991  Robert J. Chassell  (bob at kropotki)
-
-        * emacs/texinfmt.el (texinfo-clear): Clear flag even if flag not
-        previously set.
-
-Wed Oct 23 11:15:58 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfo.el (texinfo-mode): page-delimiter now finds top node as
-        well as chapters.
-
-Tue Oct 22 11:46:12 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-do-flushright): Test whether a line is too
-        long for the flush right command (line length must be less than
-        the value of fill column).
-
-        * emacs/texnfo-tex.el (texinfo-tex-buffer): Prompt for original file
-        even if point moved to *texinfo-tex-shell*.
-        texinfo-tex-original-file: variable to hold file name.
-
-Wed Oct 16 08:32:05 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-format-center): Expand string before
-        centering so @-commands not included.
-
-Thu Oct 10 22:01:47 1991  Robert J. Chassell  (bob at kropotki)
-
-        * emacs/texnfo-tex.el (texinfo-show-tex-print-queue): Do not kill a
-        running process; do start a process none exists.
-
-Thu Sep 26 21:58:47 1991  Robert J. Chassell  (bob at kropotki)
-
-        * util/texi2dvi: Misc. bugs fixed.
-
-        * emacs/texinfo.el: Remove extraneous references to TeX.
-
-Thu Sep 19 20:45:29 1991  Robert J. Chassell  (bob at kropotki)
-
-        * emacs/texinfmt.el: add @cartouche as a noop (makes box with rounded
-        corners in TeX)
-
-Tue Sep 10 20:44:57 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texnfo-upd.el (texinfo-make-one-menu): Copy node-name correctly
-        for message.
-
-Thu Aug 29 17:54:07 1991  Robert J. Chassell  (bob at kropotki)
-
-        * emacs/texnfo-tex.el (texinfo-quit-tex-job): Do not set mark.
-
-Wed Aug 21 10:36:21 1991  Robert J. Chassell  (bob at grackle)
-
-         * emacs/texnfo-upd.el: (texinfo-copy-menu-title): Copy title as it
-         should rather than node line.
-
-Mon Aug  5 15:27:12 1991  Robert J. Chassell  (bob at grackle)
-
-         * emacs/texinfmt.el (texinfo-format-convert): Changed regexp that
-         looks for three hyphens in a row to find those between word
-         constituent characters, as now, for Oxford Univ. style dashes and
-         also between spaces, for Cambridge Univ. Press style dashes.
-
-        * emacs/texnfo-tex.el (texinfo-tex-start-shell): Runs "/bin/sh" so
-        `explicit-shell-file-name' is not set globally.
-
-        * emacs/texnfo-upd.el: Rewrite messages.
-        (texinfo-find-higher-level-node): Stop search at limit.
-        (texinfo-copy-menu-title): Rewrite to handle outer include files.
-        (texinfo-multi-file-update): Update all nodes properly;
-        rewrite doc string and interactive.
-
-Sat Aug  3 10:46:13 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texnfo-upd.el (texinfo-all-menus-update): Fixed typo that
-        caused the function to create a master menu when it shouldn't.
-
-        * emacs/texinfo.el (texinfo-mode): Make `indent-tabs-mode' a local
-        variable and set to nil to prevent TABs troubles with TeX.
-
-Wed Jul 31 11:07:08 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texnfo-tex.el (texinfo-quit-tex-job): New function: quit
-        currently running TeX job, by sending an `x' to it.
-        (texinfo-tex-shell-sentinel): New function to
-        restart texinfo-tex-shell after it is killed.
-        (texinfo-kill-tex-job): Rewrite to use kill-process rather than
-        quit-process; uses `texinfo-tex-shell-sentinel' to restart
-        texinfo-tex-shell after it is killed.
-        (texinfo-tex-region, texinfo-tex-buffer): Replace
-        texinfo-kill-tex-job with quit-process.
-
-        * emacs/texinfo.el (texinfo-define-common-keys): Add keybinding for
-        texinfo-quit-tex-job
-
-Wed Jul 10 15:15:03 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el: New commands @set, @clear, @ifset...@end
-        ifset, and @ifclear...@end ifclear.
-        Definition functions rewritten to make them easier to
-        maintain.
-
-Wed Jul  3 19:37:04 1991  Robert J. Chassell  (bob at kropotki)
-
-        * emacs/texinfmt.el (texinfo-format-deftypefn-index): Remove reference
-        to data-type to make consistent with texinfo.tex and makeinfo.
-        texinfo.el: Fix page-delimiter and texinfo-chapter-level-regexp
-        variables.
-
-Thu Jun 27 18:35:36 1991  Robert J. Chassell  (bob at nutrimat)
-
-        * emacs/texinfmt.el: Add @dmn as `texinfo-format-noop'.
-        texinfo2.texi: Document @dmn.
-        texinfmt.el (texinfo{,-end}-{eleterate,ecapitate} renamed
-        {alphaenumerate, capsenumerate}.
-
-Fri Jun 14 12:46:32 1991  Robert J. Chassell  (bob at churchy.gnu.ai.mit.edu)
-
-        * emacs/texinfmt.el (texinfo-format-defun-1): @defivar prints name
-        correctly.
-
-Thu Jun  6 21:38:33 1991  Robert J. Chassell  (bob at churchy.gnu.ai.mit.edu)
-
-        * emacs/texinfo.el (texinfo-mode): Set page delimiter to
-        'texinfo-chapter-level-regexp' so that page commands work by
-        chapter or equivalent.
-
-        * emacs/texinfmt.el (texinfo-format-defun-1): @defop prints name
-        correctly.
-        (batch-texinfo-format): replace unsupported
-        'buffer-disable-undo' with 'buffer-flush-undo'
-
-Fri Apr  5 15:17:17 1991  Robert J. Chassell  (bob at wookumz.gnu.ai.mit.edu)
-
-        * emacs/makeinfo.el (makeinfo-compilation-sentinel): Check for
-        existance of makeinfo-temp-file to avoid harmless error message.
-        texinfo2.texi: Minor typos fixed.
-
-Thu Mar 28 19:13:24 1991  Robert J. Chassell  (bob at pogo.gnu.ai.mit.edu)
-
-        * util/texi2dvi: Revised.
-
-Mon Mar 11 12:35:51 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el: (@footnotestyle): New command to set
-        footnotestyle.
-        (@paragraphindent): New command to set indentation.
-        (texinfo-format-refill): Add indentation feature so as to
-        indent paragraph or leave indentation asis before refilling
-        according to value set by @paragraphindent command.
-        (texinfo-format-region): Insert header, if any, into Info buffer.
-        (texinfo-format-separate-node, texinfo-format-end-node): Run
-        texinfo-format-scan on footnote text only once.
-        (texinfo-format-scan): Shorten `---' to `--'.
-
-        * emacs/texinfo.el: Define key for `texinfo-master-menu'; define
-        start and end of header expressions.
-
-        * emacs/texnfo-upd.el (texinfo-all-menus-update): Update
-        pre-existing master menu, if there is one.
-
-Fri May 11 14:36:07 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-        * util/texindex.c: Rename `lines' to `nlines'.
-        (bzero): Pass arg to lib$movc5 through non-register var.
-        (perror_with_file, pfatal_with_file): Move extern decls and includes
-        to top of file.
-        [VMS]: If not using VMS C, define away `noshare' keyword.
-        Include perror.h.
-
-Mon Jul 11 18:02:29 1988  Chris Hanson  (cph at kleph)
-
-        * util/texindex.c (indexify): when comparing to initial strings to
-        decide whether to change the header, must use `strncmp' to avoid
-        comparing entire strings of which initials are a substring.
-
-Sun Jun 26 18:46:16 1988  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-        * util/texindex.c (sort_in_core, sort_offline, parsefile):
-        Give up on input file if any line doesn't start with backslash.
-
-/* changelog for texinfo.tex before 19jun01.  */
-
-2001-05-24    <karl@gnu.org>
-
-	* texinfo.tex (\smallbreak, \medbreak, \bigbreak): add check for
-	\ifnum\lastpenalty to plain tex definitions, so that we won't
-	insert space right after a section title.
-	(\aboveenvbreak): similar check of \lastpenalty.
-
-2001-05-21    <karl@gnu.org>
-
-	* texinfo.tex (\pdfurl): \let\value=\expandablevalue, so at least
-	some cases can be properly handled.
-
-2001-03-28    <karl@gnu.org>
-
-	* texinfo.tex: Copyright.
-
-	* texinfo.tex (\pdfmkdest): remove trailing @ in target names;
-	suggestion from: Reiner Schlotte <R.Schlotte@science-computing.de>.
-	(\imagexxx): call \normalturnoffactive so _ (among others) will be
-	allowed in filenames; report from arnold@skeeve.com.
-
-2001-02-02    <karl@gnu.org>
-
-	* texinfo.tex (\secondary): handle pdf case.
-	(\dosubind): secondary index entry not written as separate arg for
-		texindex.
-	From: Trevin Beattie <trevin@eyring.com>
-	Date: Tue, 21 Mar 2000 13:04:06 -0700
-
-2001-01-12    <karl@gnu.org>
-
-	* texinfo.tex (\dopdfimage): different syntax for filename
-	inclusion (foo vs {foo}).  From: <Kurt.Hornik@ci.tuwien.ac.at>,
-	22dec99.
-
-2001-01-08    <karl@gnu.org>
-
-	* texinfo.tex (\afivepaper): new command from Jose Romildo
-	Malaquias <romildo@urano.iceb.ufop.br>.
-
-2000-12-12    <karl@gnu.org>
-
-	* texinfo.tex: oops, had outside page reversed.
-
-2000-12-11    <karl@gnu.org>
-
-	* texinfo.tex (\inmargin): allow lefttext and righttext as args.
-
-2000-11-10    <karl@gnu.org>
-
-	* texinfo.tex: implementation of new commands @verbatim, @verb,
-	and @verbatiminclude from janneke@gnu.org.
-
-2000-11-09    <karl@gnu.org>
-
-	* texinfo.tex (\inmargin): rewrite to allow for placing the
-	material either in the right or left margin.
-
-2000-10-27    <karl@gnu.org>
-
-	* texinfo.tex (\dosynindex): new macro subroutine, do not
-	\closeout twice the index being redirected.
-	(\synindex, \syncodeindex): call it.
-
-2000-10-18    <karl@gnu.org>
-
-	* texinfo.tex (\inmargin): rewrite to allow argument to be vmode
-	material, such as a box from an image.
-
-2000-09-06    <karl@gnu.org>
-
-	* texinfo.tex (\doublecolumnout): must subtract \ht\partialpage
-	here, not in \begindoublecolumns.  Otherwise the \partialpage on
-	the first page of double columns affects every subsequent page,
-	e.g., if @setchapternewpage off.  Reported by Aharon Robbins
-	<arnold@skeeve.com> for standards.texi.
-
-2000-05-28    <karl@gnu.org>
-
-	* texinfo.tex (\linkcolor): replace Cyan with Blue.
-	(\output): do \pdfmkdest at top.
-	(\pdfmakeoutlines): set \_ to \normalunderscore.
-	From: Trevin Beattie <trevin@eyring.com>.
-
-2000-05-27    <karl@gnu.org>
-
-	* texinfo.tex (\today): only define if undefined.
-	From: Stepan Kasal <kasal@suse.cz>.
-
-2000-05-16    <karl@gnu.org>
-
-	* texinfo.tex (\deftypeivarheader): need defheaderxcond.  From:
-	Marcel van der Boom <marcel@hsdev.com>.
-
-1999-10-01  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\afourwide): had hsize and vsize reversed.
-	From: Pascal Obry <pascal_obry@csi.com>
-
-1999-09-25  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\alias): fix from Andreas.
-
-1999-09-19  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\key): rename the \smallrm and \smallsy here.
-
-	* texinfo.tex (\indexfonts): rename to \smallfonts, along with
-		\indrm, etc.
-	Define all the fonts, too.
-	(\footnotezzz): use \smallfonts.
-
-	* texinfo.tex (\needx): get better leading; do nothing if @need
-	       value is less than one linespace.  From Arnold.
-	(\douref, \xrefX, \doemail [pdf]): make spaces normal again, so our
-	\ignorespaces commands are effective even in an @display.
-
-	* texinfo.tex (\finishtitlepage): remove FINISH TITLE debugging
-		message.
-
-	* texinfo.tex (\anchor): rewrite to always \ignorespaces.
-	Bug from esken.
-
-	* texinfo.tex (\indexnofonts): dummy up \acronym.
-	From: Thomas Esken <esken@nmlab.informatik.fh-dortmund.de>
-
-1999-09-06  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\texinfoversion): update.
-
-	* texinfo.tex: Avoid multiparagraph cells losing linespace between
-	paragraphs.  From: Andreas Schwab <schwab@suse.de>.
-	Bug from: Lalo Martins <lalo@webcom.com>.
-
-1999-08-19  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\shortchaplabel): move computation of width of
-	"Appendix" inside, in case it's been changed by a language.
-
-Mon Aug  9 16:31:55 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: pdf updates from Han.
-
-Fri Aug  6 13:48:22 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\charcode): remove unused counter.
-	From: Akira KAKUTO <kakuto@fsci.fuk.kindai.ac.jp>.
-
-Thu Jul 22 19:08:19 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: Update from Han.
-
-Tue Jul 20 17:13:16 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: More pdf improvements from Han.
-
-Mon Jul 19 16:33:31 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: Better pdf support from: Han The Thanh
- 		<thanh@informatics.muni.cz>.
-
-Sun Jul 18 14:21:03 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: pdfimage takes braces.
-
-Tue Jul  6 19:40:14 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\deftypeop): New command.
-
-Mon Jul  5 17:17:33 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\contents): call \pdfmakeoutlines here instead of
- 	inline (!).
-	(\pdfmakeoutlines): call \indexnofonts instead of making a separate
-	attempt at it.
-
-Tue May 25 06:16:06 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (time-stamp-format): use %02H.
-
-	* texinfo.tex: Had PDF and DVI transposed.
-
-Sun Apr 25 15:30:00 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\appendixletter): restore \the, necessary for .toc.
-
-Thu Apr 22 19:22:12 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\emergencystretch): Increase to .15\hsize.
-
-Tue Apr 20 05:11:04 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\defunargs): use \tensl\hyphenchar\font to work
-		better with Gildea's PostScript version.
-
-	* texinfo.tex (\tab): Change back to just &.
-	From: Nathan Sidwell <nathan@acm.org>.
-
-	* texinfo.tex: No \fi.
-
-Mon Apr 19 17:38:54 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\pdflink) [!\ifpdf]: define to ignore arg.
-
-	* texinfo.tex: Add pdf support.  Merge from: Kurt Hornik
- 		<Kurt.Hornik@ci.tuwien.ac.at>.
-
-Wed Mar 31 13:24:16 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\defopheader): missing word space before `on'.
-  		Report from: Chris Hanson <cph@martigny.ai.mit.edu>.
-
-Fri Mar 26 17:00:41 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\imagexxx): Equalize space above and below if in
- 		vmode.  From rms.
-
-Thu Mar 25 20:00:00 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\deftypeivar): new command.
-
-Tue Mar 23 17:53:37 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (&): be sure active & is defined for @deftypefn
-		operator&.
-	Report from: Nathan Sidwell <nathan@acm.org>.
-
-Sat Mar 20 12:31:53 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\exampleindent): new command.  From Yoshiki.
-
-	* texinfo.tex: Changes from Andreas to use \sl\$ inside italics
-		and to avoid extra spaces around @anchor.
-
-	* texinfo.tex (\image, \imagexx): move pdf test to imagexxx for
- 		correct filename parsing.
-
-Mon Mar 15 16:51:20 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\imagexxx): reset catcode ^^M in case we're inside
- 		in an example.  Report from kama.
-
-	* texinfo.tex (\putwordin): new macro for word `in'.
-	(\xrefX): use it.
-	Report from: "Alexey A. Nikiforov" <A.A.Nikiforov@inp.nsk.su>
-
-Sun Feb 21 16:47:28 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: Expand tabs.
-
-Sun Feb 14 16:02:29 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\paragraphindent): implement.
-	Suggestion from: Paul DuBois <dubois@primate.wisc.edu>.
-
-Tue Feb  9 07:25:07 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\alias): use def rather than \let.
-	Change timestamp format to include hours.
-
-	* texinfo.tex: New commands @alias and @definfoenclose.
-	From: "Eric S. Raymond" <esr@snark.thyrsus.com>.
-
-Mon Feb  8 14:46:56 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\scanmacro): Use \endinput to avoid spurious space,
- 		and various other space fixes.  From: Andreas Schwab
- 		<schwab@ls5.informatik.uni-dortmund.de>.
-
-Thu Feb  4 15:24:40 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\uref): implement optional third arg.
-
-	* texinfo.tex (\dosubind): Include index entry in third arg to
-		\entry instead of writing as bogus fourth arg.
-	Report from: kama@hippo.fido.de (Karl Heinz Marbaise).
-
-	* texinfo.tex (\setemergencystretch): Increase somewhat.
-
-	* texinfo.tex (\putwordof): rename from \putwordOf.
-	* texinfo.tex (defivarhead, \defcvarheader): Use \putwordof.
-
-Tue Feb  2 16:57:00 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\documentlanguage, \documentencoding): new
-	commands.  \documentlanguage based on an implementation by kama.
-
-Sat Jan 30 17:23:45 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\putwordMMai): Should be MMay.  From Trond.
-
-Fri Jan 29 17:52:16 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: Fix @macro expansion inside @section.  Patch from
- 	Andreas:
-
-	From: Andreas Schwab <schwab@ls5.informatik.uni-dortmund.de>
-
-	The general idea is to construct a list a all defined macros in
- 		the form \do\macro1\do\macro2..., then temporarily define
- 		\do to something appropriate and execute the list to do
- 		whatever is needed.  Here is a patch, and i have also
- 		fixed a few other bugs that i found while browsing through
- 		the @macro implementation.  Additionally i have added a
- 		check to prevent the user from doing silly things like
- 		@macro shipout.
-
-Sun Jan 24 09:59:42 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\obstexwarn): Don't use *** in message, it
- 		interferes with make output parsing.
-
-Thu Jan 21 15:45:20 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: Internationalization improvements from kama.
-
-Wed Jan 20 17:12:52 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\contents, \shortcontents): Run \contentspagealignmacro.
- 	From: Trond Endrestol <trond@agamemnon.gtf.ol.no>
-
-Thu Jan 14 16:53:43 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\begindoublecolumns): Ship out \partialpage
-	immediately if it is nonvoid, instead of saving it.  This avoids a
-	bug where the index could end up printing one line per page (see
-	the indexspread.tex test).
-	From: Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
-
-	* texinfo.tex (\image): If running pdftex, do \pdfimage{imagefile.pdf}.
- 	From: Samuel Tardieu <sam@inf.enst.fr>
-
- 	Also, update copyright year.
-
-Tue Jan  5 17:50:45 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\enddoublecolumns): Move \pagegoal reset to after
- 		the \endgroup so we get the restored single-column \vsize
- 		as intended.
-
-Sun Dec 20 17:57:22 1998  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\indexdummies): Set \{ and \} to \mylbrace and
-	\mybrace to avoid braces in the index file, which
-	texindex can't handle.
-
-Sat Dec 19 18:13:16 1998  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\pickupwholefraction): Ignore whole-number part.
-	(\setuptable): Always pass whole-number part and decimal point.  This
-	allows leading zeroes.
-	Suggestion from: Ben Bullock <ben@hayamasa.demon.co.uk>.
-	Date: Fri, 21 Aug 1998 14:06:50 +0100 (BST)
-
-Tue Dec 15 16:38:07 1998  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\indexdummies): set \{ and \} to \lbracecmd and
-        \rbracecmd to avoid lossage if @tex is active during \shipout.
-	Report from: "Peter Kabal" <Kabal@ece.mcgill.ca>.
-
-Sun Dec  6 17:11:17 1998  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: Doc fix.
-
-1998-11-11  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
-
-	* doc/texinfo.tex (\onepageout): Put the cropmarks in vboxes of
-	zero height so that they don't contribute space themselves.
-	Compensate for \topandbottommargin.
-	(\internalpagesizes): Advance \outervsize by 2\topandbottommargin,
-	not only 0.6in.
-
-Fri Nov  6 17:27:57 1998  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: Use standard time-stamp.el package instead of
- 		update-date.el.
-
-Sat Oct 31 19:23:02 1998  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\indexnofonts,\indexdummies): add \url and \uref to
- 		list.
-
-Fri Oct 30 08:16:23 1998  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\expandablevalue): Delete spurious `v' character.
-
-Tue Oct 27 11:18:40 1998  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (@env, @command, @option): Must disable for index
- 		and xref commands.  Also, \input plain if necessary before
- 		using {} in the version number.
-
-Wed Sep 30 11:40:36 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: Use date as version number instead of RCS, and
- 		update-date to update it.
-
-Thu Sep 17 13:22:44 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: Fix @macro expansion of @code with _ in the
- 		argument.
- 	From: Zack Weinberg <zack@rabi.columbia.edu>.
-
-Fri Aug 28 10:30:29 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\itemzzz): take \itemmargin into account when
- 		unhboxing.  Reported by Bob.
-
-Fri Aug 14 16:56:58 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: Change @defun environments so that right margin is
- 		not changed, and instead the defun type label is outdented
- 		into the margin.
-
-Thu Aug 13 13:31:41 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\smartslanted): define this separately from
- 	\smartitalic.
-	(\emph, \i): use \smartitalic for true italics.
-
-Mon Aug 10 11:51:13 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\value): handle active _ or - in argument (happens
- 		if called from @code).
- 	Report from: Dave Love <d.love@dl.ac.uk>.
-
-Sun Jul 19 09:49:23 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\dosubind): Don't do \vskip to preserve \lastskip
- 		unless we are in vertical mode.  Otherwise we might end a
- 		paragraph prematurely, and \folio won't get expanded by
- 		\output.
- 	Report from: "Richard E. Stone" <res@rstone.mn.org>
-
-Thu Jul 16 15:33:37 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: Keep track of how negative the page numbers have
- 	gotten:
-	(\lastnegativepageno): New \count register.
-	(\startcontents): Use it.
-	(\contents, \summarycontents): set it.
-
-Mon Jul 13 16:58:11 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\imagexxx): Add some space around the image if it's
- 		by itself.
-
-1998-07-09  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* texinfo.tex (chapterzzz): Put a space before the chapter number
-	in the message.
-	(appendixzzz): Use \putwordAppendix in the message.
-
-Thu Jul  9 08:39:53 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\macro): Globalize assignments since it's done
-		inside a group.  From Zack.
-
-Mon Jul  6 17:21:25 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\comment): Speed up.
-	(\loggingall): Turn on eTeX's extended tracing.
-	More macro fixes.
-	Date: Sat, 04 Jul 1998 14:51:49 -0400
-	From: Zack Weinberg <zack@rabi.phys.columbia.edu>
-
-Thu Jul  2 10:20:32 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\contents, \summarycontents, \startcontents): Use
- 		roman numerals for toc, arabic outside, even when toc is
- 		at the beginning.
-
-Mon Jun 29 10:05:28 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\anchor): New command @anchor.
-	(\xrefX): Avoid double space when xref to an @anchor or an @unnumbered.
-
-	* texinfo.tex (\itemzzz): Use kerns and \unhbox when item text
-		fits in the space, so footnotes can work.
-
-	* texinfo.tex (\setref): Take additional argument for the -snt
- 	xref.  Call \indexdummies.
-	(\donoderef, \appendixnoderef, \unnumbnoderef): Change \setref calls.
-
-Sat Jun 27 19:16:34 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\contents, \summarycontents): Must not be \outer.
-
-Fri Jun 26 16:15:14 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\writetocentry): New macro.
-	(\chapternofonts): No longer needed.
-	(\chapter, ..., \unnumberedsubsubsec): Change all the sectioning
-		commands to call \writetocentry instead of doing it inline.
-	Also, do not call \chapternofonts, we avoid expansion with
-		\the\toks instead.
-	(\opencontents): No longer needed, instead \writetocentry opens
-		the file when necessary.
-	(\setfilename): Don't call \opencontents.
-	(\ifsetcontentsaftertitlepage, \ifsetshortcontentsaftertitlepage):
-		New conditionals.
-	(\Etitlepage): Call \contents and/or \shortcontents if
-		conditionals are set.
-
-	Global: use \nobreak instead of \penalty 10000 for epsilon efficiency.
-
-Thu Jun 25 08:29:32 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\option,\env,\command): New markup commands.
-	Suggested by arnold@gnu.org.
-
-	* texinfo.tex (\afourpaper): More reasonable margins.
-	From: Wilhelm Mueller <muewi@hb.senbvs43.uni-bremen.de>
-	Date: Thu, 25 Jun 1998 10:48:13 +0200 (MET DST)
-
-Wed Jun 24 17:46:43 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\acronym): New Texinfo command.
-
-Tue Jun 23 17:36:39 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\dots, \enddots): Missing \leavevmode.
-	Report from: Thomas Esken <esken@nmlab.informatik.fh-dortmund.de>
-	Date: Tue, 23 Jun 1998 14:22:27 +0200 (MET DST)
-
-Mon Jun 22 16:00:53 1998  Karl Berry  <karl@north>
-
-	* texinfo.tex: Rewrite of index stuff to do better column breaking
-	and balancing.
-	The old code failed miserably when the index was just the wrong size,
-	e.g., the Autoconf manual with @afourpaper.
-	Bug report from: Wilhelm Mueller <muewi@hb.senbvs43.uni-bremen.de>
-	Date: Fri, 12 Jun 1998 16:34:49 +0200 (MET DST)
-	(\initial): Add more glue around the initial, and make it a
-		multiple of \baselineskip.
-	(\entry): Add glue before each entry so the columns can always be the
-	 same height.
-	(\doublecolumnout): Available space no longer needs to handle
-	 \partialpage specially.
-	(\pagesofar): Take \ht\partialpage into account with \vsize.
-	(\enddoublecolumns): Reset \output to avoid calling
-		\balancecolumns twice
-	(\balancecolumns): Format for readability.
-	(\initialskipamount): No longer needed, remove.
-
-	(\hbadness): Increase a bit, boxes that are a little underfull look ok.
-
-Sun Jun 21 16:48:38 1998  Karl Berry  <karl@north>
-
-	* texinfo.tex (\ninettsl): cmsltt10 is not standard, so use
-		cmsltt10 scaled 900.
- 	Date: Mon, 15 Jun 1998 12:35:41 +0200 (MET DST)
- 	From: Werner Struckmann <struck@ips.cs.tu-bs.de>.
-
-Thu Jun 18 08:32:15 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: @macro fixes from Zack Weinberg
-  	     <zack@rabi.phys.columbia.edu>.
- 	- @ifblah did not work inside @macro
-        - spaces in parameter lists in macro definitions caused errors
-        - leading spaces in parameter lists in macro invocations were
-	  preserved inappropriately.
-
-Wed Jun 10 16:50:53 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\smallformatx, \smalldisplayx): New macros.
-	(\smallbook): Arrange to use them.
-	(\display, \flushleft, etc.): Rewrite to avoid duplication.
-
-Sun Jun  7 18:13:45 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\pagesizes): Rename to \internalpagesizes.
-	(\custompaper): Rename to \pagesizes.
-
-Sat Jun  6 13:16:32 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: Rewrite paper size definitions, add @custompaper.
-
-	* texinfo.tex: Fix for macros in arguments to other commands.
-  		From Zack.
-
-Thu Jun  4 11:21:07 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: Better @macro implementation.
-	From: Zack Weinberg <zack@rabi.phys.columbia.edu>.
-
-Tue May 26 17:43:21 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\imagexxx): Center image if it is not part of a
- 		paragraph.
-
-Tue May 19 17:17:12 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: \linkstrue by default.
-	Also, first implementation of @macro; can only handle some cases,
- 		but that is better than nothing.
-	From: Zack Weinberg <zack@rabi.phys.columbia.edu>
-
-Thu May 14 17:32:47 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: New command @novalidate along the lines of makeinfo
-		--no-validate.
-	Date: Sun, 26 Oct 1997 18:54:47 -0500
-	From: Zack Weinberg <zack@rabi.phys.columbia.edu>
-
-Tue May 12 16:19:35 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\valuexxx): Split up into expandable and
- 		non-expandable parts.
-	(\expandablevalue): New macro.
-	(\indexdummies): \let\value = \expandable value.
-
-	* texinfo.tex: Doc fixes.
-
-	* texinfo.tex (\doind): Just call \dosubind with empty third arg.
-	(\dosubind): Replace with \doind definition and suitable code to handle
-	possible third arg.  And propagate glue past the whatsit from the
- 	\write so index entries don't cause extra space between
- 	@defuns (for example).
-
-Wed May  6 12:51:27 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\deftypemethparsebody): Handle the extra arg in
- 	@deftypemethodx, too.
-	(\deftypefunx): Error definition was misspelled as \deftypeunx.
-
-Fri May  1 17:31:58 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo/texinfo.tex (\putwordon, \putwordMethodon): New macros.
-  	Use in \def... commands.
-	(\indexdummies): make `\ ' be just ` ' for sorting.
-	(\deftypemethparsebody): New macro.
-	(\defmethod): Call it.
-	Various doc fixes.
-	Repored by: KHMarbaise@p69.ks.fido.de (Karl Heinz Marbaise)
-	Date: Wed, 07 Jan 1998 10:19:42 +0100
-
-Fri Apr 10 16:54:48 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: @cartouche: Align right side correctly.
-	From: dale.smith@bellhow.com (Dale Smith)
-	Date: Fri, 06 Mar 1998 14:47:02 GMT
-
-Sun Apr  5 17:19:03 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\dosetq): Use \normalturnoffactive instead of just
- 	\turnoffactive, so \'s in node names are handled properly.
-	(\tie): Move definition to more rational position in the file.
-	(\@, \{, etc.): Use decimal numbers in all cases, to avoid use of '.
-	Paranoia only.
-	(\+): Turn off once and for all at the beginning, and define as
-	\tabalign in @tex.
-
-Tue Mar 31 19:33:31 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\synindex, \syncodeindex): \closeout the redirected
-		index.
-	From: Jakob Stoklund Olesen <stoklund@mi.aau.dk>
-
-	* texinfo.tex (\doignore): Ignore everything after `c', so @end
- 	ifinfo and the like can be commented out.
-	(\macrocsname): New macro.
-	Reported by: "James A. Lupo" <lupoja@feynman.ml.wpafb.af.mil>
-
-Wed Feb 25 15:48:51 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\doprintindex): Change catcode of @ before \read,
-		in case of \initial{@} being the line that is read.
-	Reported by: Drew Csillag <drew_csillag@geocities.com>
-
-	* texinfo.tex (\dotable): Add \leftskip to \hsize in the first column.
-	Don't inherit \rightskip from surrounding environment.
-	Set \item to \crcr to avoid empty first row.
-        Prepend \parskip glue before table.
-        Set \everycr locally outside of alignment, don't reset it
-	        explicitly in \Emultitable.
-	All from Andreas Schwab, to avoid overfull hboxes.
-
-	Also, work on leading commentary in file a bit.
-
-Tue Feb 24 17:48:29 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: \!: Save and restore this for @tex.
-	From: Jean-Pierre Moreau <jpmoreau@ciframedical.com>
-	Date: Fri, 22 Aug 1997 16:47:36 -0400
-
-	* texinfo.tex (\angleleft, \angleright): New macros.
-	(\refx, \email, \key): Use them.
-	From: Stephen Gildea <gildea@intouchsys.com>
-	Date: Fri, 26 Dec 1997 11:43:32 EST
-
-Mon Feb 23 17:34:23 1998  Karl Berry  <karl@cs.umb.edu>
-
-	1997-08-28 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
-	* doc/texinfo.tex (xrdef): Read the second argument with \
- 	as an escape character.
-
-1998-01-22  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* texinfo.tex (\tocentry): Don't \turnoffactive before typesetting
-		the arguments, it causes special characters to be printed
-		incorrectly.
-
-Mon Jan 19 10:58:25 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texi2html: Correct version number, home page reference.
-
-Sat Jan 17 15:12:03 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texi2html: Version 1.54.  Handle @image better, etc.
-	* From: Bob Friesenhahn <bfriesen@simple.dallas.tx.us>.
-
-Wed Dec 24 13:59:07 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\dots, \enddots): Use current font instead of
- 		always using math italic.  From Stephen Gildea.
-
-Tue Dec 23 11:33:07 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: Spurious xepsf.tex should be epsf.tex.
-
-Mon Oct 13 15:49:28 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\titlefont): Explicitly set \rm.
-
-Sat Jul 26 15:12:37 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\email): Let to \uref instead of \code, as a second
- 		optional argument makes sense for this, too.
-
-Mon Jul 14 13:43:43 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\indexdummies): Add \value.
-
-Thu Jul 10 13:34:30 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\authorrm): Must use \def instead of \let, as
- 		\secrm is not yet defined.
-
-1997-07-09  Richard Stallman  <rms@psilocin.gnu.ai.mit.edu>
-
-	* texinfo.tex (\titlefont): Define again, using \titlefonts.
-
-Wed Jul  9 16:45:30 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\startcontents): Leave ^ catcode as other.
-
-Sat Jul  5 17:16:40 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\titlefonts): New macro to set title font styles,
- 	so italic etc. work in @title.
-	(\titlefont): No longer needed.
-	(\titlepage): Call \titlefonts instead of \titlefont.
-	(\chapsf, \ssecsy, \ssecttsl): Correct magstep values.
-	From: Stephen Gildea <gildea@intouchsys.com>.
-
-	* texinfo.tex (\onepageout): Back up to 2\baselineskip per Stephen.
-	(\kbdinputstyle): New command.
-
-1997-04-03  00:07:28 1997  Richard Stallman  <rms@gnu.ai.mit.edu>
-
-	* texinfo.tex (\kbdfont, \kbdexamplefont): New macros, parms that
-	tell @@kbd what to do.
-	(\setkbdinputdistinct, \setkbdinputexample): New commands set them.
-	(\kbd): Use those parms.
-
-Thu Jul  3 16:52:39 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\onepageout): Leave only one line space above the
- 	footline, to be more like plain.  Suggested by Stephen Gildea.
-	(\evenfootline): Left one too many line spaces here, so reduce by two.
-
-	(\ifnottex): Another ignore command.
-	(\ifnothtml,\ifnotinfo): New commands.
-	(\doignore): Ignore brace characters, so mismatched braces in ignored
-	text do not cause complaints.
-
-Fri Jun 27 15:09:16 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\image): New definition for new @image command.
-
-Wed Jun 18 15:58:20 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\oddfootingxxx),
-	(\onepageout): Leave space for the footline if present.
-	(\everyfootingxxx, \everyheadingxxx): Call \oddfootingxxx and
-	\evenfootingxxx instead of repeating their code.  From: Stephen
- 	Gildea <gildea@intouchsys.com>.
-
-	(\setfilename): Read texinfo.cnf if present.
-
-	(\indexdummies, \indexnofonts): No-op additional commands @result @equiv
-	@expansion @print @error @point.  From: Dave Bodenstab
- 		<imdave@ais.net> (for texi2www doc).
-
-Fri Jun  6 10:31:34 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\setmultitablespacing): Restore bad typing mistake
- 		from yesterday.
-
-Thu Jun  5 18:04:26 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\uref): Write real definition, taking one mandatory
-		argument and one optional one.
-
-Wed Jun  4 17:16:09 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\mainmagstep): Define this as a \count variable
- 	instead of with \let, to make changing to \magstep1 more transparent.
- 	From: HERBERT@boevm4.vnet.ibm.com.
-	(\uref): New command a la \url.
-
-Sat May 24 18:06:41 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\deftypemethod, \deftypemethodheader): New macros
-		to implement new commands @deftypemethod and @deftypemethodx.
-	Suggestion from: KHMarbaise@p69.ks.fido.de (Karl Heinz Marbaise).
-
-Wed May 21 17:17:52 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\opnr, \clnr): Increment/decrement \parencount, for
-   	  @defun lines with nested parens.  From Bill Schelter
- 	  <wfs@fireant.ma.utexas.edu>.
-	(\itemizeitem): Correct \errmessage.
-
-Mon May 19 17:34:40 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\codeunder): Use \_ and \ifusingtt to avoid
- 	dotaccent from _ in roman fonts, e.g., @deftypefn.
-	(\tex): Remove spurious spaces at the end of subdefinitions.
-	From: "John W. Eaton" <jwe@bevo.che.wisc.edu>.
-	(\url, \email): \let to \code; no quotes or angle brackets.
-
-Mon May  5 17:06:35 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\onepageout): \ifcropmarks, center the page body.
-  	Lost this when merged \croppageout with \onepageout.  Found by
- 	Arnold.
-
-	(\doprintindex): Do not bother to go into double column mode unless
-	there actually is a non-empty index.
-
-	(\begindoublecolumns): Include any existing \partialpage in the new one,
-	lest we lose a whole page of output.  Found by M J Morley
- 	<mjm@scs.leeds.ac.uk>.
-
-	(\chapternofonts): Remove spurious spaces, both in the definitions that
-	get output to the aux file(s) and in this macro.
-
-	Fix comments and rationalize whitespace in various other places.
-
-Sun Apr 27 15:41:16 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\chapter, etc.): Avoid expansion of section title
-        when writing the toc.
-
-Thu Apr 24 16:35:46 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\onepageout): Integrate cropmarks case here,
-	instead of having a completely different routine.
-	(\croppageout): Remove this.
-
-Sun Jun  9 14:26:42 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\ignoremorecommands): Ignore \defcodeindex, and do
-        not ignore \message.
-
-Thu Apr 11 12:59:42 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\macro): New macro.
-	(\enddots, \endldots): New macros.
-	(\centerchap, \centerchapyyy): New macros.
-	(\centerchfplain, \centerchfopen): New macros.
-	(\CHAPFplain, \CHAPFopen): Set \centerchapmacro.
-
-Wed Mar 13 11:42:17 1996  Karl Berry  <karl@cs.umb.edu>
-
-        * texinfo.tex (\url): New macro, like \samp for now.
-
-Sun Mar 10 13:05:08 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex: Changes in @multitable code.
-	Change meaning of @multitablelinespace.
-
-Tue Mar  5 18:56:08 1996  Dave Love  <d.love@dl.ac.uk>
-
-	* texinfo.tex (\set): Set catcode of space explicitly (inside a
- 	group) to avoid losing inside @example, say.
-
-Sun Mar  3 17:01:27 1996  Karl Berry  <karl@cs.umb.edu>
-
-        * texinfo.tex (\itemxpar): Protect the \vskip here with \nobreak,
-        to avoid a possible page break at an @itemx.
-
-Sun Feb 25 14:53:15 1996  Karl Berry  <karl@cs.umb.edu>
-
-        * texinfo.tex (\obstexwarn): Use \global to avoid ever getting the
-        warning twice.
-
-        * texinfo.tex (\include): Allow underscores and other such
-        characters we made active in the file name argument.
-
-Tue Feb  6 15:06:27 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\afourlatex): Delete the old duplicate definition
-	of \afourlatex.
-
-Sun Feb  4 15:20:16 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\tab): New definition.
-	(\setuptable): Fix previous change.
-	(\multitablecolspace): Renamed from \multitablecolmargin.
-	(\multitablelinespace): Renamed from \multitablelineskip.
-
-Fri Feb  2 02:20:16 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\multitableparskip): Renamed from \intableparskip.
-	Allocate with \newskip.
-	(\multitableparindent): Renamed from \intableparindent.  Use \newskip.
-	(\multitablelineskip): Renamed from \spacebetweenlines.  Use \newskip.
-	(\multitablecolmargin): Renamed from \spacebetweencols.
-	(\columnfractions): Renamed from \percentofhsize.
-	(xcolumnfractions): Renamed from \xpercentofhsize.
-
-	* texinfo.tex (\setuptable): Handle >1 digits after @percentofsize.
-	(\pickupwholepercent): New macro.
-
-Sun Jan 28 21:14:46 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\key, \kbdfoo): Use \ttsl unconditionally.
-	(\setkeyfont): Definition deleted.
-
-Tue Jan 23 14:57:23 1996  Karl Berry  <karl@cs.umb.edu>
-
-        * texinfo.tex: @kbd within @example selects slanted tty font:
-	(\ttsl, \ttslshape): Define this new font shape.
-        (\kbdfoo): Set the font to \ttsl if already using \tt.
-        (\setkeyfont, \ifmonospace): New macros.
-
-Wed Jan 17 23:57:48 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\changepagesizes): Additional arg for topskip.
-	(\afourlatex): Total rewrite.
-	(\afourwide): Pass new arg to \changepagesizes.
-
-Wed Jan  3 17:15:00 1996  Stephen Gildea  <gildea@x.org>
-
-        * texinfo.tex (\slbshape, \itbshape): Use bold slant and and
-	bold italic in titles to match the bold roman.  Do not use
-        bold sf or bold tt, which would be too heavy.
-
-        * texinfo.tex (\setfont): Pass font name in more pieces.
-        (\*shape): New macros defining symbolic names for all font
-	shapes so can use other font families with different naming
-	conventions.
-
-Wed Jan  3 15:52:18 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\ignoremorecommands): Turn off @everyheading and
-	friends, @headings, @setchapternewpage, @setchapterstyle.
-
-Sat Dec 30 17:20:48 1995  Karl Berry  <karl@cs.umb.edu>
-
-        * texinfo.tex (\inmargin): Don't allow a break before the vertical
-        kern.  Do allow a whole paragraph of marginal text, not just one line.
-	Use \inmarginspacing.
-
-Thu Dec 28 23:22:08 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\inmargin): New command @inmargin.
-	(\dircategory): Ignore @dircategory.
-
-Tue Dec 12 17:25:36 1995  Karl Berry  <karl@cs.umb.edu>
-
-        * texinfo.tex (\lvvmode): Remove this; use \leavevmode as usual,
-        so spaces/underscores at beginnings of lines inside @example work.
-        Bogus index entries should be (and now are, I think) handled in
-        other ways.
-
-Mon Nov 13 16:07:09 1995  Karl Berry  <karl@cs.umb.edu>
-
-        * texinfo.tex (\xrefX): Test for xref-automatic-section-title
-        being @set correctly, and remove spurious redefinition of
-        \printednodename in that case.
-
-Mon Oct 16 15:16:34 1995  Karl Berry  <karl@cs.umb.edu>
-
-        * texinfo.tex (\unsepspaces): New macro to make active space
-        expand into a normal space char in index entries.
-	(\indexdummies): Use \unsepspaces.
-
-Thu Oct 12 14:56:52 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\tie): Use \lvvmode, not \leavevmode.
-	Don't use \@M directly either.
-
-Sun Aug 27 21:17:09 1995  Paul Eggert  <eggert@twinsun.com>
-
-	* texinfo.tex (\appendixsection): Fix misspelled defn.
-
-Mon Jul 31 23:57:57 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\ttfont): Don't call \nohyphenation.
-
-Sun Jul 30 18:30:47 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\tocentry): Use \turnoffactive.
-
-Sun Feb  5 05:34:13 1995  Richard Stallman  <rms@pogo.gnu.ai.mit.edu>
-
-	* texinfo.tex (\boldbraxnoamp): New function.
-	(\deftypefunargs): Use that, not \boldbrax.
-
-Tue Jan 31 12:15:28 1995  Karl Berry  <karl@cs.umb.edu>
-
-        * texinfo.tex (\set): Use \gdef, not \xdef.
-
-Sat Jan 21 16:39:36 1995  Richard Stallman  <rms@pogo.gnu.ai.mit.edu>
-
-	* texinfo.tex: Initially make _ and + \active,
-	then later make them \other.
-	(\otherifyactive): New command.
-
-Thu Jan 19 21:59:22 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\afourwide): New command.
-
-Mon Jan 16 09:29:38 1995  Stephen Gildea  <gildea@x.org>
-
-	* texinfo.tex: Initially make + and _ "other" characters.
-	(\fixbackslash, \everyjob): Make + and _ active characters.
-
-Tue Jan 10 19:16:09 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex: At beginning, \input plain if necessary.
-	(\deftypefunargs): Use \boldbrax, not \functionparens.
-
-Sun Dec 18 16:40:11 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\indsc): Use csc10 (at 9pt), not indrm.
-
-Mon Oct 31 00:51:20 1994  Richard Stallman  <rms@pogo.gnu.ai.mit.edu>
-
-	* texinfo.tex (\changepapersizes): Fix definition syntax.
-	(\fontprefix): Define only if not yet defined.
-
-	* texinfo.tex (\margin): Define a new insert.
-	(\SETmarginindex): Initialize to \relax.
-	(\doindex): Optionally put the entry in the margin.
-	(\pagecontents): Print the index entries put in the margin.
-
-Sat Oct 29 19:50:10 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\auxhat): New macro.
-	(\dosetq): Use \auxhat.
-	(reading the aux file): Give ^ catcode 7.
-
-Wed Oct 26 03:28:04 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\setfont): New macro.  Use it for specifying
-	most of the fonts that are normally cm fonts.
-	(\fontprefix): New macro, normally `cm'.
-
-Mon Oct 24 01:27:09 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\startcontents): Set catcode of ^.
-
-Thu Oct 13 02:19:43 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\ifhtml, \html, \enddots, \?, \!): New commands.
-
-Fri Sep 16 16:30:52 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\defheaderxcond): New macro.
-	(\deftypefnheaderx): Use defheaderxcond when calling defname.
-	(\deftypefunheaderx, \deftypevarheader, \deftypevrheader): Likewise.
-
-Fri Aug 26 03:08:08 1994  Amy Hendickson  <amyh@ai.mit.edu>
-
-	* texinfo.tex (\multitable): New command.
-
-Mon Aug  1 14:28:57 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\changepagesizes, \afourlatex): New macros.
-
-Tue Jul 12 11:45:58 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * texinfo.tex (\quotation): Set \parskip to zero to avoid extra
-        space below the environment.
-	(\quotation): Clean up comments and indentation.
-
-Wed Jul 13 05:36:40 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\xrefX): Put back, and correct, the test of
-	SETxref-automatic-section-title.
-
-Thu Jul  7 15:57:52 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* Set catcodes of chars 128-255 to \other.
-
-Mon Jul  4 15:32:41 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * texinfo.tex (\tie): Set \catcode of @ to 11 before using \@M.
-
-        * texinfo.tex (\xrefX): Undo \turnoffactive while printing the node
-        name, so _ in node names doesn't come out as the dot accent.
-
-Sat Jul  2 14:49:26 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * texinfo.tex (\tie): Ensure we're in horizontal mode before the
-        \penalty.
-
-Tue May 10 01:21:28 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\donoderef, \unnumbnoderef, \appendixnoderef):
-	Set \lastnode globally.
-
-Sun Apr 17 15:35:43 1994  Karl Berry  (karl@ra.cs.umb.edu)
-
-        * texinfo.tex (\~): Define to be a tie.
-        (\ptextilde): New defn to save the plain's tilde accent.
-        (\tex): Restore plain tilde.
-
-Sun Mar 27 23:35:17 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\smallbook): Set \defbodyindent and \deftypemargin.
-
-Sun Mar 20 19:47:59 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\xrefX): Define and use \correctnodename.
-	(@turnoffactive): Move after @ becomes available
-	and turn off backslash as well as other chars.  Use @realbackslash.
-	(@normalturnoffactive): Like @turnoffactive but use @normalbackslash.
-
-Sat Mar 19 12:26:25 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * texinfo.tex (\singlespaceskip): Increase to 12.5pt.
-        (\singlespace): Call \setleading instead of just assigning to
-        \baselineskip, so the strut box will be reset.
-        (\smalllispx): Likewise.
-
-Sun Mar 13 20:32:28 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\dots): Change back to \ldots.
-
-Sat Mar 12 22:34:10 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\indexnofonts): Add %'s to suppress newlines after \def.
-
-Sat Feb 26 15:51:37 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\deftexinfoversion): New macro.
-	(\texinfoversion): Define using \deftexinfoversion.
-
-Wed Jan 26 12:40:52 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\putwordSee, \putwordInfo, \putwordfile)
-	(\putwordChapter, \putwordAppendix, \putwordSection)
-	(\putwordsection, \putwordpage)
-	(\putwordTableofContents, \putwordShortContents): New macros.
-	Used in various places instead of fixed words.
-
-Mon Jan 24 22:51:36 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\ignoremorecommands): Turn off @item and @message.
-
-Thu Jan 20 17:01:53 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\indexnofonts): Treat accents as dummies.
-	Turn modified European letters into one or more ordinary letters.
-
-Tue Jan 18 14:54:32 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\indexdummies): Handle tex accents and European letters.
-
-Wed Nov 24 16:11:51 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\dots): Use $\,$ for spacing.
-
-Sun Nov 21 22:16:21 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\dots): Avoid using \ldots; use periods and kern.
-	(\indexdotfill): Use italic periods.
-
-Fri Nov 19 20:50:31 1993  Roland H. Pesch  (pesch@apple-gunkies.gnu.ai.mit.edu)
-
-        * texinfo.tex (\deftypefunargs): use \tclose rather than \code to
-        avoid side effects on active chars
-
-Tue Sep 28 16:01:58 1993  Roland H. Pesch  (pesch@apple-gunkies.gnu.ai.mit.edu)
-
-	* texinfo.tex (\obeyedspace defn): remove blank after \sepspaces
-	(left destructive penalty in vertical list)
-
-Mon Aug 30 14:17:27 1993  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* texinfo.tex (\setref, \unnumbsetref, \appendixsetref): Uncomment
-	\dosetq for title.
-	(\Ytitle): Define as \thissection instead of \thischapter.
-	(\xrefX): If there is no printed-title arg given, and @ifset
-	xref-automatic-section-title, try to use the real section title.
-
-Tue Jul 27 12:47:24 1993  Charles Hannym  (mycroft@trinity.gnu.ai.mit.edu)
-
-	* texinfo.tex (\ifitemxneedsnegativevskip): New \if; set immediately
-	following a short \item.
-	(\itemxpar): \par and then if \ifitemxneedsnegativevskip is set, do
-	a \vskip-\parskip.
-	(\internalBitemx, \internalBxitemx, \internalBkitemx): Use \itemxpar
-	rather than \par.
-	(\itemzzz): Set \ifitemxneedsnegativevskip as appropriate.
-
-Thu Jul 22 16:08:33 1993  Charles Hannum  (mycroft@trinity.gnu.ai.mit.edu)
-
-	* texinfo.tex (\titlezzz, \finishtitlepage): Explicitly make hrules
-	have a width of \hsize so they aren't too long in smallbook format.
-
-Tue Jun 29 15:56:19 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
-
-	* texinfo.tex (\deftypefnheaderx): call \normalparens to permit
-	normal typesetting of strings (e.g. for C++ docn) containing `&'
-
-Fri Jun 25 14:08:44 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
-
-	* texinfo.tex (\nestedignore): turn off \ind... fonts too
-	(primarily for use within @smallexample)
-
-Wed Jun 23 11:58:48 1993  Jim Kingdon  (kingdon@wombat.gnu.ai.mit.edu)
-
-	* longopts.table: Update GDB options.
-
-Sun Jun 20 22:00:11 1993  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* lgpl.texinfo: Use @smallexample instead of @example.  Reformat
-	example disclaimer to avoid overfull \hbox.
-
-Mon Jun 14 04:09:47 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\entry): Don't make a line of dots
-	if there are no page numbers.
-
-Fri Jun 11 16:35:23 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* texinfo.tex (\defparsebodycommon): New macro from \defvrparsebody.
-	(\deftpparsebody): Call it; can't use \defvrparsebody.
-	(\deftpheaderline, \removeemptybraces): New macros.
-
-Sat May  8 10:49:25 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* texinfo.tex (\itemzzz): Only change \parskip temporarily, and
-	unskip by it later if the item text is on its own line.
-
-	* texinfo.tex (\tablez): Do \afterenvbreak before the \endgroup,
-	so the \parskip value is the table's, not the surrounding text's.
-	(\vtable, \ftable, \itemizey): Likewise.
-	Note: for most environments, \nonfillfinish deals with this.
-
-	* texinfo.tex (\smalllisp): New definition for non-small case, a
-	la @smallexample.
-
-	* texinfo.tex: Delete \message{} at beginning; it does nothing.
-
-	(These changes are all trying to make space above and below
-	environments more equal.)
-	* texinfo.tex (\singlespace): Don't insert a kern.
-	(\group): Do \offinterlineskip, and reset \par to insert a blank
-	line's worth of space.
-	(\lisppar): Delete meaningless call to \obeyspaces before making
-	the definition.
-	(\Elisp [the outer one]): Rename to \nonfillfinish, and end the
-	paragraph before the group.
-	(\lisp): Set \Elisp (the inner one) to \nonfillfinish
-	(\example, \smallexample, \display, \format, \flushleft,
-	\flushright, \quotation): Use \nonfillfinish.
-	(\lineskipfactor, \strut{height,depth}percent): Set to more exact
-	values.
-	(\setleading): Set \normallineskip and call \normalbaselines, for
-	cleanliness.
-
-Thu May  6 16:00:59 1993  Jeffrey Osier  (jeffrey@deneb.cygnus.com)
-
-	* texinfo.tex (\ignoremorecommands): Turn off \set and \clear.
-
-Tue Apr 20 17:02:34 1993  Roland H. Pesch  (pesch@apple-gunkies.gnu.ai.mit.edu)
-
-	* texinfo.tex (\codex): Delete space.
-
-Thu Apr 15 14:59:04 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
-
-	* texinfo.tex (\ignoremorecommands): Turn off @raisesections, @up,
-	@lowersections, @down within false conditionals.
-
-Sun Apr 18 04:33:13 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\code): Define - and _ to permit line-breaking
-	despite the fact that hyphenation is disabled.
-	(\codex, \codedash, \codeunder): New macros.
-
-Tue Mar 16 18:19:16 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
-
-	* texinfo.tex (\ignoremorecommands): Turn off @printindex within
-	false conditionals.
-
-Sun Mar 14 10:47:36 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* texinfo.tex (\footnote): Don't bother to take the footnote text
-	as an argument, and hence don't define as \long.
-        (\footnotezzz): Do \footstrut after we start the paragraph.
-        (Also reformat these macros to make them easier to read.)
-
-Fri Feb 26 13:02:44 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
-
-	* texinfo.tex (@include): Use \thisfile rather than #1 as \input arg.
-
-	* texinfo.tex (\readauxfile): Call \warnedobstrue to turn off warning
-		      re TeX 3.0 on second and subsequent runs.
-
-Thu Feb 25 18:03:38 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* texinfo.tex (\realeverypar): Delete, as it was unused.
-
-	* texinfo.tex (\group): Do a \strut in \everypar.
-
-Mon Feb 22 17:10:06 1993  Karl Berry  (karl@claude.cs.umb.edu)
-
-	* texinfo.tex (\obeyedspace): Define to be whatever \sepspaces
-	does (and move the definition to after \sepspaces).
-
-Wed Feb 17 01:55:20 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\nonfillstart): Do \singlespaces and \let\par
-	before \obeylines.
-
-Fri Feb 12 12:32:56 1993  Roland H. Pesch  (pesch at el_bosque.cygnus.com)
-
-	* texinfo.tex (\obstexwarn): issue message re bug in TeX 3.0.
-          (\nullfont): commented-out redefinition, to enable w/TeX 3.0.
-          (\nestedignore): call \obstexwarn for manuals that may trip bug
-
-	* texinfo.tex (\nestedignore): avoid @tex contents with \doignore
-
-Thu Feb 11 15:41:06 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
-
-	* texinfo.tex (\indexdummies): enable @dfn and @emph in index entries
-
-Thu Feb 11 13:32:32 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
-
-	* texinfo.tex (\ignoremorecommands): ignore @include within
-          failing conditionals
-
-Sat Feb  6 19:44:28 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\nestedignore): Set \globaldefs--make all defs local.
-
-Tue Feb  2 15:57:37 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
-
-	* texinfo.tex (@raisesections, @lowersections): new commands.
-	* (@up, down): original BFox synonyms for above.
-        * (\numhead, \apphead, \unnmhead): internal macros to map headings
-	to appropriate level
-	* (@nwnode): new synonym for @node, used in newest
-	makeinfo
-
-Tue Jan 26 17:05:02 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
-
-	* texinfo.tex (\include): avoid group around file contents
-
-Tue Jan 19 18:58:56 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
-
-	* texinfo.tex (\ignoremorecommands, used in \nestedignore): also
-	ignore cross-ref commands and \settitle
-        (\setyyy, used in @set): make definitions global
-        (\clearxxx, used in @clear): clear definitions globally
-
-Thu Jan 14 17:43:32 1993  Michael I Bushnell  (mib@geech.gnu.ai.mit.edu)
-
-	* texinfo.tex: Added \shorttitlepage.
-
-Sat Jan  2 15:01:45 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* texinfo.tex (\tclose): Use \spaceskip instead of modifying
-	\fontdimen's to normalize the interword space.
-
-	* texinfo.tex (\t, \key, \tclose): Use \hyphenchar instead of
-	\exhyphenpenalty, to turn off hyphenation for real.
-        (\{no,restore}hyphenation): New macros.
-
-Sat Jan  2 15:01:45 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* texinfo.tex (\t, \key, \tclose): Use \hyphenchar instead of
-	\exhyphenpenalty, to turn off hyphenation for real.
-        (\{no,restore}hyphenation): New macros.
-
-Tue Jan  5 19:15:46 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\deftpparsebody): Make synonymous with \defvrparsebody.
-
-Sun Dec 27 09:40:08 1992  Karl Berry  (karl@cs.umb.edu)
-
-	* texinfo.tex (\inforef, \inforefzzz): Use the \ignorespaces
-	primitive instead of \losespace.
-        (\losespace): Delete.
-
-	* texinfo.tex (\menu, \direntry): Handle like \ifinfo.
-
-	* texinfo.tex (\unmatchedenderror, \defineunmatchedend): New macros.
-        (\endxxx): Call it, instead of just doing it inline.
-        (\conditionalsucceed, \nece): More new macros.
-        (\iftex): Call \conditionalsucceed.
-        (\Eiftex): Define to give an error at the outer level.
-
-	* texinfo.tex (\ignoremorecommands, \nestedignore): New macros.
-        (\ifset, \ifclear): Expand a macro on success as well as failure;
-        also switch to using expansion instead of assignments to act after
-        the conditional.
-        (\if{set,clear}succeed): Call \conditionalsucceed.
-        (\if{set,clear}fail): Call \nestedignore instead of \doignore.
-
-	* texinfo.tex (\clear): Don't insert a spurious space.
-
-	* texinfo.tex (\value): Put comment next to definition.
-
-	* texinfo.tex (\setyyy): Call \setzzz, and define the variable as
-	simply the parameter, no \unskip.
-        (\setzzz): New macro; do not globally define the variable.
-
-Thu Dec  3 17:24:05 1992  Roland H. Pesch  (pesch@fowanton.cygnus.com)
-
-	* texinfo.tex (croppageout): use same escape-char switching as
-	default output routine.  Permits using _ in TOC entries.
-
-Fri Nov 13 17:35:38 1992  Charles Hannum  (mycroft@gnu.ai.mit.edu)
-
-	* texinfo.tex (indexing): Rewrote double-column mode to fix a
-	rare breakage.
-
-Sun Oct 25 07:13:31 1992  Karl Berry  (karl@cs.umb.edu)
-
-	* texinfo.tex (\obeyedspace): No need to define with \gdef, we're
-	at the outer level.
-
-Fri Oct 16 18:04:40 1992  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
-
-	* lgpl.texinfo: Change "This program" to "This library" in example
-	copying notice.
-
-Sat Oct 10 09:43:45 1992  Karl Berry  (karl@cs.umb.edu)
-
-	* texinfo.tex (\bullet, \minus): Use \implicitmath instead of $.
-
-Fri Oct  2 08:35:51 1992  Karl Berry  (karl@cs.umb.edu)
-
-	* texinfo.tex (\Egroup): Don't do the \strut and \nointerlineskip.
-
-Sat Sep 26 09:08:59 1992  Karl Berry  (karl@cs.umb.edu)
-
-        * texinfo.tex (\doignore, \enddoignore): New macros.
-        (\ifinfo): Call \doignore.
-        (\ifxinfoxxx): Deleted.
-	(\ignore, \ifsetfail, \ifclearfail): use \doignore.
-
-        * texinfo.tex (\unnumbered): Expand the arg only once for the \message.
-
-        * texinfo.tex (\deftpparsebody, \parsetpheaderline): New macros.
-        (\deftp): Call \deftpparsebody.
-
-Thu Sep 24 10:12:45 1992  Karl Berry  (karl@cs.umb.edu)
-
-        * texinfo.tex (\entry): Do \par first; add comments.
-        (\short{chap,unnumbered}entry,\do{chap,sec,subsec,subsubsec}entry):
-          Call \tocentry, instead of using \vbox.
-        (\tocentry): New macro.
-
-Sat Sep 19 14:36:11 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\`, \'): Definitions deleted.
-
-Fri Sep 18 14:33:09 1992  Roland H. Pesch  (pesch@cygnus.com)
-
-	* texinfo.tex (\ifset, \ifclear): Standardize catcode of space as
-	for \ignore.
-
-Fri Sep 11 15:25:01 1992  Karl Berry  (karl@hayley)
-
-        * texinfo.tex (\finalout): Move out of final section of file,
-          which claims not to define new control words.
-
-        * texinfo.tex (\setleading): New macro.
-        (outer level, @smallbook, @afourpaper): Call it, instead of
-        setting \baselineskip directly.
-
-        * texinfo.tex (\|): New definition for changebars.
-
-Tue Sep  1 17:32:48 1992  Karl Berry  (karl@hayley)
-
-        * texinfo.tex (\begindoublecolumns): Exactly double \vsize.
-
-Sat Aug 29 10:12:16 1992  Karl Berry  (karl@hayley)
-
-        * texinfo.tex (\group): Define \Egroup to use struts instead of
-          letting TeX do its own interline spacing.
-
-        * texinfo.tex (\{remove,ignore}activespaces): New macros.
-        (\end): Call \removeactivespaces; give the correct error messages;
-          don't try to expand a nonexistent \E... macro.
-
-        * texinfo.tex (\EMsimple): End the help message with a period.
-
-        * texinfo.tex (\gobble): New macro.
-        (\lisp): Call it (instead of defining it every time).
-        (\example, \smallexample): Define \E... within the macro.
-
-Tue Aug 25 11:56:26 1992  Roland H. Pesch  (pesch@fowanton.cygnus.com)
-
-	* texinfo.tex (\readauxfile): Make + normal while reading aux file.
-
-Thu Aug 20 21:32:34 1992  Karl Berry  (karl@hayley)
-
-        * texinfo.tex (\doublecolumnhsize): Compute value in
-          \begindoublecolumns.
-        (\afourpaper, \smallbook, <outer level>): Remove these (virtually
-          identical) computations.
-
-        * texinfo.tex (\doublecolumnvsize): Deleted.
-        (\afourpaper, \smallbook): Don't compute it.
-        (\begindoublecolumns): Just double \vsize here (thus decreasing
-          the value considerably from the old value of 19.1in, which was far
-          too large.)
-
-Fri Aug 14 10:16:42 1992  Karl Berry  (karl@hayley)
-
-        * texinfo.tex (\parseargx): Use \expandafter instead of
-        \aftergroup to continue the processing.
-        (\parsearglinex): Renamed to \parseargline, since the former
-        \parseargline is no longer needed.
-
-	* texinfo.tex (\parseargline) Remove a trailing @c or @comment.
-        (\argremovec, \argremovecomment): New macros.
-
-Thu Aug  6 11:28:55 1992  Roland H. Pesch  (pesch@fowanton.cygnus.com)
-
-	* texinfo.tex: extended @set to define expandable vars;
-	  @value expands same.  Auxiliary macros \setxxx, \setyyy
-	  used for @set.
-
-Sun Aug  2 14:34:48 1992  Karl Berry  (karl@hayley)
-
-        * texinfo.tex (\entry): do line-breaking on the index entry.
-
-Wed Jul  1 17:05:26 1992  Karl Berry  (karl@claude.cs.umb.edu)
-
-        * texinfo.tex (\lparen, \rparen): new definitions.
-        ((,[,],)): new global definitions for these four active
-          characters, so parens and brackets can be used in @deffn names.
-
-Sat Jun 27 11:32:58 1992  Karl Berry  (karl@hayley)
-
-        * texinfo.tex (\shortchaplabel): new macro to align chapter and
-          appendix labels.
-        (\shortchapentry): call it.
-        (\shortappendixwidth): new dimen register.
-
-Wed Jun 24 09:45:34 1992  Karl Berry  (karl@hayley)
-
-        * texinfo.tex (\afterenvbreak): make the same as \aboveenvbreak,
-          so space below environments doesn't get lost.
-        (\aboveenvskipamount): rename to \envskipamount, since it's used
-          both above and below.
-
-Wed Jun 24 09:45:34 1992  Karl Berry  (karl@hayley)
-
-        * texinfo.tex (\group): do @comment at the end, to avoid excessive
-          white space when called inside @group.
-
-Wed Jun 24 16:36:04 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\startcontents): End page before setting pageno.
-
-Thu May 28 20:27:25 1992  Robert J. Chassell  (bob@hill.gnu.ai.mit.edu)
-
-        * texinfo.tex (\vtable): Like @ftable, but for variables.
-
-Fri May 22 07:04:32 1992  Karl Berry  (karl@hayley)
-
-        * texinfo.tex (\w): do \leavevmode before the \hbox.
-
-Sat May 16 11:16:27 1992  Karl Berry  (karl@hayley)
-
-        * texinfo.tex (\smallbook): decrease \topskip somewhat.
-
-        * texinfo.tex (\group): use \vtop instead of \vbox.
-
-        * texinfo.tex (\newlinechar): define for use in help strings.
-        (\groupinvalidhelp): define this for use with \errhelp.
-        (\group): set \errhelp to above.
-
-Thu Apr 30 16:19:17 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\need): Rewritten by karl.
-
-Sat Apr 18 16:24:00 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\exdentamount): New var, set by environments.
-	(\exdent, \exdentyyy): Define suitably for filled environments.
-	Always exdent by innermost indentation step.
-	(\nofillexdent, \nofillexdentyyy): Alternates for nofill envs.
-	(\lisp, \smalllispx, \display): Set \exdent to \nofillexdent.
-
-Thu Apr  2 15:04:15 1992  Robert J. Chassell  (bob@kropotkin.gnu.ai.mit.edu)
-
-        * texinfo.tex (\Esmalllisp): Smaller baseline skip for smallexamples.
-
-Sun Mar 29 20:44:49 1992  Brendan Kehoe  (brendan@cs.widener.edu)
-
-	* texinfo.tex (\startcontents): Always close contentsfile and
-	adjust the page.
-
-Fri Mar 27 17:41:52 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\chapternofonts): Deal with \result, \equiv, etc.
-
-Sat Mar 21 08:22:29 1992  Karl Berry  (karl at hayley)
-
-        * texinfo.tex (\entry): format entries better if the page number
-          and entry text don't fit on one line.
-
-        * texinfo.tex (\loggingall, \gloggingall): new macros to help with
-          debugging.
-
-Fri Mar 20 15:35:42 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\result, \expansion, \print, \equiv):
-	Don't copy prefabricated boxes; must adapt to current font.
-	(\dblarrowbox, \longdblarrowbox, \pushcharbox, \equivbox): Deleted.
-	(\bullbox): Deleted.
-
-Thu Mar 19 22:17:14 1992  Robert J. Chassell  (bob@kropotkin.gnu.ai.mit.edu)
-
-	* texinfo.tex (\widowpenalty, \clubpenalty): Set them to 10000, since
-          8000 did not work.
-
-Fri Mar  6 13:26:36 1992  Robert J. Chassell  (bob@kropotkin.gnu.ai.mit.edu)
-
-	* texinfo.tex (\widowpenalty, \clubpenalty): Set them to 8000, since
-          2000 did not work (but \widowpenalty at 20000 did work).
-
-Thu Feb 27 12:27:14 1992  Karl Berry  (karl@wombat.gnu.ai.mit.edu)
-
-        * texinfo.tex (\widowpenalty): set to 2000, not 20000.
-
-Sat Feb  8 14:34:45 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\widowpenalty, \clubpenalty): Set them to 2000.
-	(\itemizeitem): Use penalty 1200.
-	(\itemzzz): Add \nobreak near beginning.
-
-	* texinfo.tex (\quotation): Increase right margin, instead of
-	left margin twice.
-
-Wed Feb  5 12:08:30 1992  Karl Berry  (karl at hayley)
-
-        * texinfo.tex (\alphaenumerate, \capsenumerate): redefine as a call
-          to \enumerate.
-        (\{lower,upper}caseenumerate): Rename from \{alpha,caps}enumerate.
-
-Sun Feb  2 21:07:19 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\itemzzz): Compensate in line-by-itself case for
-	a table that is indented.
-
-Mon Jan 13 21:04:07 1992  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex: Use 26 instead of control-z as character constant.
-
-Sat Jan 11 02:20:58 1992  Roland McGrath  (roland@albert.gnu.ai.mit.edu)
-
-	* gpl.texinfo: Unfilled Yoyodyne example.
-
-Sat Dec  7 16:16:54 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\cartouche): Set \nonarrowing.
-	(\lisp, \smalllisp, \quotation, \display): If set, don't narrow.
-
-Mon Dec  2 08:15:08 1991  Karl Berry  (karl at hayley)
-
-        * texinfo.tex (\itemzzz): don't start a paragraph if the item text
-          is on a line by itself; don't allow a page break after that
-          line; always do \par before typesetting anything.
-
-Tue Nov 26 15:13:13 1991  Roland McGrath  (roland@albert.gnu.ai.mit.edu)
-
-	* lgpl.texinfo: @ifset lgpl-appendix, use @appendix instead of
-	@unnumbered.
-
-Sun Nov 10 12:00:06 1991  Karl Berry  (karl at hayley)
-
-        * texinfo.tex (\doprintindex): only \read if the file existed;
-          \closein the test stream in all cases.
-        (\initial, \entry): do not \outer, so that \read does not get an
-          error if the index exists.
-
-Fri Nov  8 18:13:28 1991  Michael Bushnell  (roland@churchy.gnu.ai.mit.edu)
-
-	* texinfo.tex (\itemizey): missing %'s in macro defn.
-	  Also, add \begingroup; accidentally deleted by Karl Berry.
-
-Thu Nov  7 11:41:25 1991  Karl Berry  (karl at hayley)
-
-        * texinfo.tex (\doprintindex): \read from the index file to make
-          \ifeof true when the file exists but is empty.
-
-Tue Nov  5 08:29:13 1991  Robert J. Chassell  (bob at grackle)
-
-        * texinfo.tex (@thischaptername): Provide default value for when
-          @chapter not defined.
-
-Sat Nov  2 17:59:02 1991  Karl Berry  (karl at hayley)
-
-        * texinfo.tex (\itemizezzz): do \begingroup here, since \itemizey
-          can't any longer.
-
-Tue Oct 29 12:17:41 1991  Robert J. Chassell  (bob at grackle)
-
-        * texinfo.tex: @paragraphindent defined as a no op.
-
-Fri Oct 25 15:19:47 1991  Karl Berry  (karl at hayley)
-
-        * texinfo.tex (\enumeratey): allow any lowercase letter, uppercase
-          letter, or number as argument; initialize \itemno and begin the
-          environment's group here.
-          (\itemizey): don't initialize \itemno here.
-          (\numericenumerate, \startenumeration): new macro.
-
-Wed Oct 23 16:26:30 1991  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\ifclear, \ifset): Remove \outer.
-
-	* texinfo.tex (\afourpaper): Set various parameters.
-
-Tue Oct 22 18:42:31 1991  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\alphaenumerate, \capsenumerate):
-	Let @end enumerate end these.
-	(\Ealphaenumerate, \Ecapsenumerate): Aliases for \Eenumerate.
-
-Sun Oct 20 18:23:18 1991  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\mainmagstep): New parameter macro.
-	(Defining fonts): Use that parameter to scale them.
-	If \bigger is defined, use 12 point fonts.
-
-Tue Sep 24 00:30:07 1991  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* texi2dvi: Iterate over the right variable to look for new idx files.
-
-	* texi2dvi: GPL 2.
-
-	* texi2dvi: Fix 2nd invocation of texindex to pass right args.
-
-Wed Sep 11 20:52:42 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\cartouche): New macro.
-
-Fri Aug 23 16:13:46 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\section, \subsection, \subsubsection):
-	Initially define for numbered chapters.
-
-Fri Aug  2 01:46:09 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\footnote): Use \unskip instead of \removelastskip.
-
-Mon Jul 29 14:06:54 1991  Roland H. Pesch  (pesch at cygint.cygnus.com)
-
-	* texinfo.tex (\majorheadingzzz, \chapheadingzzz, \chfplain,
-	\unnchfplain, \unnchfopen, \secheadingi, \subsecheadingi,
-	\subsubsecheadingi): allow line breaks in headings.
-	(\shortchapentry, \shortunnumberedentry, \dochapentry, \dosecentry,
-	\dosubsecentry, \dosubsubsecentry): allow line breaks in table of
-	contents entries.
-
-Thu Jul 18 19:01:53 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\secfonts, \indexfonts): Fix typos.
-
-Sun Jul  7 16:36:28 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\afourpaper): New command.
-
-	* texinfo.tex (\numberedsec): Renamed from \section.
-	(\numberedsubsec): Renamed from \subsection.
-	(\numberedsubsubsec): Renamed from \subsubsection.
-	(\chapter, \appendix, \unnumbered): Define \section, \subsection,
-	and \subsubsection here according to type of chapter.
-
-Thu Jul  4 14:19:32 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\defvarparsebody, \defvrparsebody, \defopvarparsebody):
-	New functions.
-	(\defvar, \defvr, \defopt, \defcv, \defivar): Use them.
-	(\deftypevar, \deftypevr): Likewise.
-
-Mon Jul  1 13:49:25 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\group): Report error if used outside @example, etc.
-
-	* texinfo.tex (\defname): Reduce \leftskip
-	to cancel temporarily the increase made in \defparsebody.
-
-	* texinfo.tex (\enumerate): Allow optional arg to specify type
-	of counting.
-
-	* texinfo.tex (\set, \clear): New commands.
-
-Mon Jun 24 12:22:44 1991  Roland McGrath  (roland@albert.gnu.ai.mit.edu)
-
-	* texinfo.tex (\eleterate): Renamed to \alphaenumerate.  Sigh.
-	(\ecapitate): Likewise \capsenumerate.
-
-Thu Jun  6 20:02:48 1991  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
-
-	* lgpl.texinfo: Created from /fsf/rms/gnuorg/lgpl.text.
-
-	* gpl.texinfo: Created from /fsf/rms/gnuorg/gpl.text (GPL v2).
-
-	* texinfo.tex (\eleterate, \ecapitate): New commands, like @itemize,
-	but with [a..z] or [A..Z] instead of [1..n].
-
-Tue May 21 15:46:32 1991  Karl Berry  (karl at hayley)
-
-        * texinfo.tex (\dmn): new command to typeset a dimension.
-
-Tue May 21 20:58:22 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\doind, \dosubind): Make new group around \indexdummies
-	and most of body, excluding the \penalty commands.
-
-Mon May 20 21:16:32 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\tex): Typo in redefining \@.
-
-	* texinfo.tex (\_): Use \lvvmode, not \leavevmode.
-	(\lvvmode): New macro.
-
-	* texinfo.tex (\authorrm, \titlerm): Move to after section fonts.
-
-Tue May 14 21:13:29 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\defunargs): Set \hyphenchar in \tensl, not \sl.
-
-Thu May  9 17:07:08 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\ignore): Standardize catcode of space.
-
-Wed May  8 13:49:45 1991  Karl Berry  (karl at hayley)
-
-        * texinfo.tex (\sffam, \sf): New macros; support sans serif
-	type style in math.
-        (top level): Set up \textfonts early on, so we can create boxes w/ it.
-        (\tenrm...\tensf): Define these to be \textrm...\textsf instead.
-        (\df, \textfonts, \chapfonts, \secfonts, \subsecfonts):
-        (\indexfonts): Redefine \tenrm (etc.) instead of just \rm, so that
-	the math family assignment doesn't get lost; call \resetmathfonts.
-        (\resetmathfonts): New macro; redefines \textfont of each math family.
-        (\indsc, \indi, \indsy \chapsc, \chapi, \chapsy, \secsc, \seci):
-        (\secsy, \ssecsc, \sseci, \ssecsy): New font definitions.
-
-Mon May  6 21:30:19 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\indexdummies): Write \_ when an _ is seen.
-
-Mon Apr 29 01:41:44 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\defname): Use \dimen2, \dimen3 for outer margins.
-	Use outer margins for influencing \rightline.
-	(\tclose, \key, \t): Turn off line breaks at hyphens.
-
-Fri Apr 12 03:12:14 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\authorrm): Move definition to top level; copy \secrm.
-
-Tue Apr  2 22:48:39 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\defname): Adjust size of \rlap box, not \dimen0
-	or \dimen1, for current width.
-
-	* texinfo.tex (\Yappendixletterandtype): End with {}.
-
-Sat Mar 30 16:13:25 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\xrefX): Really use \cite.
-	(\inforefzzz): Use \samp for node name.
-
-	* texinfo.tex (\defname): Use current width for \dimen0, \dimen1.
-
-	* texinfo.tex (\doprintindex): Put lots of whitespace before index.
-
-Fri Mar 29 17:00:58 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\xrdef): Take out last change.
-
-	* texinfo.tex (\needx): Turn off \baselineskip.  Use kern, and no glue.
-
-	* texinfo.tex (\shortcontrm): Renamed from \truesecrm.
-	(\shortcontbf, \shortcontsl): New fonts for short contents lines.
-	(\summarycontents): Use them.
-
-	* texinfo.tex (\defname): Don't set \leftskip to 0; just decrease by
-	one indent level.
-	(\defparsebody, \def*parsebody): Increment both margins by one level.
-
-Tue Mar 26 22:41:38 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-	* texinfo.tex (\xrdef): Change catcode before reading args.
-
-Wed Mar 20 14:21:57 1991  Roland McGrath  (roland at geech.gnu.ai.mit.edu)
-
-	* texi2dvi: Use p modifier in sed -n command, so it works.
-	Duplicate code to find the index files, instead of being smart in
-	one place and dumb in another.
-
-Thu Mar  7 17:08:32 1991  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\defaultparindent): New variable.
-	(\footnotezzz): Reset \parindent to default.
-	(\xrefX): Use \cite for printed manual and node names.
-
-Tue Mar  5 13:39:34 1991  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\emergencystretch feature): Use \thisisundefined.
-
-Mon Mar  4 00:35:57 1991  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\ftablex): Define \Eftable; undefine \Etable.
-
-	* texinfo.tex (\footnote): Discard preceding whitespace.
-
-	* texinfo.tex: Use the \emergencystretch feature if available.
-
-Fri Feb 22 03:50:58 1991  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\tex): Make + not active.
-
-Fri Feb 15 10:05:24 1991  Roland McGrath  (mcgrath at cygint.cygnus.com)
-
-	* texi2dvi: Use $TEXINFO in place of $TEX (falling back to $TEX
-	if $TEXINFO is undefined).
-
-	* texi2dvi: Renamed from texinfo.  Bob (I believe) did this at some
-	point at and didn't make a ChangeLog entry.  I'd shoot him myself if
-	he weren't the person who signs my paychecks.
-
-Sun Feb 10 22:51:52 1991  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\doprintindex): If index is empty, print a dummy.
-	(\need): Use vskips and penalties; don't use \pagetotal.
-
-Fri Feb  8 17:36:53 1991  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\ignoresections):
-	Turn off \contents, \smallbook and \titlepage.
-
-	* texinfo.tex (\Etitlepage): Do a page break before ending the group.
-
-	* texinfo.tex (\setref, \unnumbsetref, \appendixsetref):
-	Comment out recording the chapter title.
-
-Thu Jan 24 23:28:41 1991  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\top): Synonym for \unnumbered.
-	(\infotop): Synonym for \infounnumbered.
-	(\ignoresections): Handle \top.
-
-Thu Jan 24 12:41:33 1991  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex: Delete spurious character at beginning.
-
-Thu Jan 17 16:34:25 1991  Roland McGrath  (roland at cygint.cygnus.com)
-
-	* texinfo: Check the exit status of tex and texindex.  Don't procede
-	after a failing run.
-
-Thu Jan 10 15:16:47 1991  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\xrefX): Get rid of blank line.
-
-Wed Jan  9 18:06:20 1991  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\entry, \secondary): Use \indexdotfill.
-	(\indexdotfill): New macro.
-
-Tue Jan  8 17:44:01 1991  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\donoderef): Define a ...-title cross-reference.
-	(Ytitle): Subroutine for that.
-	(xrefX): Use the real title by default (but this is commented out).
-
-Tue Jan  1 23:18:21 1991  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\indexnofonts): Delete troublemaking blank line.
-
-Sat Dec 22 00:47:21 1990  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\xrefX): Prevent extra space.
-
-Fri Dec 21 21:14:50 1990  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\comment, \commentxxx): Ignore @ in comment.
-
-Thu Dec 13 22:38:31 1990  Chris Hanson  (cph at kleph)
-
-	* texinfo.tex (\defivarheader): Capitalize "Variable".
-
-Sun Dec  2 01:46:04 1990  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\indexdummies, \indexnofonts): Handle \t like \r.
-
-	* texinfo.tex (heading fonts): New fonts based on cm...12.
-
-Tue Nov 27 16:59:35 1990  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\indexnofonts): Also supersede \TeX and \dots.
-
-Sun Nov 18 16:18:14 1990  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\*): End with \ignorespaces.
-
-Fri Nov  2 17:41:48 1990  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\*): Output empty hbox to avoid losing whitespace.
-	(\deftypevarheader, \deftypevrheader): End the paragraph
-	with suitable penalties.
-	(\deftypevrheader): Do print the data type.
-
-Thu Nov  1 12:04:52 1990  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\defmethodheader): Print `method', not `operation'.
-
-Fri Oct 26 17:11:08 1990  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\indexdummies): Temporarily redefine \_.
-	(\ptexdots): Copy of plain tex \dots.
-	(\tex): Temporarily reinstall that.
-
-Fri Oct 19 16:57:48 1990  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\subsubsecheadingi, \subsecheadingi): New subroutines.
-
-Mon Oct  8 13:34:19 1990  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (active _): Use \normalunderscore.
-
-Tue Sep 25 22:32:55 1990  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\deftypefn, \deftypevar, \deftypevr): New macros.
-	Their subroutines also new.
-
-Tue Sep 25 16:42:52 1990  Roland McGrath  (roland at geech.ai.mit.edu)
-
-	* texinfo: Recognize `.tex' as a suffix.
-
-Tue Sep 25 01:46:54 1990  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\deftypefun): New macro.
-	(\deftypefunheader, \deftypefunheaderx, \deftypefunargs): Also new.
-
-Fri Sep 14 00:38:28 1990  Roland McGrath  (roland at churchy.ai.mit.edu)
-
-	* texinfo: Weed out files that have two-letter extensions but don't
-	start with a backslash, and therefore aren't index files.
-
-	* texinfo: Handle index files that have any two-letter extension,
-	rather than using a static list of extensions.
-
-	* texinfo: Handle .texi extension as well as .texinfo.
-
-	* texinfo: New file, a sh script to do .texinfo -> .dvi.
-
-Mon Sep 10 13:14:39 1990  Richard Stallman  (rms at mole.ai.mit.edu)
-
-	* texinfo.tex (\math): New macro.
-
-Tue Sep  4 07:43:33 1990  Karl Berry  (karl at hayley)
-
-        * texinfo.tex (\chfplain): Do not print a period after the chapter
-        number, for consistency with sections et al.
-
-        * texinfo.tex (\refX): hyphenate `undefined' so that the ligature
-        is not lost.
-
-        * texinfo.tex (_): use \_ unless we're in tt.
-        (\ifusingtt): new macro for such conditionalization.
-
-        * texinfo.tex (\xrefX): don't use \unhbox to print the node names,
-        since that loses on hyphens.
-	Use \ignorespaces rather than \losespace.
-
-Thu Aug  2 07:03:26 1990  Karl Berry  (karl at hayley)
-
-        * texinfo.tex (\linenumber): new macro.
-        (\refx): give the line number in the message.
-
-Tue Jul 31 09:13:32 1990  Karl Berry  (karl at hayley)
-
-        * texinfo.tex (\refx): improve warning messages, remove
-        unnecessary groups, and improve logic.
-
-Thu Jul 26 20:53:38 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\subheading, \subsubheading): Missing macros defined.
-
-Thu Jul 19 22:48:26 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\titlepage): Don't print rule for \page unless already
-	printed a rule.
-	(\abstract): Deleted.
-	(\direntry): New command, much like \ignore.
-
-Sun Jul 15 16:28:42 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\abstract): New construct; trivial in tex.
-
-Sun Jun 17 01:03:16 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\defcv): Protect space before `of'.
-	(\defspec): Capitalize `Form'.
-
-Sat Jun 16 19:36:56 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\kbd, \kbdfoo): Use \par to term. arg to \kbdfoo.
-
-Fri Jun 15 10:47:12 1990  Robert J. Chassell  (bob at pogo.ai.mit.edu)
-
-	* texinfo.tex (\defcv): Use \defcvarheader instead of (undefined)
-	\defcvheader.
-
-Fri May 25 18:04:31 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\xrefX): Use \turnoffactive.
-
-Mon May 21 21:17:34 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\turnoffactive): New command.
-	(\normaldoublequote, ...): New commands.
-	(\dosetq): Use \turnoffactive.
-
-Sat May 19 12:31:17 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\indit): Use slanted font, not italic.
-	(\smalllispx): Do \indexfonts.
-
-Fri May	 4 17:35:04 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\footnote, \footnotezzz): Make it \long.
-
-Wed May	 2 01:19:55 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\titlerm): Go back to cmbx10 scaled \magstep5.
-	(\hsize): Don't set it, use the default.
-
-Fri Mar 23 21:07:02 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\footnote): Read arg in braces, not as a line.
-
-Mon Mar 19 19:30:08 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\unnumbsubsubsecentry): Typo in name being defined.
-
-Tue Mar 13 18:49:27 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\defvarargs): Add penalty at end.
-
-	* texinfo.tex (\synindex, \syncodeindex): Copy one index file name
-	into the other.
-
-Tue Mar	 6 16:58:54 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\deftt): Make this a distinct font.
-
-	* texinfo.tex (\initial): Define \tt like \tentt.
-
-	* texinfo.tex (\ifinfo): End with \losespace.
-	(\ignore, \ifsetfailxxx, \ifclearfailxxx): Likewise.
-
-Sun Mar	 4 19:55:57 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\lbrb, \rbrb): Use \bf.
-
-Sat Mar	 3 17:53:22 1990  Richard Stallman  (rms at geech)
-
-	* texinfo.tex (\onepageout): Set \escapechar here.
-
-	* texinfo.tex (\rawbackslash): Define using \chardef.
-
-	* texinfo.tex (\@): Use ttfont.
-
-Thu Mar	 1 16:37:46 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (Ysectionnumberandtype, Yappendixletterandtype):
-	Capitalize "chapter", "appendix" and "section".
-
-Mon Feb 19 20:26:22 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\xkey): Attempt to eliminate spurious space from
-	output.	 Look at y-or-n-p.
-
-Mon Feb 12 16:34:00 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\errorbox): Get \dimen0 from \tentt.
-
-Sun Feb 11 15:11:57 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\defunargs): Use ragged right for args.
-	Add large penalty at end.
-
-	* texinfo.tex: Make active definition for = using \tt, but disable.
-	(\defparsebody): Make = active.
-	(\defunheader, etc.): Make inactive again.
-
-	* texinfo.tex (\errorbox): Try to equalize outside space to both sides.
-
-Fri Feb	 2 14:47:21 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\appendix): Don't use \the before \appendixletter.
-
-Sat Dec 16 14:02:56 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\chapter, \appendix): Make defn of \thischapter
-	refer to \thischaptername, and store actual name there.
-	(\chapternofonts): Turn off more macros.
-	(\indexdummies): Likewise.
-
-Sun Nov 19 15:29:47 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\titlerm): There were two definitions of this command.
-	Put them together and commented out one of them.
-	(\subtitlerm): Was same as \tenrm, so just copy that.
-	(\ninett): Always define this.
-	(\indtt): Copy from \ninett.
-
-Sat Nov 18 22:57:37 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\ssecrm, etc.): Scale by 1315, rather than to 13pt.
-
-Wed Nov	 8 18:38:33 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\titlepage): Turn on iffinishedtitlepage so
-	bottom rule is not printed.
-	(\titlezzz): Turn it off, so bottom rule is printed.
-
-Mon Nov	 6 09:23:29 1989  Karl Berry  (karl at hayley)
-
-	* texinfo.tex (\chapterzzz, \appendixzzz): include `Chapter
-	\the\chapno' and `Appendix \appendixletter' in \thischapter; use
-	\xdef instead of \gdef to define \thischapter, to avoid timing
-	problems with \chapno or \appendixletter.
-	(\startcontents): don't bother putting `Table of Contents' or
-	`Short Contents' in the headline.
-
-Fri Oct 20 09:11:35 1989  Karl Berry  (karl at hayley)
-
-	* texinfo.tex (\titlepage): remove obsolete code for subtitles.
-	(\titlezzz): end with \relax, to avoid misinterpretation of a
-	following `plus' or `minus'
-	(\page (inside \titlepage)): call \finishtitlepage.
-	(\Etitlepage): call \finishtitlepage, if it hasn't been.
-	(\finishtitlepage): new macro to print a rule and leave some space
-	at the bottom of the title page.
-	(\iffinishedtitlepage): new; says whether \finishtitlepage has been
-	called.
-
-Mon Nov	 6 21:35:34 1989  Robert J. Chassell  (bob at rice-chex)
-
-	* texinfo.tex: Replaced `GNU CC' in the copyleft of this file with
-	  the phrase `this texinfo.tex file'.
-
-Fri Oct 27 10:36:32 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\setfilename): Do nothing except 1st time used.
-	(\titlepage): Brace misplaced in \titlezzz.
-	(\indexdummies, \indexnofonts): Handle @w.
-
-	(\readauxfile): Set \ifhavexrefs true.
-	(\refX): Warn for every use of an undefined xref,
-	but if no xref values are known, warn just once that none are known.
-
-Tue Sep 19 04:12:51 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\xrefX): Go back to `section N [Foo], page M'.
-	(\exp): Delete it.
-
-Mon Sep 18 15:29:30 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\chapentryfonts): Try using \rm for chap title.
-
-Tue Sep 12 03:41:10 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\titlepage): Missing closeparen after \title.
-	Delete excess paren after \page.
-
-	* texinfo.tex (\samp): Use \tclose.
-
-Mon Sep 11 23:28:04 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\tclose): Make `@ ' a full-width space.
-
-Sat Sep	 9 20:11:29 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\balancecolumns): Handle properly the case where
-	the index ends before one page is output, so \partialpage is nonempty.
-	In this case we may need to output two pages if the data
-	would just barely fit if not for \partialpage.
-
-Wed Aug 30 22:45:31 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\refx): New 2nd operand, output if xref is non-null.
-	(\xrefX): Use that to output the comma after the section number.
-	(\appendixnoderef, \appendixsetref, \Yappendixletterandtype):
-	Define xrefs for appendices that say "Appendix N".
-	Used in \appendix, \appendixsec, etc.
-
-	* texinfo.tex (\smartitalic): The actual italic correction was omitted.
-
-Mon Aug 28 00:21:33 1989  Richard Stallman  (rms at apple-gunkies.ai.mit.edu)
-
-	* texinfo.tex (\ref): New kind of cross-reference.
-	(\xrefX): Put single quotes around section name.
-	(\refx): Allow hyphenation in `undefined'.
-
-	* texinfo.tex (+): Make it active.
-	(Altmode): Delete active defn.
-
-	* texinfo.tex (\defunargs): Prevent hyphenation at `-' in args.
-	Move the penalty at the end so that it works.
-	(\defvarargs): Move the penalty at the end so that it works.
-
-	* texinfo.tex (\defparsebody): Do increase right margin.
-
-	* texinfo.tex (\defbodyindent): Now .4 inch.
-
-	* texinfo.tex (\point, \result, \expansion, \print, \equiv, \error):
-	New macros for Lisp manual.
-
-	* texinfo.tex (\tex): Set = to code 12.
-
-	* texinfo.tex (\entry): Hairier way to output dots.
-
-	* texinfo.tex (\kbd): If arg consists of one \key command, be a no op.
-
-	* texinfo.tex (\sc): Delete spurious \.
-
-	* texinfo.tex (\smartitalic): New macro, does italic correction at end.
-	(\i, \var, \dfn, \emph, \cite): Use that.
-
-	* texinfo.tex (\node): Do \ENVcheck.
-
-	* texinfo.tex (\initial): Infinite penalty at end.
-
-	* texinfo.tex (\chapternofonts): New macro, sets \code, etc. to
-	output selves into file.  Also undef \frenchspacing and \rawbackslash.
-	(\xhapterzzz, etc.): Call that.	 Make a group to undo it.
-	(\indexdummies): Do like \chapternofonts.
-
-Sun Aug 27 16:05:23 1989  Richard Stallman  (rms at apple-gunkies.ai.mit.edu)
-
-	* texinfo.tex (\frenchspacing): Our own definition, using
-	decimal numbers for all character codes.  The standard one fails.
-
-	* texinfo.tex (\indexnofonts): Handle \file, \tt, and many more.
-
-Fri Aug 25 22:05:24 1989  Richard Stallman  (rms at apple-gunkies.ai.mit.edu)
-
-	* texinfo.tex (\chapter, etc.): Undefine \tclose around \edef\temp.
-
-Mon Aug 21 15:42:47 1989  Richard Stallman  (rms at apple-gunkies.ai.mit.edu)
-
-	* texinfo.tex (\tclose): Like \t but make space same width
-	as in surrounding text.
-	(\code, \kbd): Use \tclose.
-
-Tue Jul	 4 20:53:52 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (titlepage): Don't set \everypar; start just one group.
-	See comments in the code.
-
-	* texinfo.tex (defop,defcv): Use defopparsebody.
-	* texinfo.tex (defopparsebody): Like defmethparsebody but defines
-	def...x for more arguments.
-
-Sat Jun 17 13:49:13 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\titlepage): Rename @subtext, etc., to @subtitle, etc.
-
-	* texinfo.tex (\titlepage): Don't print the title automatically.
-	Define @title to print it, and the rule underneath it.
-	This should make @titlepage upward compatible with the old one.
-
-	* texinfo.tex (\titlepage): Revert local definition of @page
-	to previous.  Don't print a rule.
-
-Mon Jun 12 20:49:17 1989  Karl Berry.  (karl at mote)
-
-	* texinfo.tex (\titlepage): allow intensional definition of the
-	items on the title page.  New control sequences (allowed only
-	within the titlepage environment:)
-	 (@subtext): may take either a paragraph (e.g., a brief
-	 description of the program) or just a line (e.g., the date).
-	 May appear more than once.
-	 (@author): must come after all the @subtext's.	 Can appear more
-	 than once, also.
-	 Also, use the title defined by @settitle.
-	 (\subtextfont, \authorfont): switch to using the appropriate
-	 fonts with appropriate leading.
-	 (\titlepagetopglue, \titlepagebottomglue): define space that
-	 never stretches or shrinks.
-	 (\realeverypar): formatting for the @subtext's.
-
-Sun Jun	 4 15:04:59 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (\shortchapentry, \shortunnumberedentry):
-	Use dots, right justify page numbers.  Don't use italics.
-
-Fri Jun	 2 14:40:28 1989  Karl Berry.  (karl at mote)
-
-	* texinfo.tex (\entry, \secondary): use plain TeX \dotfill for
-	better leaders than the homegrown one.
-	(\Dotsbox): Deleted.
-	(\dotfill): Deleted; use Plain TeX definition.
-
-Wed May 31 17:19:30 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (ignore): Undefine the chapter/section macros
-	while reading the args, since they are \outer.
-	(ifinfo): Likewise
-	(ifsetxxx, ifclearxxx): Call another macro to parse the
-	conditionalized text, and do to that macro as with \ignore.
-
-Tue May 30 15:04:37 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex (unnumbered): Change back from \long to \outer.
-
-	* texinfo.tex: Changes by Karl Berry for toc format.
-	Rewrite the table of contents for appearance's sake.  Add a
-	synonym for \summarycontents, \shortcontents, since that is the
-	traditional name.  Two subroutines are now shared by \contents and
-	\summarycontents: \prepareforcontents, to reset the page number
-	and such; and \startcontents, which begins the \unnumbered and
-	resets catcodes before \input \jobname.toc.  Some other macros --
-	\labelspace, \dopageno, \shortpageno -- are shared by the printing
-	macros.
-
-	* texinfo.tex (\truesecrm): New font, section-size roman, used in the
-	new toc. (cmr12)
-
-Sun May 28 07:25:42 1989  Karl Berry.  (karl at mote)
-
-	* texinfo.tex (\eatinput): Do not print the `\input texinfo' if a
-	.fmt file is being used; ignore it, instead.  This is the initial
-	definition for `\' now.
-	(\fixbackslash): on the other hand, subsequent backslashes should
-	be printed, and if the file does not have an `\input texinfo', the
-	first one should be printed.  This new macro makes the definition
-	for `\' be \normalbackslash, if it is \eatinput.
-	(\setfilename): use \fixbackslash.
-
-Wed May 24 15:34:59 1989  Joseph Arceneaux  (jla at apple-gunkies.ai.mit.edu)
-
-	* texinfo.tex: Changed def of unnumbered from \outer to \long.
-
-Tue May 23 12:27:59 1989  Karl Berry.  (karl at mote)
-
-	* texinfo.tex: Allow one to make a texinfo.fmt file (with the
-	invocation:
-	   initex \&plain texinfo
-	and then saying
-	   @dump
-	after texinfo.tex has been read.
-	Changes:
-	(\setfilename): Instead of being a no-op, read the xref info, and
-	open the contents and index files.  These actions were done as
-	texinfo.tex was read before.
-	(\opencontents, \openindices): new macros to open those files.
-	(\readauxfile): and one to read the aux file.
-
-Sat Apr 29 22:28:02 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex: `@headings on' no longer does a page break.
-
-Sun Apr	 2 11:22:29 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex: Defined `@headings single' and `@headings double'.
-	`@headings on' picks one of them: `@setchapternewpage odd'
-	says `@headings	on' means double; otherwise it means single.
-
-Mon Jan 30 22:00:35 1989  Robert J. Chassell  (bob at rice-krispies.ai.mit.edu)
-
-	* texinfo.tex: Changed the size of the subsection fonts so they
-	are scaled at13pt rather than at magstep 2. This makes them
-	smaller than the section fonts, which are scaled at magstep 2.
-	In addition, changed the ssecrm font from cmbx to cmb.
-
-Fri Jan	 6 15:00:44 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-	* texinfo.tex: Changed @lisp, @smalllisp, @display not to change
-	the right margin.
-
-Mon Dec	 5 22:01:49 1988  Robert J. Chassell  (bob at rice-krispies.ai.mit.edu)
-
-	* texinfo.tex: Tested the use of `cmbx10' vrs `cmb10' font and
-	stayed with cmb10 font since cmb10 looks better when the bold face
-	is part of a sentence although the cmbx10 font looks better on its own.
-
-Mon Aug 15 14:33:51 1988  Robert J. Chassell  (bob at spiff)
-
-	* texinfo.tex:	Changed the (undocumented) @today command from a
-	Month Day, Year format to a Day Month Year format.  Left old
-	version commented out.
-
-
-Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
-1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.
-
-
-Local Variables:
-mode: indented-text
-left-margin: 8
-fill-column: 76
-version-control: never
-End:

Property changes on: head/contrib/texinfo/ChangeLog.46
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/README
===================================================================
--- head/contrib/texinfo/README	(revision 276550)
+++ head/contrib/texinfo/README	(nonexistent)
@@ -1,112 +0,0 @@
-$Id: README,v 1.16 2004/12/13 13:36:32 karl Exp $
-This is the README file for the GNU Texinfo distribution.  Texinfo is
-the preferred documentation format for GNU software.
-
-  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-  2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-  Copying and distribution of this file, with or without modification,
-  are permitted in any medium without royalty provided the copyright
-  notice and this notice are preserved.
-
-See ./INSTALL* for installation instructions.
-
-Primary distribution point: ftp://ftp.gnu.org/gnu/texinfo/
-  (list of mirrors at: http://www.gnu.org/prep/ftp.html)
-
-Home page: http://www.gnu.org/software/texinfo/
-  (list of mirrors at: http://www.gnu.org/server/list-mirrors.html)
-  This page includes links to other Texinfo-related programs.
-
-Mailing lists and archives:
-- bug-texinfo@gnu.org for bug reports or enhancement suggestions,
-  archive: http://mail.gnu.org/pipermail/bug-texinfo
-- help-texinfo@gnu.org for authoring questions and general discussion, 
-  archive: http://mail.gnu.org/pipermail/help-texinfo
-- texinfo-pretest@texinfo.org for pretests of new releases,
-  archive: http://texinfo.org/ftp/texinfo-pretest-archive
-There are no corresponding newsgroups.
-
-Bug reports:
- please include enough information for the maintainers to reproduce the
- problem.  Generally speaking, that means:
-- the contents of any input files necessary to reproduce the bug (crucial!).
-- a description of the problem and any samples of the erroneous output.
-- the version number of Texinfo and the program(s) involved (use --version).
-- hardware, operating system, and compiler versions (uname -a).
-- unusual options you gave to configure, if any (see config.status).
-- anything else that you think would be helpful.
-
-Patches are most welcome; if possible, please make them with diff -c and
-include ChangeLog entries.
-
-When sending email, please do not encode or split the messages in any
-way if at all possible; it's easier to deal with one large message than
-many small ones.  GNU shar (http://www.gnu.org/software/sharutils/) is a
-convenient way of packaging multiple and/or binary files for email.
-
-See README.dev for information on the Texinfo development environment --
-any interested parties are welcome.  If you're a programmer and wish to
-contribute, this should get you started.  And if you're not a
-programmer, you can still make significant contributions by writing test
-cases, checking the documentation against the implementation, etc.
-
-This distribution includes the following files, among others:
-    README                      This file.
-    README.dev                  Texinfo developer information.
-
-    INSTALL                     Texinfo-specific installation notes.
-    NEWS                        Summary of new features by release.
-    INTRODUCTION                Brief introduction to the system, and
-                                how to create readable files from the
-                                Texinfo source files in this distribution.
-
-Texinfo documentation files (in ./doc):
-    texinfo.txi                 Describes the Texinfo language and many
-                                of the associated tools.  It tells how
-                                to use Texinfo to write documentation,
-                                how to use Texinfo mode in GNU Emacs,
-                                TeX, makeinfo, and the Emacs Lisp
-                                Texinfo formatting commands.
-
-    info.texi                   This manual tells you how to use 
-                                Info.  This document also comes as part of
-                                GNU Emacs.  If you do not have Emacs,
-                                you can format this Texinfo source
-                                file with makeinfo or TeX and then
-                                read the resulting Info file with the
-                                standalone Info reader that is part of
-                                this distribution.
-
-    info-stnd.texi              This manual tells you how to use
-                                the standalone GNU Info reader that is
-                                included in this distribution as C
-                                source (./info).
-
-Printing related files:
-    doc/texinfo.tex             This TeX definitions file tells
-                                the TeX program how to typeset a
-                                Texinfo file into a DVI file ready for
-                                printing.
-
-    util/texindex.c             This file contains the source for
-                                the `texindex' program that generates
-                                sorted indices used by TeX when
-                                typesetting a file for printing.
-
-    util/texi2dvi               This is a shell script for
-                                producing an indexed DVI file using
-                                TeX and texindex. 
-
-Source files for standalone C programs: 
-  ./lib
-  ./makeinfo
-  ./info
-
-Installation files:
-    Makefile.am                 What Automake uses to make a Makefile.in.
-    Makefile.in                 What `configure' uses to make a Makefile,
-                                created by Automake.
-    configure.ac		What Autoconf uses to create `configure'.
-    configure                   Configuration script for local conditions,
-                                created by Autoconf.

Property changes on: head/contrib/texinfo/README
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/ChangeLog
===================================================================
--- head/contrib/texinfo/ChangeLog	(revision 276550)
+++ head/contrib/texinfo/ChangeLog	(nonexistent)
@@ -1,5008 +0,0 @@
-2004-12-31  Karl Berry  <karl@gnu.org>
-
-	* Version 4.8.
-
-2004-12-21  Karl Berry  <karl@gnu.org>
-
-	* pretest version 4.7.94.
-
-	* makeinfo/xref.c: doc fix.
-
-2004-12-20  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/html.c (cm_node) <html>: need old-style names in the normal
-	(not no_headers) html case, too, of course.
-	(add_html_names): canon_white the new name, too.
-
-2004-12-19  Karl Berry  <karl@gnu.org>
-
-	* pretest version 4.7.93.
-
-	* automake 1.9.4.
-
-	* makeinfo/xml.c (try_docbook_image): new fn.
-	(xml_insert_docbook_image): call it, trying additional formats
-	pdf, svg, etc.
-	* makeinfo/makeinfo.c (cm_image): check for gif too.
-	http://www.gnu.org/philosophy/gif.html says:
-	"we can and will include support for displaying GIF files in GNU
-	 software."  Leaving it undocumented, though.
-	Based on patch from Jens Elkner, 18 Dec 2004 01:56:28 +0100.
-
-2004-12-19  Torsten Bronger  <bronger@physik.rwth-aachen.de>
-
-	* util/texinfo.dtd: define most entities, add <neos>.
-
-2004-12-17  Juan M. Guerrero  <st001906@hrz1.hrz.tu-darmstadt.de>
-
-	* djgpp/config.bat: remove files like coXXXXXX.tmp created
-	in the top_srcdir by the gl_FUNC_MKSTEMP test.
-
-2004-12-15  Karl Berry  <karl@gnu.org>
-
-	* pretest version 4.7.92.
-
-	* util/texinfo.dtd: merge with makeinfo/texinfo.dtd.
-	* makeinfo/texinfo.dtd, makeinfo/texinfo.xsl: remove.
-
-2004-12-15  Stepan Kasal  <kasal@ucw.cz>
-
-	* Makefile.am (EXTRA_DIST): Removed po/Makevars.template, sorry.
-
-2004-12-15  Juan M. Guerrero  <st001906@hrz1.hrz.tu-darmstadt.de>
-
-	* djgpp/config.sed: adjust for new autoconf.
-	* makeinfo/node.c (enumerate_filename): make dos_file_names const
-	instead of static, since it may involve a fn call to pathconf.
-
-2004-12-15  Karl Berry  <karl@gnu.org>
-
-	* Makefile.am (EXTRA_DIST): include ChangeLog.46, README.dev,
-	and po/Makevars.template.  From Stepan.
-
-2004-12-14  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (inforef): try to explain possible uses more
-	thoroughly.
-	From: Luc Teirlinck, 13 Dec 2004 21:45:58 -0600.
-
-	* doc/texinfo.txi (pxref): more explanation.
-	* doc/info-stnd.texi (Basic Windows): put pxref in parens.
-	help-texinfo mail from adl, 13 Dec 2004 17:07:50 +0100.
-
-2004-12-13  Andreas Schwab  <schwab@suse.de>
-
-	* info/echo-area.c (DECLARE_INFO_COMMAND): Add intermediate cast
-	to avoid warning.
-	* info/infokey.c (compile): Likewise.
-	* info/session.c (forward_move_node_structure): Likewise.
-	(DECLARE_INFO_COMMAND): Likewise.
-
-	* makeinfo/makeinfo.c (init_paragraph): Don't use free_and_clear
-	to avoid strict aliasing issue.
-
-	* makeinfo/cmds.c (cm_center): Avoid strict aliasing issue.
-
-2004-12-13  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (HTML Cross-reference Command Expansion): add
-	@euro{} -> U+20AC.  texinfo-pretest mail from Patrice,
-	12 Dec 2004 23:49:50 +0100.
-
-2004-12-12  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (makeinfo options): don't be so suggestive about
-	skipping xref validation.
-	emacs-devel mail from: Luc Teirlinck, 12 Dec 2004 13:02:11 -0600.
-
-2004-12-08  Karl Berry  <karl@gnu.org>
-
-	* pretest version 4.7.91.
-
-	* info/echo-area.c, info/infokey.c, info/session.c: omit useless
-	casts to intptr_t, since we're just casting to (void *) next.
-	intptr_t is not defined with gcc 3.04 on Tru64 Unix V5.1
-	(This whole vararg stuff needs to be redone correctly.)
-	Report from: Svend Tollak Munkejord (via te)
-        8 Dec 2004 17:15:17 +0100.	
-
-	* doc/texinfo.txi (ref): rewrite last two redundant paragraphs.
-
-2004-12-07  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Macro Details): document @c kludge in macro
-	definitions to work around some newline problems.  (From Werner.)
-
-2004-12-05  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/html.c (add_escaped_anchor_name): prefix g_t if the
-	nodename begins with a nonletter.  Ugh.
-	* doc/texinfo.txi (HTML Xref Node Name Expansion): document this.
-	http://ff0.org/pipermail/texinfo-pretest/2004-December/000210.html
-	
-	* doc/texinfo.txi (HTML Xref 8-bit Character Expansion): define
-	behavior for Unicode code points above 0xfff.
-
-	* makeinfo/makeinfo.c (reader_loop): <wbr> didn't make it into
-	HTML 4, remove it.  Sigh.
-	texinfo-pretest mail from wl, 05 Dec 2004 23:39:05 +0100.
-
-2004-12-02  Karl Berry  <karl@gnu.org>
-
-	* configure.ac (install-warnings): simplify default case.  From te.
-
-2004-12-01  Karl Berry  <karl@gnu.org>
-
-	* pretest version 4.7.90.
-
-	* util/texi2dvi (recode): new option, off by default.
-	Unconditionally calling recode seems problematic, when there
-	hasn't been a release for years and its Texinfo support is less than
-	perfect.
-
-2004-11-30  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Quotations and Examples): @quotation does not
-	reduce interparagraph spacing.
-	
-	* makeinfo/node.c (cm_node) <html>: do not bother calling
-	add_html_nodes in the split case, the filename is wrong.
-
-2004-11-29  Karl Berry  <karl@gnu.org>
-
-	Support for writing <a name="..."> using the old-style node name
-		to HTML name conversion, to keep the gcc folks happy.
-	* makeinfo/node.c (add_html_names): new routine, factoring out
-	common code (plus new code) from cm_node.
-	(cm_node) <html>: call it.
-	* makeinfo/makeinfo.h (OLD_HTML_SAFE, OLD_URL_SAFE_CHAR):
-	(re)define these.
-	* makeinfo/html.c (add_escaped_anchor_name): take new argument to
-	optionally output the old-style conversion.
-	(add_anchor_name): change call.
-	* index.c: change calls.
-	* makeinfo/html.h (add_escaped_anchor_name): change decl.
-
-2004-11-26  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (reader_loop): allow <wbr> after &mdash;
-
-2004-11-25  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Fonts): document new command @sansserif.
-	* doc/texinfo.tex (\sansserif): new command.
-	* makeinfo/cmds.h (cm_sansserif): new cmd.
-	* makeinfo/cmds.c (cm_sansserif): new cmd.
-	(command_table): add it.
-	* makeinfo/texinfo.dtd (Inline.fonts): add it; also slanted.
-	* makeinfo/xml.h (SANSSERIF, SLANTED): define these new elements.
-	* makeinfo/xml.c (texinfoml_element_list): add them.
-	From: Frank Küster, 21 Oct 2004 23:27:33 +0200, Debian bug#277754.
-
-	* doc/texinfo.txi (Quotations and Examples, end titlepage): state
-	that there must be only one space between the @end and its
-	argument.  Report from: christoph.sobotka, 26 Oct 2004 22:04:03 +0200.
-
-2004-11-22  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (euro): new node, documenting new command,
-		@euro{}, for the Euro currency symbol.
-	* doc/texinfo.tex (\euro): new command, along with \eurofont to
-	support it.  The following extra font support is also related to
-	supporting @euro{}:
-	(\bfstylename): define this.
-	(\textnominalsize .. \ssecnominalsize): new macros.
-	(\textfonts .. \ssecfonts): define \curfontsize.
-	* makeinfo/cmds.c (command_table): add euro.
-	* makeinfo/lang.c (cm_special_char): handle euro.
-	(iso8859_15_map): new global.	
-
-2004-11-18  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\ptexnewwrite): Save \newwrite.
-	(\newwrite): Call it.
-
-2004-11-17  Karl Berry  <karl@gnu.org>
-
-	* configure.ac (install-warnings): new --enable option, requested
-		by te.
-
-2004-11-11  Karl Berry  <karl@gnu.org>
-
-	* texinfo.dtd (metainformation): add documentdescription.
-	(documentdescription): define.
-	* xml.h (DOCUMENTDESCRIPTION): new value for xml_element.
-	* xml.c (texinfoml_element_list): define documentdescription.
-	(docbook_element_list): likewise, but don't know how to handle it.
-	* cmds.c (cm_documentdescription): insert opening xml tag.
-	* insertion.c (end_insertion): insert closing xml tag.
-
-	* makeinfo/makeinfo.c (insert_string): declare const char * arg.
-        * makeinfo/makeinfo.h: likewise.
-	Report from: Vincent Lefevre, 20 Oct 2004 15:40:39 +0200,
-	noting a spurious </para> after </dircategory>.
-
-2004-11-08  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\pdfmakeoutlines): in the first run through the
-	toc, define \thischapnum...\thissubsecnum as 0, rather than \empty.
-	This is so \expnumber doesn't end up trying to expand
-	\csname sec\empty\endcsname, i.e., \sec, which is the secant function.
-	Report from: Oliver Beck, help-texinfo, 8 Nov 2004 08:05:55 +0100.
-
-2004-11-07  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (main) [LC_MESSAGES]: #ifdef the setlocale
-	using LC_MESSAGES.  From te, 6 Nov 2004 23:36:10 +0100.
-
-2004-11-06  Karl Berry  <karl@gnu.org>
-
-	* lib/Makefile.am (libtxi_a_SOURCES): add strdup.h.
-	Report from: Thomas Esser <te@dbs.uni-hannover.de>,
-	6 Nov 2004 18:11:51 +0100.
-
-2004-11-01  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/xref.c (cm_xref): don't include the external file name
-	in the HTML output, since it's pretty traditional not to
-	distinguish internal and external links in HTML, and it disturbs
-	the flow of reading.
-	From: Han-Wen Nienhuys <hanwen@xs4all.nl>, 31 Oct 2004 00:13:36 +0200.
-	(For lilypond.)
-
-2004-10-31  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\setmultitablespacing): just let \multistrut be
-	the same as \strut.  Its previous computation was wrong.
-	See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100.
-
-2004-10-22  Stepan Kasal  <kasal@ucw.cz>
-
-	* info/Makefile.am (generated_sources): Add dependencies defining
-	  a total order on the files, to prevent race conditions with
-	  parallel make.
-	  Move the code about generated sources to the end of the file.
-
-2004-10-20  Stepan Kasal  <kasal@ucw.cz>
-
-	* info/Makefile.am (doc.c, key.c, funs.h): Don't distribute them.
-	  of these three files.
-	(ginfo_SOURCES, nodist_ginfo_SOURCES): Move files.
-	(infokey_SOURCES, nodist_infokey_SOURCES): Likewise.
-	(DISTCLEANFILES): Include generated_sources.
-
-2004-10-20  Stepan Kasal  <kasal@ucw.cz>
-
-	BUILT_SOURCES is a special variable for a hack to supplement
-	  the automatic dependency tracking; we need it for funs.h only.
-	  See the explanation in the automake manual.
-
-	* info/Makefile.am (BUILT_SOURCES): All occurences replaced by ...
-	(generated_sources): ... this new variable.
-	(BUILT_SOURCES): set to ``funs.h''.
-
-2004-10-20  Stepan Kasal  <kasal@ucw.cz>
-
-	* info/Makefile.am (ginfo_SOURCES): replace $(BUILT_SOURCES)
-	  with ``doc.c funs.h''; this reflects the true situation.
-	(infokey_SOURCES): Add funs.h.
-
-2004-10-20  Stepan Kasal  <kasal@ucw.cz>
-
-	* info/Makefile.am (EXTRA_DIST): No need to mention the generated
-	  sources here, they are in ginfo_SOURCES or infokey_SOURCES.
-
-2004-10-19  Stepan Kasal  <kasal@ucw.cz>
-
-	* configure.ac: When cross compiling, we have to remove
-	  ./config.status, not "$native_tools"/config.status.
-	  Replace ``echo'' with AC_MSG_NOTICE.  Quote the variable
-	  values passed to ``env.''
-
-2004-10-17  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/node.c (cm_node): don't output <br> after the
-		navigation line, it's apparently just extra space.
-
-	* configure.ac: Clean environment for native configure.
-	From: Mark Fortescue <mark@mtfhpc.demon.co.uk>,
-	17 Oct 2004 19:09:53 +0100.
-
-2004-10-11  Stepan Kasal  <kasal@ucw.cz>
-
-	* configure.ac: Add a short explanation about cross compile.
-
-2004-10-08  Karl Berry  <karl@gnu.org>
-
-	* info/Makefile.am (generated_sources): remove.  Found by Stepan.
-
-2004-10-08  Stepan Kasal  <kasal@ucw.cz>
-
-	Support cross compiling.  Based on research by Mark Fortescue.
-	Maciej W. Rozycki pointed out this issue previously.
-
-	* configure.ac: If cross compiling, run second configure script
-	  in a subdirectory ${native_tools}.  New automake conditional
-	  TOOLS_ONLY is set inside that subdirectory.
-	* Makefile.am (SUBDIRS): Add $(native_tools); restrict the
-	  SUBDIRS to minimum, if we are inside the $(native_toos) dir.
-	(distclean-local): Remove directory $(native_tools).
-	* doc/Makefile.am: If necessary, use makeinfo and install-info
-	  from $(native_tools).
-	* info/Makefile.am: Similarily with the ``makedoc'' program.
-
-2004-10-07  Stepan Kasal  <kasal@ucw.cz>
-
-	@table command doesn't work inside environment @display.
-	There is no point in trying to fix it: just give up with a cry.
-
-	* doc/texinfo.tex (\table, \ftable, \vtable): Instead of calling
-	  \tablex directly, call ...
-	(\tablecheck): ... this new macro which checks for active newline;
-	  if it's found, it reports an error and uses \doignore to recover.
-	* doc/texinfo.txi (display): mention this.
-
-2004-10-06  Karl Berry  <karl@gnu.org>
-
-	* doc/*.texi: more consistent use of dashes.
-	From Stepan and Benno Schulenberg <benno@nietvergeten.nl>.
- 
-2004-10-04  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (cm_value): increment and restore
-		input_text_offset before execute_string on the value,
-		so cm_xref doesn't complain about missing punctuation.
-	From: Sergey Poznyakoff <gray@Mirddin.farlep.net>,
-	04 Oct 2004 15:04:33 +0300.
-
-2004-10-01  Karl Berry  <karl@gnu.org>
-
-	* lib/Makefile.am (libtxi_a_SOURCES): add getopt_.h.
-
-	* configure.ac: bump version to 4.7.90, although we're not really
-		pretesting yet.  (I need a distribution to check an
-		automake issue.)
-
-2004-09-14  Karl Berry  <karl@gnu.org>
-
-	* util/srclist.txt (getopt.h): renamed to getopt_.h.
-	* lib/getopt_.h: new file.
-	* lib/getopt.h: just include getopt.h.
-
-2004-09-09  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Image Syntax): mention @noindent, @center.
-
-2004-09-06  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\Efloat): Take care to run \scantokens on
-	  \thisshortcaption before writing the lof line to auxfile.
-	  Otherwise, when a newline appears in the argument to
-	  @shortcaption, a literal ^^M is written to the aux file.
-	  Report from Patrice, 1 Aug 2004 15:54:44 +0200.
-
-2004-09-01  Karl Berry  <karl@gnu.org>
-
-	* util/gendocs.sh: show commands, allow / in description.
-
-2004-08-30  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (maybe_escaped_expansion): new routine, like
-		expansion but does HTML escapes.
-	* makeinfo/makeinfo.h (maybe_escaped_expansion): declare.
-	* makeinfo/index.c (cm_printindex): call it.
-	This is @cindex Kahrs, J@"urgen does not get
-	gawk.texi:23425: Unknown command `&quot;urgen'.
-	(in gawk 3.1.4).
-	Report from: Stepan Kasal <kasal@ucw.cz>, 24 Aug 2004 12:36:34 +0200.
-
-2004-08-29  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/node.c (split_file): do not search for output file
-		along the path when calling find_and_load (can cause seg
-		fault when cross-compiling).
-	From: Martin Husemann <martin@duskware.de>, 29 Aug 2004 08:40:33 +0200.
-	http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=26791
-
-2004-08-27  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Macro details): more warnings about macro usage.
-	Report from: Stepan Kasal <kasal@ucw.cz>, 24 Aug 2004 09:29:35 +0200.
-
-	* doc/texinfo.tex (\Efloat): \vskip\parskip after printing the
-	caption; previous \printedsomething code to do this had become
-	obsolete.  Reported by Stepan.
-
-	* doc/texinfo.txi (caption shortcaption): show an example for
-        @shortcaption, and remark that weird commands like @c and @verb
-	are not allowed.  Suggested by Stepan.
-
-2004-08-27  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\initial): when breaking the column before the
-	  initial, allow for some space at the bottom of the column, so
-	  the baselineskip is preserved (more or less).
-	  Don't give negative penalty, it encouradges creating of underfull
-	  columns with stretched baselineskip.
-	  At the end, the \nobreak should be before \vskip, not after it.
-
-2004-08-26  Stepan Kasal  <kasal@ucw.cz>
-
-	* util/texi2dvi: fix the sed script searching for @documentencoding;
-	  Double-quote some instances of "$filename_???"
-
-2004-08-26  Akim Demaille  <akim@epita.fr>
-
-	Let DVI and PDF files honor the document encoding in TeX.
-
-	* util/texi2dvi ($language): Be sure to set its value.
-	(get_xref_files): Turn this external shell script into a function.
-	(filename_rcd, $tmpdir_rcd): New.
-	If the file is in Texinfo, and has @documentencoding, and recode
-	is available, then run it.
-
-2004-08-25   Akim Demaille  <akim@epita.fr>
-
-	* util/Makefile.am (texinfo.cat): Fix for srcdir != builddir.
-
-2004-08-25  Karl Berry  <karl@gnu.org>
-
-	* util/texi2dvi: @ is also ok for the first character of xref_files.
-
-2004-08-20  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\tablez): accidentally removed assignments
-		enabling @item and @itemx within @table.
-
-2004-08-19  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\multitable): \def\item to \crcr, instead of
-		\let, to avoid errors with a nested @itemize inside
-		@multitable.
-	Report from: Pierre-Luc Veilleux <plv@centretiv.com>,
-	18 Aug 2004 13:26:00 -0400.
-
-2004-08-19  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\scanmacro): Make backslash active, not other,
-	  as this is the default when processing texinfo files. 
-	  Otherwise, a \ inside @copying will eventually print as ``.
-
-2004-08-18  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\scantxt): " is another active char to be
-	  sanitized.
-
-2004-08-18  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (exampleindent): document that the default is
-		different in TeX.
-	From: Simon Josefsson <jas@extundo.com>, 18 Aug 2004 13:44:32 +0200.
-
-2004-08-14  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\cslet): equivalent-or-better, and shorter,
-	version from dak, 12 Aug 2004 19:17:27 +0200.
-
-	* doc/texinfo.txi (makeinfo options): use --no-number-sections
-		with non-hierarchical manuals.
-
-2004-08-13  Karl Berry  <karl@gnu.org>
-
-	* util/texi2dvi: check for -file-line-error, since -style is no
-		longer part of the name.
-
-2004-08-07  Karl Berry  <karl@gnu.org>
-
-	* info/echo-area.c (inform_in_echo_area): avoid buffer overrun.
-	Report from: Roman Werpachowski <rwerp@gazeta.pl>,
-	7 Aug 2004 01:18:32 +0200.
-	
-	* info/echo-area.h (inform_in_echo_area): declare arg as const,
-	while we're at it.
-
-2004-08-02  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/cmds.c (cm_acronym_or_abbr): use strchr, not index.
-	Report from: Prof Brian Ripley <ripley@stats.ox.ac.uk>, 
-	2 Aug 2004 12:47:36 +0100 (BST)
-
-2004-07-31  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi,
-	* doc/texinfo.tex,
-	* makeinfo/cmds.c, cmds.h, xml.c, xml.h,
-	* util/texinfo.dtd: new command @abbr, suggested by Paul Eggert,
-	who also sent the original documentation.
-
-2004-07-30  Karl Berry  <karl@gnu.org>
-
-	* info/infomap.c (initialize_vi_like_keymaps): bind j to
-	info_next_line and k to info_prev_line.  From Eli.
-
-2004-07-30  Maciej W. Rozycki  <macro@linux-mips.org>
-
-	* info/filesys.c (extract_colon_unit): Clean up handling of the 
-	end of string.
-
-2004-07-27  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (verb): explicitly warn that @verb cannot be
-	used in xref contexts.
-
-2004-07-27  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\float): The parameters for @float are
-	  separated by commas; allow a space after each of the commas.
-
-	The TeX code for @caption, @shortcaption and @copying now uses
-	a similar mechanism to macro definitions.  In detail:
-
-	* doc/texinfo.tex (\macrobodyctxt, \macroargctxt): Generalize, ...
-	  (\scanctxt, \scanargctxt): ... and introduce new variants.
-	  (\scanexp): New macro--expand the parameter and call \scantokens.
-	  (\copying, \docopying, \insertcopying): Use \scanargctxt and
-	  \scanexp--this simplifies things a lot.
-	  (\caption, \shortcaption): Redefine, using \scanargctxt via ...
-	  (\docaption, \defcaption): ... these new macros.
-	  (\appendtomacro): Simplify code, using \expandafter.
-
-2004-07-26  Karl Berry  <karl@gnu.org>
-
-        Avoid using the path for output files, since this led to problems
-        when incompatible files created by previous versions were found.
-	* makeinfo/files.c (find_and_load): introduce second parameter
-		use_path, set to 0 from the call in handle_delayed_writes,
-		1 in all cases.
-        * makeinfo/files.h: change decl.
-        * makeinfo/cmds.c, makeinfo.c, node.c: change calls.
-	From: Thomas Klausner <wiz@danbala.ifoer.tuwien.ac.at>,
-	14 Jul 2004 00:31:54 +0200.
-
-2004-07-25  Werner Lemberg  <wl@gnu.org>
-
-	Rename @s to @slanted.
-
-	* doc/texinfo.tex (\s): Replace with...
-	(\slanted): This.
-	* doc/texinfo.txi: Updated.
-
-	* makeinfo/cmds.c (command_table): Add @slanted, not @s.
-	(cm_s): Replace with...
-	(cm_slanted): This.
-	* makeinfo/cmds.h: Add cm_slanted, not cm_s..
-
-	* NEWS: Updated.
-
-2004-07-24  Karl Berry  <karl@gnu.org>
-
-	* info/echo-area.c (ea_possible_completions),
-	* info/session.c (forward_move_node_structure),
-	* info/infokey.c (compile): cast to intptr_t to avoid cast to
-		pointer from integer of different size.
-	From Havard Eidnes <he@netbsd.org>, 14 Jul 2004 20:38:59 +0200.
-
-2004-07-19  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (main): with XML, instead of directly calling
-	handle_variable_internal for -D and -U command line flags, hold the
-	variable declarations until output document is started.
-	(convert_from_loaded_file): handle variables provided with -D and -U
-	flags here, just before entering the reader_loop.
-	(Otherwise, -D/-U with --xml cause a segfault.)
-
-2004-07-15  Werner Lemberg  <wl@gnu.org>
-
-	* doc/texinfo.tex (\s): New command to typeset text with a slanted
-		font.
-	* doc/texinfo.txi: Document @s.
-
-	* makeinfo/cmds.c (command_table): Add @s.
-	(cm_s): New function.  Currently the same as cm_i -- it probably
-		has to be adapted to Docbook and XML.
-	* makeinfo/cmds.h: Add prototype for cm_s.
-
-	* NEWS: Document new command @s.
-
-2004-07-15  Werner Lemberg  <wl@gnu.org>
-
-	* doc/texinfo.tex (\TeX): Adjust \spacefactor to make it act like a
-		lowercase letter, not like a period.
-
-2004-07-12  Karl Berry  <karl@gnu.org>
-
-	* texinfo/texinfo.txi (Useful Highlighting): Include
-		cross-references to each of the commands.  Suggestion from
-		Wolfgang Pausch, 12 Jul 2004 08:26:28 +0200.
-
-	* texinfo/texinfo.txi (Invoking makeinfo),
-	* makeinfo/makeinfo.c: mention that --if-noFORMAT also processes
-	@ifnotFORMAT blocks.
-	Suggestion from Stepan.
-
-2004-07-11  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (discard_until): leave input_text_offset at
-		the end of input_text if not found, not at one past the
-		end of input_text.  (Had erroneously put that in the block
-		only if an error was given.)  The result was a null byte
-		after macro expansions.  Report from Werner,
-		10 Jul 2004 15:36:40 +0200.		
-
-	* makeinfo/node.c (split_file): fwrite Local Variables trailer so
-		it actually gets into the output of the top-level info
-		file; don't just insert_string.  
-	Report from: Werner LEMBERG, 11 Jul 2004 08:58:13 +0200.
-
-2004-07-10  Karl Berry  <karl@gnu.org>
-
-        * util/texi2pdf: new script.
-        * util/Makefile.am: install it.
-        * doc/texinfo.txi: document it.
-
-2004-07-05  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/xref.c (cm_email, cm_uref, et al.): 
-	* makeinfo/xml.c (xml_insert_indexentry, xml_insert_indexterm):
-	* makeinfo/sectioning.c (sectioning_underscore):
-	* makeinfo/makeinfo.c (cm_listoffloats): use %s, don't pass string to
-		execute_string.  Report from Christian Schenk.
-
-2004-07-02  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makinfo.c (execute_string): don't worry about
-		mismatched multiline commands if executing_macro.
-
-2004-06-27  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex: Various doc fixes.
-	(\dosubindsanitize): propagate the same penalty
-	>10000, don't just use \nobreak.
-	(\sectionheading): insert a final penalty of
-	10001, not 10000.  This causes \aboveenvbreak to
-	insert \parskip glue, cancelling the
-	\vskip-\parskip done here.  Otherwise, when (e.g.)
-	@section is followed immediately by @example, the
-	example can be shrunk up above the section title.
-
-2004-06-14  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\commondummies, \indexnofonts): dummy-up @comma.
-	Report from Arnold.
-
-2004-06-06  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/index.c (index_add_arg): ensure all elements are always
-	initialized, including output_file, section, and section_name.
-	(cm_printindex): don't pass index->output_file to
-	add_html_block_elt_args if it is null.  Also do
-	not pass spurious extra index_name argument.
-
-	* makeinfo/makeinfo.c (add_char): don't call html_output_head if
-	only_macro_expansion (e.g., a macro call in the
-	Top menu).  From: Yuri D'Elia <wavexx@yuv.info>,
-	05 Jun 2004 21:11:00 +0200.
-
-2004-06-03  Karl Berry  <karl@gnu.org>
-
-	* info/session.c (info_menu_digit): use menu, rather than entry, to
-	avoid seg fault on "0" (the last item),
-	since menu has already been checked.
-	From: Malcolm Rowe <malcolm-gnu@farside.org.uk>,
-	02 Jun 2004 21:32:37 +0100.
-
-2004-05-17  Karl Berry  <karl@gnu.org>
-
-	* util/gendocs.sh, gendocs_template: use package.format.tar.gz
-		consistently.  Before, -, _, and . were all used.
-
-2004-05-16  Karl Berry  <karl@gnu.org>
-
-	* lib/Makefile.am (libtxi_a_SOURCES): include strcase.h.
-	From: "Gerrit P. Haase" <gp@familiehaase.de>,
-	15 May 2004 21:50:52 +0200.
-
-	* util/gendocs.sh: force HTML output name, otherwise Emacs fails
-        with its "@setfilename ../...".
-
-2004-05-04  Karl Berry  <karl@gnu.org>
-
-	* util/texi2dvi (TEX): don't use the value when it ends in
-	"latex"; TEX is also used by mpost.  Report from
-	Yvon.Henel@wanadoo.fr.
-
-2004-04-29  Karl Berry  <karl@gnu.org>
-
-	* doc.texinfo.txi (Invoking makeinfo): mention --plaintext.
-	From Akim.
-
-	* doc/texinfo.tex (\emptyusermacros): can use \asis.
-	(\identity): remove.
-
-2004-04-29  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\commondummiesnofonts, \indexnofonts):  In order
-	  to correctly transform words like `Dvo\v{r}\'{a}k' to `Dvorak'
-	  for index sorting, one has to define all accent control sequences
-	  as @asis.  (Current code would produce `Dvor{a}k'.)
-
-2004-04-29  Jan Nieuwenhuizen  <janneke@gnu.org>
-
-	* makeinfo/makeinfo.c (remember_error): Try cm_bye not more than
-	twice.  Fixes `Too many errors!  Gave up.' looping.
-
-2004-04-26  Karl Berry  <karl@gnu.org>
-
-	* lib/system.h (STRCASEEQ, STRNCASEEQ): new #defines for
-		convenience.
-	* makeinfo/cmds.c (cm_strong): actually change the output to avoid a
-	spurious xref.  Suggestion from Jan Nieuwenhuizen
-	<janneke@gnu.org>, 26 Apr 2004 00:04:04 +0200, emacs-devel.
-
-	* automake 1.8.4.
-
-2004-04-24  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\emptyusermacros, \identity): new macros.
-	(\indexdummiesnofonts): call it.
-	This is to semi-support macro calls in the arg to @deffn.
-	Report from: Akim Demaille <akim@epita.fr>, 20 Apr 2004 17:48:28 +0200.
-
-2004-04-21  Karl Berry  <karl@gnu.org>
-
-	* configure.ac (gl_FUNC_MKSTEMP): rename from UTILS_FUNC_MKSTEMP,
-	per new gnulib code.
-
-2004-04-20  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/tests/copying: force POSIX language setting.
-
-2004-04-19  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/cmds.c (cm_code): use <samp> for commands other than
-	@code, so we get typewriter output; and add `...'
-	for @samp.
-	Report from: John Blevin <blevin@lucent.com>, 
-	16 Apr 2004 11:40:01 -0400.
-
-	* makeinfo/html.c (html_output_head) [CSS_FONT_ROMAN,
-	CSS_FONT_SMALL_CAPS]: prettify.
-
-2004-04-18  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\Orb): define if undefined.
-	Report from Laurent Siebenmann.
-
-	* util/dir-example: diff updates.
-
-2004-04-13  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex: remove trailing blanks.  suggestion from Jim.
-
-2004-04-12  Paul Eggert  <eggert@twinsun.com>
-
-	* doc/Makefile.am (info.1, infokey.1, install-info.1,
-	makeinfo.1, texi2dvi.1, texindex.1): Don't use $< in ordinary
-	rules; it's not portable.
-	* util/Makefile.am (texinfo.cat): Likewise.
-
-2004-04-12  Karl Berry  <karl@gnu.org>
-
-	* bootstrap: update from berlios.
-
-2004-04-11  Karl Berry  <karl@gnu.org>
-
-	* Version 4.7.
-
-2004-04-09  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (execute_string): do not free the temporary copy
-	of input_filename until we're definitely done with
-	it.  It is used in line_error, etc.
-
-	* INSTALL: mention texinfo.tex install step.
-
-	* util/Makefile.am (texinfo.cat): new name instead of just
-		`catalog'.  rename files.
-	* util/Makefile.am (EXTRA_DIST): texinfo-cat.in now, not
-		catalog.in.
-
-2004-04-09  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (begin_insertion): after @copying, do not
-	discard until a newline if we are looking at one.
-	(end_insertion): decrement input line number after @end copying.
-
-2004-04-08  Karl Berry  <karl@gnu.org>
-
-	* util/Makefile.am: doc fix, as automake.diff is no longer needed.
-
-2004-04-07  Karl Berry  <karl@gnu.org>
-
-	* pretest version 4.6.95.
-	
-	* doc/texinfo.tex (\dodonode): new macro to remove trailing comma.
-	(\donode): call it, after removing space-comma.
-	
-	* doc/texinfo.txi (indicateurl): new name for url.
-	(uref): url is now a synonym for uref.
-	* doc/texinfo.tex (\url, \indicateurl): implement.
-	* makeinfo/cmds.c (cm_indicate_url): rename from cm_url.
-	(command_table): make "url" a synonym for "uref".
-	* makeinfo/cmds.h (cm_indicate_url): declare it.
-
-2004-04-06  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/sectioning.c (insert_and_underscore): use `...' quote
-	instead of "..." in error message.
-	* info/*.c: likewise.
-
-2004-04-07  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_colon): check if the character we are erasing
-	from the output belongs to an XML tag.
-
-2004-04-07  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (cm_author): use author element in XML output
-	for attribution.
-
-2004-04-06  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (convert_from_loaded_file): do not call
-	write_tag_table if the output filename is "-".
-
-2004-04-06  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (end_insertion): <pre> blocks implicitly ends
-	the previous paragraph, so avoid </p> after the end tag.
-
-	* makeinfo/footnote.c (output_pending_notes): made Footnotes anchor
-	non translatable, and changed it to "texinfo-footnotes-in-document" to
-	lessen the chance of getting in the way of another Footnotes anchor.
-
-2004-04-04  Jim Meyering  <jim@meyering.net>
-
-	* info/nodes.c (info_load_file_internal): Don't free lowered_name
-	until *after* using fullpath, since they may be one and the same.
-
-2004-04-03  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Image Syntax): had missing @'s in cookies.
-
-	* makeinfo/cmds.c (cm_w): insert a comment at the end of @w, so that
-	@w{$}Log$ doesn't end up as <dollar>Log<dollar>.
-	Report from rms.
-	* doc/texinfo.txi (GNU Sample Texts, w): mention this.
-
-2004-04-02  Karl Berry  <karl@gnu.org>
-
-	* configure.ac: pretest version 4.6.94.
-
-	* doc/texinfo.txi (Node Line Requirements): discuss whitespace.
-
-	* doc/texinfo.tex (\node, \donode): remove trailing
-	spaces (before the first comma) in the @node line.
-
-2004-03-29  Karl Berry  <karl@gnu.org>
-
-	* util/install-info.c (menu_line_lessp, menu_line_equal): move to
-		before all uses.
-
-2004-03-27  Karl Berry  <karl@gnu.org>
-
-	* info/signals.c (initialize_info_signal_handler) [SA_NOCLDSTOP]:
-	use instead of HAVE_SIGACTION, since Solaris 2.7+
-	with Sun CC don't have sa_handler, sa_flags, sa_mask.
-
-	* info/session.c (search_string_index): remove unused variable.
-	* info/terminal.c (term_mo): remove unused variable.
-	* info/display.c (display_clear_display): remove unused variable
-		display_line.
-	* util/install-info.c (infilelen_sans_info): remove unused
-		variable.
-
-	* doc/texinfo.txi: mistakenly had * name: node: in menu items instead
-	of * name: node.
-
-	* util/install-info.c (menu_item_equal): must declare ret at beginning
-	of function.  From Werner.
-
-2004-03-27  Jim Meyering  <jim@meyering.net>
-
-	* info/info-utils.c (info_parse_node): Don't read beyond end
-	of buffer when looking for ``(line ...)'' in a menu item.
-
-2004-03-27  Andreas Schwab  <schwab@suse.de>
-
-	* util/install-info.c (menu_item_equal): Don't scan past
-	term_char.
-
-2004-03-26  Karl Berry  <karl@gnu.org>
-
-	* pretest version 4.6.93.
-
-	* util/install-info.c (menu_item_equal): compare basenames,
-	so lilypond/ subdir will match.  Bug report from Werner,
-	21 Mar 2004 08:31:10 +0100.
-
-	* configure.ac (AC_CHECK_DECLS): skip strncasecmp again.
-	* lib/system.h (strcase.h): change conditional to
-	!HAVE_STRNCASECMP || !HAVE_STRCASECMP.  Extra
-	!HAVE_DECL seems superfluous.
-
-	* lib/system.h: include <unistd.h> last, following Autoconf's
-		ac_includes_default.
-
-2004-03-25  Karl Berry  <karl@gnu.org>
-
-	All these changes are because strncasecmp is only declared in
-	<strings.h> on IBM AIX 4.2.  (Report from Nelson Beebe.)
-	
-	* configure.ac (AC_CHECK_DECLS): add memchr; no need to check for
-	  	     strcasecmp.(gl_STRCASE): call this ... 
-	(AC_REPLACE_FUNCS): ... replacing checks for
-	strcasecmp and strncasecmp here.
-	* lib/system.h (memchr) [!HAVE_DECL_MEMCHR]: add conditional
-	     declaration.
-	(strcase.h) [!HAVE_DECL_STRNCASE]: add conditional include.
-	(strings.h) [HAVE_STRINGS_H]: include if
-	available, even if <string.h> is also available.
-	* info/session.c (strncasecmp) [M_XENIX]: remove this conditional
-	declaration, since we haven't been testing for M_XENIX in many
-	years.
-	* m4/Makefile.am (EXTRA_DIST): add strcase.m4.
-	* util/srclist.txt (lib/strcase.h, m4/strcase.m4): add, updating
-		from gnulib.
-
-2004-03-24  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/index.c:
-	* makeinfo/float.c: avoid use of snprintf, which is not available on
-	all platforms.  Bug report by Nelson and Vin Shelton (22mar03).
-
-	* automake 1.8.3.
-
-2004-03-23  Karl Berry  <karl@gnu.org>
-
-	* doc/info-stnd.texi (Searching Commands): typo from jesper.
-
-2004-03-21  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\indexnofonts): \definedummyletter needs to
-	define the control letters to be empty, without
-	taking any argument; most control letters, such as
-	@:, don't take arguments, and it won't hurt to
-	just always ignore them for index sorting.
-	Report from Arnold.
-
-	* info/doc.h (InfoFunction): cast NULL to VFunction *, to
-	prevent pgcc from complaining.  From Nelson.
-
-2004-03-20  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Structuring Command Types): be even more explicit
-	about @unnumbered vs. @heading.
-
-	* makeinfo/html.c (insert_html_tag_with_attributes): use the same
-	parameter names (start_or_end and tag) in both stdc and !stdc
-	cases.  Report from Nelson.
-
-	* info/m-x.c (info_execute_command): don't dereference
-	InfoFunction(command) as a function call if it's NULL.  Report
-	from Nelson, pgcc-5.1-3 complains.
-
-2004-03-19  Karl Berry  <karl@gnu.org>
-
-	* info/signals.h [!SA_NOCLDSTOP]: borrow test from coreutils'
-	sort.c, to avoid using sigset_t when it's not
-	defined (apparently).
-
-	* makeinfo/html.c (escape_string): escape ", too, for @image's
-	alttext among others.
-	* makeinfo/html.h: doc fix.
-	* doc/texinfo.txi (Image Syntax): making empty alt text, do
-		escaping.
-
-	* util/dir-example: reorder.
-
-	* doc/texinfo.txi (title subtitle author): using them outside
-	@titlepage is an error, they're not actually "ignored".
-	* makeinfo/insertion.c (cm_author): one mdash suffices.
-
-2004-03-19  Jim Meyering  <jim@meyering.net>
-
-	* makeinfo/makeinfo.c (add_char): Use memmove, rather than strncpy,
-	since source and destination strings overlap.
-
-	* makeinfo/float.c (add_new_float): Avoid buffer overrun when
-	appending `.' to a chapter number.
-
-2004-03-18  Karl Berry  <karl@gnu.org>
-
-	* pretest version 4.6.92.
-
-2004-03-18  Andreas Schwab  <schwab@suse.de>
-
-	* lib/xmalloc.c: Include "system.h" instead of declaring malloc
-	and realloc ourselves.
-	(xmalloc): Change type of size parameter to size_t.
-	(xrealloc): Likewise.
-
-	* lib/system.h (xmalloc, xrealloc): Change type of size parameter
-	to size_t.
-
-2004-03-18  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/xref.c (cm_xref): ignore any directory part or extension
-	in html case, warn if nothing left.
-	* doc/texinfo.txi (HTML Xref Link Basics): ignore directory part in
-	@xref cmd.
-
-	* lib/getopt.h (__GNUC_PREREQ) [! __GNUC_PREREQ]: change
-	conditional to the actual symbol, instead of just
-	__GNUC, else --disable-nls compilation fails under
-	SunOS 5.8 with gcc 3.2.3 (at least).
-	Report from Vin Shelton, 15 Mar 2004 08:51:14 -0500.
-
-	* util/texindex.c: add some const declarations.
-	* util/install-info.c: add some const declarations.
-	(by no means all)
-
-	* doc/texinfo.txi (HTML Xref *): new nodes.
-
-2004-03-15  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/xref.c (cm_xref): need ../ in reference to foreign html
-	manual, if splitting.
-
-2004-03-14  Jim Meyering  <jim@meyering.net>
-
-	* makeinfo/index.c (insert_index_output_line_no): Ensure that `i'
-	is larger than zero before (not after) using `i-1' as an array index.
-
-	* makeinfo/cmds.c (cm_acronym): Don't write description[-1]
-	when description is the empty string.
-
-	* makeinfo/makeinfo.c (insert): Avoid buffer under-run when
-	output_paragraph_offset is zero.
-	(canon_white): Rewrite not to use strcpy (was used with
-	overlapping source and destination)
-
-2004-03-14  Andreas Schwab  <schwab@suse.de>
-
-	* info/session.c: Fix buffer overflows.
-
-2004-03-14  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xref.c (cm_xref): print the fifth arg (or fourth if it's
-	not available), in parens for the visible text of the HTML link.
-
-2004-03-14  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/tests/node-expand.txi:
-	* makeinfo/tests/node-whitespace.txi: added titles to @top.
-
-2004-03-14  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/sectioning.c (sectioning_underscore): check if title is
-	pointing to NULL before calling strlen (happens when there is no
-	@settitle before @top.)
-
-2004-03-14  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/sectioning.c (sectioning_underscore): warn if both @top and
-	@settitle are empty.
-	(sectioning_html, insert_and_underscore): use @settitle argument if
-	@top is empty.
-	(insert_and_underscore): removed with_char argument from function
-	declaration.
-
-	* makeinfo/sectioning.h: insert_and_underscore proto update.
-
-2004-03-13  Karl Berry  <karl@gnu.org>
-
-	* pretest version 4.6.91.
-
-	* info/*.[ch]: copyright dates, and final ugly casts.
-
-	* doc/texinfo.txi (Generating HTML): make its own chapter, since we
-	have lots to say about xrefs now.
-
-	* doc/texinfo.txi (Refilling Paragraphs): @ignore this, just
-	describe @refill better in the summary.
-	(Obtaining TeX): make a section of Hardcopy,
-	instead of its own appendix.
-	(Command Syntax): subnode of @@-Command List.
-	This reduction in the number of appendices will hopefully make the
-		manual less overwhelming.
-
-2004-03-13  Alper Ersoy  <dirt@gtk.org>
-
-	* info/dir.c:
-	* info/display.c:
-	* info/display.h:
-	* info/doc.h:
-	* info/dribble.c:
-	* info/dribble.h:
-	* info/echo-area.c:
-	* info/echo-area.h:
-	* info/filesys.c:
-	* info/filesys.h:
-	* info/footnotes.c:
-	* info/footnotes.h:
-	* info/gc.c:
-	* info/gc.h:
-	* info/indices.c:
-	* info/indices.h:
-	* info/info-utils.c:
-	* info/info-utils.h:
-	* info/info.c:
-	* info/info.h:
-	* info/infodoc.c:
-	* info/infokey.c:
-	* info/infomap.c:
-	* info/infomap.h:
-	* info/m-x.c:
-	* info/makedoc.c:
-	* info/man.c:
-	* info/man.h:
-	* info/nodemenu.c:
-	* info/nodes.c:
-	* info/nodes.h:
-	* info/search.c:
-	* info/search.h:
-	* info/session.c:
-	* info/session.h:
-	* info/signals.c:
-	* info/terminal.c:
-	* info/terminal.h:
-	* info/tilde.c:
-	* info/tilde.h:
-	* info/variables.c:
-	* info/variables.h:
-	* info/window.c:
-	* info/window.h:
-	* lib/system.h: protoized.
-
-2004-03-12  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/sectioning.c (sectioning_underscore): don't segfault when
-	generating xml if @top arg was empty.  Report from Pat.
-
-2004-03-11  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\pdfoutput): check also for \relax and 0, not
-	just \undefined, in case pdftex is being run in dvi mode.
-	Reported by Thomas Esser.
-
-	* lib/Makefile.am (libtxi_a_SOURCES): add getopt_int.h.
-
-2004-03-11  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/html.c (add_escaped_anchor_name): removed unnecessary
-	ampersand check.
-	(fix_filename): removed size calculation and memory reallocation for
-	filename as it is already PATH_MAX bytes.  Added a check so we don't
-	cross PATH_MAX boundary while expanding not-isalnum to hex values.
-
-	* makeinfo/toc.c (toc_add_entry): generate links following html cross
-	refs proposal from Patrice Dumas.
-
-2004-03-11  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.h: changed URL_SAFE_CHAR to isalnum.
-
-	* makeinfo/html.c (add_escaped_anchor_name, add_anchor_name)
-	(fix_filename): generate links following html cross refs proposal
-	from Patrice Dumas.
-
-	* makeinfo/xref.c (cm_xref): tweaked references to external manuals,
-	to better follow html cross refs proposal.
-
-2004-03-08  Karl Berry  <karl@gnu.org>
-
-	* pretest version 4.6.90.
-
-	* makeinfo/Makefile.am (makeinfo_SOURCES): include multi.h.
-	* makeinfo/cmds.c (cm_verb): avoid spurious warning.
-
-2004-03-06  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/lang.c (cm_special_char): call add_encoded_char for Info
-	output too.
-
-2004-03-01  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_minus): use minus entity for HTML too.
-
-2004-03-01  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (reader_loop): disable multiple dashes and
-	quotes entity substitution for HTML and XML, if escape_html is not
-	true.
-
-2004-03-01  Alper Ersoy  <dirt@gtk.org>
-
-	* util/texinfo.dtd: added math element and updated footnote.
-
-2004-03-01  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c (xml_insert_footnote): start <para> if not already
-	started.
-
-2004-03-01  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/index.c (index_add_arg): make entry node name 'Footnotes'
-	if the output format is non-split HTML, and we are handling footnotes.
-
-	* makeinfo/footnote.c (output_pending_notes): added anchor at the
-	start of footnotes block for the non-split HTML output, so @printindex
-	can refer to that point as the nodename.
-
-2004-03-01  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/defun.c (defun_internal): use var element for HTML, instead
-	of i.
-
-2004-03-01  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (cm_image): reset filling_enable to its previous
-	state after getting the cookie done.
-
-2004-03-01  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (cm_image): insert magic cookie only if there's
-	a bitmap file (if all we have is a text file, skip the cookie.)
-
-2004-02-29  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/node.c (cm_node): moved node order handling to ...
-	(remember_node): here.
-
-2004-02-29  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/multi.c (draw_horizontal_separator): insert a space before
-	the newline so it looks different than @subsection's.
-
-2004-02-29  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (insert): do not strip trailing whitespace in
-	multitables.
-
-2004-02-29  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (execute_string): removed XML tag balance
-	checks.
-
-2004-02-28  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (begin_insertion, end_insertion): for rawxml,
-	rawhtml and rawdocbook blocks, change the state of escaping depending
-	on raw_output_block in order to avoid problems when these blocks are
-	used within a @rmacro.
-
-2004-02-28  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (end_insertion): for quotation use
-	default_indentation_increment.
-
-2004-02-28  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (info_trailer): call current_document_encoding
-	here too.
-
-2004-02-28  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/lang.h: new variable unknown_encoding.
-
-	* makeinfo/lang.c (cm_documentencoding): save and use the encoding
-	argument even if it's unknown.
-
-	* makeingo/html.c (html_output_head): call current_document_encoding
-	instead of checking document_encoding_code. 
-
-2004-02-28  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.c (cm_listoffloats): simplified entry generation.
-
-2004-02-28  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/files.h: new members node_order and index_order in
-	DELAYED_WRITE struct.
-
-	* makeinfo/files.c (register_delayed_write): save current node and
-	index order.
-	(handle_delayed_writes): update tag_table positions and index line
-	numbers by comparing orders, not line numbers they are defined.
-
-	* makeinfo/index.c: made index_counter not static and ...
-	* makeinfo/index.h: extern.
-
-	* makeinfo/node.h: new member order in TAG_ENTRY struct.
-
-	* makeinfo/node.c (cm_node): keep the order of the node entry.
-
-2004-02-27  Karl Berry  <karl@gnu.org>
-
-	* util/gendocs.sh: generate ASCII in static file, not stdout, so
-	toc/index can get written.
-
-	* util/gendocs_template: XHTML version from
-	http://www.gnu.org/boilerplate.html, via John Darrington
-	<john@cellform.com.au>, 9 Jan 2004 07:24:27 +0800.
-
-2004-02-27  Jan Nieuwenhuizen  <janneke@gnu.org>
-
-	* doc/texinfo.txi (Image Syntax): Update.
-
-	* makeinfo/makeinfo.c (cm_image): Only insert a period between the
-	image's NAME and EXTENSION as a second guess, to retain backward
-	compatibility.
-
-2004-02-27  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c (xml_insert_element_with_attribute): if we are
-	closing either TABLEITEM, ITEM or DEFINITIONITEM during string
-	execution, update relevant state.
-
-2004-02-27  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (execute_string): moved state updates below
-	insertion and element stack checks, so any code executed in those
-	checks will be aware of executing_string.
-
-2004-02-27  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c (xml_insert_docbook_image): for Docbook, if paragraph
-	is open, use inlinemediaobject instead of mediaobject in an
-	informalfigure.
-	(xml_insert_element_with_attribute): indent after informalfigure.
-
-2004-02-27  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c:
-	* makeinfo/xml.h: new element INLINEIMAGE.
-
-	* makeinfo/makeinfo.c (cm_image): for XML, use INLINEIMAGE or IMAGE
-	depending on paragraph state.
-
-2004-02-27  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (cm_image): for Info, enclose text image in
-	brackets if @image is used inline (ie. paragraph is open).
-
-2004-02-27  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_noindent_cmd, cm_indent): start paragraph for
-	Info too.
-
-2004-02-27  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (cm_image): for HTML, if paragraph is not open,
-	enclose image in a <div> block.
-
-2004-02-27  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_noindent_cmd, cm_indent): insert <p> for HTML.
-
-2004-02-26  Alper Ersoy  <dirt@gtk.org>
-
-	* util/texinfo.dtd: moved verbatim to &block;.
-
-2004-02-25  Stepan Kasal  <kasal@ucw.cz>
-
-	A first step towards general cleanup of sectioning macros:
-	* doc/texinfo.tex (\genhead): A generalized version of ...
-	  (\numhead, \apphead, unnmhead): ... these, which uses ...
-	  (\chapheadtype, \unmlevel, \maxseclevel): ... these "variables".
-
-2004-02-25  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/index.c (cm_printindex): insert cookie in Info output
-	for benefit of Info readers.
-
-2004-02-26  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (end_insertion): removed obsolete Docbook
-	indentation work-around.
-
-2004-02-25  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (cm_author): new function.
-	(cm_titlepage_cmds): removed @author parts.
-
-	* makeinfo/cmds.c: made @author call cm_author.
-
-2004-02-24  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: avoid duplicate index entries within the same
-	node (from Alper): syncodeindex, lines 9627 and 9633 TEXINPUTS,
-	lines 14157 and 14202 texinfo-format-buffer 15131 and 15159
-	texinfo-format-region 15130 and 15149
-
-2004-02-24  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.h: new variable example_indentation_increment.
-
-	* makeinfo/cmds.c (set_default_indentation_increment): renamed to
-	set_example_indentation_increment.
-	(cm_exampleindent): call set_example_indentation_increment.
-
-	* makeinfo/insertion.c (begin_insertion, end_insertion): @example,
-	@display and the like now rely on example_indentation_increment.
-
-2004-02-24  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (begin_insertion, end_insertion): @float should
-	not play with indentation.
-
-2004-02-24  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.c (cm_listoffloats): check if we are crossing the
-	caption boundaries looking for a space to break at.
-
-2004-02-24  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c: TEXINFO_OUTPUT -> TEXINFO_OUTPUT_FORMAT,
-	after discussion with tar maintainer.
-
-2004-02-20  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\infochapter, \infosection, etc.): these stubs
-		of sectioning commands nuked.
-
-2004-02-24  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\centerchap): Fixed to work again,
-	  don't open group.
-	  (\centerparameters): New macro.
-	  (\centerchfplain): Nuked.
-
-	The following continues with prosecution of @setchapterstyle{open}:
-	* doc/texinfo.tex (\chfplain): renamed to \chapmacro.
-	  (\CHAPFplain): Nuked.
-	  (\setchapterstyle): Moved next to its deprecated friends.
-
-2004-02-24  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\dofloat): start a paragraph.
-
-2004-02-24  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (cm_caption): check if the innermost
-	environment is @float.
-
-2004-02-24  Alper Ersoy  <dirt@gtk.org>
-
-	* info/session.c (info_menu_digit): if the menu entry has a line
-	number, go to that line.
-
-2004-02-24  Alper Ersoy  <dirt@gtk.org>
-
-	* info/info.c (main): make sure dir file is not listed for option
-	--where.
-
-2004-02-24  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c (xml_insert_element_with_attribute, xml_add_char)
-	(xml_begin_table, xml_end_table, xml_begin_table_item)
-	(xml_continue_table_item): separated ITEM and TABLEITEM states to
-	handle @table environments better.
-
-2004-02-24  Alper Ersoy  <dirt@gtk.org>
-
-	* util/texinfo.dtd: added float and friends, updated tableitem and
-	Inline.reference.
-
-2004-02-23  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Structuring Command Types): slightly more info
-	about headings.  Fix other references, too.
-
-	* Makefile.am (EXTRA_DIST): explicitly list every file in djgpp,
-	so that the CVS directory is not included in the dist.tar.gz.
-
-2004-02-23  Arnold D. Robbins  <arnold@skeeve.com>
-
-	* makeinfo/cmds.c (cm_code): For @samp, using single quotes instead of
-	double quotes, to match TeX output more closely.
-
-2004-02-23  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/index.h: new output_file and entry_number members in
-	index_elt struct.
-
-	* makeinfo/index.c (index_add_arg, cm_printindex): rewrote hyperlink
-	generation for HTML to avoid duplicate anchors, and to work with
-	splitting enabled.
-
-2004-02-20  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.c (cm_listoffloats): create HTML hyperlinks with
-	add_word instead of using @ref to avoid problems with commas in
-	captions.
-
-2004-02-20  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/node.c (cm_node): remove whitespace before the node
-	separator sequence.
-
-2004-02-20  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/sectioning.c (handle_enum_increment): do not increment
-	counters for ENUM_SECT_NO heading commands (ie. @unnumbered,
-	@majorheading, etc.)
-
-2004-02-20  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/multi.c (multitable_item): unset hsep if item command is
-	not @headitem.
-
-2004-02-19  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex: More hyphenation exceptions.
-	(\author, \quotation): implement @author inside
-	@quotation, for attribution purposes.
-
-2004-02-19  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_exampleindent): fixed paragraph handling after
-	@exampleindent lines.
-
-2004-02-19  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/index.c (index_add_arg): create an anchor where @index is
-	used in HTML documents.
-	(cm_printindex): make index text an hyperlink to the created anchor.
-
-2004-02-19  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (begin_insertion): skip empty lines following
-	@table, @ftable, @vtable and @itemize lines.
-
-2004-02-18  Karl Berry  <karl@gnu.org>
-
-	* lib/substring.c,
-	* lib/xexit.c,
-	* lib/xmalloc.c,
-	* lib/system.h: ANSI-fy.  (Other lib files come from gnulib.)
-
-	* doc/texinfo.txi (Definition Commands): describe the argument/@var
-	situation more accurately.
-
-	* doc/texinfo.txi (Definition Commands): explicitly document the
-	implicit index entry creation in all cases.
-
-	* doc/texinfo.txi (Printing Indices & Menus, Indices, Predefined
-	Indices): remove redundancies, make different
-	purposes clear, etc.
-
-2004-02-18  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.h:
-	* makeinfo/xml.c (xml_get_assoc_for_id, xml_associate_title_with_id):
-	removed these functions.
-	
-	* makeinfo/xref.c (cm_xref): do not call xml_get_assoc_for_id.
-
-	* makeinfo/sectioning.c (sectioning_underscore): added xreflabel
-	attribute to @unnumbered for Docbook.
-
-2004-02-18  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xref.c (cm_xref): for Docbook, use lowercase ``see'' when
-	printing index.
-
-2004-02-18  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c (xml_insert_indexentry): removed ``see'' from index
-	entries as cm_xref takes care of it.
-
-2004-02-17  Karl Berry  <karl@gnu.org>
-
-	* doc/info.texi (Help-Int): mention the new line number feature.
-	* doc/texinfo.txi (Indices): plural correction.
-	* doc/info-stnd.texi (Invoking Info): matche typo.
-	(Searching Commands): grammar.
-	* info/session.c (info_menu_or_ref_item): need to subtract 1 from
-	the actual line number to get to the right place,
-	don't really know why.
-
-	* makeinfo/makeinfo.c, info/info.c, util/texindex.c,
-	utils/install-info.c, util/texi2dvi: update copyright year to
-	2004, and do not mark copyright line for translation, since
-	international law says to always use the English word "copyright".
-
-2004-02-17  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (end_insertion): use add_html_block_elt instead
-	of add_word for </pre> ending @example and the like.
-	* makeinfo/float.c (cm_listoffloats): use add_html_block_elt for <li>.
-
-2004-02-17  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (begin_insertion): do not expand @copying for
-	HTML and Info too.
-	(cm_insert_copying): expand copying_text for all formats here.
-
-	* makeinfo/html.c (html_output_head): use text_expansion for copying
-	text.
-
-2004-02-17  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (float): mention @multitable and @image
-	as typical contents.  From Arnold.
-
-2004-02-17  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c (xml_insert_element_with_attribute): removed check
-	to see if current element contains para before calling xml_start_para,
-	as that check is performed in xml_start_para too.
-
-2004-02-17  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (end_insertion): indent float caption.
-
-2004-02-17  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (begin_insertion): for XML and Docbook, do not
-	expand @copying text.  Instead of calling @anchor, use <float
-	name="floatlabel"> for XML.
-	(cm_copying): removed ugly copying_text manipulation for Docbook.
-	Warn if there is no @copying before @insertcopying.
-
-	* makeinfo/xml.c: made floats contain para.
-	(xml_start_para): check if current element can contain para.
-	(xml_add_char): removed @copying checks.
-
-2004-02-17  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (end_insertion): if the output format is XML,
-	do not call close_insertion_paragraph after @end menu.
-
-2004-02-17  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c (xml_insert_element_with_attribute): indentation
-	fixes for @multitable.
-
-2004-02-17  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/multi.c (do_multitable): remove trailing newline when the
-	output format is Docbook or XML, as output_paragraph becomes unusable
-	later for xml_indent during select_output_environment.
-
-2004-02-16  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_bye): do not call flush_output as text appended
-	by convert_from_loaded_file may need to play with output_paragraph.
-
-2004-02-16  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c (xml_end_document): insert newline after </texinfo>
-	only if indentation is disabled (otherwise xml_indent takes care of
-	the newline.)
-	(xml_insert_indexentry): disable warnings when executing implicit
-	@xref commands  for Docbook, otherwise makeinfo will warn about
-	missing punctuation.
-
-2004-02-16  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (begin_insertion): eat one newline after
-	@xml/@docbook blocks for proper indentation.
-
-2004-02-16  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_center): fixed line wrapping after the @center
-	command.
-
-2004-02-15  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c (xml_begin_document): disabled warnings around the
-	implicit register_delayed_write("@documentencoding") call.
-
-2004-02-15  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (begin_insertion, end_insertion): when handling
-	@xml, @html and @docbook blocks, do not touch para elements, and keep
-	whitespace as-is.
-
-2004-02-15  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.h: made xml_keep_space extern.
-
-2004-02-15  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_noindent_cmd, cm_indent): implicitly start
-	para element for Docbook and XML.
-
-2004-02-15  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\hyphenation): add more hyphenation exceptions,
-	gleaned from the log in TUGboat.
-	* doc/info-stnd.texi: document new option --where.
-	* info/info.c (main): in print_where_p case, ensure we don't try
-	to print NULL.
-
-2004-02-14  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\addtokens): had two identical definitions,
-	remove one.
-	(\maketoks): no space token after |ENDTOKS|,
-	although I guess it hasn't mattered.
-	(\entry): make clear what is the argument to
-	\pdfgettoks and what is output.
-	(\appendtomacro): use our own token registers,
-	for safety.
-	(\listoffloatsdoentry): fully expand the page
-	number, and don't expand the lof text.
-
-2004-02-14  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_strong):
-	* makeinfo/xml.c (xml_begin_index): cast output_paragraph to char, to
-	avoid warnings with -pedantic.
-
-2004-02-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c:
-	* makeinfo/cmds.h:
-	* makeinfo/defun.c:
-	* makeinfo/defun.h:
-	* makeinfo/files.c:
-	* makeinfo/files.h:
-	* makeinfo/float.c:
-	* makeinfo/float.h:
-	* makeinfo/footnote.c:
-	* makeinfo/footnote.h:
-	* makeinfo/html.c:
-	* makeinfo/html.h:
-	* makeinfo/index.c:
-	* makeinfo/index.h:
-	* makeinfo/insertion.c:
-	* makeinfo/insertion.h:
-	* makeinfo/lang.c:
-	* makeinfo/lang.h:
-	* makeinfo/macro.c:
-	* makeinfo/macro.h:
-	* makeinfo/makeinfo.c:
-	* makeinfo/makeinfo.h:
-	* makeinfo/multi.c:
-	* makeinfo/node.c:
-	* makeinfo/node.h:
-	* makeinfo/sectioning.c:
-	* makeinfo/sectioning.h:
-	* makeinfo/toc.c:
-	* makeinfo/toc.h:
-	* makeinfo/xml.c:
-	* makeinfo/xml.h:
-	* makeinfo/xref.c:
-	* makeinfo/xref.h: protoized functions.
-
-2004-02-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/multi.h: new file.
-
-2004-02-13  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\caption): make \long.
-	* doc/texinfo.txi (Nodes): mention that changing node names is bad.
-	(caption shortcaption, listoffloats): write these, finishing the
-	first cut at @float documentation.
-
-2004-02-12  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_verb): end @verb only if delimiter is followed
-	by a closing brace.
-
-2004-02-12  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/lang.c (cm_accent_generic): warn if accented character is
-	whitespace.
-
-2004-02-12  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertionc. (end_insertion): decrement current_indent
-	only if the output format is Info.
-
-2004-02-12  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (end_insertion): adjusted caption styles for
-	label and type conditions.
-	(begin_insertion, end_insertion): indent first paragraphs inside
-	@float, even if first paragraph in a chapter.  Increment/decrement
-	current_indent.
-
-2004-02-12  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/tests/defxcond: look for `--' instead of `-'.
-
-2004-02-12  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/float.c (cm_listoffloats): change warning wording.
-
-2004-02-11  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\dofloat): initialize caption macros here, not
-		globally.
-	(\Efloat): rewrite for more consistent caption
-	line, matching documentation.
-	(\appendtomacro): new macro.
-	(\currentparindent): this \newdimen was not used; removed.
-	* doc/texinfo.txi (float): continue documenting.
-
-	* makeinfo/files.c (register_delayed_write): change wording of msgs.
-
-2004-02-10  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/defun.c: --- (which gets reduced to --)
-	instead of -- (which gets reduced to -).
-	Report from Akim Demaille <akim@epita.fr>, 09 Feb 2004 18:06:29 +0100.
-
-2004-02-09  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\pickupwholefraction): allow the fraction to be
-	an integer without a decimal point, like `1'.  Report from: Dumas
-	Patrice <dumas@centre-cired.fr>, 9 Feb 2004 16:46:30 +0100.
-	* makeinfo/multi.c (setup_multitable_parameters): compute width
-	and pass it, for clarity.
-
-2004-02-07  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (cm_insert_copying): insert double newlines
-	instead of one in non XML outputs.
-
-2004-02-07  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_code): do not decrement in_fixed_width_font as
-	it gets decremented elsewhere.
-
-2004-02-07  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (next_nonwhitespace_character): also check
-	global input_text since filestack does not contain it.
-
-2004-02-07  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (next_nonwhitespace_character): go through the
-	whole filestack looking for the next character.
-
-2004-02-06  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\indexnofonts): define \bullet .. \result, so
-	they can be used in @?index commands.
-	Report from: Akim Demaille <akim@epita.fr>, 06 Feb 2004 13:34:15 +0100.
-
-2004-02-05  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/xref.c (add_xref_punctuation): if we insert anything,
-	make it a period.
-	(cm_xref): include command name in error message.
-	* doc/texinfo.txi (ref): mention generating a period, if needed.
-	Too many complaints when we made a warning for @ref not followed
-	by period or comma.
-
-2004-02-05  Alper Ersoy  <dirt@gtk.org>
-
-	* info/info-utils.c (info_parse_node): look for ``(line '' instead of
-	skipping any non-digit characters. 
-
-2004-02-05  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/index.c (insert_index_output_line_no): made ``(line NNN)'' not
-	translatable for Info output.
-
-2004-02-03  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (flush_output): increment node_line_number too.
-
-	* makeinfo/makeinfo.h: new variable node_line_number to hold the last
-	output line number the current node.
-
-	* makeinfo/nodes.c (cm_node): reset node_line_number just before the
-	node start cookie.
-
-	* makeinfo/files.h: new node member in DELAYED_WRITE struct.
-	* makeinfo/files.c (register_delayed_write): save current node name if
-	there's one.
-	(handle_delayed_writes): adjust line numbers in indices only if the
-	output is plaintext, or the index entry appears in the changed node.
-
-	* makeinfo/index.c (index_add_arg, cm_printindex): use
-	node_line_number instead of output_line_number if the output is an
-	Info file.
-
-2004-02-03  Alper Ersoy  <dirt@gtk.org>
-
-	* info/info-utils.h: new line_number member in REFERENCE struct.
-
-	* info/info-utils.c (info_parse_node): parse (line ...) strings
-	from menu items.
-	(info_references_internal): save parsed line number in the entry.
-
-	* info/session.c (info_menu_of_ref_item): if selected entry has a line
-	number associated with it, jump to that line after updating window.
-
-2004-02-02  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c (add_xref_punctuation): new function that inserts
-	necessary punctuation after @ref and @pxref commands.
-	(cm_xref): call add_xref_punctuation when multiple parameters are
-	given, make use of next_nonwhitespace_character function in the END
-	case.
-	(cm_ref): do not call cm_xref in the END case.
-
-2004-02-02  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (next_nonwhitespace_character): new function.
-
-2004-02-02  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_code): call xml_start_para instead of tweaking
-	in_fixed_width_font, and use entities rather than quotes.
-
-2004-02-02  Arnold D. Robbins  <arnold@skeeve.com>
-
-	* makeinfo/cmds.c (cm_TeX, cm_LaTeX): Add docbook support.
-	(cm_code): Add opening and closing single quotes for @samp in the
-	Docbook output.
-	* makeinfo/xml.c (xml_begin_document): Add `tex' and `latex' entities.
-	* makeinfo/xref.c (cm_xref): Add `See' and `see' strings for docbook
-	and xml.
-
-2004-01-31  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (main): fixed ``--option: makeinfo'' messages.
-
-2004-01-31  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_TeX, cm_LaTeX): really ignore the arguments as
-	the warning suggests.
-
-2004-01-31  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_TeX, cm_LaTeX): warn if there are any arguments.
-
-2004-01-31  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/files.c (pop_path_from_include_path): do not mock with
-	include_files_path address directly, as it confuses realloc.
-
-2004-01-31  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (main, usage): new --output-indent option.
-
-2004-01-31  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c (xml_add_char): break long lines in paragraphs
-	when the output format is Docbook.
-
-2004-01-31  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/files.c (prepend_to_include_path, append_to_include_path)
-	(pop_path_from_include_path): new functions to manipulate
-	include_files_path.
-
-	* makeinfo/makeinfo.c (convert_from_file): prepend the loaded file's
-	path to include_files_path in order to make relative include files to
-	be found, then remove afterwards.
-	(main): make use of new functions for -I and -P options. 
-
-2004-01-30  Alper Ersoy  <dirt@gtk.org>
-
-	* util/texinfo.dtd: added exdent element.
-
-2004-01-29  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (convert_from_loaded_file): call
-	xml_begin_document after opening the output stream for writing.
-
-	* makeinfo/files.c (register_delayed_write): use delayed_command
-	instead of command in messages as it may differ from the actual
-	command name.  Check the usability of current_output_filename.
-
-2004-01-28  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (HTML Splitting): describe when two nodes are
-		written to one output file.
-
-	* doc/texinfo.tex (\TeX): \edef using original \TeX definition.
-
-2004-01-28  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/defun.c (process_defun_args, defun_internal):
-	* makeinfo/insertion.c (begin_insertion, end_insertion): execute XML
-	only blocks for Docbook also.
-
-	* makeinfo/xml.c: added Docbook elements for definition commands.
-	(xml_begin_def_term): for Docbook, generate an Info-like @defun line.
-	(xml_insert_element_with_attribute): do not indent DEFINITION and
-	DEFINITIONTERM when the output is Docbook.
-
-2004-01-25  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c: changed majorheading and the like with bridgehead
-	for Docbook.
-
-	* makeinfo/sectioning.c (sectioning_underscore): do not start sections
-	with @majorheading and the like, only insert title.
-
-2004-01-25  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c:
-	* makeinfo/xml.h: new element EXDENT.
-
-	* makeinfo/cmds.c (cm_comment): save the paragraph state.
-	(cm_exdent): use EXDENT element for XML, LINEANNOTATION for Docbook.
-
-	* makeinfo/html.c (html_output_head):
-	* makeinfo/xml.c (xml_begin_document): erase output_paragraph.
-
-	* makeinfo/insertion.c (begin_insertion): canonize whitespace around
-	copying text.
-	(cm_insert_copying): comment fixes.  Do not append newline if the
-	output is Docbook.
-
-	* makeinfo/makeinfo.c (close_paragraph): return if Docbook too.
-
-	* makeinfo/sectioning.c (sectioning_underscore): removed newline from
-	the end of titles.
-
-	* makeinfo/lang.c (cm_documentencoding): insert encoding attribute 
-	into XML and Docbook prologs when handling delayed writes.
-
-	* makeinfo/xml.c (xml_begin_document): register a delayed write for
-	@documentencoding when writing the prolog.
-	(xml_end_para): removed docbook checks.
-	(xml_insert_element_with_attribute): skip indentation if
-	xml_keep_space is true, indent after table element.  When the output
-	is Docbook, do not insert xml:space attribute, and do not remove from
-	the end of group element and keep_space blocks.
-	(xml_add_char): join lines in a paragraph for Docbook too.
-
-2004-01-24  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/multi.c (out_char): simple use add_char for XML and Docbook
-	outputs too.
-
-	* makeinfo/makeinfo.c (close_paragraph): just return when the output
-	format is XML.
-
-	* makeinfo/makeinfo.h: new variable xml_indendation_increment.
-
-	* makeinfo/cmds.c (cm_comment): insert a newline before the comment,
-	if there is not already one.
-	(cm_noindent_cmd): skip whitespace after the command.
-
-	* makeinfo/xml.c:
-	* makeinfo/xml.h: new element DETAILMENU.
-
-	* makeinfo/xml.c: menuentry and menucomment should not contain para.
-	(xml_indent, xml_indent_end_para): use xml_indentation_increment
-	value, and indent only if it is a positive number.
-	(xml_start_para): apply indentation for XML output too.
-	(xml_end_para): add newline if xml_indentation_increment is positive.
-	(xml_insert_element_with_attribute): major indentation fixes.
-	(xml_start_menu_entry): skip whitespace at the start of menu comments.
-	(xml_add_char): fixed paragraph detection in menus, and added a check
-	to detect multiple whitespaces after newline in menu comments.  Do not
-	return when inside multitable to avoid concatenation of two lines
-	without a space char in between.
-
-	* makeinfo/insertion.c (cm_insert_copying, cm_lisp, cm_smalllisp)
-	(cm_format, cm_smallformat, cm_display, cm_smalldisplay, cm_example)
-	(cm_smallexample): do not insert newline when the output is XML.
-	(end_insertion): ditto for the above mentioned block commands and
-	@group.  Do not increment in_fixed_font for XML output.
-	(begin_insertion, end_insertion): enclose @detailmenu in a detailmenu
-	element.
-
-	* util/texinfo.dtd: added detailmenu, and fixed menucomment and
-	tableitem definitions.
-
-2004-01-23  Alper Ersoy  <dirt@gtk.org>
-
-	* util/Makefile.am: substituted catalog in EXTRA_DIST with catalog.in,
-	and added catalog to CLEANFILES.
-
-2004-01-23  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/files.h: new input_filename member in delayed_write struct.
-
-	* makeinfo/files.c (register_delayed_write): added input_filename to
-	saved variables, and adjusted line_number saving.
-	(handle_delayed_writes): set input_filename and line_number for
-	correct warning and error messages.
-
-2004-01-23  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.c (cm_listoffloats):
-	* makeinfo/index.c (cm_printindex): decrement line_number only if
-	not handling delayed writes.
-
-	* makeinfo/float.c (float_type_exists): check if float has a label.
-
-2004-01-23  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (main): updated copyright year in --version text.
-
-2004-01-23  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/tests/Makefile.am: commented top2.texi to fix distcheck.
-
-2004-01-23  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c (xml_begin_document): use PUBLIC id for TexinfoML
-	instead of SYSTEM.
-
-2004-01-23  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/Makefile.am: removed texinfo.dtd and texinfo.xsl and ...
-
-	* util/Makefile.am: added here.
-
-2004-01-23  Alper Ersoy  <dirt@gtk.org>
-
-	* utils/catalog.in: catalog file for texinfo.dtd.
-
-2004-01-23  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/texinfo.dtd:
-	* makeinfo/texinfo.xsl: moved to ...
-
-	* utils/texinfo.dtd:
-	* utils/texinfo.xsl: here.
-
-2004-01-23  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/texinfo.dtd: added ordm and ordf entities and dmn element.
-	updated indexterm location in tables.
-
-2004-01-22  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\dofloat): handle empty float type and empty
-	float label separately, matching makeinfo behavior.
-	* doc/texinfo.txi (Floats): new section, not yet fully written.
-	(Special Displays): new chapter to hold it.
-	(Footnotes, Images): move these sections to the new chapter.
-	(@@-Command Summary): list new commands.
-	* NEWS: mention new commands here too.
-
-2004-01-21  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c (xml_begin_index): move data to a temporary location
-	for delayed use and insert back when handling delayed writes.
-
-	* makeinfo/index.c (cm_printindex): call xml_begin_index when not
-	handling delayed writes too.
-
-2004-01-19  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex: doc fix.
-
-2004-01-18  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\commondummies): dummify @tie and remaining
-	@<char> commands.
-	(\tocindent): reduce to 15pt to match \defaultparindent.
-	(\setref): use XR as control sequence prefix
-	instead of just X; seems nicer.  Change calls.
-	
-	Finish implementing @listoffloats:
-	(\xrdef): keep lists of each float type.
-	(\dofloat): save the floattype in the aux file.
-	(\Efloat): write the lof text to the aux file.
-	(\iffloat, \doiffloat, \listoffloats,
-	\listoffloatsdo, \listoffloatsentry): new macros.
-	* bootstrap: autoheader should come after aclocal, I think.
-
-2004-01-17  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\doitemize): rename from \itemizey.
-	(\itemizeitem): do not set \parskip=0 if the last
-	thing was a \nobreak (e.g., from \sectionheading).
-	Report from: Jesper Harder <harder@ifa.au.dk>, 
-	17 Jan 2004 22:03:51 +0100.
-
-	* doc/texinfo.txi (email): no angle brackets in TeX output.
-	Report from: Jesper Harder <harder@ifa.au.dk>,
-	17 Jan 2004 21:03:21 +0100.
-
-2004-01-17  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.c (cm_listoffloats): Prefixed captions with
-	float_type.  For HTML, used an <ul> block.  
-
-2004-01-17  Alper Ersoy  <dirt@gtk.org>
-
-	* info/info.c (main, info_short_help): new option -w, --where,
-	--location that prints the physical location of Info file.
-
-2004-01-17  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/defun.c (defun_internal):
-	* makeinfo/insertion.c (end_insertion): enclose paragraphs in @def
-	blocks in a blockquote element for indentation in the HTML output.
-
-2004-01-17  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/html.c (insert_html_tag_with_attribute): new function.
-	(insert_html_tag): only call insert_html_tag_with_attribute with
-	NULL attribute string and return.
-	(push_tag, pop_tag): keep the element attributes in stack too.
-	(html_output_head): fixed span.roman in the default CSS.
-
-	* makeinfo/html.h: new attribs member in hstack struct.
-
-	* makeinfo/cmds.c (cm_dmn, cm_code, cm_sc, cm_r): use
-	insert_html_tag_with_attribute for setting element class.
-
-2004-01-15  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\readauxfile): \ must have catcode other to
-	handle \ in node/section names.
-
-2004-01-16  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/toc.c (cm_contents): fixed Docbook element stack underflow.
-
-	* makeinfo/xml.c (xml_insert_indexterm): set xml_dont_touch_items_defs
-	for only XML output.
-
-2004-01-14  Simon Josefsson <jas@extundo.com>
-
-	* util/gendocs.sh: new option --html.
-
-2004-01-14  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/html.c (rollback_empty_tag): rewrote to also identify empty
-	elements with attributes.
-	(insert_html_tag): increment and decrement in_html_elt.
-
-	* makeinfo/index.c (index_add_arg): do not call flush_output for xml
-	and html outputs as they do not need an accurate output line number
-	tracking, and flush_output makes rollback_empty tag useless.
-
-2004-01-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_code): increment and decrement in_html_elt when
-	inserting the class attribute to avoid space char being replaced with
-	entities.
-	(cm_r, cm_dmn): use insert_string instead of add_word for the class
-	attribute.
-
-2004-01-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_r): changed add_word_args with insert_html_tag,
-	and changed inline style with a class attribute.
-
-	* makeinfo/html.c (insert_html_tag): when the current element is the
-	same with the last in the stack, do not return if it's span.
-	(html_output_head): new CSS class roman (for @r.)
-
-2004-01-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/node.c (cm_node): reset output_position when closing the
-	current HTML output file.
-
-	* makeinfo/files.c (handle_delayed_writes): fixed position updating of
-	the next writes.
-
-2004-01-13  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/files.c (register_delayed_write): reword warning, and
-	only warn if writing to stdout, not /dev/null.
-
-2004-01-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/node.c (glean_node_from_menu): removed unnecessary
-	line_number incrementation.
-
-2004-01-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.c (cm_listoffloats): 
-	* makeinfo/index.c (cm_printindex): decrement line_number just after
-	get_rest_of_line to make messages refer to the correct line,
-	re-increment it just before returning.
-
-2004-01-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/node.c (cm_node): fixed prev, next, up nodes defaulting
-	code to not make use of @menus after @bye.
-
-2004-01-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/index.c (cm_printindex): handle @printindex immediately
-	if the output format is Docbook, rather than waiting for delayed
-	writes.
-
-2004-01-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.c (cm_listoffloats): insert xml elements also for
-	docbook.
-
-2004-01-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.c (float_type_exists): new function that checks if a
-	specific type of @float is previously used.
-	(cm_listoffloats): warn if requested float_type is unknown.
-
-2004-01-12  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/files.c (register_delayed_write): warn if delayed write is
-	requested when the output file is not seekable.
-
-2004-01-10  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Using Include Files): mention the possibility
-	of no nodes in an include file.  From Bob.
-
-2004-01-10  Simon Josefsson  <jas@extundo.com>
-
-	* makeinfo/node.c (cm_node): Only print ",\n" at correct places.
-
-2004-01-10  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/html.c (html_output_head): use insert_string instead of
-	add_word for css inclusion to avoid reformatting.
-
-2004-01-09  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c:
-	* makeinfo/xml.h: new variable xml_dont_touch_items_defs.
-
-	* makeinfo/cmds.c (cm_comment, cm_sp):
-	* makeinfo/xml.c (xml_insert_indexterm): set and unset
-	xml_dont_touch_items_defs.
-
-	* makeinfo/xml.c (xml_insert_element_with_attribute)
-	(xml_add_char): do not do anything about @deffnx and @itemx commands
-	if xml_dont_touch_items_defs is non-zero.
-
-2004-01-09  Alper Ersoy  <dirt@gtk.org>
-
-	* info/Makefile.am: define INFODIR2 that points to $datadir/info.
-
-	* info/info.c (main): prepend INFODIR2 to infopath, if defined and if
-	not the same with INFODIR.
-
-2004-01-08  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/index.c (cm_printindex): adapted to delayed writing,
-	decreased the space between the columns of plaintext output.
-
-	* makeinfo/float.c (cm_listoffloats): disabled menu header checks,
-	synced column_width with @printindex.
-
-2004-01-08  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/index.c: moved INDEX_ELT and INDEX_ALIST typedefs to ...
-
-	* makeinfo/index.h: here
-
-	* makeinfo/files.h:
-	* makeinfo/files.c (register_delayed_write): save line number in input
-	document that the calling command is in.
-	(handle_delayed_writes): adjust byte offsets in tag table and output
-	line numbers in all of the indices, 
-
-	* makeinfo/makeinfo.c (convert_from_loaded_file): when finished, write
-	the tag table after handling delayed writes.
-
-	* makeinfo/node.c (write_tag_table): accept a filename argument, and
-	open the file in append mode.
-
-2004-01-08  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.c (add_new_float):
-	* makeinfo/float.h: save the line number @float command used.
-
-2004-01-08  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/toc.c (cm_contents): moved the call to html_output_head
-	to ...
-
-	* makeinfo/files.c (register_delayed_write): here.
-
-2004-01-08  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.c (cm_listoffloats): adapted for delayed writing,
-	and slightly fixed formatting with no_headers.
-
-2004-01-08  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c: use cm_contents for @shortcontents
-	and @summarycontents too.
-
-	* makeinfo/files.c (register_delayed_write)
-	(handle_delayed_writes): new functions.
-
-	* makeinfo/files.h: new delayed_write struct and
-	handling_delayed_writes variable.
-
-	* makeinfo/makeinfo.c (insert): use whitespace macro instead of
-	testing characters manually.
-	(convert_from_loaded_file): call handle_delayed_writes when finished.
-	
-	* makeinfo/toc.c (contents_update_html, contents_update_info)
-	(shortcontents_update_html, shortcontents_update_info): changed file
-	read/writes with insert and insert_string.
-	(rewrite_top, contents_update, shortcontents_update)
-	(toc_update, cm_shortcontents): removed functions.
-	(cm_contents): for HTML and Info, only call register_delayed_write if
-	handling_delayed_writes is not true.  Call contents_update_html and
-	other variants according to output format and command name.
-
-	* makeinfo/toc.h: removed obsolete variables and functions.
-
-2004-01-08  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/index.c (index_add_arg): keep line number of the index
-	entry where it appears in the output.
-	(insert_index_output_line_no): new function.
-	(cm_printindex): call insert_index_output_line_no for info and
-	plaintext outputs.
-
-2004-01-08  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.h: new variable output_line_number.
-
-	* makeinfo/makeinfo.c (flush_output): keep number of lines in the
-	flushed data, in output_line_number variable.
-
-2004-01-07  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.c (cm_listoffloats): when there is no caption, do not
-	insert space between the float number and the colon.
-
-2004-01-07  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.c (cm_listoffloats): use shorttitle only if it's
-	defined.
-
-2004-01-07  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c: new command @shortcaption.
-
-	* makeinfo/xml.c:
-	* makeinfo/xml.h: new element SHORTCAPTION.
-
-	* makeinfo/insertion.c (cm_caption): insert CAPTION or SHORTCAPTION
-	according to command.
-	(begin_insertion): read @shortcaption too.  Fixed XML floatpos
-	contents.
-
-	* makeinfo/float.h: added shorttitle and position to the float_elt
-	struct.
-
-	* makeinfo/float.c (add_new_float): accept a shorttitle argument.
-	(current_float_shorttitle, current_float_position): new functions.
-	(cm_listoffloats): if title is too long to fit into a line, try
-	shorttitle.
-
-2004-01-07  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.h: new variable node_has_listoffloats.
-
-	* makeinfo/float.c (cm_listoffloats): insert menu header string only
-	if node_has_listoffloats is not true.
-
-	* makeinfo/node.c (cm_node): reset node_has_listoffloats.
-
-2004-01-06  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (begin_insertion): fixed a thinko in @float
-	arguments parsing code, regarding string termination; changed manual
-	input text skipping with skip_whitespace_and_newlines for proper
-	line_number handling; and changed magic number 10 with sizeof for
-	improved readability.
-
-	* makeinfo/float.c (cm_listoffloats): end paragraph before the menu
-	header.  Use add_html_block_elt to insert <div> element.
-
-2004-01-06  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/crossrefs.c:
-	* makeinfo/crossrefs.h: moved to ...
-
-	* makeinfo/xref.c:
-	* makeinfo/xref.h: new files.
-
-	* makeinfo/Makefile.am:
-	* makeinfo/cmds.c:
-	* makeinfo/footnote.c:
-	* makeinfo/html.c:
-	* makeinfo/makeinfo.c:
-	* makeinfo/node.c:
-	* makeinfo/node.h:
-	* makeinfo/sectioning.c:
-	* makeinfo/toc.c: adjusted for new names.
-
-2004-01-06  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c:
-	* makeinfo/makeinfo.h: moved cross referencing commands to ...
-
-	* makeinfo/crossrefs.c:
-	* makeinfo/crossrefs.h: new files.
-
-	* makeinfo/cmds.c:
-	* makeinfo/footnote.c:
-	* makeinfo/html.c:
-	* makeinfo/makeinfo.c:
-	* makeinfo/node.c:
-	* makeinfo/sectioning.c:
-	* makeinfo/toc.c: added crossrefs.h to includes.
-
-	* makeinfo/Makefile.am: added new files crossrefs.c and crossrefs.h
-
-2004-01-06  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/node.c (cm_node): removed ``Node: <nodename>'' from the
-	node headers.
-
-2004-01-06  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (begin_insertion): keep line_number the same
-	before and after get_until, so messages issued inside full_expansion
-	have correct line numbers.
-
-2004-01-06  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (handle_menu_entry):
-	* makeinfo/node.c (glean_node_from_menu): adjust line_number.
-
-2004-01-05  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\rawbackslashxx): rename to \backslashcurfont,
-	to keep reducing the number of `xx's here.
-
-	* doc/texinfo.tex (\setref): call \atdummies, not \indexnofonts; we
-	need to keep the user's commands.
-	(\dofloat): call \indexnofonts and \turnoffactive
-	to support commands and special characters in the
-	float type name.
-
-	* doc/texinfo.txi (firstparindent): shorten name so it doesn't
-	break in the toc.
-
-2004-01-05  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/html.c (html_output_head): new CSS entry span.sc for
-	small-caps font variant.
-
-	* makeinfo/cmds.c (cm_sc): use span with class attribute sc, instead
-	of small.
-
-2004-01-04  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\commondummies, \indexnofonts): Merge the
-	  common part of these two to ...
-	  (\commondummiesnofonts): ... a new macro.
-	  (\indexdummylatex, \indexdummytex, \indexdummydots): Nuke,
-	  the time saved is not worth the hassle.
-
-2004-01-04  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\makedispenv): Determine the size of the fonts
-	  according to the value of SETdispenvsize, using ...
-	  (\setnormaldispenv, \setsmalldispenv, \SETdispenvsize, \smallword):
-	  (\nosmallword): ... these new macros.
-	  (\flushleft): No longer defined via \makedispenv.
-
-2004-01-03  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\TeX): new macro, copying plain but make a
-	period following end a sentence.  Idea from LaTeX.
-
-2004-01-02  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/node.c (clean_old_split_files): new function.
-	(split_file): moved filename generation code to a ...
-	(enumerate_filename): new function.
-
-	* makeinfo/makeinfo.c (convert_from_loaded_file): call
-	clean_old_split_files before calling split_file.
-
-2004-01-02  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (create_html_directory): new function.
-	(insert_toplevel_subdirectory): moved common if blocks to
-	create_html_directory.  Adjusted checks to reuse existing
-	directories, and remove existing <output>.html files, when
-	falling back to suffices.
-
-2004-01-02  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_code): for HTML, use span for @command, @env,
-	@file, @option and @samp, and insert command name as class attribute.
-
-2003-12-31  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (add_char, handle_menu_entry): end <ul> block
-	before inserting <p>, and restart afterwards.
-
-2003-12-31  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (handle_menu_entry): for HTML, append colon only
-	if there is a description following the menu item.
-
-2003-12-31  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (usage): removed short forms of output options.
-
-2003-12-30  Alper Ersoy  <dirt@gtk.org>
-
-	* cmds.c (cm_comment): do not output comments before HTML header is
-	written.
-
-2003-12-30  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (main): new option --plaintext.
-	(usage): added short forms of --html, --xml, --docbook and --plaintext
-	to the help text.
-
-2003-12-30  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/multi.c (multitable_item): removed thead and tbody from
-	HTML tables.  Added hsep after @headitem for Info.
-	(multitable_item, multitable_tab): for HTML, use th instead of td for
-	@headitem rows.
-
-	* makeinfo/xml.c (xml_begin_multitable): moved Docbook TGROUP code to
-	a ...
-	(xml_begin_multitable_group): new function.
-	(xml_end_multitable_row): restart TGROUP on @headitem.
-	(xml_end_multitable): warn if @headitem is the last item in
-	multitable, and output format is Docbook.  Joined common code between
-	XML and Docbook.
-
-2003-12-30  Arnold D. Robbins  <arnold@skeeve.com>
-
-	* makeinfo/cmds.c (cm_strong): Use <emphasis role="bold"> for docbook.
-
-2003-12-30  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.c (cm_listoffloats): substituted fixed numbers with
-	the sizeof operator where possible, and commented code where not, to
-	improve code readability.
-
-2003-12-30  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (cm_image): do not escape backslash and double
-	quote characters in plaintext output.
-
-2003-12-30  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (cm_image): do not write magic cookie when
-	output format is plaintext.
-
-2003-12-30  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (add_char): added forgotten html check to
-	in_html_block_level_elt if block.
-
-2003-12-30  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c:
-	* makeinfo/xml.h: added new element alttext (IMAGEALTTEXT),
-	as a child of image.
-
-	* makeinfo/makeinfo.c (cm_image): moved alttext attribute to the new
-	alttext child in XML output, to keep markup intact.  Moved filename
-	CDATA to name attribute.
-
-	* makeinfo/texinfo.dtd: updated image element.
-
-2003-12-30  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (cm_image): use HTML entities in alt attribute.
-
-2003-12-28  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (cm_item): do not call close_single_paragraph
-	and use rollback_empty_tag for empty <dd> removal.
-
-2003-12-28  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/html.c (rollback_empty_tag): new function.
-	(insert_html_tag): try rollback_empty_tag before closing both
-	tag and old_tag.
-
-2003-12-28  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_sp): for HTML use <pre>.
-
-	* makeinfo/defun.c (defun_internal): do not close paragraph when
-	outputting HTML to avoid empty <p> elements.
-	(process_defun_args): joined duplicate if/else blocks.
-
-	* makeinfo/html.c (insert_html_tag): removed redundant paragraph
-	starting code.
-
-	* makeinfo/insertion.c (begin_insertion): keep state of the first <dt>
-	child of a <dl> in the new html_deflist_has_term variable for ...
-	(cm_item): cleaner <br> insertion checks.  Fixed non-functional empty
-	<dd> rollback code.
-
-	* makeinfo/makeinfo.c (add_html_block_elt, add_html_block_elt_args):
-	new functions for inserting block level elements that must not be
-	preceded by a <p> element.
-	(add_char): insert <p> only if in_html_block_level_elt is not true.
-
-	* makeinfo/cmds.c (cm_comment, cm_center):
-	* makeinfo/footnote.c (output_pending_notes):
-	* makeinfo/html.c (html_output_head):
-	* makeinfo/index.c (cm_printindex):
-	* makeinfo/insertion.c (enum_html, begin_insertion, end_insertion)
-	(handle_verbatim_environment, cm_item):
-	* makeinfo/makeinfo.c (handle_menu_entry):
-	* makeinfo/multi.c (do_multitable):
-	* makeinfo/node.c (cm_node):
-	* makeinfo/sectioning.c (sectioning_html): use add_html_block_elt and
-	add_html_block_elt_args instead of add_word and add_word_args
-	respectively, when inserting <ul>, <div>, <h?> and the like.
-
-2003-12-25  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Def Cmd Continuation Lines): new node.
-	* NEWS: mention this new feature.
-
-2003-12-25  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (end_insertion): inhibit paragraph indentation
-	for more cases after example, display and the like environments.
-
-	* makeinfo/xml.c (xml_start_para, xml_end_para): made <para> and
-	</para> indentation more newline-aware.
-
-2003-12-25  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (end_insertion, cm_example, cm_smallexample)
-	(cm_lisp, cm_smalllisp, cm_format, cm_smallformat, cm_display)
-	(cm_smalldisplay): unified whitespaces inside these elements
-	in XML and Docbook output (always one newline at the beginning
-	and one at the end).
-
-2003-12-25  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/lang.c (cm_accent_generic_no_headers): do not issue
-	warnings when substituting non-ASCII accents with punctuation.
-
-2003-12-24  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (cm_xref): rparen is not allowed after all,
-	confirmed by experimentation (thanks to Luc).
-	* doc/texinfo.txi (ref): remove it from doc.
-
-2003-12-23  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (convert_from_loaded_file): when finished, do
-	not indent body and html closing tags, and do not use comment tags if
-	there is no trailing information.
-
-2003-12-23  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_acronym):
-	* makeinfo/cmds.h: save second arguments of acronym in acronyms_stack
-	and reuse them as title attributes of acronym element of HTML output,
-	when there is only one argument given.
-
-2003-12-23  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (cm_image): use text_expansion for alt
-	attribute of images.
-
-2003-12-23  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/sectioning.c (sectioning_html): do not insert "%s "
-	unconditionally for title enumerations, which causes unnecessary
-	blanks for @unnumbered and @top.
-
-2003-12-23  Arnold D. Robbins  <arnold@skeeve.com>
-
-	* float.h (FLOAT_ELT): New member: `title_used'. Avoids reuse of
-	title inside nested floats.
-	(current_float_used_title, current_float_set_title_used): declared.
-
-	* float.c (add_new_float): Init `new->title_used' to zero.
-	(current_float_used_title, current_float_set_title_used): new
-	functions.
-
-	* xml.c (xml_begin_docbook_float): Make use of new functions to
-	avoid omitting title, tag, id if have already done so inside
-	nested float.
-
-2003-12-22  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (cm_xref): warn if character after @ref does
-		not produce a valid Info ref.
-	(cm_ref): call cm_xref in both START and END cases.
-	* doc/texinfo.txi (ref): make the second example being a "wrong"
-	        one explicit (report from Luc), and mention the warning.
-
-2003-12-21  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\comma): new command.
-	* makeinfo/cmds.c (cm_comma): new fn.
-	(command_table): use it for @comma.
-	* doc/texinfo.txi (Atsign Braces Comma): Rename node.
-	(Inserting a Comma): new node.
-	(@@-Command Summary): include it here.
-
-2003-12-20  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.13.1.
-
-2003-12-19  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\ordf, \ordm): use \lllsize instead of \lsize.
-	Advice from Steve Peter.
-
-	* doc/texinfo.txi (Printing Indices & Menus): typo, @@index ->
-		@@vindex.  From Luc.
-
-2003-12-19  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_acronym): read and make use of second argument
-	like texinfo.tex does.
-
-	* makeinfo/xml.c:
-	* makeinfo/xml.h:
-	* makeinfo/texinfo.dtd: new elements acronymword and acronymdesc.
-
-2003-12-19  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (begin_insertion): insert float element for
-	docbook too.
-
-2003-12-18  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi, doc/info-stnd.texi: fix incorrect cross-manual
-	xrefs.  From: Juri Linkov <juri@jurta.org>, 18 Dec 2003 05:01:07 +0200.
-
-2003-12-18  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (insert): rollback unnecessary whitespace before
-	newline characters.
-
-2003-12-17  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\ordf, \ordm): new macros.
-	(\commondummies): include them.
-	(\indexnofonts): here too.
-	* makeinfo/makeinfo.c (command_table): add them.
-	* makeinfo/lang.c (cm_special_char): first cut at handling them.
-	* doc/texinfo.txi (Inserting Accents): document them.
-
-2003-12-16  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/defun.c (process_defun_args): use execute_string instead
-	of add_word so accent commands are honored.
-
-2003-12-16  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c (xml_begin_document): output xml process instruction
-	also in the Docbook prolog.
-
-2003-12-16  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (dots): document enddots spacing.
-
-2003-12-16  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\dots): Use \hfil instead of \hss and only
-	  the stretch factor in explicit skips; I don't suppose the dots
-	  will overlap.
-	  (\enddots): Merged with \dots.
-
-2003-12-16  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (cm_image): quote the src= arg in the Info
-	case, since apparently that's what Jan implemented.  Report from:
-	Torsten Bronger <bronger@physik.rwth-aachen.de>, 16 Dec 2003
-	12:55:30 +0100.
-
-	* util/dir-example: wdiff tools.
-
-2003-12-15  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\dofloat): Move \startsavinginserts before
-	  the begin of the vtop; it's still local---within the group
-	  open by \float.
-	  (\dofloat, \Efloat): Fix indentation.
-
-2003-12-15  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\innerdef, \innernewcount): Nuked.
-	  (\getfloatno): New macro, to establish the right float count.
-
-2003-12-15  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\innernewbox): Nuked, the call expanded.
-
-2003-12-14  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/tests/*: unset TEXINFO_OUTPUT where necessary.
-
-2003-12-13  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Smallcaps, acronym): Compare and contrast these
-		a bit more fully.
-	* doc/texinfo.tex (\setfontstyle): just \def the string; since we
-		are \edef'd, we can't make ourselves a control sequence.
-	(\selectfonts): new macro.
-	(\doacronym): print acronym in smaller size, and \unsepspaces for
-		if we're called inside @display.
-	(\registeredsymbol): we can use \lllsize here too.
-
-	* configure.ac: gettext 0.13 (many generated files updated).
-
-	* Makefile.am (AUTOMAKE_OPTIONS): 1.8.
-
-	* makeinfo/makeinfo.c: give warning if TEXINFO_OUTPUT value is
-		unrecognized.
-	* doc/texinfo.txi (makeinfo options): document TEXINFO_OUTPUT.
-
-	* doc/texinfo.txi (tex): document @LaTeX.
-	
-	* doc/texinfo.tex (\loggingall): reduce \errorcontextlines for
-	sake of infinite loops.
-	(\setfontstyle): \def better than \edef?
-	(\commondummies): LaTeX is a new dummy.
-	(\indexdummies): likewise.
-	(\indexdummylatex): sorted the obvious way.
-
-	* doc/texinfo.tex (\LaTeX): New macro for new command.
-	(\setfontstyle): new macro to remember current font style.
-	(\rm,\it,\sl,\bf,\tt,\sf,\ttsl): call it; all but
-	the last two are new too.
-	(\ssecsc): use correct magnification, we do for everything else.
-	(\reducedrm..\reducedsy): new fonts.
-	(\reducedfonts): new macro.
-	(\textfonts..\smallerfonts): set \lsize and \lllsize macros.
-
-2003-12-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (main): changed TEXINFO_XML_OUTPUT to
-	TEXINFO_OUTPUT.  It now specifies the default output format.
-
-2003-12-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/defun.c (defun_internal): implemented basic line
-	continuation.
-
-2003-12-13  Karl Berry  <karl@gnu.org>
-
-	* CVSROOT/loginfo: put filename/version number in mail subject.
-
-	* util/srclist.txt (help2man): remove, we require cvs-builders to
-		have this installed now (or accept `missing's replacement),
-		along with the rest of the dev tools.
-
-2003-12-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/defun.c (defun_internal):
-	* makeinfo/insertion.c (end_insertion): do not use tables for HTML
-	@deffns.
-
-2003-12-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (begin_insertion): strip whitespace from @float
-	arguments.
-
-	* makeinfo/sectioning.c: last_section_title and last_section_number
-	now default to empty strings.
-
-2003-12-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_LaTeX): new function for @LaTeX{}.
-
-	* makeinfo/texinfo.dtd: new latex entity.
-
-2003-12-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.h:
-	* makeinfo/xml.c: new element DIMENSION.
-
-	* makeinfo/cmds.c (cm_dmn): new function for @dmn.
-
-2003-12-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (main): if TEXINFO_XML_OUTPUT envvar is set,
-	default to XML output.
-
-2003-12-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (main): enabling one output format effectively
-	disables others.
-
-2003-12-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/lang.h:
-	* makeinfo/lang.c (current_document_encoding): new function.
-
-	* makeinfo/xml.c (xml_begin_document): specify encoding in the XML
-	prolog if different from no_encoding.
-
-2003-12-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c:
-	* makeinfo/texinfo.dtd: moved documentlanguage out of para.
-
-2003-12-13  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.c (add_new_float): now expects position argument too.
-
-	* makeinfo/insertion.c (begin_insertion): read arguments from @float
-	line, do not look for @anchor.
-	(end_insertion): changed info caption style.
-	(cm_caption): use is_in_insertion_of_type instead of
-	current_insertion_type.
-
-	* makeinfo/xml.h:
-	* makeinfo/xml.c: new element floatpos.
-	(xml_begin_enumerate): check actual supplied value, not first digit.
-	Also special case for GPL's silly `@enumerate 0'.  From Aharon Robbins
-	<arnold@skeeve.com> Tue, 9 Dec 2003 12:38:04 +0200.
-
-2003-12-12  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (ifnotdocbook,ifnotxml): define these @-commands.
-	Report from Arnold.
-
-	* doc/texinfo.tex (\setfilename): make the \openout\auxfile be
-	\immediate, again.
-
-2003-12-09  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\envparseargdef): New macro, a combination
-	  of \envdef and \parseargdef.
-	  (\enumerate, \float): Use it.
-
-2003-12-09  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\float, \Efloat, \caption, \shortcaption):
-	(\listoffloats): Adapt to the new environment definition framework.
-
-2003-12-09  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\setref, \xrefX): Make the ``\indexnofonts''
-	  setups in these two consistent.
-
-2003-12-09  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\innernewbox): New macro, non-outer \newbox.
-	  (\newsaveinsX): Use it.
-
-2003-12-09  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex: after test for epsf.tex, \closein 1, even if the
-	  file wasn't there.
-	  (\summarycontents, \tryauxfile): Similarily, \closein 1 even if eof.
-	  (\startcontents, \contents, \summarycontents): fix indentation.
-
-2003-12-09  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\pdfmakeoutlines): Fix a typo, need
-		\def\thisubsecnum not \let.
-
-2003-12-08  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\makedefun): Add `\def\deffnheader' or the like
-	  at the end; all calls of this macro changed.
-
-2003-12-08  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\normaldefunargs): Renamed to ...
-	(\defunargs): ... this; all callers changed.
-	(\ampdefunargs): Nuked, the only call expanded.
-
-2003-12-08  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\setfilename): Simplify the code for conditional
-	\input of texinfo.cnf.
-	(\contents): Call \pdfmakeoutlines only if .toc exists.
-	(\pdfmakeoutlines): Thus .toc must exist, no need to check again.
-	(\documentlanguage): Simplify, fix indentation.
-
-2003-12-08  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\center): Separate the horizontal and vetical...
-	(\centerH, \centerV): ... versions; account for \leftskip in \centerV.
-
-2003-12-08  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\group, \Egroup): Don't call \offinterlineskip;
-	to fix the line spacing after the group, propagate \prevdepth.
-	(Else, @exdent inside @group gets the wrong spacing.)
-
-2003-12-08  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\acronym): Check for second parameter, ...
-	(\doacronym): using this new function; remove smallcaps.
-
-2003-12-08  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\pdfmakeoutlines): Make the counting macros
-	  robust, so that they won't break on incorrectly nested sections.
-	  (For instance, in the bzip2 manual.)
-
-2003-12-08  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\author): If appears inside a @quotation
-	environment, interpret it as an affiliation; otherwise it has to
-	appear directly inside @titlepage.
-
-2003-12-08  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\argremovec, \argcheckspaces): Add support for
-	continued lines to \parsearg, while ...
-	(\domakedefun, \printdefunline): ... removing it from @defun's ...
-	(\parsedefunline): ... and thus nuking this.
-	(\startdefunx): Replaced by ...
-	(\dodefunx): ... this; it reuses the code of the respective @defun.
-
-2003-12-08  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\defparsearg): Rename to ...
-	(\parseargdef): ... this; all uses changed.
-
-2003-12-08  Stepan Kasal  <kasal@ucw.cz>
-
-	New framework for environments in texinfo.tex.  It's used like this:
-		\envdef\foo{...}
-		\def\Efoo{...}
-	It's the responsibility of \envdef to insert \begingroup before the
-	actual body; @end closes the group after calling \Efoo.
-	\envdef also defines \thisenv, so the current environment is known;
-	@end checks whether the environment name matches.
-	The \checkenv macro can be used also elsewhere to check whether the
-	current environment is the one expected.
-
-	Non-false conditionals (@iftex, @ifset) don't fit into this, so they
-	are not treated as enviroments; they don't open a group.
-	(The implementation of @end takes care not to call \endgroup in this
-	special case.)
-
-	* doc/texinfo.tex: All environment definitions, true conditionals and
-	@ifset, @ifclear, changed.
-
-	Another issue:
-	@set and @value allowed - and _ in variable names, but @clear, @ifset
-	and @ifclear were not ready to accept such variables.
-
-	* doc/texinfo.tex (@set, @clear, @ifset, @ifclear): Call
-	\makevalueexpandable.
-
-2003-12-08  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\multitable): Move \everytab={} and the check
-	for saved inserts to \everycr; thus \item is \crcr again.
-	(\Emultitable): Call \setpercentfalse only after the last \crcr.
-
-2003-12-08  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\readauxfile): Read it, unconditinally;
-	don't open the aux file for writing.
-	(\tryauxfile): A new wrapper around \readauxfile, which checks
-	whether the file exists.
-	(\setfilename): Call \tryauxfile, then open the aux file for writing.
-
-2003-12-08  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\readauxfile): Don't hide serious problems by
-	setting the catcode of backslash to other.
-
-2003-12-08  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\setref): Call \indexnofonts to get nicer names
-	of reference identifiers expanded in \edef.
-
-2003-12-08  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\scanmacro): Add \spaceisspace, in case we are
-	  in an environment with active spaces; without this, \eatspaces
-	  didn't work.
-
-2003-12-08  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\scanmacro): Define only one version, using ...
-	  (\scantokens): ... which is a primitive of e-TeX; under ordinary
-	  TeX, define a replacement.
-
-2003-12-08  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\spaceisspace): A macro which resets space's
-	catcode to its normal value; use where appropriate.
-
-2003-12-08  Karl Berry  <karl@gnu.org>
-
-	* util/texi2dvi: use etex/pdfetex if available.
-	(findprog): new helper fn.
-	* NEWS (texi2dvi): mention this.
-	* doc/texinfo.txi (Format with texi2dvi): use @TeX{} instead of
-	@code{tex}, since we don't literally run `tex' any more.
-
-	* info/session.c (info_select_reference_this_line): don't crash if
-	we have no window->line_starts, as it is after
-	set-screen-height to less than 5.
-	Report from: Christian Biere <christianbiere@gmx.de>,
-	8 Dec 2003 19:12:08 +0100.
-
-	* doc/texinfo.tex (\comma): new command.
-
-	* bootstrap: make need for --enable-maintainer-mode more explicit.
-
-	* doc/texinfo.tex (\xrefX): otherify everything before getting the
-	-title \csname, so that _'s (et al.) are allowed.
-
-2003-12-07  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\xrefX): handle float case.
-	(\parsefloat): take additional optional arg for xref label.
-	(\dofloat): call \setref to define the float in
-	the aux file.
-	(\Yfloat): new macro for \setref.
-	(\floatmagic): new macro for \xrefX and \dofloat
-	to communicate.
-
-2003-12-03  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Not Ending a Sentence): mention special
-	entities output for @: in Docbook and XML.
-
-2003-12-02  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_punct): new function to handle @., @! and @?
-	commands.
-	(cm_comment): crunch multiple dashes to a single dash for XML
-	validity.
-
-	* makeinfo/texinfo.dtd: new entities: period, eosperiod, quest,
-	eosquest, excl, eosexcl.
-
-2003-12-02  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (begin_insertion): look for a newline before
-	@anchor and @caption commands in floatenv.
-
-2003-12-2 Arnold Robbins  <arnold@skeeve.com>
-
-	* makeinfo/insertion.c (end_insertion): Change tests for docbook
-	and insertion to check current insertion type instead of if deep
-	inside a float insertion.
-	(cm_example, cm_smallexample, cm_lisp, cm_smalllisp, cm_cartouche)
-	(cm_caption): Same.
-
-	* xml.h (FLOATCARTOUCHE): New constant.
-	* xml.c (texinfoxml_element_list, docbook_element_list): Add "sidebar"
-	for FLOATCARTOUCHE.  For docbook, map @display, @smalldisplay to
-	"literallayout".
-	(replacement_elements): Add entry for CARTOUCHE -> FLOATCARTOUCHE.
-	(xml_begin_docbook_float): Special case for CARTOUCHE, sidebars don't
-	have labels.
-
-2003-12-01  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\float, \listoffloats): new macros for new
-		@-commands -- skeletal implementation only now.
-
-	From: Aharon Robbins <arnold@skeeve.com>, 1 Dec 2003 17:43:12 +0200:
-	* makeinfo/float.h (current_float_type): declare.
-	* makeinfo/cmds.c (cm_colon): new fn.
-	(command_table): use it for @:.
-
-2003-11-29  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (@turnoffactive): include @unsepspaces, so
-	spaces in anchor names don't expand in the .aux file.  From
-	Stepan.
-
-2003-11-28  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Abstract Objects): class names are no longer
-	printed in rm by default.
-	* doc/texinfo.tex (\cite): redefine to always use \sl, never \ttsl.
-	* doc/texinfo.tex (\ttslanted): new macro.
-	(\normaldefunargs): use it for @var; go back to
-	\sl by default.
-
-	* doc/texinfo.txi: document @deftypecv.
-
-2003-11-28  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_comment): do not perform expansion.
-
-2003-11-28  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_r): also set font-weight to normal in HTML.
-
-2003-11-28  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_comment): new function to output comments in
-	HTML, XML and Docbook outputs.
-
-2003-11-28  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/index.c: new section and section_name properties in
-	index_elt struct.
-
-	* makeinfo/index.c (index_add_arg): save current section number and
-	title for plain text output.
-	(cm_printindex): simplified printing with no_headers output.
-
-2003-11-28  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.h: new section and section_name properties in
-	float_elt struct.
-
-	* makeinfo/float.c (add_new_float): save current section number and
-	title for plain text output.
-	(cm_listoffloats): list floats with no_headers too, following
-	printindex @example.
-
-2003-11-28  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/sectioning.h:
-	* makeinfo/sectioning.c (current_sectioning_number)
-	(current_sectioning_title): new functions.
-
-	* makeinfo/sectioning.c (get_sectioning_number): moved space char at
-	the end of numbers to ...
-	(insert_and_underscore, sectioning_html): here.
-	(get_sectioning_number, insert_and_underscore): keep track of the last
-	number/title to be used by @float, @cindex like commands that need to
-	know in which section they are used.
-
-2003-11-27  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_math): new function that encloses @math
-	statements in a math element in XML.
-
-	* makeinfo/xml.c:
-	* makeinfo/xml.h: new element math.
-
-2003-11-27  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.c (cm_listoffloats): made the layout in Info output
-	the same with indices.
-
-2003-11-25  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.c (cm_listoffloats): generate a menu for Info, with
-	automatically shortened captions.
-
-2003-11-25  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_acronym): use acronym element for HTML.
-	Report from: Torsten Bronger <bronger@physik.rwth-aachen.de>
-	Tue, 25 Nov 2003 10:30:52 +0100.
-
-2003-11-25  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/sectioning.c (cm_appendix): reset numbers only when
-	changing enum_marker.
-
-2003-11-25  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/index.c (cm_printindex): made Appendix matching locale
-	aware.
-
-2003-11-24  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/index.c (cm_printindex): also catch Appendix and A.1 kind
-	of numbers with --no-headers Info output.
-
-2003-11-24  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (cm_example):
-	* makeinfo/xml.c (xml_insert_docbook_image, xml_begin_multitable):
-	moved common floatenv handling to ...
-	(xml_begin_docbook_float): here.
-
-	* makeinfo/insertion.c (end_insertion, cm_smallexample, cm_lisp)
-	(cm_smalllisp): insert FLOATEXAMPLE for Docbook if inside @float.
-
-2003-11-24  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (is_in_insertion_of_type): don't return the
-	level, as it is not useful.
-	(begin_insertion): instead of is_in_insertion_of_type, use
-	float_active.
-
-	* makeinfo/insertion.c (cm_example):
-	* makeinfo/xml.c (xml_insert_docbook_image, xml_begin_multitable):
-	insert empty label for @floats with no @anchor.
-
-2003-11-24  Karl Berry  <karl@gnu.org>
-
-	* doc/Makefile.am (EXTRA_DIST): remove no-longer-defined
-	noinst_SCRIPTS.
-
-2003-11-24  Akim Demaille  <akim@epita.fr>
-
-	* configure.ac (HELP2MAN): Look for it.
-	* doc/help2man: Remove.
-	* doc/Makefile.am (HELP2MAN, noinst_SCRIPT): Remove.
-	(common_mandeps): Don't depend on HELP2MAN which can be a complex
-	command such as "missing --run help2man.
-
-2003-11-24  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex: doc/\global fixes.
-
-2003-11-24  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c: new command @listoffloats.
-
-	* makeinfo/float.c (count_floats_of_type_in_chapter): only count
-	floats with @anchors.
-	(cm_listoffloats): new function.
-
-	* makeinfo/insertion.c (end_insertion): do not prepend float type and
-	number if no @anchors.
-
-2003-11-24  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c:
-	* makeinfo/xml.h: new element listoffloats.
-
-2003-11-24  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.h: number sections by default.
-
-2003-11-24  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (cm_xref): if a reference is being made to a
-	float with only one parameter, use the float number in HTML, and
-	prepend it to the link in Info outputs.
-
-2003-11-24  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.h:
-	* makeinfo/float.c (get_float_ref): new function to retrieve a float's
-	number by its id.
-
-2003-11-24  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (end_insertion): indent the first paragraph
-	after @float.
-
-2003-11-24  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c: new commands @float and @caption.
-
-	* makeinfo/insertion.h: new environment floatenv.
-
-	* makeinfo/insertion.c (cm_float, cm_caption): new functions.
-	(begin_insertion, end_insertion): handle floatenv.
-
-	* makeinfo/xml.c:
-	* makeinfo/xml.h: new elements float, floattype, caption, floattable,
-	floatfigure, floatexample.
-
-	* makeinfo/insertion.c (cm_example):
-	* makeinfo/xml.c (xml_insert_docbook_image, xml_begin_multitable):
-	insert label and id attributes, title element for docbook if used
-	inside @float.
-
-	* makeinfo/xml.c: replacements for multitable and informalfigure.
-	(xml_insert_element_with_attribute): special-cased float element for
-	docbook to make it appear in element stack and thus enable element
-	replacements inside floatenv.
-
-2003-11-24  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/float.c:
-	* makeinfo/float.h: new files for float environment functions.
-
-	* makeinfo/Makefile.am: added new files to makeinfo_SOURCES.
-
-2003-11-24  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (cm_xref): xstrdup the result from
-	xml_get_assoc_for_id, as it gets freed later.
-
-	* makeinfo/xml.c (xml_get_assoc_for_id, xml_associate_title_with_id):
-	reimplemented unnumbered_labels handling.
-	(xml_insert_docbook_image): Docbook expects format attribute values to
-	be uppercase.
-
-2003-11-23  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex: doc fix for multitable.
-	* util/gendocs.sh: docbook support, from Simon Josefsson.
-
-	* doc/texinfo.tex (\defttsl): new font.
-	(\df): set ttsl too.
-	(\deffngeneral,\deftypefngeneral,\deftypecvgeneral,
-	 \deftypheader): call \ampdefunargs or \normaldefunargs.
-	(\normaldefunargs): new macro, typesetting defun
-	 args in ttsl (instead of sl).
-	(\ampdefunargs): treat & specially and then call \normaldefunargs.
-	(\defname): typeset defun name in tt (instead of bf).
-
-	* doc/texinfo.tex: uniformly comment out eol with {% at macro
-	starts.
-
-2003-11-23  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (is_in_insertion_of_type): return the level
-	where the insertion is found.
-
-	* makeinfo/makeinfo.c (search_forward_until_pos): new function that
-	sets search_forward boundary.
-	(text_expansion): also reset docbook.
-
-	* makeinfo/sectioning.h:
-	* makeinfo/sectioning.c (current_chapter_number): new function that
-	returns top level chapter numbers.
-	(handle_enum_increment): always do the incrementation. but return
-	strings conditionally.
-
-	* makeinfo/xml.c: changed screen element's contained_in_para to 0 for
-	Docbook. @lisp/@smalllisp create programlisting.
-	(xml_insert_quotation): reimplemented quotation_stack handling.
-
-2003-11-22  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\tocentry): same as \entry, no second 1pt of
-	stretch.  And a couple doc fixes.
-
-	* doc/texinfo.txi (Conventions): finally, get rid of @vskip
-	-@baselineskip kludge, we handle index entries after @item's now.
-
-2003-11-22  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.txi: use new @quotation feature.
-
-	* texinfo.tex (\putwordDeftypevar, \putwordDeftypefun): Remove.
-	* txi-cs.tex, txi-de.tex, txi-en.tex, txi-es.tex, txi-fr.tex,
-	  txi-it.tex. txi-nl.tex, txi-no.tex, txi-pl.tex, txi-pt.tex,
-	  txi-tr.tex: The same. 
-	[texinfo-20031120-deftype-del.patch]
-
-	* doc/texinfo.tex (\verbatim,\Everbatim): remove one extra level
-	of grouping; move two lines of code ...
-	(\setupverbatim): ... here.
-	(\doverbatiminclude): just call the new \setupverbatim.
-	(\setupverbatiminclude): remove.
-	[texinfo-20031121-verbatim2.patch]
-	
-	* doc/texinfo.tex (\math): no need for \mathcode, and we actually
-		can use $ not \implicitmath.
-	[texinfo-20031121-math.patch]
-
-	* doc/texinfo.tex (\zeroskipmacro): new macro, so we can
-	check for true zero skip.
-	(\dosubindsanitize): use it.
-	[texinfo-20031120-zeroskip.patch]
-	
-	* doc/texinfo.tex (\doignore): scan in verbatim mode.  Without this,
-	if the last line of ignored text ended with ``@'', the ``@end ifxxx''
-	tag was missed.
-	(\dodoignore): use \_STOP_ instead of \ST@P.
-	[texinfo-20031120-ignore-at.patch]
-	
-	* doc/texinfo.tex (\defparsearg): new macro, to simplify places
-	where the user macro just calls \parsearg.  Use it in many places.
-	[texinfo-20031121-defparsearg.patch]
-	
-	* doc/texinfo.tex (\begin): remove, this is undocumented
-	and unused.
-	[texinfo-20031121-begin.patch]
-	
-	* doc/texinfo.tex (\title,\subtitle,\author,...): move to outer
-	level (was inside \titlepage), it's more readable than nested
-	definitions.
-	[texinfo-20031116-titlepage1.patch]
-	
-	* doc/texinfo.tex (\evenheadingxxx,\oddfootingyyy): might as well
-		use \ and avoid changing catcode of @.
-	[texinfo-20031116-catofat.patch]
-	
-	* doc/texinfo.tex (\set): use new macros: \parseargusing and
-	\makecsname.
-	[texinfo-20031116-set.patch]
-	
-	* doc/texinfo.tex (\cartouche): avoid \par if we are already in
-	vertical mode, in case it has an effect, eg. in an @example;
-	avoid extra space from the @cartouche line itself.
-	(\Ecartouche): force vertical mode, so that the \kern has the desired
-	effect.
-	[texinfo-20031120-cart.patch]
-	
-	* doc/texinfo.tex (\ptexfootnote,\ptexinsert): save orig definitions.
-	(\startsavinginserts): new macro (with relatives), call from
-		\cartouche, \group, \table.
-	[texinfo-20031118-saveins.patch]
-	
-	* doc/texinfo.tex (\table, \ftable, \vtable, \tablex, \tabley,
-	\tablez): Cleaned up indentation, etc.
-	(\kitem, \kitemx, \xitem, \xtemx, \description): Removed; they
-	  didn't look as if they would work in their present state, anyway.
-	[texinfo-20031114-table.patch]
-
-	* doc/texinfo.tex (\filenamecatcodes): new macro.
-	(\include,\verbatiminclude): use it, with new \parseargusing.
-	(\pushthisfilestack,etc.): implement our own stack of filenames
-	instead of reading the @include argument in a group.
-	[texinfo-20031109-include.patch]
-	
-	* doc/texinfo.tex (\indexbreaks): remove, and remove call.
-	(\entry): read arguments on the fly, to avoid fixing catcodes.
-	[texinfo-20031121-indexbreaks.patch]
-	
-	* doc/texinfo.tex (\makevalueexpandable): new macro.
-	Change occurrences of \let\value=\expandablevalue to use it,
-	to reduce code duplication.
-	[texinfo-20031121-value.patch]
-
-	* doc/texinfo.tex (\parsedefunlineX,\defunchkspace,defunchktab,
-	\defunloop,\defunchkfinish,\replaceeols): New macros.
-	(\parsedefunline): start them off.  This is to support continuations
-	lines for @defun headers.
-	[texinfo-20031108-defun-cont.patch]
-	
-	* doc/texinfo.tex (\defun and all related commands):
-	rewrite to use \parsearg and uniform command generation.
-	(\makecsname): New macro, to be used within \edef's only.
-	[texinfo-20031120-defun.patch]
-	
-	* doc/texinfo.tex (=, \equalChar): remove active definition of =
-	and hacks that printed = in \tt sometimes.  We want to print
-	everything in \tt anyway, ultimately.
-	[texinfo-20031120-defun-pres3.patch]
-	
-	* doc/texinfo.tex (\defopheader,\defcvarheader,defivarheader):
-	use \code for the class name.
-	[texinfo-defun-pres2.patch]
-	
-	* doc/texinfo.tex (\parsearg): Reset the catcode of space before
-		we scan the argument; so we don't have to worry about
-		obeyed spaces before and after the argument.
-	(\parseargx, \parseargy): Nuke, it was wrong anyway--\obeyedspace,
-	which is a macro, was compared with \temp which could have been let
-	to an obeyed space, but it couldn't be a macro.
-	(\removeactivespaces,\removeactivespacesX,\removeactivespacesY): Nuke.
-	(\argremovespace): If the argument scanned by \parsearg ends with
-	a space, remove it.
-	[texinfo-20031108-parsearg-space.patch]
-
-	* doc/texinfo.tex: use \other, for clarity and efficiency;
-		use `\^^M instead of raw number 13.
-	[texinfo-20031108-other.patch]
-
-	* doc/texinfo.tex (\doverbatim): \xdef and \gobble, to avoid
-		the active space between `\end' and `verbatim'.
-	[texinfo-20031120-verbatim.patch]
-
-	* doc/texinfo.tex (\quotationlabel): new macro to print label,
-		with a \bf space.
-	(\quotation): change call so \parsearg is at the end.
-	[texinfo-20031118-quot.patch]
-
-2003-11-21  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (cm_xref): removed the warning about
-	@xrefs to @unnumbered sections, as there are many situations where
-	there is no way to fix them.
-
-	* makeinfo/insertion.c: removed lingering titlepage_cmd_present
-	declaration.
-
-2003-11-21  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_titlepage, cm_titlepage_cmds): moved to ...
-	* makeinfo/insertion.c: here.
-
-	* makeinfo/cmds.h (titlepage_cmd_present): moved to ...
-	* makeinfo/makeinfo.h: here.
-
-	* makeinfo/insertion.c (is_in_insertion_of_type): new function to
-	query insertion_stack to see if we are inside a given insertion type.
-
-	* makeinfo/makeinfo.h:
-	* makeinfo/insertion.c (begin_insertion, end_insertion):
-	* makeinfo/xml.c (xml_add_char):
-	* makeinfo/xml.h: removed xml_in_copying and inside_titlepage_cmd
-	global variables in favor of the new query function.
-
-2003-11-21  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (discard_until, execute_string): reworded
-	multiline related error messages.
-	(discard_until): rollback input_text_offset only if not dealing with a
-	multiline error, otherwise the same block gets in the way repeatedly.
-
-2003-11-21  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.h:
-	* makeinfo/xml.c (xml_get_assoc_for_id, xml_associate_title_with_id):
-	new functions.
-	(xml_insert_indexentry): call execute_string(xref) instead of creating
-	references directly.
-
-	* makeinfo/makeinfo.c (cm_xref): check to see if xref is being made to
-	an @unnumbered, and only one argument is given.  issue a warning, use
-	@unnumbered's title as the third argument.
-
-	* makeinfo/sectioning.c (sectioning_underscore): keep track of
-	unnumbered sections, and their node names.
-
-2003-11-21  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/sectioning.c (sectioning_underscore): for Docbook, always
-	provide label attribute for chapter and unnumbered.
-	(handle_enum_increment): simplified enumeration constraints, and
-	changed to follow TeX way.  Moved marker handling to ...
-	(cm_chapter, cm_unnumbered, cm_appendix): here.
-	(cm_appendix): restart numbering.
-
-2003-11-21  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.h:
-	* makeinfo/insertion.c: new rawdocbook and rawxml insertion types to
-	provide better block names in error messages (instead of "rawhtml" for
-	everything.)
-	(current_item_function, insertion_type_pname, find_type_from_name)
-	(begin_insertion, end_insertion, discard_insertions, cm_docbook)
-	(cm_xml, cm_item): honor new types.
-
-2003-11-21  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (cm_image): issue only a warning instead of an
-	error when .txt file is unreadable, to better comply with the manual.
-
-2003-11-21  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/sectioning.c (sectioning_underscore): insert label="" only
-	when the output format is Docbook.
-
-2003-11-21  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (cm_end): get rest of the line before returning
-	in case of error, so the parameter to @end does not get leaked into
-	the output document.
-
-	* makeinfo/makeinfo.c (discard_until): when the expected string is not
-	found, check to see if we are looking for @end, and if so issue a more
-	descriptive error message.
-	(execute_string): keep track of insertion stack to catch multiline
-	commands where they are not allowed.
-	Report from: Dumas Patrice <dumas@centre-cired.fr>, Wed, 18 Jun 2003
-	09:41:56 +0200.
-
-2003-11-21  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/multi.c (multitable_item): start <tbody> immediately if
-	this a regular @item, and first in the table
-
-2003-11-19  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/footnote.c (output_pending_notes): always output footnotes
-	with in_fixed_width_font = 0, so entity substitutions can take place.
-
-2003-11-19  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/footnote.c (cm_footnote, output_pending_notes): provide
-	back link from footnote marker.
-
-2003-11-19  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (cm_insert_copying): remove blockquote from
-	copying_text when inside bookinfo and the output format is Docbook.
-
-2003-11-19  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (cm_value): return immediately instead of
-	just suppressing bogus warnings.
-
-2003-11-19  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (cm_value): do not issue bogus warnings about
-	undefined values when @value is used inside a @menu environment, and
-	the output format is Docbook.
-
-2003-11-19  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/sectioning.c (sectioning_underscore): use @settitle value
-	if @top parameter is empty.
-
-2003-11-19  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c (xml_begin_index): make sure we are removing the
-	label attribute and not something else.
-
-2003-11-19  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/sectioning.c (get_sectioning_number): do not append space
-	with Docbook.
-	(sectioning_underscore): insert label attribute to make
-	distinction between chapter and unnumbered in Docbook.
-	(handle_enum_increment): also increment for Docbook.
-
-	* makeinfo/xml.c (xml_begin_index): remove label attribute from index
-	element.
-
-2003-11-18  Karl Berry  <karl@gnu.org>
-
-	* cmds.c (command_table): new commands @deftypecv, @deftypecvx.
-	* defun.c, insertion.[ch], xml.c: implement them.
-
-2003-11-18  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (execute_string): better para handling in case
-	of nested executions.
-
-2003-11-18  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Multi-column Tables): include cmd name in
-	section name.
-	(Multitable Rows): use @headitem in example.
-
-2003-11-17  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c (xml_begin_document): upgraded docbook DTD to Docbook
-	XML 4.2.
-
-	* makeinfo/makeinfo.c (cm_xref):
-	* makeinfo/xml.c (xml_insert_docbook_image, xml_insert_indexentry)
-	(xml_begin_multitable): close previously open-tag-only elements.
-
-2003-11-17  Karl Berry  <karl@gnu.org>
-
-	* bootstrap: honor environment variables.
-
-2003-11-17  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (execute_string): end paragraphs if
-	executing @copying text with xml.
-
-	* makeinfo/xml.c: disallow nested quotations, legalnotice in abstract,
-	and samp in var with Docbook.
-
-2003-11-17  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/insertion.c (begin_insertion): keep @copying state.
-	use legalnotice instead of abstract for @copying.
-	(cm_insert_copying): removed redundant work arounds.
-
-	* makeinfo/makeinfo.c (execute_string): try to keep tags balanced with
-	Docbook and xml.
-
-	* makeinfo/xml.c
-	(xml_current_stack_index, xml_end_current_element): new functions.
-	(xml_add_char): enclose @copying text in a quotation element with
-	Docbook.
-
-2003-11-17  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_settitle): do not automatically start bookinfo
-	element after settitle.
-
-2003-11-17  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c (xml_synindex): new function to keep track of index
-	redirections.
-	(xml_insert_indexterm): added a check to see if any index
-	redirections are made.
-
-	* makeinfo/index.c (cm_synindex): let xml_synindex() handle xml part.
-
-2003-11-17  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (cm_uref):
-	* makeinfo/xml.c: use ulink for @uref with Docbook.
-
-2003-11-16  Karl Berry  <karl@gnu.org>
-
-	* util/install-info.c: protoize.
-	* util/texindex.c: protoize.
-	* util/dir-example (protoize,unprotoize): add.
-
-	* doc/texinfo.tex (\everytab): new \toks.
-	(\headitem): use it to typeset in bold.
-	(\item): reset it.
-
-2003-11-15  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (quotation): document it.
-	* doc/texinfo.tex (\quotation): accept optional argument.
-	(\doquotation): new macro to test for and typeset it.
-
-	* doc/texinfo.txi (Multitable Rows): document @headitem.
-
-	* doc/texinfo.tex (\headitem): error by default, redefine inside
-	@multitable (= \dotable).  New command suggested by Arnold.
-
-2003-11-15  Akim Demaille  <akim@epita.fr>
-
-	* util/texi2dvi (fatal): New function. Use it.
-	(txiversion): Be robust to broken texinfo.tex.
-
-	* doc/texinfo.txi (example): mention use of @r for annotations.
-
-2003-11-15  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c: new command @headitem.
-
-	* makeinfo/insertion.c (cm_headitem): new function.
-
-	* makeinfo/insertion.h: new variables to keep head item state.
-
-	* makeinfo/multi.c (multitable_item, end_multitable):
-	* makeinfo/xml.c (xml_end_multitable_row, xml_end_multitable):
-	insert thead element if @headitem is used.
-	
-	* makeinfo/xml.h: new element THEAD.
-
-	* makeinfo/texinfo.dtd: updated multitable structure.
-
-	* NEWS: announced @headitem.
-
-2003-11-14  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (cm_xref): make use of third and fifth arguments
-	of @xref with Docbook.
-
-	* makeinfo/xml.c: use Docbook citetitle for @cite.
-
-2003-11-13  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex: doc fixes.
-
-	* configure.ac, NEWS: autoconf 2.59.
-
-2003-11-13  Akim Demaille  <akim@epita.fr>
-
-	* configure.ac: Use AC_CHECK_DECLS, not txi_CHECK_DECLS.
-	Also use # instead of dnl for comments.
-	* acinclude.m4: Remove.
-
-2003-11-14  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_noindent): output continued paragraphs with
-	docbook and xml only when @noindent command is used.
-	(cm_noindent_cmd): new function.  Patch from Arnold Robbins
-	<arnold@skeeve.com>, 13 Nov 2003 15:43:02 +0200.
-
-2003-11-11  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_i, cm_b, cm_r): do not use lineannotation if we
-	are printing indices.
-
-	* makeinfo/insertion.c (cm_insert_copying): removed unnecessary xml
-	fix.
-
-	* makeinfo/texinfo.dtd: added OElig and oelig entities.
-
-2003-11-11  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_sp): disabled parameter expansion.
-
-2003-11-10  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c:
-	* makeinfo/insertion.c (cm_html): do not process @xml blocks.
-	(cm_xml): new function to process @xml.
-
-	* makeinfo/xml.c (xml_start_para, xml_end_para): skip para handling in
-	footnote.
-	(xml_insert_footnote): keep state in xml_in_footnote variable.
-
-	* makeinfo/texinfo.dtd: updated settitle definition.
-
-2003-11-10  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Output Formats): rewrite to fix underfull
-	boxes.
-
-2003-11-10  Alper Ersoy  <dirt@gtk.org>
-
-	* doc/texinfo.tex (\commondummies): added registeredsymbol.
-
-2003-11-09  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/makeinfo.c (main): fixed a segfault with --html
-	--no-header.
-
-2003-11-09  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/html.c (html_output_head): output node name in title first.
-
-2003-11-09  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c:
-	* makeinfo/xml.h: new Docbook elements for quotation: tip, note,
-	important, warning, caution.
-
-	* makeinfo/xml.c: better font tags for Docbook.
-	(xml_insert_quotation): new function that is aware of specialized
-	Docbook elements for quotation.
-	(xml_insert_entity): use add_char() instead of insert() for correct
-	paragraph handling.
-
-	* makeinfo/insertion.c (begin_insertion, end_insertion): use
-	xml_insert_quotation() for quotations.
-	(cm_quotation): removed quotation element insertion.
-	(cm_insert_copying): also work around xml tags.
-
-	* makeinfo/cmds.c (cm_b): really use bold with Docbook.
-
-	* NEWS: @quotation changes.
-
-2003-11-08  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (registeredsymbol): new node.
-
-	* doc/Makefile.am (HELP2MAN): invoke explicitly from $(srcdir), in
-	case . is not in PATH.
-
-	* configure.ac (AC_CONFIG_HEADERS): apparent AM_CONFIG_HEADERS is
-	obsolete now, and we get to use AC_CONFIG_HEADERS again.
-
-	* doc/texinfo.txi (Fonts): mention <lineannotation> feature in
-	Docbook feature.
-
-	* doc/texinfo.txi (itemx): warn not to use blank lines between
-	@itemx's.
-
-2003-11-08  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c (cm_i, cm_b, cm_r): for Docbook, use <lineannotation>
-	in @example-like environments.
-	(cm_r): For HTML use <span> to make sure we always get roman text.
-
-	* makeinfo/xml.c:
-	* makeinfo/xml.h: new docbook element <lineannotation>.  Added also to
-	replace_elements to avoid nesting.
-
-2003-11-08  Alper Ersoy  <dirt@gtk.org>
-
-	* doc/texinfo.txi (Custom Headings): removed a newline that broke
-	Docbook output.
-
-	* NEWS:
-	* makeinfo/cmds.c: new command @registeredsymbol
-
-	* makeinfo/cmds.c (cm_registeredsymbol): new function.
-	(cm_code): fixed in_fixed_width_font adjustment for XML and Docbook
-	outputs.
-	(cm_noindent, cm_indent): set xml_no_indent as well.
-
-	* makeinfo/makeinfo.c (reader_loop): use entities for double quotes
-	and dashes in HTML, XML and Docbook outputs.
-
-	* makeinfo/multi.c (setup_multitable_parameters): convert
-	@columnfractions to integer percentages (original code from Arnold
-	Robbins <arnold@skeeve.com>.)
-	(multitable_item, cm_tab): add width attribute to <td> element if
-	@columnfractions is used.
-
-	* makeinfo/texinfo.dtd: added an optional role attribute to para
-	element (used for @noindent.)  New attributes ldquo, rdquo, ndash,
-	mdash, registered.
-
-	* makeinfo/xml.c: replaced repeated command element with more
-	appropriate Docbook elements in docbook_element_list.
-	(xml_start_para, xml_end_para): new functions to centralize paragraph
-	handling.
-
-	* makeinfo/xml.h: new variable xml_no_indent.
-
-2003-11-07  Karl Berry  <karl@gnu.org>
-
-	* bootstrap: run the various auto* tools we need instead of
-		autoreconf, which copies in older versions of files.
-
-	* doc/Makefile.am (texinfo): remove the special rule, it seems to
-		be fixed.
-
-	* Makefile.am (AUTOMAKE_OPTIONS): bump to 1.7.8.
-	* doc/version.texi, doc/version-stnd.texi: cvs add these again,
-	because with AM_MAINTAINER_MODE they are not created
-	(unless --enable-maintainer-mode is given).
-
-	* doc/Makefile.am (*.1) [MAINTAINER_MODE]: use this conditional
-	instead of TEXINFO_MAINT, now that we have it.
-	* configure.ac (TEXINFO_MAINT): no longer needed, since we call
-	AM_MAINTAINER_MODE.
-
-2003-11-06  Karl Berry  <karl@gnu.org>
-
-	* bootstrap: ok, restore --force since it doesn't help Alper
-	anyway.
-
-	* AUTHORS: Silly syntax.
-	* bootstrap: no --force, everything is considered obsolete then
-	(thanks Alper).
-
-2003-11-06  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/html.c (html_output_head): add <link> elements pointing to
-	top, up, next, prev nodes when splitting output, and to top when not
-	splitting.  Also provide a link to Texinfo homepage.
-	(add_link): use nodename as title attribute.
-
-2003-11-05  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/html.c (html_output_head): append node name to title if
-	splitting.  Escape special chars in title.
-
-	* makeinfo/node.c (cm_node): removed <link> elements from HTML node
-	navigation <div> as they are only allowed in <head>.
-
-2003-11-05  Alper Ersoy  <dirt@gtk.org>
-
-	* doc/texinfo.txi (Installing Dir Entries): fixed @uref for Free
-	Software Directory.
-	(Command List): Escaped @/.
-
-	* info/display.c (handle_tag, handle_tag_start, handle_tag_end): new
-	functions.
-	(display_update_one_window): ignore the text between magic
-	tags/cookies.
-
-	* makeinfo/cmds.c (cm_dots, cm_enddots): use insert_string() for HTML
-	to avoid escaping.
-	(cm_bullet): use entity name (bull) instead of number (149).
-
-	* makeinfo/index.c (cm_printindex): escape expanded_index.
-
-	* makeinfo/lang.c (cm_accent_generic_html): handle @dotless{i}
-	correctly.
-	(cm_special_char): use entity names for @OE (OElig) and @oe (oelig)
-	instead of numbers.
-
-	* makeinfo/node.c (cm_node): escape node names in HTML output.
-
-	* makeinfo/xml.c (xml_id): check to see if the character is allowed.
-	
-	* makeinfo/tests/accent-text.txi: new @dotless{j} lines.
-
-	* makeinfo/tests/accent: look for &acute;j instead of &acute;i.
-
-	* TODO: removed item about @dotless in HTML output.
-
-2003-11-04  Karl Berry  <karl@gnu.org>
-
-	* util/Makefile.am (EXTRA_DIST): spurious space after trailing
-	backslash.
-
-	* configure.ac (AC_PREREQ): 2.58.
-
-2003-11-03  Karl Berry  <karl@gnu.org>
-
-	* util/Makefile.am (EXTRA_DIST): add gdoc.
-
-2003-11-02  Karl Berry  <karl@gnu.org>
-
-	* util/gendocs.sh: doc fix.
-
-	* doc/texinfo.txi (Using Texinfo): merge most details into ...
-	(Output Formats): ... this section.
-
-	* util/dir-example (VM): add.
-
-2003-11-01  Alper Ersoy  <dirt@gtk.org>
-
-	* doc/texinfo.txi (Conditional Commands): Docbook text should
-		really use @ifdocbook.
-
-	* info/info.c (raw_escapes_p): 1 by default.
-	(long_options): new option no-raw-escapes.
-	* doc/info-stnd.texi (Invoking Info): document it.
-
-2003-10-31  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/xml.c:
-	* makeinfo/xml.h:
-	* makeinfo/insertion.c (handle_verbatim_environment): use
-	<![[CDATA...]]> for @verbatim in docbook output too.
-
-2003-10-31  Karl Berry  <karl@gnu.org>
-
-	* TODO: image scaling in html needed.
-	* makeinfo/cmds.c (cm_strong): only give the warning if we're
-	actually producing Info output.
-
-	* makeinfo/cmds.c (cm_strong): reword message and check for only
-	*Note:, not *Note:*.  From: Kevin Ryde <user42@zip.com.au>, 31 Oct
-	2003 06:19:05 +1000.
-
-2003-10-29  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Def Cmd Template): shorten.
-	* makeinfo/makeinfo.c: help message.
-	* doc/texinfo.tex: version update.
-	* makeinfo/texinfo.dtd: update copyright.
-
-2003-10-28  Alper Ersoy  <dirt@gtk.org>
-
-	* makeinfo/cmds.c: output correct elements for @command,
-	@env, @file, @option and @samp commands, and also handle
-	@titlepage in xml output.  New commands: @docbook,
-	@ifdocbook and @ifnotdocbook for conditional docbook output.
-
-	* makeinfo/defun.c (args_from_string): allow comma to be
-	recognized as a separate token to help XML side of things.
-	(process_defun_args): let xml.c handle xml output.
-
-	* makeinfo/insertion.c: handle @verbatim properly when
-	outputting xml.  This means: surround data with a <verbatim>
-	block, use <![[CDATA ... ]]> and disable escaping.
-	Recognize @titlepage, @docbook, @ifdocbook and
-	@ifnotdocbook.
-	(cm_insert_copying): do not trust the consistency of
-	copying_text, because full_expansion doesn't let open
-	docbook elements to be closed.
-	(cm_item): generate correct index entries in xml output.
-
-	* makeinfo/insertion.h: new insertion types: ifdocbook,
-	ifnotdocbook, titlepage.
-
-	* makeinfo/lang.c: notify language changes with
-	@documentlanguage in xml output, using <documentlanguage
-	xml:lang=".." /> elements.
-
-	* makeinfo/makeinfo.c: trailing encoding settings in html
-	output are commented.  Do not append any encoding settings
-	to xml and docbook outputs.  Set process_docbook variable
-	for @docbook, etc. and updated --help about it.
-	(set):
-	(clear): Output @set and @clear in xml so it's possible to
-	pass variables to further processors.
-
-	* makeinfo/makeinfo.h: process_docbook and
-	inside_titlepage_cmd (to check validity of @author, @title,
-	@subtitle, etc.)
-
-	* makeinfo/sectioning.c: heading-only commands (@chaphading,
-	etc.) do not start/end sections in xml output.  They are now
-	equivalents of the title element.
-
-	* makeinfo/toc.c: @contents and @shortcontents now appear in
-	the output.
-
-	* makeinfo/xml.c: changed element_list typedefs to also note
-	whether an element is filled.  Prefilled elements get
-	xml:space="preserve" attribute.  Added xml prolog.  Root element
-	in xml output gets the document language like it does in
-	docbook, but with xml:lang.  Removed indentation for xml
-	output.  Also lines in paragraphs are joined.
-	(xml_process_defun_args):
-	(xml_begin_definition):
-	(xml_end_definition):
-	(xml_begin_def_term):
-	(xml_end_def_term): functions to handle @def environments.
-
-	* makeinfo/xml.h: new elements in xml_element enum:
-	TITLEPAGE, AUTHOR, BOOKTITLE, BOOKSUBTITLE, COMMAND_TAG,
-	ENV, FILE_TAG, OPTION, SAMP, CONTENTS, SHORTCONTENTS,
-	DOCUMENTLANGUAGE, VERBATIM, SETVALUE, CLEARVALUE, DEF*.
-	(Suffices of COMMAND_TAG and FILE_TAG are to avoid variable
-	name clashes.)
-
-	* makeinfo/texinfo.dtd: updated to reflect changes.
-
-	* doc/texinfo.tex: skip @docbook and @ifdocbook.
-
-2003-10-28  Karl Berry  <karl@gnu.org>
-
-	* util/gendocs.sh: new -o option to specify output directory.
-
-2003-10-27  Karl Berry  <karl@gnu.org>
-
-	* lib/system.h (LC_MESSAGES): no longer needed according to
-	Bruno, libintl.h defines it.
-	Message of 16 Jul 2003 18:17:23 +0200.
-
-2003-10-27  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\defname): be sure to declare the space
-	  we get from \rightskip in the first line.
-	  (\parsebodycommon): Be careful not to issue \medbreak after
-	  \penalty 2000.
-	  (\defxbodycommon): The penalty changed from 2000 to 3000;
-	  it should be higher that the one in \parsebodycommon.
-	  -- added "@c vim:sw=2:" near the end, for my comfort.
-
-2003-10-27  Stepan Kasal  <kasal@ucw.cz>
-
-	More cleanup of active chars in @defxx arguments:
-
-	* doc/texinfo.tex (\opnr, \clnr): Reimplemented, ...
-	  (\oprm, \clrm, \opnested, \ampnr): ... nuking these, and using ...
-	  (\parenfont, \infirstlevel, \bfafterword): ... 3 new macros, ...
-	  (\ifampseen): ... and a new \if.
-	  (\brackcount): New count, to count also square braces, ...
-	  (\lbrb, \rbrb): ... here.
-	  (\checkparencounts): Macros to check whether both counts get back
-	  to 0; ...
-	  (\badparencount, \badbrackcount): ... if not, issue an error
-	  message and reset the respective count.
-	  (\deftypefnheaderx): Don't call \normalparens, it has no effect.
-	  (\defvarargs): Call \boldbrax instead of \normalparens.
-	  (\normalparens): Nuked.
-
-2003-10-26  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/session.c (info_menu_or_ref_item): If point is before all
-	the cross-references, use the first one as the default, instead of
-	setting which to -1 and crashing.  (Patch originally sent 2000-10-09.)
-	Debian bug 74278, reported from: Josip Rodin <joy@cibalia.gkvk.hr>,
-	7 Oct 2000 19:44:24 +0200.
-
-2003-10-26  Karl Berry  <karl@gnu.org>
-
-	* configure.ac (AM_MAINTAINER_MODE): enable, to avoid lossage
-	when Texinfo sources are imported into other
-	repositories (NetBSD, TeX Live).
-	Most recently suggested by Thomas Klausner
-	<wiz@danbala.ifoer.tuwien.ac.at>, 9 Sep 2003 14:57:09 +0200.
-
-	* makeinfo/node.c (validate_file): ensure tem1 && tem2 before
-	running STREQ.  Report from: Akim Demaille <akim@epita.fr>,
-	13 Oct 2003 10:43:10 +0200.
-
-	* doc/Makefile.am (infokey.1): new target.
-	(man_MANS): include infokey.1.
-	Noticed this in Debian diff.
-	
-	* util/texi2dvi: check for tex up front; inspired by Debian diff.
-
-	* TODO: makeinfo -E should do simple macro expansion, not
-	validity checking (even syntax, for @tex processing).
-
-	From: Stepan Kasal <kasal@ucw.cz>, 24 Oct 2003 19:10:02 +0200.
-	Start at making makeinfo -E behave more like a macro preprocessor,
-		avoiding consistency checks.
-	* makeinfo/insertion.c (cm_menu,cm_detailmenu): avoid checks if
-	macro_expansion_output_stream.
-	* makeinfo/makeinfo.c (main): set validating=0 if
-	macro_expansion_output_stream.
-
-	* util/texi2dvi (comment_iftex_sed): don't think we need to
-	comment out @ifhtml sections here, makeinfo will not expand them
-	by default.
-
-2003-10-25  Karl Berry  <karl@gnu.org>
-
-	* info/info.c: --raw-escapes affects Info files, not just man
-	pages.
-
-	* doc/texinfo.tex: novalis doesn't like my clarification, so make
-	it a special exception instead.
-
-2003-10-24  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\defname): Cleanup of this macro.
-	  (\boldbraxnoamp): Nuked, it's equivalent to \boldbrax;
-	  the caller changed.
-	  Other minor cleanups around active paretheses.
-	  (\defunargs): After reporting the "Unbalanced paretheses" error,
-	  reset the count.
-
-2003-10-24  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (makeinfo advantages): mention that plain text
-	--no-headers does --enable-encoding.
-
-2003-10-23  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/macro.c (define_macro): write the macro definition
-	itself to the output stream, to give texinfo.tex a chance at it.
-	Report from: Akim Demaille <akim@epita.fr>, 22 Oct 2003 17:15:34
-	+0200.
-
-	* doc/texinfo.tex (\readauxfile): make the \openout\auxfile be
-	\immediate, to avoid spurious terminal output from the
-	\immediate's in \setref.
-
-2003-10-23  Stepan Kasal  <kasal@ucw.cz>
-
-	Rewrite \parsearg:
-	* doc/texinfo.tex (\parsearg, \parseargusing): \parseargusing is
-	  a new macro which works just like good old \parsearg but takes
-	  one more parameter which contains code to be performed within
-	  a group just before we slurp the rest of the line---typically,
-	  some catcode chages go here.
-	  (\parseargx): Insert an \empty token before the arg to be read,
-	  to prevent loosing of braces.  (Thus @end{foo} no longer works.)
-	  (\parseargline, \argremovecomment, \argremovec): Change the way
-	  comments are stripped; do not use \toks0.
-	  (\removeactivespaces): is now called directly from \parsearg (via
-	  \parseargusing and \argremovec), and stripps only the trainling
-	  active spaces, doesn't perform expansion.
-	  (\finishparsearg): New macro, finishes \parsearg by nuking the
-	  added \empty token.
-	  (\end, \endxxx): Don't call \removeactivespaces, don't use \toks0;
-	  because of efficiency, move the error handling to ...
-	  (\badenderror): ... a new macro.
-	  (\doverbatim): ``\end{verbatim}'' changed to ``\end verbatim.''
-
-	Cleanup of various details with active spaces.
-	  (\parseargx): Do the \futurelet and move the rest ...
-	  (\parseargy): ... to a new macro;
-	  (\parseargusing): caller changed;
-	  (\parseargdiscardspace): the other caller nuked.
-	  (\obeyedspace, \sepspaces, \unsepspaces): Move near to \parsearg.
-	  (\obeyedspace): Is now a macro containing the active space.
-	  (\unsepspaces): No longer makes spaces active.
-	  (\ignoreactivespaces): Nuked, it's only appearance in ...
-	  (\aliasxxx): ... replaced by direct code.
-
-2003-10-23  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex: comments at top.
-
-	* AUTHORS: add kama.  (kama's address is now khmarbaise@gmx.de.)
-
-2003-10-21  Karl Berry  <karl@gnu.org>
-
-	* util/gendocs.sh: revision of mohit's original.
-	* util/Makefile.am (EXTRA_DIST): add gendocs.sh and
-		gendocs_template.
-
-2003-10-20  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/cmds.c (handle_include): only close_paragraph if
-	!insertion_stack, else we get extra blank lines when
-	used inside @example.
-	* makeinfo/insertion.c (handle_verbatim_include): likewise, plus
-		move the indentation around.
-	Report from: Brian Gough <bjg@network-theory.co.uk>,
-	20 Oct 2003 14:36:49 +0100.
-
-	* makeinfo/makeinfo.c (close_paragraph): formatting changes to
-		minimize lines.
-
-	* makeinfo/insertion.c (end_insertion): for html output in the
-	example/etc. case, kill_self_indent to get rid of
-	leading whitespace.
-	Report from: Brian Gough <bjg@network-theory.co.uk>,
-	20 Oct 2003 14:36:49 +0100.
-
-2003-10-16  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\shortcontbf): cmb10 scaled \magstep1, not cmb12,
-	since cmb12 is not a standard font.
-	Report from: Staszek Wawrykiewicz <staw@gust.org.pl>,
-	16 Oct 2003 06:44:40 +0200.
-
-2003-10-14  Karl Berry  <karl@gnu.org>
-
-	* lib/xstrdup.c: put old version back, we're not ready for gnulib
-	xmalloc yet.
-
-	* makeinfo/insertion.c: undo xml_no_para change, it causes more
-	problems than it solves, according to Alper (Ersoy, <dirt@gtk.org>).
-
-2003-10-12  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/insertion.c (begin_insertion,end_insertion): in rawhtml
-	case (also used for rawxml), increment and decrement xml_no_para.
-
-	* makeinfo/lang.c (cm_documentencoding): force the normal (info)
-	expansion when reading the arg, even when parsing xml/html/docbook.
-	Report from: Kevin Ryde <user42@zip.com.au>,
-	13 Oct 2003 10:02:23 +1000.
-
-2003-10-09  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\chapterzzz,...,\unnumberedsubsubseczzz): make
-	section number settings \global.  Otherwise, when chapters are
-	@included, they are ineffective and every chapter is numbered 1.
-	For instance, the Emacs and Elisp manuals.  Thanks to Stepan for
-	analysis.
-
-	* doc/texinfo.tex: add arch-tag for miles.
-
-2003-10-08  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\onepageout): At the beginning of \shipout, call
-	    \pdfdest directly, not via \pdfmkdest.
-	  (\pdfmkdest): Call also \atdummies before \pdfdest.
-	  (\donoderef): Remove the unsuccessful attempt to expand \lastnode
-	    before passing it to \setref (it only expanded `{' twice);
-	    things would screw up if \lastnode was expanded too much.
-	  (\setref): Rewritten, don't call \atdummies, don't expand
-	    \thissection.
-	  (\dosetq, \internalsetq, \Ypagenumber, \Ytitle): Nuked.
-	  (\chfplain): Remove referrence to \Ytitle from a comment.
-
-2003-10-08  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex: spurious space and comment (from Stepan).
-
-	* NEWS: automake 1.7.8.
-	* util/dir-example: include netpbm.
-
-2003-10-07  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\defbf, shortcontbf): use \bfshape instead of
-	\bxshape, so we use cmb consistently instead of cmbx.
-
-	* doc/texinfo.txi: more index entries for em/en dashes, fix
-		capitalizations of cindex entries.
-
-2003-10-07  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\defname): Don't use \ifempty.
-	  (\ifempty): Nuke.
-
-2003-10-06  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\dosubind, \doind): Cleanup, move code ...
-	  (\dosubindwrite, \dosubindsanitize): ... to new macros,
-	  (\emptymacro): and nuke this one.
-
-	* doc/texinfo.tex (\Ypagenumber): Add `\noexpand,' so that ...
-	  (\dosetq): ... doesn't have to redefine \folio.  Move \iflinks ...
-	  (\setref): ... here.
-
-2003-10-06  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\setdeffont): remove; this used DEF instead of
-	def, and thus had no effect for some years, so
-	clearly no one has been using it.  Noticed by Stepan.
-
-2003-10-04  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: document hyphen -> dash suppression in literal
-	contexts, and verbatim commands not working inside other commands.
-	Report from: Luc Teirlinck <teirllm@dms.auburn.edu>, 2 Oct 2003
-	22:45:14 -0500,
-
-	* doc/texinfo.tex (\commondummies,\indexnofonts): no-op @verb; I
-	doubt this is sufficient to make @verb work in index entries etc.,
-	but it's a start.  Analysis from: Andreas Schwab <schwab@suse.de>,
-	02 Oct 2003 18:54:40 +0200.
-
-2003-09-28  Karl Berry  <karl@gnu.org>
-
-	* TODO: add item for conversion of non-texinfo manuals.
-
-2003-09-26  Karl Berry  <karl@gnu.org>
-
-	* CVSROOT/loginfo: back to log_accum.
-
-	* doc/texinfo.tex (\parsebodycommon): increase \penalty between
-	headers to 2000 from 0.
-	(\defxbodycommon): check for 10002, not 1000.  We don't want to
-	allow a page break after a section heading.  Hmm, but it seems
-	this should never be called next after a section heading?
-
-2003-09-25  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/cmds.c (cm_strong): warn if argument is exactly
-	"Note:", since that conflicts with Info usage.  Suggestion from
-	rms.
-
-2003-09-24  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\dosubind): must propagate penalty after all,
-	because we insert a non-discardable item (the whatsit), which
-	makes following glue a breakpoint.  Now I understand (maybe).
-	(\sectionheading): must end with \nobreak after
-	all, purely to make \lastpenalty 10000 so future code can check
-	that and avoid breaks.
-	(\parsebodycommon): such as this code; don't do a
-	\medbreak if lastpenalty >=10000.
-
-	* doc/texinfo.tex (\tocindent): decrease to 2pc.
-	(\{app,unn}sub{sub,}secentry): redefine so that they
-	indent properly.
-
-2003-09-23  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\dosubind): remove my misbegotten idea of
-	propagating the penalty; all that did was increase the chance of a
-	valid breakpoint.  Bug report from: Werner LEMBERG <wl@gnu.org>,
-	23 Sep 2003 15:47:31 +0200.
-	(\numhead,\apphead,\unnmhead): avoid spurious
-	blank spaces, for cleanliness.
-
-	* CVSROOT/loginfo: syncmail instead of external log_accum.
-	* doc/texinfo.tex (\sectionheading): remove extraneous \nobreak,
-	found by Stepan (of course).
-
-2003-09-22  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\sectionheading): the space below a section
-	  heading should have fixed size; \nobreak after a \vskip is
-	  redundant.
-
-2003-09-21  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\sectionheading): make space below be half of
-	space above, and don't add \parskip to space above.  Suggestion
-	from Han-Wen Nienhuys <hanwen@cs.uu.nl>, implementation ideas from
-	Stepan Kasal <kasal@math.cas.cz>, 16 Sep 2003 11:30:43 +0200.
-
-2003-09-21  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\dosuppressfirstparagraphindent): change the
-	  redefinition of \indent and \noindent and factor out common
-	  parts of all redefinitions to ...
-	  (\restorefirstparagraphindent): ... a new macro.
-
-2003-09-20  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/macro.c (cm_alias): do not expand when calling
-	get_until_in_line, since xml/docbook expansion is empty.
-	Report from: Richard Kreuter <kreuter@anduril.rutgers.edu>,
-	17 Sep 2003 17:59:58 -0400.
-
-	* info/signals.c: Clear the screen when exiting from a SIGQUIT.
-	From: Wojciech Polak <polak@gnu.org>, 19 Sep 2003 10:27:28 +0200.
-
-2003-09-16  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\sectionheading): there is no need to insert
-	  \nobreak before a kern which is not followed by
-	  a glue.  Such a kern is not a permissible breakpoint.
-
-2003-09-16  Simon Law <sfllaw@uwaterloo.ca>
-
-	* doc/texinfo.tex (\dosuppressfirstparagraph): Gobble \noindent
-	if it occurs in the first paragraph.
-	(\ptexnoindent): for saving/restoring \noindent in @tex.
-	(\footnote): Neutralise the effect of @noindent within a footnote.
-
-2003-09-16  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex: Changes to make pdf references go to the correct
-	place on the page.  This is most easily testable
-	at high magnifications (I used 400% and 800%).
-	(\output): put \the\pageno pdfdest at very
-	beginning of \shipout.(\dopdfoutline): new macro.
-	(\pdfmakeoutlines): recompute all section numbers.
-	(\unnumberedno): \newcount.
-	(\chapterzzz,\appendixzzz,\unnumberedzzz,
-	 ..., \unnumberedsubsubseczzz): abstract common
-	elements, keep track of numbering for everything.
-	(\doheading,\dosubheading,\dosubsubheading): call
-	\sectionheading directly instead of \plain*secheading.
-	(\chfplain, \sectionheading): take additional section type
-	argument; call \writetocentry and \donoderef.  
-	(\unnchfopen): mention this is deprecated.
-	(\writetocentry): handle "omit" case, and
-	\global\pdfmakepagedesttrue.
-	(\startcontents, \summarycontents): sectioning
-	commands take an extra arg.
-	(\dosub*secentry): take extra arg with section
-	number; change callers.
-	(\pdfcatalog): move this call to the opening PDF
-	commands, for clarity.
-	(\unnumbnoderef): no longer needed, collapsed into
-	\donoderef.(\Yomitfromtoc): new xref constant.
-	(\Ynumbered,\Yappendix): renamed from
-	\Ysectionnumberedandtype and
-	\Yappendixletterandtype, for clarity.
-
-	* doc/texinfo.txi (cartouche): omit invalid @group.
-
-	* makeinfo/node.c (cm_node): restore accesskey= on the <link>s.
-	From hanwen.
-
-2003-09-15  Karl Berry  <karl@gnu.org>
-
-	* util/dir-example: add guile-tut.
-
-	* info/session.c (info_follow_menus): take the first best_guess
-	rather than the last.
-	From: Rob Browning <rlb@defaultvalue.org>,
-	15 Sep 2003 01:26:17 -0500.
-
-2003-09-13  Karl Berry  <karl@gnu.org>
-
-	* automake 1.7.7.
-
-	* makeinfo/insertion.c (begin_insertion): start cartouche html output
-	with <p>.  @cartouche can't be used meaningfully
-	within a paragraph.
-	Report from: Simon Josefsson <jas@extundo.com>,
-	11 Sep 2003 19:25:20 +0200.
-
-2003-09-12  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/tests/html-manuals: include -I../../doc for case when
-	version-stnd.texi is in build tree.
-	From: ezra peisach <epeisach@med-xtal.bu.edu>, 
-	12 Sep 2003 13:53:32 -0400.
-
-2003-09-11  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Cartouche): document that @cartouche needs to
-		be outside the @example for HTML output to work.  This
-		is painful to fix in the current makeinfo.
-	Report from: Simon Josefsson <jas@extundo.com>,
-	11 Sep 2003 15:21:44 +0200.
-
-2003-09-10  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/sectioning.c (section_alist): add entry for centerchap,
-	so at least makeinfo does not bomb out.  (No centering is actually
-	done.)  From: Denys Duchier <duchier@ps.uni-sb.de>, 10 Sep 2003
-	21:35:24 +0200.
-
-	* lib/system.h: __CYGWIN__ in comments, too.
-
-2003-09-09  Karl Berry  <karl@gnu.org>
-
-	* bootstrap: --include=m4.  From Werner.
-
-2003-09-08  Karl Berry  <karl@gnu.org>
-
-	* lib/system.h: make that __CYGWIN__, not __unix__.  From Eli.
-	* lib/system.h (DEFAULT_TMPDIR,PATH_SEP) [O_BINARY && !__unix__]:
-	new case for cygwin, from: Thomas Klausner
-	<wiz@danbala.ifoer.tuwien.ac.at>, 8 Sep 2003 13:43:29 +0200
-	(for cross-building netbsd).
-
-2003-09-04  Karl Berry  <karl@gnu.org>
-
-	* texinfo.txi (Conventions): say more about quotations and dashes,
-	based on a report to help-texinfo from
-	David.Billinghurst@riotinto.com, 18 Jul 2003 16:07:00 +1000.
-
-	* NEWS: mention @tex/@iftex are executed in a group.
-
-2003-09-03  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Macro Details): mention some makeinfo
-	limitations too, from recent bug reports by Patrice Dumas
-	<dumas@centre-cired.fr> and (16 Jul 2003 17:21:56 +0200) Jesper
-	Harder <harder@ifa.au.dk>.
-	* makeinfo/macro.c (define_macro): "end rmacro" is 10 chars long.
-
-2003-08-29 Reiner Steib <Reiner.Steib@gmx.de>
-	
-	* makeinfo/lang.c (encoding_table): Downcase coding system
-	names, since Emacs does not recognize the uppercase names.
-
-	* makeinfo/lang.h: doc fixes.
-
-2003-08-28  Karl Berry  <karl@gnu.org>
-
-	* bootstrap: new file (cvs only).
-	* README.dev: mention it.
-	Report from hanwen@cs.uu.nl, sample script from
-	Akim Demaille <akim@epita.fr>.
-	* aclocal.m4: remove from cvs repository.
-
-2003-08-26  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/node.c (cm_node): add <LINK> tags. This will produce a
-	navigation bar in Mozilla 1.4 (and perhaps earlier).  Original
-	code from Han-Wen Nienhuys <hanwen@cs.uu.nl>.
-
-2003-08-23  Karl Berry  <karl@gnu.org>
-
-	* util/texi2dvi: Run tex --help in $tmpdir, to avoid leaving
-	texput.log for old TeX versions.  Report from Patrick Welche
-	<prlw1@newn.cam.ac.uk>, patch from Akim.
-
-2003-08-20  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/defun.c (cm_defun): skip @ifset/@ifclear insertions
-	when looking for the @defun going with this @defunx.  Report from:
-	Akim Demaille <akim@epita.fr>, 14 Aug 2003 12:10:37 +0200.
-
-	* makeinfo/insertion.c (cm_end): rewrite error message for
-	clarity.
-
-2003-08-13  Karl Berry  <karl@gnu.org>
-
-	* info/indices.c (info_index_apropos): correct typo, whoses ->
-	whose.  From: Jesper Harder <harder@ifa.au.dk>, 13 Aug 2003
-	14:49:26 +0200.
-
-2003-08-11  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex: excise spurious spaces, etc.
-
-2003-08-09  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: don't use @ifinfo/@heading construct to replace
-	@section any more, the XML output is wrong.
-
-	* doc/texinfo.tex (\pdfmakeoutlines): doc fixes, and use \def once
-	instead of \let twice.
-
-	* doc/texinfo.txi: rewrite @ifinfo text sections to take better
-	 account of HTML.  Suggestion from: Dumas Patrice
-	<dumas@centre-cired.fr>, 8 Aug 2003 17:19:22 +0200.
-
-2003-08-07  Derek Price  <derek@ximbiot.com>
-
-	* makeinfo/insertion.c (cm_direntry): Skip @direntry in --no-headers
-	mode.
-
-2003-08-05  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (Beginning a File, title, titlefont): more
-	clarifications.  Suggestions from Patrice.
-
-	* doc/texinfo.txi (emph & strong): inconsistent source & example.
-	From Jesper Harder.
-
-2003-08-04  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (titlefont): discuss html output a bit.
-	Suggestion from Patrice.
-
-2003-07-31  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.tex (\doignorecount): no need to initialize.
-	(\doignoreyyy): doc fix.
-	From Stepan.
-
-2003-07-29  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\doignorecount): No need to initialize the
-	  count while reading texinfo.tex.
-	  (\doignoreyyy): Tiny comment change.
-
-2003-07-28  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/html.c (process_css_file): @c (for @charset) should
-	also put us into import_state.
-
-	* doc/texinfo.txi (Conditional Nesting): new section; also change
-	other conditional sections slightly.
-
-	* doc/texinfo.tex (\doignoretext, \doignoretextyyy): Only look for
-	conditionals at the beginning of a line, to avoid problems with a
-	commented conditional.  Fix from: Stepan Kasal
-	<kasal@math.cas.cz>, 28 Jul 2003 02:50:41 +0200.
-
-2003-07-27  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\doignore): Rewritten to handle nesting.
-	  (\ignoremorecommands, \obstexwarn, \ifwarnedobs): No longer needed.
-	  (\nestedignore): No longer needed.
-	  (\readauxfile): Remove reference to \warnedobstrue.
-
-2003-07-27  Karl Berry  <karl@gnu.org>
-
-	* util/dir-example: lowercase automake.
-
-2003-07-26  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/html.c (process_css_file): in null_state, only consider
-	@i to be the start of an @import, since @media can get misparsed.
-	Report from: Dumas Patrice <dumas@centre-cired.fr>, 22 Jul 2003
-	12:13:29 +0200.
-
-2003-07-25    <karl@gnu.org>
-
-	* doc/texinfo.txi (Raise/lower sections): mention difficulties with
-	node pointer creation and top nodes.
-	Report from: Dumas Patrice <dumas@centre-cired.fr>,
-	22 Jul 2003 13:08:24 +0200.
-
-2003-07-24    <karl@gnu.org>
-
-	* makeinfo/sectioning.c (what_section): take additional SECNAME
-		argument; change callers.
-	* makeinfo/sectioning.h (what_section): remove redundant decl.
-	* makeinfo/node.c (cm_node): change what_section call here, too.
-	Report from: Dumas Patrice <dumas@centre-cired.fr>,
-	22 Jul 2003 13:09:19 +0200.
-
-	* doc/texinfo.tex (\doheading,\dosubheading,\dosubsubheading):
-	rationalize names.
-	(\heading,\subheading,\subsubheading): change
-	calls.  (yesterday's patch called the undefined
-	\subsecheadingyyy, etc.)
-
-2003-07-23  Stepan Kasal  <kasal@ucw.cz>
-
-	* doc/texinfo.tex (\heading, \subheading, \subsubheading): Call
-	  \suppressfirstparagraphindent after setting the heading.
-	  (\headingyyy, \subheadingyyy, \subsubheadingyyy): New macros.
-	  (\chapheadingzzz): Call \suppressfirstparagraphindent at the end
-	  and move \chapbreak ...
-	  (\chapheading): ... here.
-	  (\majorheading): Do a modified \chapbreak, then call \chapheadingzzz.
-	  (\majorheadingzzz): Deleted.
-
-2003-07-16    <karl@gnu.org>
-
-	* doc/texinfo.txi (makeinfo Pointer Creation): must pxref Menus,
-	since Menu Location is not a valid xref point for
-	TeX, because of the special @heading stuff.
-
-	* makeinfo/insertion.c (begin_insertion): lack of */ caused
-	display: and smalldisplay: cases to be ignored.
-
-	* lib/system.h (LC_MESSAGES) [!defined (HAVE_LC_MESSAGES) &&
-	!defined (LC_MESSAGES)]: change conditional.  Report from
-	Christian Krackowizer <ckrackowiz@std.schuler-ag.com>, 16 Jul 2003
-	14:40:30 +0200.
-
-2003-07-14    <karl@gnu.org>
-
-	* util/install-info.c (ensure_dirfile_exists): replace literal ^_ with
-	\x1f.  Report from Trond Endrestøl
-	<trond@ramstind.gtf.ol.no>, 14 Jul 2003 13:31:29 +0200.
-
-	* makeinfo/sectioning.c (sectioning_html): forgot to change closing </hN>
-	to match opening <hN> (that is, maximum h3).
-	Report from: Jesper Harder <harder@ifa.au.dk>,
-	14 Jul 2003 15:04:04 +0200.
-
-2003-07-03    <karl@gnu.org>
-
-	* doc/info.texi: copy from Emacs (with revisions by Luc).
-
-2003-07-02   Akim Demaille  <akim@epita.fr>
-
-	* util/texi2dvi: Add thumbpdf support.
-	Use FD 6 instead of /dev/null so that when --debugging, the output
-	from auxiliary tools can be observed.
-
-2003-07-02    <karl@gnu.org>
-
-	* doc/texinfo.txi (kbd): document actual makeinfo behavior.
-
-2003-07-01    <karl@gnu.org>
-
-	* doc/texinfo.txi (Menus): require that menus come at the end of the
-	node, since Info readers can't determine the end
-	of a menu.
-	Report from: Luc Teirlinck <teirllm@dms.auburn.edu>,
-	29 Jun 2003 21:33:19 -0500.
-
-	* makeinfo/insertion.c (begin_insertion): do not increment
-	in_fixed_width_font for @display or @format; this
-	incorrectly caused quotes to be omitted in @kbd
-	output in those environments.
-	Report from: Luc Teirlinck <teirllm@dms.auburn.edu>,
-	26 Jun 2003 21:59:48 -0500.
-
-2003-06-24    <karl@gnu.org>
-
-	* doc/texinfo.txi (tex): misplaced period.
-	From: Jesper Harder <harder@ifa.au.dk>.
-	(GNU Sample Texts): don't end the $Id index entries with a :.
-	Report from: Luc Teirlinck <teirllm@dms.auburn.edu>.
-	
-2003-06-20    <karl@gnu.org>
-
-	* makeinfo/defun.c (process_defun_args): only insert the HTML
-	start/end tags if we're actually generating html.
-	Report from: Shawn Betts <sabetts@sfu.ca>, 12 Jun 2003
-	16:48:50 -0700.
-
-	* TODO: support translated manuals, from polak@gnu.org.
-
-	* doc/texinfo.txi: Edit Options node no longer exists in the Emacs
-		manual.  From: Luc Teirlinck <teirllm@dms.auburn.edu>.
-
-2003-06-18    <karl@gnu.org>
-
-	* config.{guess,sub}, install-sh, lib/xalloc.h: update from gnulib.
-
-2003-06-10    <karl@gnu.org>
-
-	* version 4.6.
-
-
-Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.
-
-
-Local Variables:
-mode: indented-text
-left-margin: 8
-fill-column: 76
-version-control: never
-End:

Property changes on: head/contrib/texinfo/ChangeLog
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/INTRODUCTION
===================================================================
--- head/contrib/texinfo/INTRODUCTION	(revision 276550)
+++ head/contrib/texinfo/INTRODUCTION	(nonexistent)
@@ -1,108 +0,0 @@
-$Id: INTRODUCTION,v 1.3 2004/04/11 17:56:45 karl Exp $
-Getting started with Texinfo.
-
-  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-  Free Software Foundation, Inc.
-
-  Copying and distribution of this file, with or without modification,
-  are permitted in any medium without royalty provided the copyright
-  notice and this notice are preserved.
-
-
-
-Getting Started with Texinfo
-============================
-
-"Texinfo" is a documentation system that uses a single source file to
-produce both on-line information and printed output.  Using Texinfo,
-you can create a printed document with the normal features of a book,
-including chapters, sections, cross references, and indices.  From the
-same Texinfo source file, you can create a menu-driven, on-line Info
-file with nodes, menus, cross references, and indices.
-  
-The name of the Texinfo source documentation file is `texinfo.txi'.
-You can produce both on-line information and printed output from this
-source file.  The documentation describes Texinfo in detail, including
-how to write Texinfo files, how to format them for both hard copy and
-Info, and how to install Info files.
-
-To get started, you need to create either a printed manual or an
-on-line Info file from the `texinfo.txi' file.  You do not need to
-create both, although you will probably want both eventually.
-
-To learn how to use Info, read the info documentation.  You can do this in
-one of two ways: using the standalone `info' program, or using Info mode in
-GNU Emacs.
-
-  * If you want to use the `info' program, run
-
-         info -f info-stnd
-
-  * If you want to use Emacs, start up emacs and type `C-h i' [M-x info].
-    Follow the instructions to learn how to use Info.
-
-After learning how to use Info, you can read the Texinfo documentation.
-Using the standalone `info', type the following at the shell prompt:
-
-         info -f texinfo
-
-To use read this manual in Emacs, you first need to edit the Info-directory
-menu (the file `dir' in the system info directory) to contain the
-appropriate node.  To learn how to do this, see node: Add in the Info
-documentation.
-
-The Texinfo documentation describes Texinfo in detail; among other things,
-it tells how to install Info files in the usual manner.  (See node: Install
-an Info File.)
-
-The `info-stnd.info' file describes the standalone Info reader in detail.  To
-read this file, type
-
-         $ info -f info-stnd
-
-
-To create a printed manual
-==========================
-
-You need:
-
-  * The `tex' program, which typesets the manual using TeX.
-  * The `texinfo.tex' definition file that tells TeX how to typeset
-    a Texinfo file.
-  * The `texindex' program, which sorts the unsorted index files
-    created by TeX.
-  * A printing program such as `lp' or `lpr',
-  * A printer.
-
-This Texinfo distribution package contains `texinfo.tex', the C source
-for `texindex', and the handy shell script `texi2dvi'.  The `tex'
-program is not part of this distribution, but is available separately.
-(See `How to Obtain TeX' in the Texinfo documentation.)
-
-  * Install `tex'.  (`texindex' is installed automagically by 
-    `make install' in this distribution.)
-
-  * Move the `texinfo.tex' file to an appropriate directory; the current
-    directory will do.  (`/usr/local/lib/tex/inputs' might be a good place.
-    See ``Preparing to Use TeX'' in the Texinfo manual, for more
-    information.)
-
-After following those instructions, type the following to make the .dvi
-files:
-
-      $ (cd doc; make dvi)
-
-You can then print the resulting .dvi files with the `lpr' or `lp'
-commands, or maybe `dvips'.
-
-For example, the command to print the texinfo.dvi file might be:
-
-      $ lpr -d texinfo.dvi
-
-The name of the printing command depends on the system; `lpr -d' is
-common, and is illustrated here.  You may use a different name for the
-printing command.
-
-Please report bugs to bug-texinfo@gnu.org.
-
-Happy formatting.

Property changes on: head/contrib/texinfo/INTRODUCTION
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/util/texindex.c
===================================================================
--- head/contrib/texinfo/util/texindex.c	(revision 276550)
+++ head/contrib/texinfo/util/texindex.c	(nonexistent)
@@ -1,1689 +0,0 @@
-/* texindex -- sort TeX index dribble output into an actual index.
-   $Id: texindex.c,v 1.11 2004/04/11 17:56:47 karl Exp $
-
-   Copyright (C) 1987, 1991, 1992, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307. */
-
-#include "system.h"
-#include <getopt.h>
-
-static char *program_name = "texindex";
-
-#if defined (emacs)
-#  include "../src/config.h"
-/* Some s/os.h files redefine these. */
-#  undef read
-#  undef close
-#  undef write
-#  undef open
-#endif
-
-#if !defined (HAVE_MEMSET)
-#undef memset
-#define memset(ptr, ignore, count) bzero (ptr, count)
-#endif
-
-char *mktemp (char *);
-
-#if !defined (SEEK_SET)
-#  define SEEK_SET 0
-#  define SEEK_CUR 1
-#  define SEEK_END 2
-#endif /* !SEEK_SET */
-
-struct linebuffer;
-
-/* When sorting in core, this structure describes one line
-   and the position and length of its first keyfield.  */
-struct lineinfo
-{
-  char *text;           /* The actual text of the line. */
-  union {
-    char *text;         /* The start of the key (for textual comparison). */
-    long number;        /* The numeric value (for numeric comparison). */
-  } key;
-  long keylen;          /* Length of KEY field. */
-};
-
-/* This structure describes a field to use as a sort key. */
-struct keyfield
-{
-  int startwords;       /* Number of words to skip. */
-  int startchars;       /* Number of additional chars to skip. */
-  int endwords;         /* Number of words to ignore at end. */
-  int endchars;         /* Ditto for characters of last word. */
-  char ignore_blanks;   /* Non-zero means ignore spaces and tabs. */
-  char fold_case;       /* Non-zero means case doesn't matter. */
-  char reverse;         /* Non-zero means compare in reverse order. */
-  char numeric;         /* Non-zeros means field is ASCII numeric. */
-  char positional;      /* Sort according to file position. */
-  char braced;          /* Count balanced-braced groupings as fields. */
-};
-
-/* Vector of keyfields to use. */
-struct keyfield keyfields[3];
-
-/* Number of keyfields stored in that vector.  */
-int num_keyfields = 3;
-
-/* Vector of input file names, terminated with a null pointer. */
-char **infiles;
-
-/* Vector of corresponding output file names, or NULL, meaning default it
-   (add an `s' to the end). */
-char **outfiles;
-
-/* Length of `infiles'. */
-int num_infiles;
-
-/* Pointer to the array of pointers to lines being sorted. */
-char **linearray;
-
-/* The allocated length of `linearray'. */
-long nlines;
-
-/* Directory to use for temporary files.  On Unix, it ends with a slash.  */
-char *tempdir;
-
-/* Number of last temporary file.  */
-int tempcount;
-
-/* Number of last temporary file already deleted.
-   Temporary files are deleted by `flush_tempfiles' in order of creation.  */
-int last_deleted_tempcount;
-
-/* During in-core sort, this points to the base of the data block
-   which contains all the lines of data.  */
-char *text_base;
-
-/* Initially 0; changed to 1 if we want initials in this index.  */
-int need_initials;
-
-/* Remembers the first initial letter seen in this index, so we can
-   determine whether we need initials in the sorted form.  */
-char first_initial;
-
-/* Additional command switches .*/
-
-/* Nonzero means do not delete tempfiles -- for debugging. */
-int keep_tempfiles;
-
-/* Forward declarations of functions in this file. */
-void decode_command (int argc, char **argv);
-void sort_in_core (char *infile, int total, char *outfile);
-void sort_offline (char *infile, off_t total, char *outfile);
-char **parsefile (char *filename, char **nextline, char *data, long int size);
-char *find_field (struct keyfield *keyfield, char *str, long int *lengthptr);
-char *find_pos (char *str, int words, int chars, int ignore_blanks);
-long find_value (char *start, long int length);
-char *find_braced_pos (char *str, int words, int chars, int ignore_blanks);
-char *find_braced_end (char *str);
-void writelines (char **linearray, int nlines, FILE *ostream);
-int compare_field (struct keyfield *keyfield, char *start1,
-                   long int length1, long int pos1, char *start2,
-                   long int length2, long int pos2);
-int compare_full (const void *, const void *);
-long readline (struct linebuffer *linebuffer, FILE *stream);
-int merge_files (char **infiles, int nfiles, char *outfile);
-int merge_direct (char **infiles, int nfiles, char *outfile);
-void pfatal_with_name (const char *name);
-void fatal (const char *format, const char *arg);
-void error (const char *format, const char *arg);
-void *xmalloc (), *xrealloc ();
-char *concat (char *s1, char *s2);
-void flush_tempfiles (int to_count);
-
-#define MAX_IN_CORE_SORT 500000
-
-int
-main (int argc, char **argv)
-{
-  int i;
-
-  tempcount = 0;
-  last_deleted_tempcount = 0;
-
-#ifdef HAVE_SETLOCALE
-  /* Set locale via LC_ALL.  */
-  setlocale (LC_ALL, "");
-#endif
-
-  /* Set the text message domain.  */
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-
-  /* In case we write to a redirected stdout that fails.  */
-  /* not ready atexit (close_stdout); */
-
-  /* Describe the kind of sorting to do. */
-  /* The first keyfield uses the first braced field and folds case. */
-  keyfields[0].braced = 1;
-  keyfields[0].fold_case = 1;
-  keyfields[0].endwords = -1;
-  keyfields[0].endchars = -1;
-
-  /* The second keyfield uses the second braced field, numerically. */
-  keyfields[1].braced = 1;
-  keyfields[1].numeric = 1;
-  keyfields[1].startwords = 1;
-  keyfields[1].endwords = -1;
-  keyfields[1].endchars = -1;
-
-  /* The third keyfield (which is ignored while discarding duplicates)
-     compares the whole line. */
-  keyfields[2].endwords = -1;
-  keyfields[2].endchars = -1;
-
-  decode_command (argc, argv);
-
-  /* Process input files completely, one by one.  */
-
-  for (i = 0; i < num_infiles; i++)
-    {
-      int desc;
-      off_t ptr;
-      char *outfile;
-      struct stat instat;
-
-      desc = open (infiles[i], O_RDONLY, 0);
-      if (desc < 0)
-        pfatal_with_name (infiles[i]);
-
-      if (stat (infiles[i], &instat))
-        pfatal_with_name (infiles[i]);
-      if (S_ISDIR (instat.st_mode))
-        {
-#ifdef EISDIR
-          errno = EISDIR;
-#endif
-          pfatal_with_name (infiles[i]);
-        }
-
-      lseek (desc, (off_t) 0, SEEK_END);
-      ptr = (off_t) lseek (desc, (off_t) 0, SEEK_CUR);
-
-      close (desc);
-
-      outfile = outfiles[i];
-      if (!outfile)
-        outfile = concat (infiles[i], "s");
-
-      need_initials = 0;
-      first_initial = '\0';
-
-      if (ptr < MAX_IN_CORE_SORT)
-        /* Sort a small amount of data. */
-        sort_in_core (infiles[i], (int)ptr, outfile);
-      else
-        sort_offline (infiles[i], ptr, outfile);
-    }
-
-  flush_tempfiles (tempcount);
-  xexit (0);
-  return 0; /* Avoid bogus warnings.  */
-}
-
-typedef struct
-{
-  char *long_name;
-  char *short_name;
-  int *variable_ref;
-  int variable_value;
-  char *arg_name;
-  char *doc_string;
-} TEXINDEX_OPTION;
-
-TEXINDEX_OPTION texindex_options[] = {
-  { "--help", "-h", (int *)NULL, 0, (char *)NULL,
-      N_("display this help and exit") },
-  { "--keep", "-k", &keep_tempfiles, 1, (char *)NULL,
-      N_("keep temporary files around after processing") },
-  { "--no-keep", 0, &keep_tempfiles, 0, (char *)NULL,
-      N_("do not keep temporary files around after processing (default)") },
-  { "--output", "-o", (int *)NULL, 0, "FILE",
-      N_("send output to FILE") },
-  { "--version", (char *)NULL, (int *)NULL, 0, (char *)NULL,
-      N_("display version information and exit") },
-  { (char *)NULL, (char *)NULL, (int *)NULL, 0, (char *)NULL }
-};
-
-void
-usage (int result_value)
-{
-  register int i;
-  FILE *f = result_value ? stderr : stdout;
-
-  fprintf (f, _("Usage: %s [OPTION]... FILE...\n"), program_name);
-  fprintf (f, _("Generate a sorted index for each TeX output FILE.\n"));
-  /* Avoid trigraph nonsense.  */
-  fprintf (f,
-_("Usually FILE... is specified as `foo.%c%c\' for a document `foo.texi'.\n"),
-           '?', '?'); /* avoid trigraph in cat-id-tbl.c */
-  fprintf (f, _("\nOptions:\n"));
-
-  for (i = 0; texindex_options[i].long_name; i++)
-    {
-      putc (' ', f);
-
-      if (texindex_options[i].short_name)
-        fprintf (f, "%s, ", texindex_options[i].short_name);
-
-      fprintf (f, "%s %s",
-               texindex_options[i].long_name,
-               texindex_options[i].arg_name
-               ? texindex_options[i].arg_name : "");
-
-      fprintf (f, "\t%s\n", _(texindex_options[i].doc_string));
-    }
-  fputs (_("\n\
-Email bug reports to bug-texinfo@gnu.org,\n\
-general questions and discussion to help-texinfo@gnu.org.\n\
-Texinfo home page: http://www.gnu.org/software/texinfo/"), f);
-  fputs ("\n", f);
-
-  xexit (result_value);
-}
-
-/* Decode the command line arguments to set the parameter variables
-   and set up the vector of keyfields and the vector of input files. */
-
-void
-decode_command (int argc, char **argv)
-{
-  int arg_index = 1;
-  char **ip;
-  char **op;
-
-  /* Store default values into parameter variables. */
-
-  tempdir = getenv ("TMPDIR");
-  if (tempdir == NULL)
-    tempdir = getenv ("TEMP");
-  if (tempdir == NULL)
-    tempdir = getenv ("TMP");
-  if (tempdir == NULL)
-    tempdir = DEFAULT_TMPDIR;
-  else
-    tempdir = concat (tempdir, "/");
-
-  keep_tempfiles = 0;
-
-  /* Allocate ARGC input files, which must be enough.  */
-
-  infiles = (char **) xmalloc (argc * sizeof (char *));
-  outfiles = (char **) xmalloc (argc * sizeof (char *));
-  ip = infiles;
-  op = outfiles;
-
-  while (arg_index < argc)
-    {
-      char *arg = argv[arg_index++];
-
-      if (*arg == '-')
-        {
-          if (strcmp (arg, "--version") == 0)
-            {
-              printf ("texindex (GNU %s) %s\n", PACKAGE, VERSION);
-              puts ("");
-              puts ("Copyright (C) 2004 Free Software Foundation, Inc.");
-              printf (_("There is NO warranty.  You may redistribute this software\n\
-under the terms of the GNU General Public License.\n\
-For more information about these matters, see the files named COPYING.\n"));
-              xexit (0);
-            }
-          else if ((strcmp (arg, "--keep") == 0) ||
-                   (strcmp (arg, "-k") == 0))
-            {
-              keep_tempfiles = 1;
-            }
-          else if ((strcmp (arg, "--help") == 0) ||
-                   (strcmp (arg, "-h") == 0))
-            {
-              usage (0);
-            }
-          else if ((strcmp (arg, "--output") == 0) ||
-                   (strcmp (arg, "-o") == 0))
-            {
-              if (argv[arg_index] != (char *)NULL)
-                {
-                  arg_index++;
-                  if (op > outfiles)
-                    *(op - 1) = argv[arg_index];
-                }
-              else
-                usage (1);
-            }
-          else
-            usage (1);
-        }
-      else
-        {
-          *ip++ = arg;
-          *op++ = (char *)NULL;
-        }
-    }
-
-  /* Record number of keyfields and terminate list of filenames. */
-  num_infiles = ip - infiles;
-  *ip = (char *)NULL;
-  if (num_infiles == 0)
-    usage (1);
-}
-
-static char **tv;
-static int tv_alloc;
-static int tv_used;
-
-static int
-findtempname (char *tempname)
-{
-  int i;
-
-  for (i = 0; i < tv_used; i++)
-    if (strcmp (tv[i], tempname) == 0)
-	return (1);
-  return (0);
-}
-
-/* Return a name for temporary file COUNT. */
-
-static char *
-maketempname (int count)
-{
-  static char *tempbase = NULL;
-  char *tempname;
-  char tempsuffix[10];
-  int fd;
-
-  if (!tempbase)
-    {
-      tempbase = concat (tempdir, "txidxXXXXXX");
-
-      fd = mkstemp (tempbase);
-      if (fd == -1)
-        pfatal_with_name (tempbase);
-    }
-
-  sprintf (tempsuffix, ".%d", count);
-  tempname = concat (tempbase, tempsuffix);
-  /*
-   * The open logic becomes a bit convoluted. If open(2) fails due to EEXIST,
-   * it's likely because somebody attempted to race us, or because we have
-   * already created this file.
-   */
-  fd = open (tempname, O_CREAT|O_EXCL|O_WRONLY, 0600);
-  if (fd == -1)
-    {
-	/*
-	 * If errno is not EEXIST, then open failed for some other reason, so
-	 * we should terminate. If errno == EEXIST AND we didn't create this
-	 * file, terminate. Otherwise, it's safe to say that errno == EEXIST
-	 * because we already created it, in this event, we can just return.
-	 */
-	if (errno != EEXIST ||
-	  (errno == EEXIST && findtempname (tempname) == 0))
-	  pfatal_with_name (tempname);
-	return (tempname);
-    }
-  else if (fd > 0)
-    {
-	close (fd);
-    }
-  if (tv == NULL)
-    {
-	tv_alloc = 16;
-	tv = calloc (tv_alloc, sizeof (char *));
-	if (tv == NULL)
-	  {
-	    fprintf (stderr, "calloc failed\n");
-	    exit (1);
-	  }
-    }
-  else if (tv_used == tv_alloc)
-    {
-	tv_alloc += 4;
-	tv = realloc (tv, tv_alloc * sizeof (char *));
-	if (tv == NULL)
-	  {
-	    fprintf (stderr, "realloc failed");
-	    exit (1);
-	  }
-    }
-  tv[tv_used++] = strdup (tempname);
-  return tempname;
-}
-
-
-/* Delete all temporary files up to TO_COUNT. */
-
-void
-flush_tempfiles (int to_count)
-{
-  if (keep_tempfiles)
-    return;
-  while (last_deleted_tempcount < to_count)
-    unlink (maketempname (++last_deleted_tempcount));
-}
-
-
-/* Compare LINE1 and LINE2 according to the specified set of keyfields. */
-
-int
-compare_full (const void *p1, const void *p2)
-{
-  char **line1 = (char **) p1;
-  char **line2 = (char **) p2;
-  int i;
-
-  /* Compare using the first keyfield;
-     if that does not distinguish the lines, try the second keyfield;
-     and so on. */
-
-  for (i = 0; i < num_keyfields; i++)
-    {
-      long length1, length2;
-      char *start1 = find_field (&keyfields[i], *line1, &length1);
-      char *start2 = find_field (&keyfields[i], *line2, &length2);
-      int tem = compare_field (&keyfields[i], start1, length1,
-                               *line1 - text_base,
-                               start2, length2, *line2 - text_base);
-      if (tem)
-        {
-          if (keyfields[i].reverse)
-            return -tem;
-          return tem;
-        }
-    }
-
-  return 0;                     /* Lines match exactly. */
-}
-
-/* Compare LINE1 and LINE2, described by structures
-   in which the first keyfield is identified in advance.
-   For positional sorting, assumes that the order of the lines in core
-   reflects their nominal order.  */
-int
-compare_prepared (const void *p1, const void *p2)
-{
-  struct lineinfo *line1 = (struct lineinfo *) p1;
-  struct lineinfo *line2 = (struct lineinfo *) p2;
-  int i;
-  int tem;
-  char *text1, *text2;
-
-  /* Compare using the first keyfield, which has been found for us already. */
-  if (keyfields->positional)
-    {
-      if (line1->text - text_base > line2->text - text_base)
-        tem = 1;
-      else
-        tem = -1;
-    }
-  else if (keyfields->numeric)
-    tem = line1->key.number - line2->key.number;
-  else
-    tem = compare_field (keyfields, line1->key.text, line1->keylen, 0,
-                         line2->key.text, line2->keylen, 0);
-  if (tem)
-    {
-      if (keyfields->reverse)
-        return -tem;
-      return tem;
-    }
-
-  text1 = line1->text;
-  text2 = line2->text;
-
-  /* Compare using the second keyfield;
-     if that does not distinguish the lines, try the third keyfield;
-     and so on. */
-
-  for (i = 1; i < num_keyfields; i++)
-    {
-      long length1, length2;
-      char *start1 = find_field (&keyfields[i], text1, &length1);
-      char *start2 = find_field (&keyfields[i], text2, &length2);
-      int tem = compare_field (&keyfields[i], start1, length1,
-                               text1 - text_base,
-                               start2, length2, text2 - text_base);
-      if (tem)
-        {
-          if (keyfields[i].reverse)
-            return -tem;
-          return tem;
-        }
-    }
-
-  return 0;                     /* Lines match exactly. */
-}
-
-/* Like compare_full but more general.
-   You can pass any strings, and you can say how many keyfields to use.
-   POS1 and POS2 should indicate the nominal positional ordering of
-   the two lines in the input.  */
-
-int
-compare_general (char *str1, char *str2, long int pos1, long int pos2, int use_keyfields)
-{
-  int i;
-
-  /* Compare using the first keyfield;
-     if that does not distinguish the lines, try the second keyfield;
-     and so on. */
-
-  for (i = 0; i < use_keyfields; i++)
-    {
-      long length1, length2;
-      char *start1 = find_field (&keyfields[i], str1, &length1);
-      char *start2 = find_field (&keyfields[i], str2, &length2);
-      int tem = compare_field (&keyfields[i], start1, length1, pos1,
-                               start2, length2, pos2);
-      if (tem)
-        {
-          if (keyfields[i].reverse)
-            return -tem;
-          return tem;
-        }
-    }
-
-  return 0;                     /* Lines match exactly. */
-}
-
-/* Find the start and length of a field in STR according to KEYFIELD.
-   A pointer to the starting character is returned, and the length
-   is stored into the int that LENGTHPTR points to.  */
-
-char *
-find_field (struct keyfield *keyfield, char *str, long int *lengthptr)
-{
-  char *start;
-  char *end;
-  char *(*fun) ();
-
-  if (keyfield->braced)
-    fun = find_braced_pos;
-  else
-    fun = find_pos;
-
-  start = (*fun) (str, keyfield->startwords, keyfield->startchars,
-                  keyfield->ignore_blanks);
-  if (keyfield->endwords < 0)
-    {
-      if (keyfield->braced)
-        end = find_braced_end (start);
-      else
-        {
-          end = start;
-          while (*end && *end != '\n')
-            end++;
-        }
-    }
-  else
-    {
-      end = (*fun) (str, keyfield->endwords, keyfield->endchars, 0);
-      if (end - str < start - str)
-        end = start;
-    }
-  *lengthptr = end - start;
-  return start;
-}
-
-/* Return a pointer to a specified place within STR,
-   skipping (from the beginning) WORDS words and then CHARS chars.
-   If IGNORE_BLANKS is nonzero, we skip all blanks
-   after finding the specified word.  */
-
-char *
-find_pos (char *str, int words, int chars, int ignore_blanks)
-{
-  int i;
-  char *p = str;
-
-  for (i = 0; i < words; i++)
-    {
-      char c;
-      /* Find next bunch of nonblanks and skip them. */
-      while ((c = *p) == ' ' || c == '\t')
-        p++;
-      while ((c = *p) && c != '\n' && !(c == ' ' || c == '\t'))
-        p++;
-      if (!*p || *p == '\n')
-        return p;
-    }
-
-  while (*p == ' ' || *p == '\t')
-    p++;
-
-  for (i = 0; i < chars; i++)
-    {
-      if (!*p || *p == '\n')
-        break;
-      p++;
-    }
-  return p;
-}
-
-/* Like find_pos but assumes that each field is surrounded by braces
-   and that braces within fields are balanced. */
-
-char *
-find_braced_pos (char *str, int words, int chars, int ignore_blanks)
-{
-  int i;
-  int bracelevel;
-  char *p = str;
-  char c;
-
-  for (i = 0; i < words; i++)
-    {
-      bracelevel = 1;
-      while ((c = *p++) != '{' && c != '\n' && c)
-        /* Do nothing. */ ;
-      if (c != '{')
-        return p - 1;
-      while (bracelevel)
-        {
-          c = *p++;
-          if (c == '{')
-            bracelevel++;
-          if (c == '}')
-            bracelevel--;
-          if (c == 0 || c == '\n')
-            return p - 1;
-        }
-    }
-
-  while ((c = *p++) != '{' && c != '\n' && c)
-    /* Do nothing. */ ;
-
-  if (c != '{')
-    return p - 1;
-
-  if (ignore_blanks)
-    while ((c = *p) == ' ' || c == '\t')
-      p++;
-
-  for (i = 0; i < chars; i++)
-    {
-      if (!*p || *p == '\n')
-        break;
-      p++;
-    }
-  return p;
-}
-
-/* Find the end of the balanced-brace field which starts at STR.
-   The position returned is just before the closing brace. */
-
-char *
-find_braced_end (char *str)
-{
-  int bracelevel;
-  char *p = str;
-  char c;
-
-  bracelevel = 1;
-  while (bracelevel)
-    {
-      c = *p++;
-      if (c == '{')
-        bracelevel++;
-      if (c == '}')
-        bracelevel--;
-      if (c == 0 || c == '\n')
-        return p - 1;
-    }
-  return p - 1;
-}
-
-long
-find_value (char *start, long int length)
-{
-  while (length != 0L)
-    {
-      if (isdigit (*start))
-        return atol (start);
-      length--;
-      start++;
-    }
-  return 0l;
-}
-
-/* Vector used to translate characters for comparison.
-   This is how we make all alphanumerics follow all else,
-   and ignore case in the first sorting.  */
-int char_order[256];
-
-void
-init_char_order (void)
-{
-  int i;
-  for (i = 1; i < 256; i++)
-    char_order[i] = i;
-
-  for (i = '0'; i <= '9'; i++)
-    char_order[i] += 512;
-
-  for (i = 'a'; i <= 'z'; i++)
-    {
-      char_order[i] = 512 + i;
-      char_order[i + 'A' - 'a'] = 512 + i;
-    }
-}
-
-/* Compare two fields (each specified as a start pointer and a character count)
-   according to KEYFIELD.
-   The sign of the value reports the relation between the fields. */
-
-int
-compare_field (struct keyfield *keyfield, char *start1, long int length1,
-               long int pos1, char *start2, long int length2, long int pos2)
-{
-  if (keyfields->positional)
-    {
-      if (pos1 > pos2)
-        return 1;
-      else
-        return -1;
-    }
-  if (keyfield->numeric)
-    {
-      long value = find_value (start1, length1) - find_value (start2, length2);
-      if (value > 0)
-        return 1;
-      if (value < 0)
-        return -1;
-      return 0;
-    }
-  else
-    {
-      char *p1 = start1;
-      char *p2 = start2;
-      char *e1 = start1 + length1;
-      char *e2 = start2 + length2;
-
-      while (1)
-        {
-          int c1, c2;
-
-          if (p1 == e1)
-            c1 = 0;
-          else
-            c1 = *p1++;
-          if (p2 == e2)
-            c2 = 0;
-          else
-            c2 = *p2++;
-
-          if (char_order[c1] != char_order[c2])
-            return char_order[c1] - char_order[c2];
-          if (!c1)
-            break;
-        }
-
-      /* Strings are equal except possibly for case.  */
-      p1 = start1;
-      p2 = start2;
-      while (1)
-        {
-          int c1, c2;
-
-          if (p1 == e1)
-            c1 = 0;
-          else
-            c1 = *p1++;
-          if (p2 == e2)
-            c2 = 0;
-          else
-            c2 = *p2++;
-
-          if (c1 != c2)
-            /* Reverse sign here so upper case comes out last.  */
-            return c2 - c1;
-          if (!c1)
-            break;
-        }
-
-      return 0;
-    }
-}
-
-/* A `struct linebuffer' is a structure which holds a line of text.
-   `readline' reads a line from a stream into a linebuffer
-   and works regardless of the length of the line.  */
-
-struct linebuffer
-{
-  long size;
-  char *buffer;
-};
-
-/* Initialize LINEBUFFER for use. */
-
-void
-initbuffer (struct linebuffer *linebuffer)
-{
-  linebuffer->size = 200;
-  linebuffer->buffer = (char *) xmalloc (200);
-}
-
-/* Read a line of text from STREAM into LINEBUFFER.
-   Return the length of the line.  */
-
-long
-readline (struct linebuffer *linebuffer, FILE *stream)
-{
-  char *buffer = linebuffer->buffer;
-  char *p = linebuffer->buffer;
-  char *end = p + linebuffer->size;
-
-  while (1)
-    {
-      int c = getc (stream);
-      if (p == end)
-        {
-          buffer = (char *) xrealloc (buffer, linebuffer->size *= 2);
-          p += buffer - linebuffer->buffer;
-          end += buffer - linebuffer->buffer;
-          linebuffer->buffer = buffer;
-        }
-      if (c < 0 || c == '\n')
-        {
-          *p = 0;
-          break;
-        }
-      *p++ = c;
-    }
-
-  return p - buffer;
-}
-
-/* Sort an input file too big to sort in core.  */
-
-void
-sort_offline (char *infile, off_t total, char *outfile)
-{
-  /* More than enough. */
-  int ntemps = 2 * (total + MAX_IN_CORE_SORT - 1) / MAX_IN_CORE_SORT;
-  char **tempfiles = (char **) xmalloc (ntemps * sizeof (char *));
-  FILE *istream = fopen (infile, "r");
-  int i;
-  struct linebuffer lb;
-  long linelength;
-  int failure = 0;
-
-  initbuffer (&lb);
-
-  /* Read in one line of input data.  */
-
-  linelength = readline (&lb, istream);
-
-  if (lb.buffer[0] != '\\' && lb.buffer[0] != '@')
-    {
-      error (_("%s: not a texinfo index file"), infile);
-      return;
-    }
-
-  /* Split up the input into `ntemps' temporary files, or maybe fewer,
-     and put the new files' names into `tempfiles' */
-
-  for (i = 0; i < ntemps; i++)
-    {
-      char *outname = maketempname (++tempcount);
-      FILE *ostream = fopen (outname, "w");
-      long tempsize = 0;
-
-      if (!ostream)
-        pfatal_with_name (outname);
-      tempfiles[i] = outname;
-
-      /* Copy lines into this temp file as long as it does not make file
-         "too big" or until there are no more lines.  */
-
-      while (tempsize + linelength + 1 <= MAX_IN_CORE_SORT)
-        {
-          tempsize += linelength + 1;
-          fputs (lb.buffer, ostream);
-          putc ('\n', ostream);
-
-          /* Read another line of input data.  */
-
-          linelength = readline (&lb, istream);
-          if (!linelength && feof (istream))
-            break;
-
-          if (lb.buffer[0] != '\\' && lb.buffer[0] != '@')
-            {
-              error (_("%s: not a texinfo index file"), infile);
-              failure = 1;
-              goto fail;
-            }
-        }
-      fclose (ostream);
-      if (feof (istream))
-        break;
-    }
-
-  free (lb.buffer);
-
-fail:
-  /* Record number of temp files we actually needed.  */
-
-  ntemps = i;
-
-  /* Sort each tempfile into another tempfile.
-    Delete the first set of tempfiles and put the names of the second
-    into `tempfiles'. */
-
-  for (i = 0; i < ntemps; i++)
-    {
-      char *newtemp = maketempname (++tempcount);
-      sort_in_core (tempfiles[i], MAX_IN_CORE_SORT, newtemp);
-      if (!keep_tempfiles)
-        unlink (tempfiles[i]);
-      tempfiles[i] = newtemp;
-    }
-
-  if (failure)
-    return;
-
-  /* Merge the tempfiles together and indexify. */
-
-  merge_files (tempfiles, ntemps, outfile);
-}
-
-/* Sort INFILE, whose size is TOTAL,
-   assuming that is small enough to be done in-core,
-   then indexify it and send the output to OUTFILE (or to stdout).  */
-
-void
-sort_in_core (char *infile, int total, char *outfile)
-{
-  char **nextline;
-  char *data = (char *) xmalloc (total + 1);
-  char *file_data;
-  long file_size;
-  int i;
-  FILE *ostream = stdout;
-  struct lineinfo *lineinfo;
-
-  /* Read the contents of the file into the moby array `data'. */
-
-  int desc = open (infile, O_RDONLY, 0);
-
-  if (desc < 0)
-    fatal (_("failure reopening %s"), infile);
-  for (file_size = 0;;)
-    {
-      i = read (desc, data + file_size, total - file_size);
-      if (i <= 0)
-        break;
-      file_size += i;
-    }
-  file_data = data;
-  data[file_size] = 0;
-
-  close (desc);
-
-  if (file_size > 0 && data[0] != '\\' && data[0] != '@')
-    {
-      error (_("%s: not a texinfo index file"), infile);
-      return;
-    }
-
-  init_char_order ();
-
-  /* Sort routines want to know this address. */
-
-  text_base = data;
-
-  /* Create the array of pointers to lines, with a default size
-     frequently enough.  */
-
-  nlines = total / 50;
-  if (!nlines)
-    nlines = 2;
-  linearray = (char **) xmalloc (nlines * sizeof (char *));
-
-  /* `nextline' points to the next free slot in this array.
-     `nlines' is the allocated size.  */
-
-  nextline = linearray;
-
-  /* Parse the input file's data, and make entries for the lines.  */
-
-  nextline = parsefile (infile, nextline, file_data, file_size);
-  if (nextline == 0)
-    {
-      error (_("%s: not a texinfo index file"), infile);
-      return;
-    }
-
-  /* Sort the lines. */
-
-  /* If we have enough space, find the first keyfield of each line in advance.
-     Make a `struct lineinfo' for each line, which records the keyfield
-     as well as the line, and sort them.  */
-
-  lineinfo = malloc ((nextline - linearray) * sizeof (struct lineinfo));
-
-  if (lineinfo)
-    {
-      struct lineinfo *lp;
-      char **p;
-
-      for (lp = lineinfo, p = linearray; p != nextline; lp++, p++)
-        {
-          lp->text = *p;
-          lp->key.text = find_field (keyfields, *p, &lp->keylen);
-          if (keyfields->numeric)
-            lp->key.number = find_value (lp->key.text, lp->keylen);
-        }
-
-      qsort (lineinfo, nextline - linearray, sizeof (struct lineinfo),
-             compare_prepared);
-
-      for (lp = lineinfo, p = linearray; p != nextline; lp++, p++)
-        *p = lp->text;
-
-      free (lineinfo);
-    }
-  else
-    qsort (linearray, nextline - linearray, sizeof (char *), compare_full);
-
-  /* Open the output file. */
-
-  if (outfile)
-    {
-      ostream = fopen (outfile, "w");
-      if (!ostream)
-        pfatal_with_name (outfile);
-    }
-
-  writelines (linearray, nextline - linearray, ostream);
-  if (outfile)
-    fclose (ostream);
-
-  free (linearray);
-  free (data);
-}
-
-/* Parse an input string in core into lines.
-   DATA is the input string, and SIZE is its length.
-   Data goes in LINEARRAY starting at NEXTLINE.
-   The value returned is the first entry in LINEARRAY still unused.
-   Value 0 means input file contents are invalid.  */
-
-char **
-parsefile (char *filename, char **nextline, char *data, long int size)
-{
-  char *p, *end;
-  char **line = nextline;
-
-  p = data;
-  end = p + size;
-  *end = 0;
-
-  while (p != end)
-    {
-      if (p[0] != '\\' && p[0] != '@')
-        return 0;
-
-      *line = p;
-
-      /* Find the first letter of the first field of this line.  If it
-         is different from the first letter of the first field of the
-         first line, we need initial headers in the output index.  */
-      while (*p && *p != '{')
-        p++;
-      if (p == end)
-        return 0;
-      p++;
-      if (first_initial)
-        {
-          if (first_initial != toupper (*p))
-            need_initials = 1;
-        }
-      else
-        first_initial = toupper (*p);
-
-      while (*p && *p != '\n')
-        p++;
-      if (p != end)
-        p++;
-
-      line++;
-      if (line == linearray + nlines)
-        {
-          char **old = linearray;
-          linearray = xrealloc (linearray, sizeof (char *) * (nlines *= 4));
-          line += linearray - old;
-        }
-    }
-
-  return line;
-}
-
-/* Indexification is a filter applied to the sorted lines
-   as they are being written to the output file.
-   Multiple entries for the same name, with different page numbers,
-   get combined into a single entry with multiple page numbers.
-   The first braced field, which is used for sorting, is discarded.
-   However, its first character is examined, folded to lower case,
-   and if it is different from that in the previous line fed to us
-   a \initial line is written with one argument, the new initial.
-
-   If an entry has four braced fields, then the second and third
-   constitute primary and secondary names.
-   In this case, each change of primary name
-   generates a \primary line which contains only the primary name,
-   and in between these are \secondary lines which contain
-   just a secondary name and page numbers. */
-
-/* The last primary name we wrote a \primary entry for.
-   If only one level of indexing is being done, this is the last name seen. */
-char *lastprimary;
-/* Length of storage allocated for lastprimary. */
-int lastprimarylength;
-
-/* Similar, for the secondary name. */
-char *lastsecondary;
-int lastsecondarylength;
-
-/* Zero if we are not in the middle of writing an entry.
-   One if we have written the beginning of an entry but have not
-   yet written any page numbers into it.
-   Greater than one if we have written the beginning of an entry
-   plus at least one page number. */
-int pending;
-
-/* The initial (for sorting purposes) of the last primary entry written.
-   When this changes, a \initial {c} line is written */
-
-char *lastinitial;
-
-int lastinitiallength;
-
-/* When we need a string of length 1 for the value of lastinitial,
-   store it here.  */
-
-char lastinitial1[2];
-
-/* Initialize static storage for writing an index. */
-
-void
-init_index (void)
-{
-  pending = 0;
-  lastinitial = lastinitial1;
-  lastinitial1[0] = 0;
-  lastinitial1[1] = 0;
-  lastinitiallength = 0;
-  lastprimarylength = 100;
-  lastprimary = (char *) xmalloc (lastprimarylength + 1);
-  memset (lastprimary, '\0', lastprimarylength + 1);
-  lastsecondarylength = 100;
-  lastsecondary = (char *) xmalloc (lastsecondarylength + 1);
-  memset (lastsecondary, '\0', lastsecondarylength + 1);
-}
-
-/* Indexify.  Merge entries for the same name,
-   insert headers for each initial character, etc.  */
-
-void
-indexify (char *line, FILE *ostream)
-{
-  char *primary, *secondary, *pagenumber;
-  int primarylength, secondarylength = 0, pagelength;
-  int nosecondary;
-  int initiallength;
-  char *initial;
-  char initial1[2];
-  register char *p;
-
-  /* First, analyze the parts of the entry fed to us this time. */
-
-  p = find_braced_pos (line, 0, 0, 0);
-  if (*p == '{')
-    {
-      initial = p;
-      /* Get length of inner pair of braces starting at `p',
-         including that inner pair of braces.  */
-      initiallength = find_braced_end (p + 1) + 1 - p;
-    }
-  else
-    {
-      initial = initial1;
-      initial1[0] = toupper (*p);
-      initial1[1] = 0;
-      initiallength = 1;
-    }
-
-  pagenumber = find_braced_pos (line, 1, 0, 0);
-  pagelength = find_braced_end (pagenumber) - pagenumber;
-  if (pagelength == 0)
-    fatal (_("No page number in %s"), line);
-
-  primary = find_braced_pos (line, 2, 0, 0);
-  primarylength = find_braced_end (primary) - primary;
-
-  secondary = find_braced_pos (line, 3, 0, 0);
-  nosecondary = !*secondary;
-  if (!nosecondary)
-    secondarylength = find_braced_end (secondary) - secondary;
-
-  /* If the primary is different from before, make a new primary entry. */
-  if (strncmp (primary, lastprimary, primarylength))
-    {
-      /* Close off current secondary entry first, if one is open. */
-      if (pending)
-        {
-          fputs ("}\n", ostream);
-          pending = 0;
-        }
-
-      /* If this primary has a different initial, include an entry for
-         the initial. */
-      if (need_initials &&
-          (initiallength != lastinitiallength ||
-           strncmp (initial, lastinitial, initiallength)))
-        {
-          fprintf (ostream, "\\initial {");
-          fwrite (initial, 1, initiallength, ostream);
-          fputs ("}\n", ostream);
-          if (initial == initial1)
-            {
-              lastinitial = lastinitial1;
-              *lastinitial1 = *initial1;
-            }
-          else
-            {
-              lastinitial = initial;
-            }
-          lastinitiallength = initiallength;
-        }
-
-      /* Make the entry for the primary.  */
-      if (nosecondary)
-        fputs ("\\entry {", ostream);
-      else
-        fputs ("\\primary {", ostream);
-      fwrite (primary, primarylength, 1, ostream);
-      if (nosecondary)
-        {
-          fputs ("}{", ostream);
-          pending = 1;
-        }
-      else
-        fputs ("}\n", ostream);
-
-      /* Record name of most recent primary. */
-      if (lastprimarylength < primarylength)
-        {
-          lastprimarylength = primarylength + 100;
-          lastprimary = (char *) xrealloc (lastprimary,
-                                           1 + lastprimarylength);
-        }
-      strncpy (lastprimary, primary, primarylength);
-      lastprimary[primarylength] = 0;
-
-      /* There is no current secondary within this primary, now. */
-      lastsecondary[0] = 0;
-    }
-
-  /* Should not have an entry with no subtopic following one with a
-     subtopic. */
-
-  if (nosecondary && *lastsecondary)
-    error (_("entry %s follows an entry with a secondary name"), line);
-
-  /* Start a new secondary entry if necessary. */
-  if (!nosecondary && strncmp (secondary, lastsecondary, secondarylength))
-    {
-      if (pending)
-        {
-          fputs ("}\n", ostream);
-          pending = 0;
-        }
-
-      /* Write the entry for the secondary.  */
-      fputs ("\\secondary {", ostream);
-      fwrite (secondary, secondarylength, 1, ostream);
-      fputs ("}{", ostream);
-      pending = 1;
-
-      /* Record name of most recent secondary. */
-      if (lastsecondarylength < secondarylength)
-        {
-          lastsecondarylength = secondarylength + 100;
-          lastsecondary = (char *) xrealloc (lastsecondary,
-                                             1 + lastsecondarylength);
-        }
-      strncpy (lastsecondary, secondary, secondarylength);
-      lastsecondary[secondarylength] = 0;
-    }
-
-  /* Here to add one more page number to the current entry. */
-  if (pending++ != 1)
-    fputs (", ", ostream);  /* Punctuate first, if this is not the first. */
-  fwrite (pagenumber, pagelength, 1, ostream);
-}
-
-/* Close out any unfinished output entry. */
-
-void
-finish_index (FILE *ostream)
-{
-  if (pending)
-    fputs ("}\n", ostream);
-  free (lastprimary);
-  free (lastsecondary);
-}
-
-/* Copy the lines in the sorted order.
-   Each line is copied out of the input file it was found in. */
-
-void
-writelines (char **linearray, int nlines, FILE *ostream)
-{
-  char **stop_line = linearray + nlines;
-  char **next_line;
-
-  init_index ();
-
-  /* Output the text of the lines, and free the buffer space. */
-
-  for (next_line = linearray; next_line != stop_line; next_line++)
-    {
-      /* If -u was specified, output the line only if distinct from
-         previous one.  */
-      if (next_line == linearray
-      /* Compare previous line with this one, using only the
-         explicitly specd keyfields. */
-          || compare_general (*(next_line - 1), *next_line, 0L, 0L,
-                              num_keyfields - 1))
-        {
-          char *p = *next_line;
-          char c;
-
-          while ((c = *p++) && c != '\n')
-            /* Do nothing. */ ;
-          *(p - 1) = 0;
-          indexify (*next_line, ostream);
-        }
-    }
-
-  finish_index (ostream);
-}
-
-/* Assume (and optionally verify) that each input file is sorted;
-   merge them and output the result.
-   Returns nonzero if any input file fails to be sorted.
-
-   This is the high-level interface that can handle an unlimited
-   number of files.  */
-
-#define MAX_DIRECT_MERGE 10
-
-int
-merge_files (char **infiles, int nfiles, char *outfile)
-{
-  char **tempfiles;
-  int ntemps;
-  int i;
-  int value = 0;
-  int start_tempcount = tempcount;
-
-  if (nfiles <= MAX_DIRECT_MERGE)
-    return merge_direct (infiles, nfiles, outfile);
-
-  /* Merge groups of MAX_DIRECT_MERGE input files at a time,
-     making a temporary file to hold each group's result.  */
-
-  ntemps = (nfiles + MAX_DIRECT_MERGE - 1) / MAX_DIRECT_MERGE;
-  tempfiles = (char **) xmalloc (ntemps * sizeof (char *));
-  for (i = 0; i < ntemps; i++)
-    {
-      int nf = MAX_DIRECT_MERGE;
-      if (i + 1 == ntemps)
-        nf = nfiles - i * MAX_DIRECT_MERGE;
-      tempfiles[i] = maketempname (++tempcount);
-      value |= merge_direct (&infiles[i * MAX_DIRECT_MERGE], nf, tempfiles[i]);
-    }
-
-  /* All temporary files that existed before are no longer needed
-     since their contents have been merged into our new tempfiles.
-     So delete them.  */
-  flush_tempfiles (start_tempcount);
-
-  /* Now merge the temporary files we created.  */
-
-  merge_files (tempfiles, ntemps, outfile);
-
-  free (tempfiles);
-
-  return value;
-}
-
-/* Assume (and optionally verify) that each input file is sorted;
-   merge them and output the result.
-   Returns nonzero if any input file fails to be sorted.
-
-   This version of merging will not work if the number of
-   input files gets too high.  Higher level functions
-   use it only with a bounded number of input files.  */
-
-int
-merge_direct (char **infiles, int nfiles, char *outfile)
-{
-  struct linebuffer *lb1, *lb2;
-  struct linebuffer **thisline, **prevline;
-  FILE **streams;
-  int i;
-  int nleft;
-  int lossage = 0;
-  int *file_lossage;
-  struct linebuffer *prev_out = 0;
-  FILE *ostream = stdout;
-
-  if (outfile)
-    {
-      ostream = fopen (outfile, "w");
-    }
-  if (!ostream)
-    pfatal_with_name (outfile);
-
-  init_index ();
-
-  if (nfiles == 0)
-    {
-      if (outfile)
-        fclose (ostream);
-      return 0;
-    }
-
-  /* For each file, make two line buffers.  Also, for each file, there
-     is an element of `thisline' which points at any time to one of the
-     file's two buffers, and an element of `prevline' which points to
-     the other buffer.  `thisline' is supposed to point to the next
-     available line from the file, while `prevline' holds the last file
-     line used, which is remembered so that we can verify that the file
-     is properly sorted. */
-
-  /* lb1 and lb2 contain one buffer each per file. */
-  lb1 = (struct linebuffer *) xmalloc (nfiles * sizeof (struct linebuffer));
-  lb2 = (struct linebuffer *) xmalloc (nfiles * sizeof (struct linebuffer));
-
-  /* thisline[i] points to the linebuffer holding the next available
-     line in file i, or is zero if there are no lines left in that file.  */
-  thisline = (struct linebuffer **)
-    xmalloc (nfiles * sizeof (struct linebuffer *));
-  /* prevline[i] points to the linebuffer holding the last used line
-     from file i.  This is just for verifying that file i is properly
-     sorted.  */
-  prevline = (struct linebuffer **)
-    xmalloc (nfiles * sizeof (struct linebuffer *));
-  /* streams[i] holds the input stream for file i.  */
-  streams = (FILE **) xmalloc (nfiles * sizeof (FILE *));
-  /* file_lossage[i] is nonzero if we already know file i is not
-     properly sorted.  */
-  file_lossage = (int *) xmalloc (nfiles * sizeof (int));
-
-  /* Allocate and initialize all that storage. */
-
-  for (i = 0; i < nfiles; i++)
-    {
-      initbuffer (&lb1[i]);
-      initbuffer (&lb2[i]);
-      thisline[i] = &lb1[i];
-      prevline[i] = &lb2[i];
-      file_lossage[i] = 0;
-      streams[i] = fopen (infiles[i], "r");
-      if (!streams[i])
-        pfatal_with_name (infiles[i]);
-
-      readline (thisline[i], streams[i]);
-    }
-
-  /* Keep count of number of files not at eof. */
-  nleft = nfiles;
-
-  while (nleft)
-    {
-      struct linebuffer *best = 0;
-      struct linebuffer *exch;
-      int bestfile = -1;
-      int i;
-
-      /* Look at the next avail line of each file; choose the least one.  */
-
-      for (i = 0; i < nfiles; i++)
-        {
-          if (thisline[i] &&
-              (!best ||
-               0 < compare_general (best->buffer, thisline[i]->buffer,
-                                 (long) bestfile, (long) i, num_keyfields)))
-            {
-              best = thisline[i];
-              bestfile = i;
-            }
-        }
-
-      /* Output that line, unless it matches the previous one and we
-         don't want duplicates. */
-
-      if (!(prev_out &&
-            !compare_general (prev_out->buffer,
-                              best->buffer, 0L, 1L, num_keyfields - 1)))
-        indexify (best->buffer, ostream);
-      prev_out = best;
-
-      /* Now make the line the previous of its file, and fetch a new
-         line from that file.  */
-
-      exch = prevline[bestfile];
-      prevline[bestfile] = thisline[bestfile];
-      thisline[bestfile] = exch;
-
-      while (1)
-        {
-          /* If the file has no more, mark it empty. */
-
-          if (feof (streams[bestfile]))
-            {
-              thisline[bestfile] = 0;
-              /* Update the number of files still not empty. */
-              nleft--;
-              break;
-            }
-          readline (thisline[bestfile], streams[bestfile]);
-          if (thisline[bestfile]->buffer[0] || !feof (streams[bestfile]))
-            break;
-        }
-    }
-
-  finish_index (ostream);
-
-  /* Free all storage and close all input streams. */
-
-  for (i = 0; i < nfiles; i++)
-    {
-      fclose (streams[i]);
-      free (lb1[i].buffer);
-      free (lb2[i].buffer);
-    }
-  free (file_lossage);
-  free (lb1);
-  free (lb2);
-  free (thisline);
-  free (prevline);
-  free (streams);
-
-  if (outfile)
-    fclose (ostream);
-
-  return lossage;
-}
-
-/* Print error message and exit.  */
-
-void
-fatal (const char *format, const char *arg)
-{
-  error (format, arg);
-  xexit (1);
-}
-
-/* Print error message.  FORMAT is printf control string, ARG is arg for it. */
-void
-error (const char *format, const char *arg)
-{
-  printf ("%s: ", program_name);
-  printf (format, arg);
-  if (format[strlen (format) -1] != '\n')
-    printf ("\n");
-}
-
-void
-perror_with_name (const char *name)
-{
-  fprintf (stderr, "%s: ", program_name);
-  perror (name);
-}
-
-void
-pfatal_with_name (const char *name)
-{
-  perror_with_name (name);
-  xexit (1);
-}
-
-
-/* Return a newly-allocated string concatenating S1 and S2.  */
-
-char *
-concat (char *s1, char *s2)
-{
-  int len1 = strlen (s1), len2 = strlen (s2);
-  char *result = (char *) xmalloc (len1 + len2 + 1);
-
-  strcpy (result, s1);
-  strcpy (result + len1, s2);
-  *(result + len1 + len2) = 0;
-
-  return result;
-}

Property changes on: head/contrib/texinfo/util/texindex.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/util/README
===================================================================
--- head/contrib/texinfo/util/README	(revision 276550)
+++ head/contrib/texinfo/util/README	(nonexistent)
@@ -1,14 +0,0 @@
-$Id: README,v 1.5 2004/04/11 17:56:47 karl Exp $
-texinfo/util/README
-
-  Copyright (C) 2002 Free Software Foundation, Inc.
-
-  Copying and distribution of this file, with or without modification,
-  are permitted in any medium without royalty provided the copyright
-  notice and this notice are preserved.
-
-Assorted Texinfo-related programs and scripts.
-
-texindex, texi2dvi, and install-info get installed.
-The other items here are for your amusement and/or hacking pleasure.
-

Property changes on: head/contrib/texinfo/util/README
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/util/install-info.c
===================================================================
--- head/contrib/texinfo/util/install-info.c	(revision 276550)
+++ head/contrib/texinfo/util/install-info.c	(nonexistent)
@@ -1,1626 +0,0 @@
-/* $FreeBSD$ */
-/* install-info -- create Info directory entry(ies) for an Info file.
-   $Id: install-info.c,v 1.12 2004/04/11 17:56:47 karl Exp $
-
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.*/
-
-#include "system.h"
-#include <getopt.h>
-
-static char *progname = "install-info";
-static char *default_section = NULL;
-
-struct spec_entry;
-struct spec_section;
-
-struct line_data *findlines (char *data, int size, int *nlinesp);
-void insert_entry_here (struct spec_entry *entry, int line_number,
-                        struct line_data *dir_lines, int n_entries); 
-int compare_section_names (const void *s1, const void *s2);
-int compare_entries_text (const void *e1, const void *e2); 
-
-/* Data structures.  */
-
-
-/* Record info about a single line from a file as read into core.  */
-struct line_data
-{
-  /* The start of the line.  */
-  char *start;
-  /* The number of characters in the line,
-     excluding the terminating newline.  */
-  int size;
-  /* Vector containing pointers to the entries to add before this line.
-     The vector is null-terminated.  */
-  struct spec_entry **add_entries_before;
-  /* 1 means output any needed new sections before this line.  */
-  int add_sections_before;
-  /* 1 means don't output this line.  */
-  int delete;
-};
-
-
-/* This is used for a list of the specified menu section names
-   in which entries should be added.  */
-struct spec_section
-{
-  struct spec_section *next;
-  char *name;
-  /* 1 means we have not yet found an existing section with this name
-     in the dir file--so we will need to add a new section.  */
-  int missing;
-};
-
-
-/* This is used for a list of the entries specified to be added.  */
-struct spec_entry
-{
-  struct spec_entry *next;
-  char *text;
-  int text_len;
-  /* A pointer to the list of sections to which this entry should be
-     added.  */
-  struct spec_section *entry_sections;
-  /* A pointer to a section that is beyond the end of the chain whose
-     head is pointed to by entry_sections.  */
-  struct spec_section *entry_sections_tail;
-};
-
-
-/* This is used for a list of nodes found by parsing the dir file.  */
-struct node
-{
-  struct node *next;
-  /* The node name.  */
-  char *name;
-  /* The line number of the line where the node starts.
-     This is the line that contains control-underscore.  */
-  int start_line;
-  /* The line number of the line where the node ends,
-     which is the end of the file or where the next line starts.  */
-  int end_line;
-  /* Start of first line in this node's menu
-     (the line after the * Menu: line).  */
-  char *menu_start;
-  /* The start of the chain of sections in this node's menu.  */
-  struct menu_section *sections;
-  /* The last menu section in the chain.  */
-  struct menu_section *last_section;
-};
-
-
-/* This is used for a list of sections found in a node's menu.
-   Each  struct node  has such a list in the  sections  field.  */
-struct menu_section
-{
-  struct menu_section *next;
-  char *name;
-  /* Line number of start of section.  */
-  int start_line;
-  /* Line number of end of section.  */
-  int end_line;
-};
-
-/* This table defines all the long-named options, says whether they
-   use an argument, and maps them into equivalent single-letter options.  */
-
-struct option longopts[] =
-{
-  { "delete",    no_argument, NULL, 'r' },
-  { "defentry",  required_argument, NULL, 'E' },
-  { "defsection", required_argument, NULL, 'S' },
-  { "dir-file",  required_argument, NULL, 'd' },
-  { "entry",     required_argument, NULL, 'e' },
-  { "help",      no_argument, NULL, 'h' },
-  { "infodir",   required_argument, NULL, 'D' },
-  { "info-dir",  required_argument, NULL, 'D' },
-  { "info-file", required_argument, NULL, 'i' },
-  { "item",      required_argument, NULL, 'e' },
-  { "quiet",     no_argument, NULL, 'q' },
-  { "remove",    no_argument, NULL, 'r' },
-  { "section",   required_argument, NULL, 's' },
-  { "version",   no_argument, NULL, 'V' },
-  { 0 }
-};
-
-/* Error message functions.  */
-
-/* Print error message.  S1 is printf control string, S2 and S3 args for it. */
-
-/* VARARGS1 */
-void
-error (const char *s1, const char *s2, const char *s3)
-{
-  fprintf (stderr, "%s: ", progname);
-  fprintf (stderr, s1, s2, s3);
-  putc ('\n', stderr);
-}
-
-/* VARARGS1 */
-void
-warning (const char *s1, const char *s2, const char *s3)
-{
-  fprintf (stderr, _("%s: warning: "), progname);
-  fprintf (stderr, s1, s2, s3);
-  putc ('\n', stderr);
-}
-
-/* Print error message and exit.  */
-
-void
-fatal (const char *s1, const char *s2, const char *s3)
-{
-  error (s1, s2, s3);
-  xexit (1);
-}
-
-/* Return a newly-allocated string
-   whose contents concatenate those of S1, S2, S3.  */
-char *
-concat (const char *s1, const char *s2, const char *s3)
-{
-  int len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3);
-  char *result = (char *) xmalloc (len1 + len2 + len3 + 1);
-
-  strcpy (result, s1);
-  strcpy (result + len1, s2);
-  strcpy (result + len1 + len2, s3);
-  *(result + len1 + len2 + len3) = 0;
-
-  return result;
-}
-
-/* Return a string containing SIZE characters
-   copied from starting at STRING.  */
-
-char *
-copy_string (const char *string, int size)
-{
-  int i;
-  char *copy = (char *) xmalloc (size + 1);
-  for (i = 0; i < size; i++)
-    copy[i] = string[i];
-  copy[size] = 0;
-  return copy;
-}
-
-/* Print fatal error message based on errno, with file name NAME.  */
-
-void
-pfatal_with_name (const char *name)
-{
-  char *s = concat ("", strerror (errno), _(" for %s"));
-  fatal (s, name, 0);
-}
-
-/* Compare the menu item names in LINE1 (line length LEN1)
-   and LINE2 (line length LEN2).  Return 1 if the item name
-   in LINE1 is less, 0 otherwise.  */
-
-static int
-menu_line_lessp (char *line1, int len1, char *line2, int len2)
-{
-  int minlen = (len1 < len2 ? len1 : len2);
-  int i;
-
-  for (i = 0; i < minlen; i++)
-    {
-      /* If one item name is a prefix of the other,
-         the former one is less.  */
-      if (line1[i] == ':' && line2[i] != ':')
-        return 1;
-      if (line2[i] == ':' && line1[i] != ':')
-        return 0;
-      /* If they both continue and differ, one is less.  */
-      if (line1[i] < line2[i])
-        return 1;
-      if (line1[i] > line2[i])
-        return 0;
-    }
-  /* With a properly formatted dir file,
-     we can only get here if the item names are equal.  */
-  return 0;
-}
-
-/* Compare the menu item names in LINE1 (line length LEN1)
-   and LINE2 (line length LEN2).  Return 1 if the item names are equal,
-   0 otherwise.  */
-
-static int
-menu_line_equal (char *line1, int len1, char *line2, int len2)
-{
-  int minlen = (len1 < len2 ? len1 : len2);
-  int i;
-
-  for (i = 0; i < minlen; i++)
-    {
-      /* If both item names end here, they are equal.  */
-      if (line1[i] == ':' && line2[i] == ':')
-        return 1;
-      /* If they both continue and differ, one is less.  */
-      if (line1[i] != line2[i])
-        return 0;
-    }
-  /* With a properly formatted dir file,
-     we can only get here if the item names are equal.  */
-  return 1;
-}
-
-
-/* Given the full text of a menu entry, null terminated,
-   return just the menu item name (copied).  */
-
-char *
-extract_menu_item_name (char *item_text)
-{
-  char *p;
-
-  if (*item_text == '*')
-    item_text++;
-  while (*item_text == ' ')
-    item_text++;
-
-  p = item_text;
-  while (*p && *p != ':') p++;
-  return copy_string (item_text, p - item_text);
-}
-
-/* Given the full text of a menu entry, terminated by null or newline,
-   return just the menu item file (copied).  */
-
-char *
-extract_menu_file_name (char *item_text)
-{
-  char *p = item_text;
-
-  /* If we have text that looks like * ITEM: (FILE)NODE...,
-     extract just FILE.  Otherwise return "(none)".  */
-
-  if (*p == '*')
-    p++;
-  while (*p == ' ')
-    p++;
-
-  /* Skip to and past the colon.  */
-  while (*p && *p != '\n' && *p != ':') p++;
-  if (*p == ':') p++;
-
-  /* Skip past the open-paren.  */
-  while (1)
-    {
-      if (*p == '(')
-        break;
-      else if (*p == ' ' || *p == '\t')
-        p++;
-      else
-        return "(none)";
-    }
-  p++;
-
-  item_text = p;
-
-  /* File name ends just before the close-paren.  */
-  while (*p && *p != '\n' && *p != ')') p++;
-  if (*p != ')')
-    return "(none)";
-
-  return copy_string (item_text, p - item_text);
-}
-
-
-
-/* Return FNAME with any [.info][.gz] suffix removed.  */
-
-static char *
-strip_info_suffix (char *fname)
-{
-  char *ret = xstrdup (fname);
-  unsigned len = strlen (ret);
-
-  if (len > 3 && FILENAME_CMP (ret + len - 3, ".gz") == 0)
-    {
-      len -= 3;
-      ret[len] = 0;
-    }
-  else if (len > 4 && FILENAME_CMP (ret + len - 4, ".bz2") == 0)
-    {
-      len -= 4;
-      ret[len] = 0;
-    }
-
-  if (len > 5 && FILENAME_CMP (ret + len - 5, ".info") == 0)
-    {
-      len -= 5;
-      ret[len] = 0;
-    }
-  else if (len > 4 && FILENAME_CMP (ret + len - 4, ".inf") == 0)
-    {
-      len -= 4;
-      ret[len] = 0;
-    }
-#ifdef __MSDOS__
-  else if (len > 4 && (FILENAME_CMP (ret + len - 4, ".inz") == 0
-                       || FILENAME_CMP (ret + len - 4, ".igz") == 0))
-    {
-      len -= 4;
-      ret[len] = 0;
-    }
-#endif /* __MSDOS__ */
-
-  return ret;
-}
-
-
-/* Return true if ITEM matches NAME and is followed by TERM_CHAR.  ITEM
-   can also be followed by `.gz', `.info.gz', or `.info' (and then
-   TERM_CHAR) and still match.  */
-
-static int
-menu_item_equal (const char *item, char term_char, const char *name)
-{
-  int ret;
-  const char *item_basename = item;
-  unsigned name_len = strlen (name);
-
-  /* We must compare the basename in ITEM, since we are passed the
-     basename of the original info file.  Otherwise, a new entry like
-     "lilypond/lilypond" won't match "lilypond".
-     
-     Actually, it seems to me that we should really compare the whole
-     name, and not just the basename.  Couldn't there be dir1/foo.info
-     and dir2/foo.info?  Also, it seems like we should be using the
-     filename from the new dir entries, not the filename on the command
-     line.  Not worrying about those things right now, though.  --karl,
-     26mar04.  */
-  while (*item_basename && !IS_SLASH (*item_basename)
-	 && *item_basename != term_char)
-    item_basename++;
-  if (! *item_basename || *item_basename == term_char)
-    item_basename = item;  /* no /, use original */
-  else
-    item_basename++;       /* have /, move past it */
-    
-  /* First, ITEM must actually match NAME (usually it won't).  */
-  ret = strncasecmp (item_basename, name, name_len) == 0;
-  if (ret)
-    {
-      /* Then, `foobar' doesn't match `foo', so be sure we've got all of
-         ITEM.  The various suffixes should never actually appear in the
-         dir file, but sometimes people put them in.  */
-      static char *suffixes[]
-        = { "", ".info.gz", ".info", ".inf", ".gz",
-#ifdef __MSDOS__
-            ".inz", ".igz",
-#endif
-            NULL };
-      unsigned i;
-      ret = 0;
-      for (i = 0; !ret && suffixes[i]; i++)
-        {
-          char *suffix = suffixes[i];
-          unsigned suffix_len = strlen (suffix);
-          ret = strncasecmp (item_basename + name_len, suffix, suffix_len) == 0
-                && item_basename[name_len + suffix_len] == term_char;
-        }
-    }
-
-  return ret;
-}
-
-
-
-void
-suggest_asking_for_help (void)
-{
-  fprintf (stderr, _("\tTry `%s --help' for a complete list of options.\n"),
-           progname);
-  xexit (1);
-}
-
-void
-print_help (void)
-{
-  printf (_("Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n\
-\n\
-Install or delete dir entries from INFO-FILE in the Info directory file\n\
-DIR-FILE.\n\
-\n\
-Options:\n\
- --delete          delete existing entries for INFO-FILE from DIR-FILE;\n\
-                     don't insert any new entries.\n\
- --defentry=TEXT   like --entry, but only use TEXT if an entry\n\
-                     is not present in INFO-FILE.\n\
- --defsection=TEXT like --section, but only use TEXT if a section\n\
-                     is not present in INFO-FILE.\n\
- --dir-file=NAME   specify file name of Info directory file.\n\
-                     This is equivalent to using the DIR-FILE argument.\n\
- --entry=TEXT      insert TEXT as an Info directory entry.\n\
-                     TEXT should have the form of an Info menu item line\n\
-                     plus zero or more extra lines starting with whitespace.\n\
-                     If you specify more than one entry, they are all added.\n\
-                     If you don't specify any entries, they are determined\n\
-                     from information in the Info file itself.\n\
- --help            display this help and exit.\n\
- --info-file=FILE  specify Info file to install in the directory.\n\
-                     This is equivalent to using the INFO-FILE argument.\n\
- --info-dir=DIR    same as --dir-file=DIR/dir.\n\
- --item=TEXT       same as --entry TEXT.\n\
-                     An Info directory entry is actually a menu item.\n\
- --quiet           suppress warnings.\n\
- --remove          same as --delete.\n\
- --section=SEC     put this file's entries in section SEC of the directory.\n\
-                     If you specify more than one section, all the entries\n\
-                     are added in each of the sections.\n\
-                     If you don't specify any sections, they are determined\n\
-                     from information in the Info file itself.\n\
- --version         display version information and exit.\n\
-"), progname);
-
-  puts (_("\n\
-Email bug reports to bug-texinfo@gnu.org,\n\
-general questions and discussion to help-texinfo@gnu.org.\n\
-Texinfo home page: http://www.gnu.org/software/texinfo/"));
-}
-
-
-/* If DIRFILE does not exist, create a minimal one (or abort).  If it
-   already exists, do nothing.  */
-
-void
-ensure_dirfile_exists (char *dirfile)
-{
-  int desc = open (dirfile, O_RDONLY);
-  if (desc < 0 && errno == ENOENT)
-    {
-      FILE *f;
-      char *readerr = strerror (errno);
-      close (desc);
-      f = fopen (dirfile, "w");
-      if (f)
-        {
-          fprintf (f, _("This is the file .../info/dir, which contains the\n\
-topmost node of the Info hierarchy, called (dir)Top.\n\
-The first time you invoke Info you start off looking at this node.\n\
-\x1f\n\
-%s\tThis is the top of the INFO tree\n\
-\n\
-  This (the Directory node) gives a menu of major topics.\n\
-  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n\
-  \"h\" gives a primer for first-timers,\n\
-  \"mEmacs<Return>\" visits the Emacs manual, etc.\n\
-\n\
-  In Emacs, you can click mouse button 2 on a menu item or cross reference\n\
-  to select it.\n\
-\n\
-%s\n\
-"), "File: dir,\tNode: Top",  /* These keywords must not be translated.  */
-    "* Menu:"
-);
-          if (fclose (f) < 0)
-            pfatal_with_name (dirfile);
-        }
-      else
-        {
-          /* Didn't exist, but couldn't open for writing.  */
-          fprintf (stderr,
-                   _("%s: could not read (%s) and could not create (%s)\n"),
-                   dirfile, readerr, strerror (errno));
-          xexit (1);
-        }
-    }
-  else
-    close (desc); /* It already existed, so fine.  */
-}
-
-/* Open FILENAME and return the resulting stream pointer.  If it doesn't
-   exist, try FILENAME.gz.  If that doesn't exist either, call
-   CREATE_CALLBACK (with FILENAME as arg) to create it, if that is
-   non-NULL.  If still no luck, fatal error.
-
-   If we do open it, return the actual name of the file opened in
-   OPENED_FILENAME and the compress program to use to (de)compress it in
-   COMPRESSION_PROGRAM.  The compression program is determined by the
-   magic number, not the filename.  */
-
-FILE *
-open_possibly_compressed_file (char *filename,
-    void (*create_callback) (char *),
-    char **opened_filename, char **compression_program, int *is_pipe) 
-{
-  char *local_opened_filename, *local_compression_program;
-  int nread;
-  char data[4];
-  FILE *f;
-
-  /* We let them pass NULL if they don't want this info, but it's easier
-     to always determine it.  */
-  if (!opened_filename)
-    opened_filename = &local_opened_filename;
-
-  *opened_filename = filename;
-  f = fopen (*opened_filename, FOPEN_RBIN);
-  if (!f)
-    {
-      *opened_filename = concat (filename, ".gz", "");
-      f = fopen (*opened_filename, FOPEN_RBIN);
-  if (!f)
-    {
-      free (*opened_filename);
-      *opened_filename = concat (filename, ".bz2", "");
-      f = fopen (*opened_filename, FOPEN_RBIN);
-    }
-
-#ifdef __MSDOS__
-      if (!f)
-        {
-          free (*opened_filename);
-          *opened_filename = concat (filename, ".igz", "");
-          f = fopen (*opened_filename, FOPEN_RBIN);
-        }
-      if (!f)
-        {
-          free (*opened_filename);
-          *opened_filename = concat (filename, ".inz", "");
-          f = fopen (*opened_filename, FOPEN_RBIN);
-        }
-#endif
-      if (!f)
-        {
-          if (create_callback)
-            { /* That didn't work either.  Create the file if we can.  */
-              (*create_callback) (filename);
-
-              /* And try opening it again.  */
-              free (*opened_filename);
-              *opened_filename = filename;
-              f = fopen (*opened_filename, FOPEN_RBIN);
-              if (!f)
-                pfatal_with_name (filename);
-            }
-          else
-            pfatal_with_name (filename);
-        }
-    }
-
-  /* Read first few bytes of file rather than relying on the filename.
-     If the file is shorter than this it can't be usable anyway.  */
-  nread = fread (data, sizeof (data), 1, f);
-  if (nread != 1)
-    {
-      /* Empty files don't set errno, so we get something like
-         "install-info: No error for foo", which is confusing.  */
-      if (nread == 0)
-        fatal (_("%s: empty file"), *opened_filename, 0);
-      pfatal_with_name (*opened_filename);
-    }
-
-  if (!compression_program)
-    compression_program = &local_compression_program;
-
-  if (data[0] == '\x1f' && data[1] == '\x8b')
-#if STRIP_DOT_EXE
-    /* An explicit .exe yields a better diagnostics from popen below
-       if they don't have gzip installed.  */
-    *compression_program = "gzip.exe";
-#else
-    *compression_program = "gzip";
-#endif
-  else if(data[0] == 'B' && data[1] == 'Z' && data[2] == 'h')
-#ifndef STRIP_DOT_EXE
-    *compression_program = "bzip2.exe";
-#else
-    *compression_program = "bzip2";
-#endif
-  else if(data[0] == 'B' && data[1] == 'Z' && data[2] == '0')
-#ifndef STRIP_DOT_EXE
-    *compression_program = "bzip.exe";
-#else
-    *compression_program = "bzip";
-#endif
-  else
-    *compression_program = NULL;
-
-  if (*compression_program)
-    { /* It's compressed, so fclose the file and then open a pipe.  */
-      char *command = concat (*compression_program," -cd <", *opened_filename);
-      if (fclose (f) < 0)
-        pfatal_with_name (*opened_filename);
-      f = popen (command, "r");
-      if (f)
-        *is_pipe = 1;
-      else
-        pfatal_with_name (command);
-    }
-  else
-    { /* It's a plain file, seek back over the magic bytes.  */
-      if (fseek (f, 0, 0) < 0)
-        pfatal_with_name (*opened_filename);
-#if O_BINARY
-      /* Since this is a text file, and we opened it in binary mode,
-         switch back to text mode.  */
-      f = freopen (*opened_filename, "r", f);
-#endif
-      *is_pipe = 0;
-    }
-
-  return f;
-}
-
-/* Read all of file FILENAME into memory and return the address of the
-   data.  Store the size of the data into SIZEP.  If need be, uncompress
-   (i.e., try FILENAME.gz et al. if FILENAME does not exist) and store
-   the actual file name that was opened into OPENED_FILENAME (if it is
-   non-NULL), and the companion compression program (if any, else NULL)
-   into COMPRESSION_PROGRAM (if that is non-NULL).  If trouble, do
-   a fatal error.  */
-
-char *
-readfile (char *filename, int *sizep,
-    void (*create_callback) (char *), char **opened_filename,
-    char **compression_program)
-{
-  char *real_name;
-  FILE *f;
-  int pipe_p;
-  int filled = 0;
-  int data_size = 8192;
-  char *data = xmalloc (data_size);
-
-  /* If they passed the space for the file name to return, use it.  */
-  f = open_possibly_compressed_file (filename, create_callback,
-                                     opened_filename ? opened_filename
-                                                     : &real_name,
-                                     compression_program, &pipe_p);
-
-  for (;;)
-    {
-      int nread = fread (data + filled, 1, data_size - filled, f);
-      if (nread < 0)
-        pfatal_with_name (real_name);
-      if (nread == 0)
-        break;
-
-      filled += nread;
-      if (filled == data_size)
-        {
-          data_size += 65536;
-          data = xrealloc (data, data_size);
-        }
-    }
-
-  /* We'll end up wasting space if we're not passing the filename back
-     and it is not just FILENAME, but so what.  */
-  /* We need to close the stream, since on some systems the pipe created
-     by popen is simulated by a temporary file which only gets removed
-     inside pclose.  */
-  if (pipe_p)
-    pclose (f);
-  else
-    fclose (f);
-
-  *sizep = filled;
-  return data;
-}
-
-/* Output the old dir file, interpolating the new sections
-   and/or new entries where appropriate.  If COMPRESSION_PROGRAM is not
-   null, pipe to it to create DIRFILE.  Thus if we read dir.gz on input,
-   we'll write dir.gz on output.  */
-
-static void
-output_dirfile (char *dirfile, int dir_nlines, struct line_data *dir_lines,
-                int n_entries_to_add, struct spec_entry *entries_to_add,
-                struct spec_section *input_sections, char *compression_program)
-{
-  int i;
-  FILE *output;
-
-  if (compression_program)
-    {
-      char *command = concat (compression_program, ">", dirfile);
-      output = popen (command, "w");
-    }
-  else
-    output = fopen (dirfile, "w");
-
-  if (!output)
-    {
-      perror (dirfile);
-      xexit (1);
-    }
-
-  for (i = 0; i <= dir_nlines; i++)
-    {
-      int j;
-
-      /* If we decided to output some new entries before this line,
-         output them now.  */
-      if (dir_lines[i].add_entries_before)
-        for (j = 0; j < n_entries_to_add; j++)
-          {
-            struct spec_entry *this = dir_lines[i].add_entries_before[j];
-            if (this == 0)
-              break;
-            fputs (this->text, output);
-          }
-      /* If we decided to add some sections here
-         because there are no such sections in the file,
-         output them now.  */
-      if (dir_lines[i].add_sections_before)
-        {
-          struct spec_section *spec;
-          struct spec_section **sections;
-          int n_sections = 0;
-          struct spec_entry *entry;
-          struct spec_entry **entries;
-          int n_entries = 0;
-
-          /* Count the sections and allocate a vector for all of them.  */
-          for (spec = input_sections; spec; spec = spec->next)
-            n_sections++;
-          sections = ((struct spec_section **)
-                      xmalloc (n_sections * sizeof (struct spec_section *)));
-
-          /* Fill the vector SECTIONS with pointers to all the sections,
-             and sort them.  */
-          j = 0;
-          for (spec = input_sections; spec; spec = spec->next)
-            sections[j++] = spec;
-          qsort (sections, n_sections, sizeof (struct spec_section *),
-                 compare_section_names);
-
-          /* Count the entries and allocate a vector for all of them.  */
-          for (entry = entries_to_add; entry; entry = entry->next)
-            n_entries++;
-          entries = ((struct spec_entry **)
-                     xmalloc (n_entries * sizeof (struct spec_entry *)));
-
-          /* Fill the vector ENTRIES with pointers to all the sections,
-             and sort them.  */
-          j = 0;
-          for (entry = entries_to_add; entry; entry = entry->next)
-            entries[j++] = entry;
-          qsort (entries, n_entries, sizeof (struct spec_entry *),
-                 compare_entries_text);
-
-          /* Generate the new sections in alphabetical order.  In each
-             new section, output all of the entries that belong to that
-             section, in alphabetical order.  */
-          for (j = 0; j < n_sections; j++)
-            {
-              spec = sections[j];
-              if (spec->missing)
-                {
-                  int k;
-
-                  putc ('\n', output);
-                  fputs (spec->name, output);
-                  putc ('\n', output);
-                  for (k = 0; k < n_entries; k++)
-                    {
-                      struct spec_section *spec1;
-                      /* Did they at all want this entry to be put into
-                         this section?  */
-                      entry = entries[k];
-                      for (spec1 = entry->entry_sections;
-                           spec1 && spec1 != entry->entry_sections_tail;
-                           spec1 = spec1->next)
-                        {
-                          if (!strcmp (spec1->name, spec->name))
-                            break;
-                        }
-                      if (spec1 && spec1 != entry->entry_sections_tail)
-                        fputs (entry->text, output);
-                    }
-                }
-            }
-
-          free (entries);
-          free (sections);
-        }
-
-      /* Output the original dir lines unless marked for deletion.  */
-      if (i < dir_nlines && !dir_lines[i].delete)
-        {
-          fwrite (dir_lines[i].start, 1, dir_lines[i].size, output);
-          putc ('\n', output);
-        }
-    }
-
-  /* Some systems, such as MS-DOS, simulate pipes with temporary files.
-     On those systems, the compressor actually gets run inside pclose,
-     so we must call pclose.  */
-  if (compression_program)
-    pclose (output);
-  else
-    fclose (output);
-}
-
-/* Parse the input to find the section names and the entry names it
-   specifies.  Return the number of entries to add from this file.  */
-int
-parse_input (const struct line_data *lines, int nlines,
-             struct spec_section **sections, struct spec_entry **entries) 
-{
-  int n_entries = 0;
-  int prefix_length = strlen ("INFO-DIR-SECTION ");
-  struct spec_section *head = *sections, *tail = NULL;
-  int reset_tail = 0;
-  char *start_of_this_entry = 0;
-  int ignore_sections = *sections != 0;
-  int ignore_entries  = *entries  != 0;
-
-  int i;
-
-  if (ignore_sections && ignore_entries)
-    return 0;
-
-  /* Loop here processing lines from the input file.  Each
-     INFO-DIR-SECTION entry is added to the SECTIONS linked list.
-     Each START-INFO-DIR-ENTRY block is added to the ENTRIES linked
-     list, and all its entries inherit the chain of SECTION entries
-     defined by the last group of INFO-DIR-SECTION entries we have
-     seen until that point.  */
-  for (i = 0; i < nlines; i++)
-    {
-      if (!ignore_sections
-          && !strncmp ("INFO-DIR-SECTION ", lines[i].start, prefix_length))
-        {
-          struct spec_section *next
-            = (struct spec_section *) xmalloc (sizeof (struct spec_section));
-          next->name = copy_string (lines[i].start + prefix_length,
-                                    lines[i].size - prefix_length);
-          next->next = *sections;
-          next->missing = 1;
-          if (reset_tail)
-            {
-              tail = *sections;
-              reset_tail = 0;
-            }
-          *sections = next;
-          head = *sections;
-        }
-      /* If entries were specified explicitly with command options,
-         ignore the entries in the input file.  */
-      else if (!ignore_entries)
-        {
-          if (!strncmp ("START-INFO-DIR-ENTRY", lines[i].start, lines[i].size)
-              && sizeof ("START-INFO-DIR-ENTRY") - 1 == lines[i].size)
-            {
-              if (!*sections)
-                {
-                  /* We found an entry, but didn't yet see any sections
-                     specified.  Default to section "Miscellaneous".  */
-                  *sections = (struct spec_section *)
-                    xmalloc (sizeof (struct spec_section));
-                  (*sections)->name =
-		    default_section ? default_section : "Miscellaneous";
-                  (*sections)->next = 0;
-                  (*sections)->missing = 1;
-                  head = *sections;
-                }
-              /* Next time we see INFO-DIR-SECTION, we will reset the
-                 tail pointer.  */
-              reset_tail = 1;
-
-              if (start_of_this_entry != 0)
-                fatal (_("START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"), 0, 0);
-              start_of_this_entry = lines[i + 1].start;
-            }
-          else if (start_of_this_entry)
-            {
-              if ((!strncmp ("* ", lines[i].start, 2)
-                   && lines[i].start > start_of_this_entry)
-                  || (!strncmp ("END-INFO-DIR-ENTRY",
-                                lines[i].start, lines[i].size)
-                      && sizeof ("END-INFO-DIR-ENTRY") - 1 == lines[i].size))
-                {
-                  /* We found an end of this entry.  Allocate another
-                     entry, fill its data, and add it to the linked
-                     list.  */
-                  struct spec_entry *next
-                    = (struct spec_entry *) xmalloc (sizeof (struct spec_entry));
-                  next->text
-                    = copy_string (start_of_this_entry,
-                                   lines[i].start - start_of_this_entry);
-                  next->text_len = lines[i].start - start_of_this_entry;
-                  next->entry_sections = head;
-                  next->entry_sections_tail = tail;
-                  next->next = *entries;
-                  *entries = next;
-                  n_entries++;
-                  if (!strncmp ("END-INFO-DIR-ENTRY",
-                                lines[i].start, lines[i].size)
-                      && sizeof ("END-INFO-DIR-ENTRY") - 1 == lines[i].size)
-                    start_of_this_entry = 0;
-                  else
-                    start_of_this_entry = lines[i].start;
-                }
-              else if (!strncmp ("END-INFO-DIR-ENTRY",
-                                 lines[i].start, lines[i].size)
-                       && sizeof ("END-INFO-DIR-ENTRY") - 1 == lines[i].size)
-                fatal (_("END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"), 0, 0);
-            }
-        }
-    }
-  if (start_of_this_entry != 0)
-    fatal (_("START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"),
-           0, 0);
-
-  /* If we ignored the INFO-DIR-ENTRY directives, we need now go back
-     and plug the names of all the sections we found into every
-     element of the ENTRIES list.  */
-  if (ignore_entries && *entries)
-    {
-      struct spec_entry *entry;
-
-      for (entry = *entries; entry; entry = entry->next)
-        {
-          entry->entry_sections = head;
-          entry->entry_sections_tail = tail;
-        }
-    }
-
-  return n_entries;
-}
-
-/* Parse the dir file whose basename is BASE_NAME.  Find all the
-   nodes, and their menus, and the sections of their menus.  */
-int
-parse_dir_file (struct line_data *lines, int nlines, struct node **nodes,
-                const char *base_name)
-{
-  int node_header_flag = 0;
-  int something_deleted = 0;
-  int i;
-
-  *nodes = 0;
-  for (i = 0; i < nlines; i++)
-    {
-      /* Parse node header lines.  */
-      if (node_header_flag)
-        {
-          int j, end;
-          for (j = 0; j < lines[i].size; j++)
-            /* Find the node name and store it in the `struct node'.  */
-            if (!strncmp ("Node:", lines[i].start + j, 5))
-              {
-                char *line = lines[i].start;
-                /* Find the start of the node name.  */
-                j += 5;
-                while (line[j] == ' ' || line[j] == '\t')
-                  j++;
-                /* Find the end of the node name.  */
-                end = j;
-                while (line[end] != 0 && line[end] != ',' && line[end] != '\n'
-                       && line[end] != '\t')
-                  end++;
-                (*nodes)->name = copy_string (line + j, end - j);
-              }
-          node_header_flag = 0;
-        }
-
-      /* Notice the start of a node.  */
-      if (*lines[i].start == 037)
-        {
-          struct node *next = (struct node *) xmalloc (sizeof (struct node));
-
-          next->next = *nodes;
-          next->name = NULL;
-          next->start_line = i;
-          next->end_line = 0;
-          next->menu_start = NULL;
-          next->sections = NULL;
-          next->last_section = NULL;
-
-          if (*nodes != 0)
-            (*nodes)->end_line = i;
-          /* Fill in the end of the last menu section
-             of the previous node.  */
-          if (*nodes != 0 && (*nodes)->last_section != 0)
-            (*nodes)->last_section->end_line = i;
-
-          *nodes = next;
-
-          /* The following line is the header of this node;
-             parse it.  */
-          node_header_flag = 1;
-        }
-
-      /* Notice the lines that start menus.  */
-      if (*nodes != 0 && !strncmp ("* Menu:", lines[i].start, 7))
-        (*nodes)->menu_start = lines[i + 1].start;
-
-      /* Notice sections in menus.  */
-      if (*nodes != 0
-          && (*nodes)->menu_start != 0
-          && *lines[i].start != '\n'
-          && *lines[i].start != '*'
-          && *lines[i].start != ' '
-          && *lines[i].start != '\t')
-        {
-          /* Add this menu section to the node's list.
-             This list grows in forward order.  */
-          struct menu_section *next
-            = (struct menu_section *) xmalloc (sizeof (struct menu_section));
-
-          next->start_line = i + 1;
-          next->next = 0;
-          next->end_line = 0;
-          next->name = copy_string (lines[i].start, lines[i].size);
-          if ((*nodes)->sections)
-            {
-              (*nodes)->last_section->next = next;
-              (*nodes)->last_section->end_line = i;
-            }
-          else
-            (*nodes)->sections = next;
-          (*nodes)->last_section = next;
-        }
-
-      /* Check for an existing entry that should be deleted.
-         Delete all entries which specify this file name.  */
-      if (*lines[i].start == '*')
-        {
-          char *q;
-          char *p = lines[i].start;
-
-          p++; /* skip * */
-          while (*p == ' ') p++; /* ignore following spaces */
-          q = p; /* remember this, it's the beginning of the menu item.  */
-
-          /* Read menu item.  */
-          while (*p != 0 && *p != ':')
-            p++;
-          p++; /* skip : */
-
-          if (*p == ':')
-            { /* XEmacs-style entry, as in * Mew::Messaging.  */
-              if (menu_item_equal (q, ':', base_name))
-                {
-                  lines[i].delete = 1;
-                  something_deleted = 1;
-                }
-            }
-          else
-            { /* Emacs-style entry, as in * Emacs: (emacs).  */
-              while (*p == ' ') p++; /* skip spaces after : */
-              if (*p == '(')         /* if at parenthesized (FILENAME) */
-                {
-                  p++;
-                  if (menu_item_equal (p, ')', base_name))
-                    {
-                      lines[i].delete = 1;
-                      something_deleted = 1;
-                    }
-                }
-            }
-        }
-
-      /* Treat lines that start with whitespace
-         as continuations; if we are deleting an entry,
-         delete all its continuations as well.  */
-      else if (i > 0 && (*lines[i].start == ' ' || *lines[i].start == '\t'))
-        {
-          lines[i].delete = lines[i - 1].delete;
-        }
-    }
-
-  /* Finish the info about the end of the last node.  */
-  if (*nodes != 0)
-    {
-      (*nodes)->end_line = nlines;
-      if ((*nodes)->last_section != 0)
-        (*nodes)->last_section->end_line = nlines;
-    }
-
-  return something_deleted;
-}
-
-int
-main (int argc, char **argv)
-{
-  char *opened_dirfilename;
-  char *compression_program;
-  char *infile_sans_info;
-  char *infile = 0, *dirfile = 0;
-
-  /* Record the text of the Info file, as a sequence of characters
-     and as a sequence of lines.  */
-  char *input_data = NULL;
-  int input_size = 0;
-  struct line_data *input_lines = NULL;
-  int input_nlines = 0;
-
-  /* Record here the specified section names and directory entries.  */
-  struct spec_section *input_sections = NULL;
-  struct spec_entry *entries_to_add = NULL;
-  int n_entries_to_add = 0;
-  struct spec_entry *default_entries_to_add = NULL;
-  int n_default_entries_to_add = 0;
-
-  /* Record the old text of the dir file, as plain characters,
-     as lines, and as nodes.  */
-  char *dir_data;
-  int dir_size;
-  int dir_nlines;
-  struct line_data *dir_lines;
-  struct node *dir_nodes;
-
-  /* Nonzero means --delete was specified (just delete existing entries).  */
-  int delete_flag = 0;
-  int something_deleted = 0;
-  /* Nonzero means -q was specified.  */
-  int quiet_flag = 0;
-
-  int i;
-
-#ifdef HAVE_SETLOCALE
-  /* Set locale via LC_ALL.  */
-  setlocale (LC_ALL, "");
-#endif
-
-  /* Set the text message domain.  */
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-
-  while (1)
-    {
-      int opt = getopt_long (argc, argv, "i:d:e:s:hHr", longopts, 0);
-
-      if (opt == EOF)
-        break;
-
-      switch (opt)
-        {
-        case 0:
-          /* If getopt returns 0, then it has already processed a
-             long-named option.  We should do nothing.  */
-          break;
-
-        case 1:
-          abort ();
-
-        case 'd':
-          if (dirfile)
-            {
-              fprintf (stderr, _("%s: already have dir file: %s\n"),
-                       progname, dirfile);
-              suggest_asking_for_help ();
-            }
-          dirfile = optarg;
-          break;
-
-        case 'D':
-          if (dirfile)
-            {
-              fprintf (stderr, _("%s: already have dir file: %s\n"),
-                       progname, dirfile);
-              suggest_asking_for_help ();
-            }
-          dirfile = concat (optarg, "", "/dir");
-          break;
-
-	case 'E':
-        case 'e':
-          {
-            struct spec_entry *next
-              = (struct spec_entry *) xmalloc (sizeof (struct spec_entry));
-            int olen = strlen (optarg);
-            if (! (*optarg != 0 && optarg[olen - 1] == '\n'))
-              {
-                optarg = concat (optarg, "\n", "");
-                olen++;
-              }
-            next->text = optarg;
-            next->text_len = olen;
-            next->entry_sections = NULL;
-            next->entry_sections_tail = NULL;
-	    if (opt == 'e')
-	      {
-		next->next = entries_to_add;
-		entries_to_add = next;
-		n_entries_to_add++;
-	      }
-	    else
-	      {
-		next->next = default_entries_to_add;
-		default_entries_to_add = next;
-		n_default_entries_to_add++;
-	      }
-          }
-          break;
-
-        case 'h':
-        case 'H':
-          print_help ();
-          xexit (0);
-
-        case 'i':
-          if (infile)
-            {
-              fprintf (stderr, _("%s: Specify the Info file only once.\n"),
-                       progname);
-              suggest_asking_for_help ();
-            }
-          infile = optarg;
-          break;
-
-        case 'q':
-          quiet_flag = 1;
-          break;
-
-        case 'r':
-          delete_flag = 1;
-          break;
-
-        case 's':
-          {
-            struct spec_section *next
-              = (struct spec_section *) xmalloc (sizeof (struct spec_section));
-            next->name = optarg;
-            next->next = input_sections;
-            next->missing = 1;
-            input_sections = next;
-          }
-          break;
-
-	case 'S':
-	  default_section = optarg;
-	  break;
-
-        case 'V':
-          printf ("install-info (GNU %s) %s\n", PACKAGE, VERSION);
-          puts ("");
-          puts ("Copyright (C) 2004 Free Software Foundation, Inc.");
-          printf (_("There is NO warranty.  You may redistribute this software\n\
-under the terms of the GNU General Public License.\n\
-For more information about these matters, see the files named COPYING.\n"));
-          xexit (0);
-
-        default:
-          suggest_asking_for_help ();
-        }
-    }
-
-  /* Interpret the non-option arguments as file names.  */
-  for (; optind < argc; ++optind)
-    {
-      if (infile == 0)
-        infile = argv[optind];
-      else if (dirfile == 0)
-        dirfile = argv[optind];
-      else
-        error (_("excess command line argument `%s'"), argv[optind], 0);
-    }
-
-  if (!infile)
-    fatal (_("No input file specified; try --help for more information."),
-           0, 0);
-  if (!dirfile)
-    fatal (_("No dir file specified; try --help for more information."), 0, 0);
-
-  /* Read the Info file and parse it into lines, unless we're deleting.  */
-  if (!delete_flag)
-    {
-      input_data = readfile (infile, &input_size, NULL, NULL, NULL);
-      input_lines = findlines (input_data, input_size, &input_nlines);
-    }
-
-  i = parse_input (input_lines, input_nlines,
-                   &input_sections, &entries_to_add);
-  if (i > n_entries_to_add)
-    n_entries_to_add = i;
-  else if (n_entries_to_add == 0)
-    {
-      entries_to_add = default_entries_to_add;
-      n_entries_to_add = n_default_entries_to_add;
-    }
-
-  if (!delete_flag)
-    {
-      if (entries_to_add == 0)
-        { /* No need to abort here, the original info file may not
-             have the requisite Texinfo commands.  This is not
-             something an installer should have to correct (it's a
-             problem for the maintainer), and there's no need to cause
-             subsequent parts of `make install' to fail.  */
-          warning (_("no info dir entry in `%s'"), infile, 0);
-          xexit (0);
-        }
-
-      /* If the entries came from the command-line arguments, their
-         entry_sections pointers are not yet set.  Walk the chain of
-         the entries and for each entry update entry_sections to point
-         to the head of the list of sections where this entry should
-         be put.  Note that all the entries specified on the command
-         line get put into ALL the sections we've got, either from the
-         Info file, or (under --section) from the command line,
-         because in the loop below every entry inherits the entire
-         chain of sections.  */
-      if (n_entries_to_add > 0 && entries_to_add->entry_sections == NULL)
-        {
-          struct spec_entry *ep;
-
-          /* If we got no sections, default to "Miscellaneous".  */
-          if (input_sections == NULL)
-            {
-              input_sections = (struct spec_section *)
-                xmalloc (sizeof (struct spec_section));
-              input_sections->name =
-		default_section ? default_section : "Miscellaneous";
-              input_sections->next = NULL;
-              input_sections->missing = 1;
-            }
-          for (ep = entries_to_add; ep; ep = ep->next)
-            ep->entry_sections = input_sections;
-        }
-    }
-
-  /* Now read in the Info dir file.  */
-  dir_data = readfile (dirfile, &dir_size, ensure_dirfile_exists,
-                       &opened_dirfilename, &compression_program);
-  dir_lines = findlines (dir_data, dir_size, &dir_nlines);
-
-  /* We will be comparing the entries in the dir file against the
-     current filename, so need to strip off any directory prefix and/or
-     [.info][.gz] suffix.  */
-  {
-    char *infile_basename = infile + strlen (infile);
-
-    if (HAVE_DRIVE (infile))
-      infile += 2;      /* get past the drive spec X: */
-
-    while (infile_basename > infile && !IS_SLASH (infile_basename[-1]))
-      infile_basename--;
-
-    infile_sans_info = strip_info_suffix (infile_basename);
-  }
-
-  something_deleted
-    = parse_dir_file (dir_lines, dir_nlines, &dir_nodes, infile_sans_info);
-
-  /* Decide where to add the new entries (unless --delete was used).
-     Find the menu sections to add them in.
-     In each section, find the proper alphabetical place to add
-     each of the entries.  */
-  if (!delete_flag)
-    {
-      struct node *node;
-      struct menu_section *section;
-      struct spec_section *spec;
-
-      for (node = dir_nodes; node; node = node->next)
-        for (section = node->sections; section; section = section->next)
-          {
-            for (i = section->end_line; i > section->start_line; i--)
-              if (dir_lines[i - 1].size != 0)
-                break;
-            section->end_line = i;
-
-            for (spec = input_sections; spec; spec = spec->next)
-              if (!strcmp (spec->name, section->name))
-                break;
-            if (spec)
-              {
-                int add_at_line = section->end_line;
-                struct spec_entry *entry;
-                /* Say we have found at least one section with this name,
-                   so we need not add such a section.  */
-                spec->missing = 0;
-                /* For each entry, find the right place in this section
-                   to add it.  */
-                for (entry = entries_to_add; entry; entry = entry->next)
-                  {
-                    /* Did they at all want this entry to be put into
-                       this section?  */
-                    for (spec = entry->entry_sections;
-                         spec && spec != entry->entry_sections_tail;
-                         spec = spec->next)
-                      {
-                        if (!strcmp (spec->name, section->name))
-                          break;
-                      }
-                    if (!spec || spec == entry->entry_sections_tail)
-                      continue;
-
-                    /* Subtract one because dir_lines is zero-based,
-                       but the `end_line' and `start_line' members are
-                       one-based.  */
-                    for (i = section->end_line - 1;
-                         i >= section->start_line - 1; i--)
-                      {
-                        /* If an entry exists with the same name,
-                           and was not marked for deletion
-                           (which means it is for some other file),
-                           we are in trouble.  */
-                        if (dir_lines[i].start[0] == '*'
-                            && menu_line_equal (entry->text, entry->text_len,
-                                                dir_lines[i].start,
-                                                dir_lines[i].size)
-                            && !dir_lines[i].delete)
-			  {
-			    if (quiet_flag)
-			      dir_lines[i].delete = 1;
-			    else
-			      fatal (_("menu item `%s' already exists, for file `%s'"),
-                                 extract_menu_item_name (entry->text),
-                                 extract_menu_file_name (dir_lines[i].start));
-			  }
-                        if (dir_lines[i].start[0] == '*'
-                            && menu_line_lessp (entry->text, entry->text_len,
-                                                dir_lines[i].start,
-                                                dir_lines[i].size))
-                          add_at_line = i;
-                      }
-                    insert_entry_here (entry, add_at_line,
-                                       dir_lines, n_entries_to_add);
-                  }
-              }
-          }
-
-      /* Mark the end of the Top node as the place to add any
-         new sections that are needed.  */
-      for (node = dir_nodes; node; node = node->next)
-        if (node->name && strcmp (node->name, "Top") == 0)
-          dir_lines[node->end_line].add_sections_before = 1;
-    }
-
-  if (delete_flag && !something_deleted && !quiet_flag)
-    warning (_("no entries found for `%s'; nothing deleted"), infile, 0);
-
-  output_dirfile (opened_dirfilename, dir_nlines, dir_lines, n_entries_to_add,
-                  entries_to_add, input_sections, compression_program);
-
-  xexit (0);
-  return 0; /* Avoid bogus warnings.  */
-}
-
-/* Divide the text at DATA (of SIZE bytes) into lines.
-   Return a vector of struct line_data describing the lines.
-   Store the length of that vector into *NLINESP.  */
-
-struct line_data *
-findlines (char *data, int size, int *nlinesp)
-{
-  int i;
-  int lineflag = 1;
-  int lines_allocated = 511;
-  int filled = 0;
-  struct line_data *lines
-    = xmalloc ((lines_allocated + 1) * sizeof (struct line_data));
-
-  for (i = 0; i < size; i++)
-    {
-      if (lineflag)
-        {
-          if (filled == lines_allocated)
-            {
-              /* try to keep things somewhat page-aligned */
-              lines_allocated = ((lines_allocated + 1) * 2) - 1;
-              lines = xrealloc (lines, (lines_allocated + 1)
-                                       * sizeof (struct line_data));
-            }
-          lines[filled].start = &data[i];
-          lines[filled].add_entries_before = 0;
-          lines[filled].add_sections_before = 0;
-          lines[filled].delete = 0;
-          if (filled > 0)
-            lines[filled - 1].size
-              = lines[filled].start - lines[filled - 1].start - 1;
-          filled++;
-        }
-      lineflag = (data[i] == '\n');
-    }
-  if (filled > 0)
-    lines[filled - 1].size = &data[i] - lines[filled - 1].start - lineflag;
-
-  /* Do not leave garbage in the last element.  */
-  lines[filled].start = NULL;
-  lines[filled].add_entries_before = NULL;
-  lines[filled].add_sections_before = 0;
-  lines[filled].delete = 0;
-  lines[filled].size = 0;
-
-  *nlinesp = filled;
-  return lines;
-}
-
-/* This is the comparison function for qsort for a vector of pointers to
-   struct spec_section.  (Have to use const void * as the parameter type
-   to avoid incompatible-with-qsort warnings.)
-   Compare the section names.  */
-
-int
-compare_section_names (const void *p1, const void *p2)
-{
-  struct spec_section **sec1 = (struct spec_section **) p1;
-  struct spec_section **sec2 = (struct spec_section **) p2;
-  char *name1 = (*sec1)->name;
-  char *name2 = (*sec2)->name;
-  return strcmp (name1, name2);
-}
-
-/* This is the comparison function for qsort
-   for a vector of pointers to struct spec_entry.
-   Compare the entries' text.  */
-
-int
-compare_entries_text (const void *p1, const void *p2)
-{
-  struct spec_entry **entry1 = (struct spec_entry **) p1;
-  struct spec_entry **entry2 = (struct spec_entry **) p2;
-  char *text1 = (*entry1)->text;
-  char *text2 = (*entry2)->text;
-  char *colon1 = strchr (text1, ':');
-  char *colon2 = strchr (text2, ':');
-  int len1, len2;
-
-  if (!colon1)
-    len1 = strlen (text1);
-  else
-    len1 = colon1 - text1;
-  if (!colon2)
-    len2 = strlen (text2);
-  else
-    len2 = colon2 - text2;
-  return strncmp (text1, text2, len1 <= len2 ? len1 : len2);
-}
-
-/* Insert ENTRY into the add_entries_before vector
-   for line number LINE_NUMBER of the dir file.
-   DIR_LINES and N_ENTRIES carry information from like-named variables
-   in main.  */
-
-void
-insert_entry_here (struct spec_entry *entry, int line_number,
-                   struct line_data *dir_lines, int n_entries)
-{
-  int i, j;
-
-  if (dir_lines[line_number].add_entries_before == 0)
-    {
-      dir_lines[line_number].add_entries_before
-        = (struct spec_entry **) xmalloc (n_entries * sizeof (struct spec_entry *));
-      for (i = 0; i < n_entries; i++)
-        dir_lines[line_number].add_entries_before[i] = 0;
-    }
-
-  /* Find the place where this entry belongs.  If there are already
-     several entries to add before LINE_NUMBER, make sure they are in
-     alphabetical order.  */
-  for (i = 0; i < n_entries; i++)
-    if (dir_lines[line_number].add_entries_before[i] == 0
-        || menu_line_lessp (entry->text, strlen (entry->text),
-                            dir_lines[line_number].add_entries_before[i]->text,
-                            strlen (dir_lines[line_number].add_entries_before[i]->text)))
-      break;
-
-  if (i == n_entries)
-    abort ();
-
-  /* If we need to plug ENTRY into the middle of the
-     ADD_ENTRIES_BEFORE array, move the entries which should be output
-     after this one down one notch, before adding a new one.  */
-  if (dir_lines[line_number].add_entries_before[i] != 0)
-    for (j = n_entries - 1; j > i; j--)
-      dir_lines[line_number].add_entries_before[j]
-        = dir_lines[line_number].add_entries_before[j - 1];
-
-  dir_lines[line_number].add_entries_before[i] = entry;
-}

Property changes on: head/contrib/texinfo/util/install-info.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/COPYING
===================================================================
--- head/contrib/texinfo/COPYING	(revision 276550)
+++ head/contrib/texinfo/COPYING	(nonexistent)
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

Property changes on: head/contrib/texinfo/COPYING
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/INSTALL
===================================================================
--- head/contrib/texinfo/INSTALL	(revision 276550)
+++ head/contrib/texinfo/INSTALL	(nonexistent)
@@ -1,45 +0,0 @@
-$Id: INSTALL,v 1.5 2004/11/19 13:08:47 karl Exp $
-
-     Copying and distribution of this file, with or without modification,
-     are permitted in any medium without royalty provided the copyright
-     notice and this notice are preserved.
-
-For generic installation instructions on compiling and installing this
-Automake-based distribution, please read the file `INSTALL.generic'.
-
-Installation notes specific to Texinfo:
-
-* texinfo.tex and the other *.tex files are not installed by `make
-  install'.  This is because there is no reliable way to know where to
-  install them.  Instead, you have to run an additional make command
-  after the normal make install:
-    make TEXMF=/your/texmf install-tex
-  texinfo.tex is installed in ${TEXMF}/tex/texinfo/texinfo.tex, etc.
-
-* On the other hand, if you're maintaining a TeX distribution, you don't
-  want your users to see the installation warnings, because you already
-  have the files installed.  (And you're keeping them up to date, right?)
-  In this case, run configure --disable-install-warnings, or set
-  enable_install_warnings=no in the environment.
-
-* On MacOSX, if configure fails with the error:
-	ac_cv_build='config.sub: invalid option -apple-darwin7.2.0
-this is probably because your uname -p is returning "unknown".  Use
-/usr/bin/uname instead.
-
-* For instructions on compiling this distribution with DJGPP tools
-  for MS-DOS and MS-Windows, see the file djgpp/README.
-
-* The Info tree uses a file `dir' as its root node; the `dir-example'
-  file in this distribution is included as a possible starting point.
-  Use it, modify it, or ignore it just as you like.
-
-* You can create a file texinfo.cnf to be read by TeX when
-  processing Texinfo manuals.  For example, you might like to use
-  @afourpaper by default.  See the `Preparing for TeX' node in
-  texinfo.txi for more details.  You don't have to create the file if
-  you have nothing to put in it.
-
-* If your info files are not in $prefix/info, you may wish to add a line
-#define DEFAULT_INFOPATH "/mydir1:/mydir2:..."
-  to config.h after running configure.

Property changes on: head/contrib/texinfo/INSTALL
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/FREEBSD-Xlist
===================================================================
--- head/contrib/texinfo/FREEBSD-Xlist	(revision 276550)
+++ head/contrib/texinfo/FREEBSD-Xlist	(nonexistent)
@@ -1,57 +0,0 @@
-$FreeBSD$
-*/ABOUT-NLS
-*/INSTALL.generic
-*/Makefile.am
-*/Makefile.in
-*/acinclude.m4
-*/aclocal.m4
-*/config.guess
-*/config.rpath
-*/config.sub
-*/configure
-*/configure.ac
-*/depcomp
-*/dir-example
-*/djgpp/*
-*/doc/*.tex
-*/doc/macro.texi
-*/doc/mdate-sh
-*/doc/stamp-*
-*/doc/texi2dvi.1
-*/doc/userdoc.texi
-*/info/makedoc.c
-*/info/pcterm.c
-*/install-sh
-*/intl/*
-*/lib/alloca.c
-*/lib/getopt*
-*/lib/memcpy.c
-*/lib/memmove.c
-*/lib/mkstemp.c
-*/lib/strcase.h
-*/lib/strcasecmp.c
-*/lib/strdup.*
-*/lib/strerror.c
-*/lib/strncasecmp.c
-*/lib/tempname.c
-*/m4/*
-*/makeinfo/tests
-*/missing
-*/mkinstalldirs
-*/po/*
-*/util/*awk
-*/util/deref.c
-*/util/fix*
-*/util/gdoc
-*/util/gen-dir-node
-*/util/gendocs*
-*/util/infosrch
-*/util/install-info-html
-*/util/tex3patch
-*/util/texi-docstring-magic.el
-*/util/texi2dvi
-*/util/texi2pdf
-*/util/texinfo-cat.in
-*/util/texinfo.dtd
-*/util/texinfo.xsl
-*/util/txitextest

Property changes on: head/contrib/texinfo/FREEBSD-Xlist
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/README.dev
===================================================================
--- head/contrib/texinfo/README.dev	(revision 276550)
+++ head/contrib/texinfo/README.dev	(nonexistent)
@@ -1,44 +0,0 @@
-$Id: README.dev,v 1.7 2003/11/24 15:11:06 karl Exp $
-README.dev - Texinfo developer information.
-
-  Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-
-  Copying and distribution of this file, with or without modification,
-  are permitted in any medium without royalty provided the copyright
-  notice and this notice are preserved.
-
-The development sources for Texinfo is available through anonymous cvs
-at Savannah, see
-  http://savannah.gnu.org/cvs/?group=texinfo
-
-This distribution uses whatever versions of automake, autoconf, and
-gettext are listed in NEWS; usually the latest ones released.  If you
-are getting the Texinfo sources from cvs, or change the Texinfo
-configure.ac, you'll need to have these tools installed to (re)build.
-You'll also need help2man.  (All of these are available from
-ftp://ftp.gnu.org/gnu.)
-
-Here's the order in which to run the tools for a fresh build:
-
-  autoheader    # creates config.in, not necessarily needed every time
-  aclocal -I m4 # for a new version of automake
-  automake
-  autoconf
-  configure CFLAGS=-g --enable-maintainer-mode
-  make
-
-(with arguments to taste, of course.)  Or you can run
-
-  ./bootstrap
-
-instead of the various auto* tools.
-
-
-One final note: If you would like to contribute to the GNU project by
-implementing additional documentation output formats for Texinfo, that
-would be great.  But please do not write a separate translator texi2foo
-for your favorite format foo!  That is the hard way to do the job, and
-makes extra work in subsequent maintenance, since the Texinfo language
-is continually being enhanced and updated.  Instead, the best approach
-is modify Makeinfo to generate the new format, as it does now for Info,
-HTML, XML, and DocBook.

Property changes on: head/contrib/texinfo/README.dev
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/TODO
===================================================================
--- head/contrib/texinfo/TODO	(revision 276550)
+++ head/contrib/texinfo/TODO	(nonexistent)
@@ -1,181 +0,0 @@
-$Id: TODO,v 1.26 2004/11/22 23:57:32 karl Exp $
-This is the todo list for GNU Texinfo.
-If you are interested in working on any of these, email bug-texinfo@gnu.org.
-
-  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2003, 
-  2001, 2002, 2003, 2004 Free Software Foundation.
-
-  Copying and distribution of this file, with or without modification,
-  are permitted in any medium without royalty provided the copyright
-  notice and this notice are preserved.
-
-* General:
-  - @euro{}.
-  - Support installation of manuals in different languages, along these lines:
-    . support a LINGUAS file or variable saying which subdirs LL in the
-      source to descend into (under doc/).
-    . within each subdir LL, install the info files into $infodir/LL,
-      and run install-info on $infodir/LL/dir.
-    . info (both emacs and standalone) should read $infodir/$LANG/dir
-      as the first dir file, and likewise read info files first from
-      $infodir/$LANG, before falling back to $infodir.
-    . consider ways to avoid installing images in both places.
-      In fact, images probably need to be installed in a subdir
-      $infodir/MANUAL/ in the first place, to avoid conflicts of having
-      the same image name in different manuals.
-    For a test case, see texinfo cvs, with its one translated manual
-    (info-fr.texi).
-    From Wojciech Polak.
-  - Monitor and improve the dir categories in existing manuals,
-    following the Free Software Directory categories.  Much mail to
-    developers has already been sent, what's needed now is to check new
-    releases and make sure they are using the right categories.
-    See the util/dir-example in the Texinfo distribution for our current
-    recommended categories.
-    For background, see the thread (which discusses a lot of other
-    issues too) at
-    http://mail.gnu.org/pipermail/emacs-devel/2002-10/msg00011.html,
-    especially 
-      http://mail.gnu.org/archive/html/emacs-devel/2002-10/msg00090.html
-      http://mail.gnu.org/archive/html/emacs-devel/2002-10/msg00137.html
-  - Get Info declared as a MIME Content-Type.
-  - Likewise the `info:' URI scheme; a library consortium has proposed a
-    completely different purpose for the URI scheme, but I don't know
-    how to send comments, despite it being a "request for comments".  Sigh.
-    There is mail about this in the bug-texinfo archives:
-      http://mail.gnu.org/archive/html/bug-texinfo/2003-09/msg00086.html
-  - Support compressed image files.
-  - Support reference card creation, perhaps by only paying attention to
-    sectioning and @def... commands.
-  - Allow @end (and other?) commands to be indented in the source.
-  - Test for memory leaks, e.g., with valgrind:
-    http://developer.kde.org/~sewardj/
-  - Extend and improve the tests.
-
-* Language:
-  - @else for the @if... conditionals.
-  - @xindexterm [def] primary [,secondary [,tertiary]]  or some such?
-  - Allow subitems and `see' and `see also' in indices.
-  - multicolumn * width to take up `the rest'.
-  - another table command to take N succeeding items and split them
-    into M columns (see eplain).
-  - support bibliographies with BibTeX (see web2c/doc for kludge prototype).
-  - @flushboth to combine @flushleft and @flushright, for RFC's.
-  - @part sectioning command.
-  - @exercise/@answer command for, e.g., gawk.
-  - Allow @hsep/@vsep at @item, instead of just in template.
-  - Support automatic line numbering of examples.
-  - Better macro syntax.
-  - Better def... command syntax.
-  - Allow : in node names for info files, for names like
-    `class::method'.  Likewise index entries.  A quoting mechanism such
-    as surrounding node names with SPACE BACKSPACE is probably the best
-    solution, although this is an incompatible change to Info format, sigh.
-  - Glossary/general definition support (dumas msg 28 Nov 2003 17:09:57 +0100).
-  - Add support for other Latin 9 (and Latin 2 and Latin 1) characters.
-
-* Makeinfo:
-  - Translation of "Appendix" etc. should depend on @doclang not $LANG.
-  - Try directory of main source file.
-  - Make makeinfo -E just do macro expansion, avoiding all error checks.
-    That way, texi2dvi could run makeinfo --iftex -E.
-  - A detexinfo program, like detex or delatex.  This command would
-    strip all the texinfo commands out, and would be used as a filter on
-    the way to a speller.  An option would be to NOT strip comments out.
-    makeinfo --no-headers comes close.
-  - If node name contains an @ command, complain explicitly.
-  - Use @documentlanguage instead of LANG for many translations.
-  - HTML: split output by chapter to improve context, per Akim.
-    Generate dummy files for all nodes for the sake of cross-references.
-  - HTML: support thumbnails.
-  - HTML: make images of math, maybe.
-  - HTML: allow settable background color, table colors and spacing,
-    <head> meta tags, etc.  A la http://texi2html.cvshome.org.  In fact:
-  - HTML: have a library of different CSS styles.
-    http://mail.gnu.org/archive/html/bug-texinfo/2004-01/msg00025.html
-  - XML: cannot be loaded directly in a browser; why not?
-  - Docbook: &euro; and other entities do not work; does anything work?
-  - Rewrite completely to simplify generation of different formats.
-
-* TeX:
-  - Use @ as the escape character, and Texinfo syntax generally, in the
-    table of contents and index files.  Eliminate all the crazy
-    multiple redefinitions of every Texinfo command in different contexts.
-  - Support input in any encoding and language, via ec or Latin Modern fonts.
-  - Reasonable way to change fonts from the default (some work has been
-    done), to allow for PostScript fonts, for example.
-  - @multitable: handle @hsep and @vsep.
-  - @multitable: repeat table headings if multiple pages long.
-  - @multitable: support a heading line concept (<thead> in HTML).
-  - Introduce new command to change \bindingoffset.
-  - How about using latex2html to produce HTML?
-  - Table of contents gets misaligned if there are 10 or more [sub]sections.
-  - Use url.sty (or something) to allow linebreak of url's.
-  - Include hyperlink \special's in the DVI output for xdvi, etc.
-  - PDF: make each letter of the index (A, B, ...) a section in the TOC.
-    From Carsten Dominik <dominik@astro.uva.nl>.
-
-* Doc:
-  - Include a complete functional summary, as in a reference card, in
-    the manual.
-  - Improve the manuals, especially for makeinfo, standalone info, etc.
-  - new section on doing dedication pages. See gawk.texi
-    for an example of doing it in both the tex and info versions.
-
-* Info:
-  - Regular expression search.
-  - Full-text search across all info files installed on the system.
-  - Support character sets other than ISO Latin 1.
-  - Perhaps comply with LANGUAGE setting on a per-node basis, to allow
-    incremental translation of Texinfo files.
-  - Search all nodes of dir file at startup, then can have
-    INFO-DIR-SEPARATE-GROUPS and other such.
-  - Better dir file merging.
-  - Global dir file (as in /etc/conf/dir) and texinfo config file
-    specifying which info directories to search.  From Dale Mellor.
-    http://mail.gnu.org/mailman/private/gnu-prog-discuss/2003q4/000439.html
-  - Steal interface ideas from Lynx: number links, use color, etc.
-    Perhaps code from the pinfo viewer can be reused:
-    http://zeus.polsl.gliwice.pl/~pborys/.
-  - More sample .infokey files, so people can choose without writing their own.
-  - q within help should quit help like C-x 0.
-  - Incorporate an X-based viewer, perhaps saxinfo or tkinfo
-      http://www.math.ucsb.edu/~boldt/tkinfo/
-  - Make "info foo bar" search for bar in foo's index(es) if no menu match.
-  - Handle M-n, C-u m, and C-u g like Emacs Info (opening new windows).
-  - Write technical definition of Info format.
-
-* install-info:
-  - be able to copy the info file to compile-time $infodir, to
-    simplify by-hand installation.
-  - also support installing HTML files, etc., along with subsidiary
-    @image (or other) files.  In subdirs.  Or something.
-  - support info dir entries for other than the current info file name;
-    see comments in menu_item_equal.
-  - merge features with Debian install-info, so we can have one program.
-
-* texindex:
-  - read source file (specified by new option) for @documentlanguage
-    and/or @documentencoding, and change the sorting appropriately.
-  From: Wojciech Polak, 26 Apr 2003 11:30:59 +0200.
-
-* Distribution:
-  - generate txi-??.tex from .po's to make translators' jobs easier.
-    From Akim and Karl E.
-
-Ideas that will not be implemented:
-- Process Texinfo files directly instead of converting to Info:
-  ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/tkman.tar.Z, which
-  uses Tcl/Tk 8.0 from ftp.smli.com in the /pub/tcl directory.
-  From: phelps@ecstasy.CS.Berkeley.EDU (Tom Phelps)
-  [This has the disadvantage of needing to be updated when the
-  Texinfo language changes, so don't.]
-
-- Call Ghostscript to get ASCII/jpg output for the @image command.
-  [makeinfo should not try to be make, or assume it knows how the user
-   wants to generate images.  Too many different methods are possible.]
-
-- Change bars.  This is difficult or impossible in TeX,
-  unfortunately.  To do it right requires device driver support.
-  wdiff or ediff may be all we can do.  Merely specifying what should be
-  changed is not obvious.

Property changes on: head/contrib/texinfo/TODO
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/doc/info-stnd.texi
===================================================================
--- head/contrib/texinfo/doc/info-stnd.texi	(revision 276550)
+++ head/contrib/texinfo/doc/info-stnd.texi	(nonexistent)
@@ -1,2203 +0,0 @@
-\input texinfo.tex    @c -*-texinfo-*-
-@comment $Id: info-stnd.texi,v 1.9 2004/12/14 16:58:15 karl Exp $
-@c We must \input texinfo.tex instead of texinfo, otherwise make
-@c distcheck in the Texinfo distribution fails, because the texinfo Info
-@c file is made first, and texi2dvi must include . first in the path.
-@comment %**start of header
-@setfilename info-stnd.info
-@include version-stnd.texi
-@settitle GNU Info @value{VERSION}
-@syncodeindex vr cp
-@syncodeindex fn cp
-@syncodeindex ky cp
-@comment %**end of header
-
-@copying
-This manual is for GNU Info (version @value{VERSION}, @value{UPDATED}),
-a program for viewing documents in Info format (usually created from
-Texinfo source files).
-
-Copyright @copyright{} 1992, 1993, 1996, 1997, 1998, 1999, 2001, 2002,
-2003, 2004 Free Software Foundation, Inc.
-
-@quotation
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
-and with the Back-Cover Texts as in (a) below.  A copy of the
-license is included in the section entitled ``GNU Free Documentation
-License.''
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-@end quotation
-@end copying
-
-@dircategory Texinfo documentation system
-@direntry
-* info standalone: (info-stnd).            Read Info documents without Emacs.
-* infokey: (info-stnd)Invoking infokey.    Compile Info customizations.
-@end direntry
-
-@titlepage
-@title GNU Info
-@subtitle for version @value{VERSION}, @value{UPDATED}
-@author Brian J. Fox (bfox@@gnu.org)
-@page
-@vskip 0pt plus 1filll
-@insertcopying
-@end titlepage
-
-@contents
-
-@ifnottex
-@node Top
-@top GNU Info
-
-@insertcopying
-
-This documentation is different from the documentation for the Info
-reader that is part of GNU Emacs.  If you do not know how to use Info,
-but have a working Info reader, you should read the Emacs documentation
-first, as it includes more background information and a thorough tutorial.
-@end ifnottex
-
-@menu
-* What is Info::                What is Info?
-* Invoking Info::               Options you can pass on the command line.
-* Cursor Commands::             Commands which move the cursor within a node.
-* Scrolling Commands::          Commands for reading the text within a node.
-* Node Commands::               Commands for selecting a new node.
-* Searching Commands::          Commands for searching an Info file.
-* Xref Commands::               Commands for selecting cross references.
-* Window Commands::             Commands which manipulate multiple windows.
-* Printing Nodes::              How to print out the contents of a node.
-* Miscellaneous Commands::      A few commands that defy categories.
-* Variables::                   How to change the default behavior of Info.
-* Custom Key Bindings::         How to define your own key-to-command bindings.
-* Copying This Manual::         The GNU Free Documentation License.
-* Index::                       Global index containing keystrokes,
-                                  command names, variable names,
-                                  and general concepts.
-@end menu
-
-
-@node What is Info
-@chapter What is Info?
-
-@dfn{Info} is a program which is used to view Info files on an ASCII
-terminal.  @dfn{Info files} are the result of processing Texinfo files
-with the program @code{makeinfo} or with one of the Emacs commands, such
-as @code{M-x texinfo-format-buffer}.  Texinfo itself is a documentation
-system that uses a single source file to produce both on-line
-information and printed output.  You can typeset and print the files
-that you read in Info.
-
-
-@node Invoking Info
-@chapter Invoking Info
-
-@cindex Info, invoking
-@cindex invoking Info
-@cindex command line options
-@cindex options, command line
-@cindex arguments, command line
-
-GNU Info accepts several options to control the initial node being
-viewed, and to specify which directories to search for Info files.  Here
-is a template showing an invocation of GNU Info from the shell:
-
-@example
-info [@var{option}]@dots{} [@var{menu-item}@dots{}]
-@end example
-
-The program accepts the following options:
-
-@table @code
-@anchor{--apropos}
-@item --apropos=@var{string}
-@cindex Searching all indices
-@cindex Info files@r{, searching all indices}
-@cindex Apropos@r{, in Info files}
-Specify a string to search in every index of every Info file installed
-on your system.  Info looks up the named @var{string} in all the indices
-it can find, prints the results to standard output, and then exits.  If
-you are not sure which Info file explains certain issues, this option is
-your friend.  Note that if your system has a lot of Info files
-installed, searching all of them might take some time.
-
-You can invoke the apropos command from inside Info; see
-@ref{Searching Commands}.
-
-@cindex directory path
-@item --directory @var{directory-path}
-@itemx -d @var{directory-path}
-Prepend @var{directory-path} to the list of directory paths searched
-when Info needs to find a file.  You may issue @code{--directory}
-multiple times; once for each directory which contains Info files.  The
-list of directories searched by Info is constructed from the value of
-the environment variable @code{INFOPATH}; @code{--directory} causes the
-named @var{directory-path} to be prepended to that list.  The value of
-@code{INFOPATH} is a list of directories usually separated by a colon;
-on MS-DOS/MS-Windows systems, the semicolon is used.  If you do not
-define @code{INFOPATH}, Info uses a default path defined when Info was
-built as the initial list of directories.  If the value of
-@code{INFOPATH} ends with a colon (or semicolon on MS-DOS/MS-Windows),
-the initial list of directories is constructed by appending the
-build-time default to the value of @code{INFOPATH}.
-
-@cindex keystrokes, recording
-@cindex remembering user keystrokes
-@item --dribble=@var{dribble-file}
-Specify a file where all user keystrokes will be recorded.  This file
-can be used later to replay the same sequence of commands, see the
-@samp{--restore} option below.
-
-@item --file @var{filename}
-@itemx -f @var{filename}
-@cindex Info file, selecting
-Specify a particular Info file to visit.  By default, Info visits
-the file @code{dir}; if you use this option, Info will start with
-@code{(@var{filename})Top} as the first file and node.
-
-@cindex relative Info file names
-@cindex file names, relative
-@cindex Info files, relative
-If @var{filename} is an absolute file name, or begins with @file{./} or
-@file{../}, Info looks for @var{filename} only in the directory of the
-specified @var{filename}, and adds the directory of @var{filename} to
-the value of @code{INFOPATH}.  In contrast, if @var{filename} is in the
-form of a relative file name, but without the @file{./} or @file{../}
-prefix, Info will only look for it in the directories specified in
-@code{INFOPATH}.  In other words, Info does @emph{not} treat file names
-which lack @file{./} and @file{../} prefix as relative to the current
-directory.
-
-@cindex compressed Info files
-@cindex files, compressed
-@cindex Info files, compressed
-In every directory Info tries, if @var{filename} is not found, Info
-looks for it with a number of known extensions of Info files@footnote{
-@file{.info}, @file{-info}, @file{/index}, and @file{.inf}.}.  For every
-known extension, Info looks for a compressed file, if a regular file
-isn't found.  Info supports files compressed with @code{gzip},
-@code{bzip2}, @code{compress} and @code{yabba} programs; it calls
-@code{gunzip}, @code{bunzip2}, @code{uncompress} and @code{unyabba},
-accordingly, to decompress such files.  Compressed Info files are
-assumed to have @file{.z}, @file{.gz}, @file{.bz2}, @file{.Z}, or
-@file{.Y} extensions, possibly in addition to one of the known Info
-files extensions@footnote{The MS-DOS version allows for the Info
-extension, such as @code{.inf}, and the short compressed file
-extensions, such as @file{.z} and @file{.gz}, to be merged into a single
-extension, since DOS doesn't allow more than a single dot in the
-basename of a file.  Thus, on MS-DOS, if Info looks for @file{bison},
-file names like @file{bison.igz} and @file{bison.inz} will be found and
-decompressed by @code{gunzip}.}.
-
-@item --help
-@itemx -h
-Produces a relatively brief description of the available Info options.
-
-@item --index-search @var{string}
-@cindex index search, selecting from the command line
-@cindex online help, using Info as
-After processing all command-line arguments, go to the index in the Info
-file and search for index entries which match @var{string}.  If such an
-entry is found, the Info session begins with displaying the node pointed
-to by the first matching index entry; press @kbd{,} to step through the
-rest of the matching entries.  If no such entry exists, print @samp{no
-entries found} and exit with nonzero status.  This can be used from
-another program as a way to provide online help, or as a quick way of
-starting to read an Info file at a certain node when you don't know the
-exact name of that node.
-
-This command can also be invoked from inside Info; see @ref{Searching
-Commands}.
-
-@item --node @var{nodename}
-@itemx -n @var{nodename}
-@cindex node, selecting from the command line
-Specify a particular node to visit in the initial file that Info
-loads.  This is especially useful in conjunction with
-@code{--file}@footnote{Of course, you can specify both the file and node
-in a @code{--node} command; but don't forget to escape the open and
-close parentheses and whitespace from the shell as in: @code{info --node
-"(emacs)Buffers"}.}.  You may specify @code{--node} multiple times; for
-an interactive Info, each @var{nodename} is visited in its own window,
-for a non-interactive Info (such as when @code{--output} is given) each
-@var{nodename} is processed sequentially.
-
-@item --output @var{filename}
-@itemx -o @var{filename}
-@cindex file, outputting to
-@cindex outputting to a file
-Specify @var{filename} as the name of a file to which to direct output.
-Each node that Info visits will be output to @var{filename} instead of
-interactively viewed.  A value of @code{-} for @var{filename} specifies
-the standard output.
-
-@cindex colors in documents
-@cindex ANSI escape sequences in documents
-@item --raw-escapes
-@itemx --no-raw-escapes
-@itemx -R
-Do not remove ANSI escape sequences from documents.  Some versions of
-Groff, the GNU document formatter, produce man pages with ANSI escape
-sequences for bold, italics, and underlined characters, and for
-colorized text.  By default, Info lets those escape sequences pass
-through directly to the terminal.  If your terminal does not support
-these escapes, use @code{--no-raw-escapes} to make Info remove them.
-
-@cindex replaying recorded keystrokes
-@item --restore=@var{dribble-file}
-Read keystrokes from @var{dribble-file}, presumably recorded during
-previous Info session (see the description of the @samp{--dribble}
-option above).  When the keystrokes in the files are all read, Info
-reverts its input to the usual interactive operation.
-
-@anchor{--show-options}
-@cindex command-line options, how to find
-@cindex invocation description, how to find
-@item --show-options
-@itemx --usage
-@itemx -O
-This option causes Info to look for the node that describes how to
-invoke the program and its command-line options, and begin the session
-by displaying that node.  It is provided to make it easier to find the
-most important usage information in a manual without the need to wade
-through complex menu hierarchies.  The effect is similar to the
-@code{M-x goto-invocation} command (@pxref{goto-invocation}) from inside
-Info.
-
-@cindex speech synthesizers
-@item --speech-friendly
-@itemx -b
-On MS-DOS/MS-Windows only, this option causes Info to use standard file
-I/O functions for screen writes.  (By default, Info uses direct writes
-to the video memory on these systems, for faster operation and colored
-display support.)  This allows the speech synthesizers used by blind
-persons to catch the output and convert it to audible speech.
-
-@item --subnodes
-@cindex @code{--subnodes}, command line option
-This option only has meaning when given in conjunction with
-@code{--output}.  It means to recursively output the nodes appearing in
-the menus of each node being output.  Menu items which resolve to
-external Info files are not output, and neither are menu items which are
-members of an index.  Each node is only output once.
-
-@item --version
-@cindex version information
-Prints the version information of Info and exits.
-
-@anchor{--vi-keys}
-@cindex vi-like key bindings
-@cindex Less-like key bindings
-@item --vi-keys
-This option binds functions to keys differently, to emulate the key
-bindings of @code{vi} and Less.  The default key bindings are generally
-modeled after Emacs.
-(@xref{Custom Key Bindings},
-for a more general way of altering GNU Info's key bindings.)
-
-@cindex Info manual location
-@cindex Where is an Info manual?
-@item --where
-@itemx --location
-@itemx -w
-Show the filename that would be read and exit, instead of actually
-reading it and starting Info.
-
-@item @var{menu-item}
-@cindex menu, following
-@anchor{command-line menu items}
-Info treats its remaining arguments as the names of menu items.  The
-first argument is a menu item in the initial node visited (generally
-@code{dir}), the second argument is a menu item in the first argument's
-node, etc.  You can easily move to the node of your choice by specifying
-the menu names which describe the path to that node.  For example,
-
-@example
-info emacs buffers
-@end example
-
-@noindent
-first selects the menu item @samp{Emacs} in the node @samp{(dir)Top},
-and then selects the menu item @samp{Buffers} in the node
-@samp{(emacs)Top}.
-@end table
-
-To avoid searching the @file{dir} files and just show some arbitrary
-file, use @samp{-f} and the filename, as in @samp{info -f ./foo.info}.
-
-The index search and the search for the node which describes program
-invocation and command-line options begins @emph{after} processing all
-the command-line menu items.  Therefore, the Info file searched for the
-index or the invocation node is the file where Info finds itself after
-following all the menu items given on the command line.  This is so
-@samp{info emacs --show-options} does what you'd expect.
-
-@c FIXME: the feature with lowercasing the file name isn't documented
-
-
-@node Cursor Commands
-@chapter Moving the Cursor
-@cindex cursor, moving
-@cindex moving the cursor
-
-Many people find that reading screens of text page by page is made
-easier when one is able to indicate particular pieces of text with
-some kind of pointing device.  Since this is the case, GNU Info (both
-the Emacs and standalone versions) have several commands which allow
-you to move the cursor about the screen.  The notation used in this
-manual to describe keystrokes is identical to the notation used within
-the Emacs manual, and the GNU Readline manual.  @xref{User Input,,,
-emacs, the GNU Emacs Manual}, if you are unfamiliar with the
-notation.@footnote{Here's a short summary.  @kbd{C-@var{x}} means
-press the @kbd{CTRL} key and the key @var{x}.  @kbd{M-@var{x}} means
-press the @kbd{META} key and the key @var{x}.  On many terminals th
-@kbd{META} key is known as the @kbd{ALT} key.  @kbd{SPC} is the space
-bar.  The other keys are usually called by the names imprinted on
-them.}
-
-The following table lists the basic cursor movement commands in Info.
-Each entry consists of the key sequence you should type to execute the
-cursor movement, the @code{M-x}@footnote{@code{M-x} is also a command; it
-invokes @code{execute-extended-command}.  @xref{M-x, , Executing an
-extended command, emacs, the GNU Emacs Manual}, for more detailed
-information.} command name (displayed in parentheses), and a short
-description of what the command does.  All of the cursor motion commands
-can take a @dfn{numeric} argument (see @ref{Miscellaneous Commands,
-@code{universal-argument}, to find out how to supply them}.  With a
-numeric argument, the motion commands are simply executed that
-many times; for example, a numeric argument of 4 given to
-@code{next-line} causes the cursor to move down 4 lines.  With a
-negative numeric argument, the motion is reversed; an argument of -4
-given to the @code{next-line} command would cause the cursor to move
-@emph{up} 4 lines.
-
-@table @asis
-@item @key{C-n} (@code{next-line})
-@itemx @key{DOWN} (an arrow key)
-@kindex C-n
-@kindex DOWN (an arrow key)
-@findex next-line
-Move the cursor down to the next line.
-
-@item @key{C-p} (@code{prev-line})
-@itemx @key{UP} (an arrow key)
-@kindex C-p
-@kindex UP (an arrow key)
-@findex prev-line
-Move the cursor up to the previous line.
-
-@item @key{C-a} (@code{beginning-of-line})
-@itemx @key{Home} (on DOS/Windows only)
-@kindex C-a, in Info windows
-@kindex Home
-@findex beginning-of-line
-Move the cursor to the start of the current line.
-
-@item @key{C-e} (@code{end-of-line})
-@itemx @key{End} (on DOS/Windows only)
-@kindex C-e, in Info windows
-@kindex End
-@findex end-of-line
-Move the cursor to the end of the current line.
-
-@item @key{C-f} (@code{forward-char})
-@itemx @key{RIGHT} (an arrow key)
-@kindex C-f, in Info windows
-@kindex RIGHT (an arrow key)
-@findex forward-char
-Move the cursor forward a character.
-
-@item @key{C-b} (@code{backward-char})
-@itemx @key{LEFT} (an arrow key)
-@kindex C-b, in Info windows
-@kindex LEFT (an arrow key)
-@findex backward-char
-Move the cursor backward a character.
-
-@item @key{M-f} (@code{forward-word})
-@itemx @kbd{C-@key{RIGHT}} (on DOS/Windows only)
-@kindex M-f, in Info windows
-@kindex C-RIGHT
-@findex forward-word
-Move the cursor forward a word.
-
-@item @key{M-b} (@code{backward-word})
-@itemx @kbd{C-@key{LEFT}} (on DOS/Windows only)
-@kindex M-b, in Info windows
-@kindex C-LEFT
-@findex backward-word
-Move the cursor backward a word.
-
-@item @key{M-<} (@code{beginning-of-node})
-@itemx @key{C-@key{Home}} (on DOS/Windows only)
-@itemx @key{b}
-@itemx @key{M-b}, vi-like operation
-@kindex b, in Info windows
-@kindex M-<
-@kindex C-Home
-@kindex M-b, vi-like operation
-@findex beginning-of-node
-Move the cursor to the start of the current node.
-
-@item @key{M->} (@code{end-of-node})
-@itemx @key{C-@key{End}} (on DOS/Windows only)
-@itemx @key{e}
-@kindex M->
-@kindex e, in Info windows
-@kindex C-End
-@findex end-of-node
-Move the cursor to the end of the current node.
-
-@item @key{M-r} (@code{move-to-window-line})
-@kindex M-r
-@findex move-to-window-line
-Move the cursor to a specific line of the window.  Without a numeric
-argument, @code{M-r} moves the cursor to the start of the line in the
-center of the window.  With a numeric argument of @var{n}, @code{M-r}
-moves the cursor to the start of the @var{n}th line in the window.
-@end table
-
-
-@node Scrolling Commands
-@chapter Moving Text Within a Window
-@cindex scrolling
-
-Sometimes you are looking at a screenful of text, and only part of the
-current paragraph you are reading is visible on the screen.  The
-commands detailed in this section are used to shift which part of the
-current node is visible on the screen.
-
-Scrolling commands are bound differently when @samp{--vi-keys} operation
-is in effect (@pxref{--vi-keys}).  These key bindings are designated
-with ``vi-like operation''.
-
-@table @asis
-@item @key{SPC} (@code{scroll-forward})
-@kindex SPC, in Info windows
-@findex scroll-forward
-Shift the text in this window up.  That is, show more of the node which
-is currently below the bottom of the window.  With a numeric argument,
-show that many more lines at the bottom of the window; a numeric
-argument of 4 would shift all of the text in the window up 4 lines
-(discarding the top 4 lines), and show you four new lines at the bottom
-of the window.  Without a numeric argument, @key{SPC} takes the bottom
-two lines of the window and places them at the top of the window,
-redisplaying almost a completely new screenful of lines.  If you are at
-the end of a node, @key{SPC} takes you to the ``next'' node, so that you can
-read an entire manual from start to finish by repeating @key{SPC}.
-
-The default scroll size is one screen-full, but it can be changed by
-invoking the (@code{scroll-forward-page-only-set-window}) command,
-@samp{z} under @samp{--vi-keys}, with a numeric argument.
-
-@item @key{NEXT} (an arrow key) (@code{scroll-forward-page-only})
-@itemx @key{C-v}
-@itemx @key{C-f}, vi-like operation
-@itemx @key{f}, vi-like operation
-@itemx @key{M-SPC}, vi-like operation
-@kindex NEXT
-@kindex C-v
-@kindex C-f, vi-like operation
-@kindex f, vi-like operation
-@kindex M-SPC, vi-like operation
-@findex scroll-forward-page-only
-Shift the text in this window up.  This is identical to the @key{SPC}
-operation above, except that it never scrolls beyond the end of the
-current node.
-
-@kindex PageDown
-The @key{NEXT} key is known as the @key{PageDown} key on some
-keyboards.
-
-@item @key{z} (@code{scroll-forward-page-only-set-window}, vi-like operation)
-@kindex z, vi-like operation
-@findex scroll-forward-page-only-set-window
-Scroll forward, like with @key{NEXT}, but if a numeric argument is
-specified, it becomes the default scroll size for subsequent
-@code{scroll-forward} and @code{scroll-backward} commands and their
-ilk.
-
-@item @key{DEL} (@code{scroll-backward})
-@kindex DEL, in Info windows
-@findex scroll-backward
-Shift the text in this window down.  The inverse of
-@code{scroll-forward}.
-If you are at the start of a node, @key{DEL} takes you to the
-``previous'' node, so that you can read an entire manual from finish to
-start by repeating @key{DEL}.  The default scroll size can be changed by
-invoking the (@code{scroll-backward-page-only-set-window}) command,
-@samp{w} under @samp{--vi-keys}, with a numeric argument.
-
-@itemx @key{PREVIOUS} (arrow key) (@code{scroll-backward-page-only})
-@itemx @key{PRIOR} (arrow key)
-@itemx @key{M-v}
-@itemx @key{b}, vi-like operation
-@itemx @key{C-b}, vi-like operation
-@kindex PREVIOUS
-@kindex M-v
-@kindex b, vi-like operation
-@kindex C-b, vi-like operation
-@findex scroll-backward-page-only
-Shift the text in this window down.  The inverse of
-@code{scroll-forward-page-only}.  Does not scroll beyond the start of
-the current node.  The default scroll size can be changed by invoking
-the(@code{scroll-backward-page-only-set-window}) command, @samp{w} under
-@samp{--vi-keys}, with a numeric argument.
-
-@item @key{w} (@code{scroll-backward-page-only-set-window}, vi-like operation)
-@kindex w, vi-like operation
-@findex scroll-backward-page-only-set-window
-Scroll backward, like with @key{PREVIOUS}, but if a numeric argument is
-specified, it becomes the default scroll size for subsequent
-@code{scroll-forward} and @code{scroll-backward} commands.
-
-@item @key{C-n} (@code{down-line}, vi-like operation)
-@itemx @key{C-e}, vi-like operation
-@itemx @key{RET}, vi-like operation
-@itemx @key{LFD}, vi-like operation
-@itemx @key{DOWN}, vi-like operation
-@kindex C-n, vi-like operation
-@kindex C-e, vi-like operation
-@kindex RET, vi-like operation
-@kindex LFD, vi-like operation
-@kindex DOWN, vi-like operation
-@findex down-line
-Scroll forward by one line.  With a numeric argument, scroll forward
-that many lines.
-
-@item @key{C-p} (@code{up-line}, vi-like operation)
-@itemx @key{UP}, vi-like operation
-@itemx @key{y}, vi-like operation
-@itemx @key{k}, vi-like operation
-@itemx @key{C-k}, vi-like operation
-@itemx @key{C-y}, vi-like operation
-@kindex C-p, vi-like operation
-@kindex UP, vi-like operation
-@kindex y, vi-like operation
-@kindex k, vi-like operation
-@kindex C-k, vi-like operation
-@kindex C-y, vi-like operation
-@findex up-line
-Scroll backward one line.  With a numeric argument, scroll backward that
-many lines.
-
-@item @key{d} (@code{scroll-half-screen-down}, vi-like operation)
-@itemx @key{C-d}, vi-like operation
-@kindex d, vi-like operation
-@kindex C-d, vi-like operation
-@findex scroll-half-screen-down
-Scroll forward by half of the screen size.  With a numeric argument,
-scroll that many lines.  If an argument is specified, it becomes the new
-default number of lines to scroll for subsequent @samp{d} and @samp{u}
-commands.
-
-@item @key{u} (@code{scroll-half-screen-up}, vi-like operation)
-@itemx @key{C-u}, vi-like operation
-@kindex u, vi-like operation
-@kindex C-u, vi-like operation
-@findex scroll-half-screen-up
-Scroll back by half of the screen size.  With a numeric argument,
-scroll that many lines.  If an argument is specified, it becomes the new
-default number of lines to scroll for subsequent @samp{u} and @samp{d}
-commands.
-@end table
-
-@cindex scrolling through node structure
-The @code{scroll-forward} and @code{scroll-backward} commands can also
-move forward and backward through the node structure of the file.  If
-you press @key{SPC} while viewing the end of a node, or @key{DEL} while
-viewing the beginning of a node, what happens is controlled by the
-variable @code{scroll-behavior}.  @xref{Variables,
-@code{scroll-behavior}}, for more information.
-
-The @code{scroll-forward-page-only} and @code{scroll-backward-page-only}
-commands never scroll beyond the current node.
-
-@kindex PageUp
-The @key{PREVIOUS} key is the @key{PageUp} key on many keyboards.  Emacs
-refers to it by the name @key{PRIOR}.  When you use @key{PRIOR} or
-@key{PageUp} to scroll, Info never scrolls beyond the beginning of the
-current node.
-
-@kindex BS (backspace)
-If your keyboard lacks the @key{DEL} key, look for a key called
-@key{BS}, or @samp{BackSpace}, sometimes designated with an arrow which
-points to the left, which should perform the same function.
-
-@table @asis
-@item @key{C-l} (@code{redraw-display})
-@kindex C-l
-@findex redraw-display
-Redraw the display from scratch, or shift the line containing the cursor
-to a specified location.  With no numeric argument, @samp{C-l} clears
-the screen, and then redraws its entire contents.  Given a numeric
-argument of @var{n}, the line containing the cursor is shifted so that
-it is on the @var{n}th line of the window.
-
-@item @kbd{C-x @key{w}} (@code{toggle-wrap})
-@kindex C-w
-@findex toggle-wrap
-Toggles the state of line wrapping in the current window.  Normally,
-lines which are longer than the screen width @dfn{wrap}, i.e., they are
-continued on the next line.  Lines which wrap have a @samp{\} appearing
-in the rightmost column of the screen.  You can cause such lines to be
-terminated at the rightmost column by changing the state of line
-wrapping in the window with @code{C-x w}.  When a line which needs more
-space than one screen width to display is displayed, a @samp{$} appears
-in the rightmost column of the screen, and the remainder of the line is
-invisible.  When long lines are truncated, the modeline displays the
-@samp{$} character near its left edge.
-@end table
-
-
-@node Node Commands
-@chapter Selecting a Node
-@cindex nodes, selection of
-
-This section details the numerous Info commands which select a new node
-to view in the current window.
-
-The most basic node commands are @samp{n}, @samp{p}, @samp{u}, and
-@samp{l}.  Note that the commands to select nodes are mapped differently
-when @samp{--vi-keys} is in effect; these keybindings are designated
-below as ``vi-like operation''.
-
-When you are viewing a node, the top line of the node contains some Info
-@dfn{pointers} which describe where the next, previous, and up nodes
-are.  Info uses this line to move about the node structure of the file
-when you use the following commands:
-
-@table @asis
-@item @key{n} (@code{next-node})
-@itemx @kbd{C-@key{NEXT}} (on DOS/Windows only)
-@itemx @kbd{C-x @key{n}}, vi-like operation
-@kindex n
-@kindex C-NEXT
-@kindex C-x n, vi-like operation
-@findex next-node
-Select the `Next' node.
-
-@kindex C-PgDn
-The @key{NEXT} key is known as the @key{PgDn} key on some
-keyboards.
-
-@item @key{p} (@code{prev-node})
-@itemx @kbd{C-@key{PREVIOUS}} (on DOS/Windows only)
-@kindex p
-@kindex C-PREVIOUS
-@findex prev-node
-Select the `Prev' node.
-
-@kindex C-PgUp
-The @key{PREVIOUS} key is known as the @key{PgUp} key on some
-keyboards.
-
-@item @key{u} (@code{up-node})
-@itemx @kbd{C-@key{UP}} (an arrow key on DOS/Windows only)
-@itemx @kbd{C-x @key{u}}, vi-like operation
-@kindex u
-@kindex C-UP
-@kindex C-x u, vi-like operation
-@findex up-node
-Select the `Up' node.
-@end table
-
-You can easily select a node that you have already viewed in this window
-by using the @samp{l} command---this name stands for ``last'', and
-actually moves backwards through the history of visited nodes for this
-window.  This is handy when you followed a reference to another node,
-possibly to read about a related issue, and would like then to resume
-reading at the same place where you started the excursion.
-
-Each node where you press @samp{l} is discarded from the history.  Thus,
-by the time you get to the first node you visited in a window, the
-entire history of that window is discarded.
-
-@table @asis
-@item @key{l} (@code{history-node})
-@itemx @key{C-@key{CENTER}} (on DOS/Windows only)
-@itemx @key{'}, vi-like operation
-@kindex l
-@kindex C-CENTER
-@kindex ', vi-like operation
-@findex history-node
-Pop the most recently selected node in this window from the node
-history.
-@end table
-
-Two additional commands make it easy to select the most commonly
-selected nodes; they are @samp{t} and @samp{d}.
-
-@table @asis
-@item @key{t} (@code{top-node})
-@itemx @key{M-t}, vi-like operation
-@kindex t
-@kindex M-t, vi-like operation
-@findex top-node
-Select the node @samp{Top} in the current Info file.
-
-@item @key{d} (@code{dir-node})
-@itemx @key{M-d}, vi-like operation
-@kindex d
-@kindex M-d, vi-like operation
-@findex dir-node
-Select the directory node (i.e., the node @samp{(dir)}).
-@end table
-
-Here are some other commands which immediately result in the selection
-of a different node in the current window:
-
-@table @asis
-@item @key{<} (@code{first-node})
-@itemx @key{g}, vi-like operation
-@kindex <
-@kindex g, vi-like operation
-@findex first-node
-Selects the first node which appears in this file.  This node is most
-often @samp{Top}, but it does not have to be.  With a numeric argument
-@var{N}, select the @var{N}th node (the first node is node 1).  An
-argument of zero is the same as the argument of 1.
-
-@item @key{>} (@code{last-node})
-@itemx @key{G}, vi-like operation
-@kindex >
-@kindex G, vi-like operation
-@findex last-node
-Select the last node which appears in this file.  With a numeric argument
-@var{N}, select the @var{N}th node (the first node is node 1).  An
-argument of zero is the same as no argument, i.e., it selects the last
-node.
-
-@item @key{]} (@code{global-next-node})
-@kindex ]
-@findex global-next-node
-Move forward or down through node structure.  If the node that you are
-currently viewing has a @samp{Next} pointer, that node is selected.
-Otherwise, if this node has a menu, the first menu item is selected.  If
-there is no @samp{Next} and no menu, the same process is tried with the
-@samp{Up} node of this node.
-
-@item @key{[} (@code{global-prev-node})
-@kindex [
-@findex global-prev-node
-Move backward or up through node structure.  If the node that you are
-currently viewing has a @samp{Prev} pointer, that node is selected.
-Otherwise, if the node has an @samp{Up} pointer, that node is selected,
-and if it has a menu, the last item in the menu is selected.
-@end table
-
-You can get the same behavior as @code{global-next-node} and
-@code{global-prev-node} while simply scrolling through the file with
-@key{SPC} and @key{DEL}; @xref{Variables, @code{scroll-behavior}}, for
-more information.
-
-@table @asis
-@anchor{goto-node}
-@item @key{g} (@code{goto-node})
-@itemx @kbd{C-x @key{g}}, vi-like operation
-@kindex g
-@kindex C-x g, vi-like operation
-@findex goto-node
-Read the name of a node and select it.  While reading the node name,
-completion (@pxref{The Echo Area, completion}) is only done for the
-nodes which reside in one of the Info files that were loaded in the
-current Info session; if the desired node resides in some other file,
-you must type the node exactly as it appears in that Info file, and you
-must include the Info file of the other file.  For example,
-
-@example
-@code{g(emacs)Buffers}
-@end example
-
-finds the node @samp{Buffers} in the Info file @file{emacs}.
-
-@anchor{goto-invocation}
-@item @key{O} (@code{goto-invocation}
-@itemx @key{I}
-@kindex O
-@kindex I
-@findex goto-invocation
-@cindex finding the Invocation node
-Read the name of a program and look for a node in the current Info file
-which describes the invocation and the command-line options for that
-program.  The default program name is derived from the name of the
-current Info file.  This command does the same as the
-@samp{--show-options} command-line option (@pxref{--show-options}), but
-it also allows to specify the program name; this is important for those
-manuals which describe several programs.
-
-If you need to find the Invocation node of a program that is documented
-in another Info file, you need to visit that file before invoking
-@samp{I}.  For example, if you are reading the Emacs manual and want to
-see the command-line options of the @code{makeinfo} program, type @kbd{g
-(texinfo) @key{RET}} and then @kbd{I makeinfo @key{RET}}.  If you don't
-know what Info file documents the command, or if invoking @samp{I}
-doesn't display the right node, go to the @samp{(dir)} node (using the
-@samp{d} command) and invoke @samp{I} from there.
-
-@item @key{G} (@code{menu-sequence})
-@kindex G
-@findex menu-sequence
-@cindex menu, following, from inside Info
-Read a sequence of menu entries and follow it.  Info prompts for a
-sequence of menu items separated by commas.  (Since commas are not
-allowed in a node name, they are a natural choice for a delimiter in a
-list of menu items.)  Info then looks up the first item in the menu of
-the node @samp{(dir)} (if the @samp{(dir)} node cannot be found, Info
-uses @samp{Top}).  If such an entry is found, Info goes to the node it
-points to and looks up the second item in the menu of that node, etc.
-In other words, you can specify a complete path which descends through
-the menu hierarchy of a particular Info file starting at the
-@samp{(dir)} node.  This has the same effect as if you typed the menu
-item sequence on Info's command line, see @ref{command-line menu items,,
-Info command-line arguments processing}.  For example,
-
-@example
- @kbd{G Texinfo,Overview,Reporting Bugs @key{RET}}
-@end example
-
-@noindent
-displays the node @samp{Reporting Bugs} in the Texinfo manual.  (You
-don't actually need to type the menu items in their full length, or in
-their exact letter-case.  However, if you do type the menu items
-exactly, Info will find it faster.)
-
-If any of the menu items you type are not found, Info stops at the last
-entry it did find and reports an error.
-
-@item @kbd{C-x @key{k}} (@code{kill-node})
-@kindex C-x k
-@findex kill-node
-Kill a node.  The node name is prompted for in the echo area, with a
-default of the current node.  @dfn{Killing} a node means that Info tries
-hard to forget about it, removing it from the list of history nodes kept
-for the window where that node is found.  Another node is selected in
-the window which contained the killed node.
-
-@item @kbd{C-x C-f} (@code{view-file})
-@kindex C-x C-f
-@findex view-file
-Read the name of a file and selects the entire file.  The command
-@example
-@code{C-x C-f @var{filename}}
-@end example
-is equivalent to typing
-@example
-@code{g(@var{filename})*}
-@end example
-
-@item @kbd{C-x C-b} (@code{list-visited-nodes})
-@kindex C-x C-b
-@findex list-visited-nodes
-Make a window containing a menu of all of the currently visited nodes.
-This window becomes the selected window, and you may use the standard
-Info commands within it.
-
-@item @kbd{C-x @key{b}} (@code{select-visited-node})
-@kindex C-x b
-@findex select-visited-node
-Select a node which has been previously visited in a visible window.
-This is similar to @samp{C-x C-b} followed by @samp{m}, but no window is
-created.
-@end table
-
-
-@node Searching Commands
-@chapter Searching an Info File
-@cindex searching
-
-GNU Info allows you to search for a sequence of characters throughout an
-entire Info file, search through the indices of an Info file, or find
-areas within an Info file which discuss a particular topic.
-
-@table @asis
-@item @key{s} (@code{search})
-@itemx @key{/}
-@kindex s
-@kindex /
-@findex search
-Read a string in the echo area and search for it.  If the string
-includes upper-case characters, the Info file is searched
-case-sensitively; otherwise Info ignores the letter case.  With a
-numeric argument of @var{N}, search for @var{N}th occurrence of the
-string.  Negative arguments search backwards.
-
-@item @key{?} (@code{search-backward}, vi-like operation)
-@kindex ?, vi-like operation
-@findex search-backward
-Read a string in the echo area and search backward through the Info file
-for that string.  If the string includes upper-case characters, the Info
-file is searched case-sensitively; otherwise Info ignores the letter
-case.  With a numeric argument of @var{N}, search for @var{N}th
-occurrence of the string.  Negative arguments search forward.
-
-@item @key{S} (@code{search-case-sensitively}
-@kindex S
-@findex search-case-sensitively
-@cindex search, case-sensitive
-@cindex case-sensitive search
-Read a string in the echo area and search for it case-sensitively, even
-if the string includes only lower-case letters.  With a numeric argument
-of @var{N}, search for @var{N}th occurrence of the string.  Negative
-arguments search backwards.
-
-@item @kbd{C-x @key{n}} (@code{search-next})
-@itemx @key{n}, vi-like operation
-@kindex C-x n
-@kindex n, vi-like operation
-@findex search-next
-@cindex repeated search
-Search for the same string used in the last search command, in the same
-direction, and with the same case-sensitivity option.  With a numeric
-argument of @var{N}, search for @var{N}th next occurrence.
-
-@item @kbd{C-x @key{N}} (@code{search-previous})
-@itemx @key{N}, vi-like operation
-@kindex C-x N
-@kindex n, vi-like operation
-@findex search-previous
-Search for the same string used in the last search command, and with the
-same case-sensitivity option, but in the reverse direction.  With a
-numeric argument of @var{N}, search for @var{N}th previous occurrence.
-
-@item @key{C-s} (@code{isearch-forward})
-@kindex C-s
-@findex isearch-forward
-@cindex incremental search
-Interactively search forward through the Info file for a string as you
-type it.  If the string includes upper-case characters, the search is
-case-sensitive; otherwise Info ignores the letter case.
-
-@item @key{C-r} (@code{isearch-backward})
-@kindex C-r
-@findex isearch-backward
-Interactively search backward through the Info file for a string as
-you type it.  If the string includes upper-case characters, the search
-is case-sensitive; otherwise Info ignores the letter case.
-
-@item @key{i} (@code{index-search})
-@kindex i
-@findex index-search
-@cindex index, searching
-@cindex searching, in the indices
-Look up a string in the indices for this Info file, and select a node
-to which the found index entry points.
-
-@item @key{,} (@code{next-index-match})
-@kindex ,
-@findex next-index-match
-Move to the node containing the next matching index item from the last
-@samp{i} command.
-
-@item @kbd{M-x index-apropos}
-@findex index-apropos
-Grovel the indices of all the known Info files on your system for a
-string, and build a menu of the possible matches.
-@end table
-
-The most basic searching command is @samp{s} or @samp{/}
-(@code{search}).  The @samp{s} command prompts you for a string in the
-echo area, and then searches the remainder of the Info file for an
-occurrence of that string.  If the string is found, the node containing
-it is selected, and the cursor is left positioned at the start of the
-found string.  Subsequent @samp{s} commands show you the default search
-string within @samp{[} and @samp{]}; pressing @key{RET} instead of
-typing a new string will use the default search string.  Under
-@samp{--vi-keys} (@pxref{--vi-keys}), using the @samp{n} or @samp{N}
-commands is a faster way of searching for the same string.
-
-@dfn{Incremental searching} is similar to basic searching, but the
-string is looked up while you are typing it, instead of waiting until
-the entire search string has been specified.
-
-@cindex search, and case-sensitivity
-@cindex case-sensitivity, and search
-Both incremental and non-incremental search by default ignore the case
-of letters when comparing the Info file text with the search string.
-However, an uppercase letter in the search string makes the search
-case-sensitive.  You can force a case-sensitive non-incremental search,
-even for a string that includes only lower-case letters, by using the
-@samp{S} command (@code{search-case-sensitively}).  The @samp{n} and
-@samp{N} commands operate case-sensitively if the last search command
-was @samp{S}.
-
-The most efficient means of finding something quickly in a manual is
-the @samp{i} command (@code{index-search}).  This command prompts for
-a string, and then looks for that string in all the indices of the
-current Info manual.  If it finds a matching index entry, it displays
-the node to which that entry refers and prints the full text of the
-entry in the echo area.  You can press @samp{,}
-(@code{next-index-match}) to find more matches.  A good Info manual
-has all of its important concepts indexed, so the @samp{i} command
-lets you use a manual as a reference.
-
-If you don't know what manual documents something, try the @kbd{M-x
-index-apropos} command.  It prompts for a string and then looks up
-that string in all the indices of all the Info documents installed on
-your system.  It can also be invoked from the command line; see
-@ref{--apropos}.
-
-
-@node Xref Commands
-@chapter Selecting Cross References
-
-We have already discussed the @samp{Next}, @samp{Prev}, and @samp{Up}
-pointers which appear at the top of a node.  In addition to these
-pointers, a node may contain other pointers which refer you to a
-different node, perhaps in another Info file.  Such pointers are called
-@dfn{cross references}, or @dfn{xrefs} for short.
-
-@menu
-* Parts of an Xref::            What a cross reference is made of.
-* Selecting Xrefs::             Commands for selecting menu or note items.
-@end menu
-
-@node Parts of an Xref
-@section Parts of an Xref
-
-Cross references have two major parts: the first part is called the
-@dfn{label}; it is the name that you can use to refer to the cross
-reference, and the second is the @dfn{target}; it is the full name of
-the node that the cross reference points to.
-
-The target is separated from the label by a colon @samp{:}; first the
-label appears, and then the target.  For example, in the sample menu
-cross reference below, the single colon separates the label from the
-target.
-
-@example
-* Foo Label: Foo Target.        More information about Foo.
-@end example
-
-Note the @samp{.} which ends the name of the target.  The @samp{.} is
-not part of the target; it serves only to let Info know where the target
-name ends.
-
-A shorthand way of specifying references allows two adjacent colons to
-stand for a target name which is the same as the label name:
-
-@example
-* Foo Commands::                Commands pertaining to Foo.
-@end example
-
-In the above example, the name of the target is the same as the name of
-the label, in this case @code{Foo Commands}.
-
-You will normally see two types of cross reference while viewing nodes:
-@dfn{menu} references, and @dfn{note} references.  Menu references
-appear within a node's menu; they begin with a @samp{*} at the beginning
-of a line, and continue with a label, a target, and a comment which
-describes what the contents of the node pointed to contains.
-
-Note references appear within the body of the node text; they begin with
-@code{*Note}, and continue with a label and a target.
-
-Like @samp{Next}, @samp{Prev}, and @samp{Up} pointers, cross references
-can point to any valid node.  They are used to refer you to a place
-where more detailed information can be found on a particular subject.
-Here is a cross reference which points to a node within the Texinfo
-documentation:  @xref{xref, , Writing an Xref, texinfo, the Texinfo
-Manual}, for more information on creating your own texinfo cross
-references.
-
-@node Selecting Xrefs
-@section Selecting Xrefs
-
-The following table lists the Info commands which operate on menu items.
-
-@table @asis
-@item @key{1} (@code{menu-digit})
-@itemx @key{2} @dots{} @key{9}
-@itemx @key{M-1}, vi-like operation
-@itemx @key{M-2} @dots{} @key{M-9}, vi-like operation
-@cindex 1 @dots{} 9, in Info windows
-@cindex M-1 @dots{} M-9, vi-like operation
-@kindex 1 @dots{} 9, in Info windows
-@kindex M-1 @dots{} M-9, vi-like operation
-@findex menu-digit
-Within an Info window, pressing a single digit, (such as @samp{1}),
-selects that menu item, and places its node in the current window.
-For convenience, there is one exception; pressing @samp{0} selects the
-@emph{last} item in the node's menu.  When @samp{--vi-keys} is in
-effect, digits set the numeric argument, so these commands are remapped
-to their @samp{M-} varieties.  For example, to select the last menu
-item, press @key{M-0}.
-
-@item @key{0} (@code{last-menu-item})
-@itemx @key{M-0}, vi-like operation
-@kindex 0, in Info windows
-@kindex M-0, vi-like operation
-@findex last-menu-item
-Select the last item in the current node's menu.
-
-@item @key{m} (@code{menu-item})
-@kindex m
-@findex menu-item
-Reads the name of a menu item in the echo area and selects its node.
-Completion is available while reading the menu label.  @xref{The Echo
-Area, completion}.
-
-@item @kbd{M-x find-menu}
-@findex find-menu
-Move the cursor to the start of this node's menu.
-@end table
-
-This table lists the Info commands which operate on cross references.
-
-@table @asis
-@item @key{f} (@code{xref-item})
-@itemx @key{r}
-@item @key{M-f}, vi-like operation
-@itemx @kbd{C-x @key{r}}, vi-like operation
-@kindex f
-@kindex r
-@kindex M-f, vi-like operation
-@kindex C-x r, vi-like operation
-@findex xref-item
-Reads the name of a note cross reference in the echo area and selects
-its node.  Completion is available while reading the cross reference
-label.  @xref{The Echo Area, completion}.
-@end table
-
-Finally, the next few commands operate on menu or note references alike:
-
-@table @asis
-@item @key{TAB} (@code{move-to-next-xref})
-@kindex TAB, in Info windows
-@findex move-to-next-xref
-Move the cursor to the start of the next nearest menu item or note
-reference in this node.  You can then use @key{RET}
-(@code{select-reference-this-line}) to select the menu or note reference.
-
-@item @key{M-TAB} (@code{move-to-prev-xref})
-@itemx @key{Shift-@key{TAB}} (on DOS/Windows only)
-@kindex M-TAB, in Info windows
-@findex move-to-prev-xref
-Move the cursor the start of the nearest previous menu item or note
-reference in this node.
-
-@kindex Shift-TAB, in Info windows
-@kindex BackTab, in Info windows
-On DOS/Windows only, the @kbd{Shift-@key{TAB}} key is an alias for
-@kbd{M-@key{TAB}}.  This key is sometimes called @samp{BackTab}.
-
-@item @key{RET} (@code{select-reference-this-line})
-@itemx @key{M-g}, vi-like operation
-@kindex RET, in Info windows
-@kindex M-g, vi-like operation
-@findex select-reference-this-line
-Select the menu item or note reference appearing on this line.
-@end table
-
-
-@node Window Commands
-@chapter Manipulating Multiple Windows
-@cindex windows, manipulating
-
-A @dfn{window} is a place to show the text of a node.  Windows have a
-view area where the text of the node is displayed, and an associated
-@dfn{mode line}, which briefly describes the node being viewed.
-
-GNU Info supports multiple windows appearing in a single screen; each
-window is separated from the next by its modeline.  At any time, there
-is only one @dfn{active} window, that is, the window in which the cursor
-appears.  There are commands available for creating windows, changing
-the size of windows, selecting which window is active, and for deleting
-windows.
-
-@menu
-* The Mode Line::               What appears in the mode line?
-* Basic Windows::               Manipulating windows in Info.
-* The Echo Area::               Used for displaying errors and reading input.
-@end menu
-
-@node The Mode Line
-@section The Mode Line
-
-A @dfn{mode line} is a line of inverse video which appears at the bottom
-of an Info window.  It describes the contents of the window just above
-it; this information includes the name of the file and node appearing in
-that window, the number of screen lines it takes to display the node,
-and the percentage of text that is above the top of the window.  It can
-also tell you if the indirect tags table for this Info file needs to be
-updated, and whether or not the Info file was compressed when stored on
-disk.
-
-Here is a sample mode line for a window containing an uncompressed file
-named @file{dir}, showing the node @samp{Top}.
-
-@example
-@group
------Info: (dir)Top, 40 lines --Top-------------------------------------
-            ^^   ^   ^^^        ^^
-          (file)Node #lines    where
-@end group
-@end example
-
-When a node comes from a file which is compressed on disk, this is
-indicated in the mode line with two small @samp{z}'s.  In addition, if
-the Info file containing the node has been split into subfiles, the name
-of the subfile containing the node appears in the modeline as well:
-
-@example
---zz-Info: (emacs)Top, 291 lines --Top-- Subfile: emacs-1.Z-------------
-@end example
-
-Truncation of long lines (as opposed to wrapping them to the next
-display line, @pxref{Scrolling Commands, toggle-wrap}) is indicated by a
-@samp{$} at the left edge of the mode line:
-
-@example
---$--Info: (texinfo)Top, 480 lines --Top-- Subfile: texinfo-1-----------
-@end example
-
-When Info makes a node internally, such that there is no corresponding
-info file on disk, the name of the node is surrounded by asterisks
-(@samp{*}).  The name itself tells you what the contents of the window
-are; the sample mode line below shows an internally constructed node
-showing possible completions:
-
-@example
------Info: *Completions*, 7 lines --All---------------------------------
-@end example
-
-@node Basic Windows
-@section Window Commands
-
-It can be convenient to view more than one node at a time.  To allow
-this, Info can display more than one @dfn{window}.  Each window has its
-own mode line (@pxref{The Mode Line}) and history of nodes viewed in that
-window (@pxref{Node Commands, , @code{history-node}}).
-
-@table @asis
-@item @kbd{C-x @key{o}} (@code{next-window})
-@cindex windows, selecting
-@kindex C-x o
-@findex next-window
-Select the next window on the screen.  Note that the echo area can only be
-selected if it is already in use, and you have left it temporarily.
-Normally, @samp{C-x o} simply moves the cursor into the next window on
-the screen, or if you are already within the last window, into the first
-window on the screen.  Given a numeric argument, @samp{C-x o} moves over
-that many windows.  A negative argument causes @samp{C-x o} to select
-the previous window on the screen.
-
-@item @kbd{M-x prev-window}
-@findex prev-window
-Select the previous window on the screen.  This is identical to
-@samp{C-x o} with a negative argument.
-
-@item @kbd{C-x @key{2}} (@code{split-window})
-@cindex windows, creating
-@kindex C-x 2
-@findex split-window
-Split the current window into two windows, both showing the same node.
-Each window is one half the size of the original window, and the cursor
-remains in the original window.  The variable @code{automatic-tiling}
-can cause all of the windows on the screen to be resized for you
-automatically (@pxref{Variables, , automatic-tiling}).
-
-@item @kbd{C-x @key{0}} (@code{delete-window})
-@cindex windows, deleting
-@kindex C-x 0
-@findex delete-window
-Delete the current window from the screen.  If you have made too many
-windows and your screen appears cluttered, this is the way to get rid of
-some of them.
-
-@item @kbd{C-x @key{1}} (@code{keep-one-window})
-@kindex C-x 1
-@findex keep-one-window
-Delete all of the windows excepting the current one.
-
-@item @kbd{ESC @key{C-v}} (@code{scroll-other-window})
-@kindex ESC C-v, in Info windows
-@findex scroll-other-window
-Scroll the other window, in the same fashion that @samp{C-v} might
-scroll the current window.  Given a negative argument, scroll the
-``other'' window backward.
-
-@item @kbd{C-x @key{^}} (@code{grow-window})
-@kindex C-x ^
-@findex grow-window
-Grow (or shrink) the current window.  Given a numeric argument, grow
-the current window that many lines; with a negative numeric argument,
-shrink the window instead.
-
-@item @kbd{C-x @key{t}} (@code{tile-windows})
-@cindex tiling
-@kindex C-x t
-@findex tile-windows
-Divide the available screen space among all of the visible windows.
-Each window is given an equal portion of the screen in which to display
-its contents.  The variable @code{automatic-tiling} can cause
-@code{tile-windows} to be called when a window is created or deleted.
-@xref{Variables, , @code{automatic-tiling}}.
-@end table
-
-@node The Echo Area
-@section The Echo Area
-@cindex echo area
-
-The @dfn{echo area} is a one line window which appears at the bottom of
-the screen.  It is used to display informative or error messages, and to
-read lines of input from you when that is necessary.  Almost all of the
-commands available in the echo area are identical to their Emacs
-counterparts, so please refer to that documentation for greater depth of
-discussion on the concepts of editing a line of text.  The following
-table briefly lists the commands that are available while input is being
-read in the echo area:
-
-@table @asis
-@item @key{C-f} (@code{echo-area-forward})
-@itemx @key{RIGHT} (an arrow key)
-@itemx @key{M-h}, vi-like operation
-@kindex C-f, in the echo area
-@kindex RIGHT, in the echo area
-@kindex M-h, in the echo area, vi-like operation
-@findex echo-area-forward
-Move forward a character.
-
-@item @key{C-b} (@code{echo-area-backward})
-@itemx @key{LEFT} (an arrow key)
-@itemx @key{M-l}, vi-like operation
-@kindex LEFT, in the echo area
-@kindex C-b, in the echo area
-@kindex M-l, in the echo area, vi-like operation
-@findex echo-area-backward
-Move backward a character.
-
-@item @key{C-a} (@code{echo-area-beg-of-line})
-@itemx @key{M-0}, vi-like operation
-@kindex C-a, in the echo area
-@kindex M-0, in the echo area, vi-like operation
-@findex echo-area-beg-of-line
-Move to the start of the input line.
-
-@item @key{C-e} (@code{echo-area-end-of-line})
-@itemx @key{M-$}, vi-like operation
-@kindex C-e, in the echo area
-@kindex M-$, vi-like operation
-@findex echo-area-end-of-line
-Move to the end of the input line.
-
-@item @key{M-f} (@code{echo-area-forward-word})
-@itemx @key{C-@key{RIGHT}} (DOS/Windows only)
-@itemx @key{M-w}, vi-like operation
-@kindex M-f, in the echo area
-@kindex M-w, in the echo area, vi-like operation
-@findex echo-area-forward-word
-Move forward a word.
-
-@kindex C-RIGHT, in the echo area
-On DOS/Windows, @kbd{C-@key{RIGHT}} moves forward by words.
-
-@item @key{M-b} (@code{echo-area-backward-word})
-@itemx @key{C-@key{LEFT}} (DOS/Windows only)
-@kindex M-b, in the echo area
-@findex echo-area-backward-word
-Move backward a word.
-
-@kindex C-LEFT, in the echo area
-On DOS/Windows, @kbd{C-@key{LEFT}} moves backward by words.
-
-@item @key{C-d} (@code{echo-area-delete})
-@itemx @key{M-x}, vi-like operation
-@kindex C-d, in the echo area
-@kindex M-x, in the echo area, vi-like operation
-@findex echo-area-delete
-Delete the character under the cursor.
-
-@item @key{DEL} (@code{echo-area-rubout})
-@kindex DEL, in the echo area
-@findex echo-area-rubout
-Delete the character behind the cursor.
-
-On some keyboards, this key is designated @key{BS}, for
-@samp{BackSpace}.  Those keyboards will usually bind @key{DEL} in the
-echo area to @code{echo-area-delete}.
-
-@item @key{C-g} (@code{echo-area-abort})
-@itemx @key{C-u}, vi-like operation
-@kindex C-g, in the echo area
-@kindex C-u, in the echo area, vi-like operation
-@findex echo-area-abort
-Cancel or quit the current operation.  If completion is being read, this
-command discards the text of the input line which does not match any
-completion.  If the input line is empty, it aborts the calling function.
-
-@item @key{RET} (@code{echo-area-newline})
-@kindex RET, in the echo area
-@findex echo-area-newline
-Accept (or forces completion of) the current input line.
-
-@item @key{C-q} (@code{echo-area-quoted-insert})
-@itemx @key{C-v}, vi-like operation
-@kindex C-q, in the echo area
-@kindex C-v, in the echo area, vi-like operation
-@findex echo-area-quoted-insert
-Insert the next character verbatim.  This is how you can insert control
-characters into a search string, for example, or the @samp{?} character
-when Info prompts with completion.
-
-@item @var{printing character} (@code{echo-area-insert})
-@kindex printing characters, in the echo area
-@findex echo-area-insert
-Insert the character.  Characters that have their 8th bit set, and not
-bound to @samp{M-} commands, are also inserted verbatim; this is useful
-for terminals which support Latin scripts.
-
-@item @key{M-TAB} (@code{echo-area-tab-insert})
-@itemx @key{Shift-@key{TAB}} (on DOS/Windows only)
-@kindex M-TAB, in the echo area
-@kindex Shift-TAB, in the echo area
-@findex echo-area-tab-insert
-Insert a TAB character.
-
-@kindex Shift-TAB, in the echo area
-@kindex BackTab, in the echo area
-On DOS/Windows only, the @kbd{Shift-@key{TAB}} key is an alias for
-@kbd{M-@key{TAB}}.  This key is sometimes called @samp{BackTab}.
-
-@item @key{C-t} (@code{echo-area-transpose-chars})
-@kindex C-t, in the echo area
-@findex echo-area-transpose-chars
-Transpose the characters at the cursor.
-@end table
-
-The next group of commands deal with @dfn{killing}, and @dfn{yanking}
-text@footnote{
-Some people are used to calling these operations @dfn{cut} and
-@dfn{paste}, respectively.}.   For an in-depth discussion of killing and
-yanking, see @ref{Killing, , Killing and Deleting, emacs, the GNU Emacs
-Manual}.
-
-@table @asis
-@item @key{M-d} (@code{echo-area-kill-word})
-@itemx @key{M-X}, vi-like operation
-@kindex M-d, in the echo area
-@kindex M-X, in the echo area, vi-like operation
-@findex echo-area-kill-word
-Kill the word following the cursor.
-
-@item @key{M-DEL} (@code{echo-area-backward-kill-word})
-@itemx @key{M-@key{BS}}
-@kindex M-DEL, in the echo area
-@findex echo-area-backward-kill-word
-Kill the word preceding the cursor.
-
-@kindex M-BS, in the echo area
-On some keyboards, the @code{Backspace} key is used instead of
-@code{DEL}, so @code{M-@key{Backspace}} has the same effect as
-@code{M-@key{DEL}}.
-
-@item @key{C-k} (@code{echo-area-kill-line})
-@kindex C-k, in the echo area
-@findex echo-area-kill-line
-Kill the text from the cursor to the end of the line.
-
-@item @kbd{C-x @key{DEL}} (@code{echo-area-backward-kill-line})
-@kindex C-x DEL, in the echo area
-@findex echo-area-backward-kill-line
-Kill the text from the cursor to the beginning of the line.
-
-@item @key{C-y} (@code{echo-area-yank})
-@kindex C-y, in the echo area
-@findex echo-area-yank
-Yank back the contents of the last kill.
-
-@item @key{M-y} (@code{echo-area-yank-pop})
-@kindex M-y, in the echo area
-@findex echo-area-yank-pop
-Yank back a previous kill, removing the last yanked text first.
-@end table
-
-@cindex completion
-Sometimes when reading input in the echo area, the command that needed
-input will only accept one of a list of several choices.  The choices
-represent the @dfn{possible completions}, and you must respond with one
-of them.  Since there are a limited number of responses you can make,
-Info allows you to abbreviate what you type, only typing as much of the
-response as is necessary to uniquely identify it.  In addition, you can
-request Info to fill in as much of the response as is possible; this
-is called @dfn{completion}.
-
-The following commands are available when completing in the echo area:
-
-@table @asis
-@item @key{TAB} (@code{echo-area-complete})
-@itemx @key{SPC}
-@kindex TAB, in the echo area
-@kindex SPC, in the echo area
-@findex echo-area-complete
-Insert as much of a completion as is possible.
-
-@item @key{?} (@code{echo-area-possible-completions})
-@kindex ?, in the echo area
-@findex echo-area-possible-completions
-Display a window containing a list of the possible completions of what
-you have typed so far.  For example, if the available choices are:
-
-@example
-@group
-bar
-foliate
-food
-forget
-@end group
-@end example
-
-@noindent
-and you have typed an @samp{f}, followed by @samp{?}, Info will pop up a
-window showing a node called @samp{*Completions*} which lists the
-possible completions like this:
-
-@example
-@group
-3 completions:
-foliate         food
-forget
-@end group
-@end example
-
-@noindent
-i.e., all of the choices which begin with @samp{f}.  Pressing @key{SPC}
-or @key{TAB} would result in @samp{fo} appearing in the echo area, since
-all of the choices which begin with @samp{f} continue with @samp{o}.
-Now, typing @samp{l} followed by @samp{TAB} results in @samp{foliate}
-appearing in the echo area, since that is the only choice which begins
-with @samp{fol}.
-
-@item @key{ESC C-v} (@code{echo-area-scroll-completions-window})
-@kindex ESC C-v, in the echo area
-@findex echo-area-scroll-completions-window
-Scroll the completions window, if that is visible, or the ``other''
-window if not.
-@end table
-
-
-@node Printing Nodes
-@chapter Printing Nodes
-@cindex printing
-
-In general, we recommend that you use @TeX{} to format the document and
-print sections of it, by running @code{tex} on the Texinfo source file.
-However, you may wish to print out the contents of a node as a quick
-reference document for later use, or if you don't have @TeX{} installed.
-Info provides you with a command for doing this.
-
-@table @asis
-@item @kbd{M-x print-node}
-@findex print-node
-@cindex INFO_PRINT_COMMAND, environment variable
-Pipe the contents of the current node through the command in the
-environment variable @code{INFO_PRINT_COMMAND}.  If the variable does not
-exist, the node is simply piped to @code{lpr} (on DOS/Windows, the
-default is to print the node to the local printer device, @file{PRN}).
-
-@cindex printing nodes to the local printer
-@cindex local printer device
-The value of @code{INFO_PRINT_COMMAND} may begin with the @samp{>}
-character, as in @samp{>/dev/printer}, in which case Info treats the
-rest as the name of a file or a device.  Instead of piping to a command,
-Info opens the file, writes the node contents, and closes the file,
-under the assumption that text written to that file will be printed by
-the underlying OS.
-@end table
-
-
-@node Miscellaneous Commands
-@chapter Miscellaneous Commands
-
-GNU Info contains several commands which self-document GNU Info:
-
-@table @asis
-@item @kbd{M-x describe-command}
-@cindex functions, describing
-@cindex commands, describing
-@findex describe-command
-Read the name of an Info command in the echo area and then display a
-brief description of what that command does.
-
-@item @kbd{M-x describe-key}
-@cindex keys, describing
-@findex describe-key
-Read a key sequence in the echo area, and then display the name and
-documentation of the Info command that the key sequence invokes.
-
-@item @kbd{M-x describe-variable}
-Read the name of a variable in the echo area and then display a brief
-description of what the variable affects.
-
-@item @kbd{M-x where-is}
-@findex where-is
-Read the name of an Info command in the echo area, and then display
-a key sequence which can be typed in order to invoke that command.
-
-@item @key{C-h} (@code{get-help-window})
-@itemx @key{?}
-@itemx @key{F1} (on DOS/Windows only)
-@itemx h, vi-like operation
-@kindex C-h
-@kindex ?, in Info windows
-@kindex F1
-@kindex h, vi-like operation
-@findex get-help-window
-Create (or Move into) the window displaying @code{*Help*}, and place
-a node containing a quick reference card into it.  This window displays
-the most concise information about GNU Info available.
-
-@item @key{h} (@code{get-info-help-node})
-@itemx @key{M-h}, vi-like operation
-@kindex h
-@kindex M-h, vi-like operation
-@findex get-info-help-node
-Try hard to visit the node @code{(info)Help}.  The Info file
-@file{info.texi} distributed with GNU Info contains this node.  Of
-course, the file must first be processed with @code{makeinfo}, and then
-placed into the location of your Info directory.
-@end table
-
-Here are the commands for creating a numeric argument:
-
-@table @asis
-@item @key{C-u} (@code{universal-argument})
-@cindex numeric arguments
-@kindex C-u
-@findex universal-argument
-Start (or multiply by 4) the current numeric argument.  @samp{C-u} is
-a good way to give a small numeric argument to cursor movement or
-scrolling commands; @samp{C-u C-v} scrolls the screen 4 lines, while
-@samp{C-u C-u C-n} moves the cursor down 16 lines.  @samp{C-u} followed
-by digit keys sets the numeric argument to the number thus typed:
-@kbd{C-u 1 2 0} sets the argument to 120.
-
-@item @key{M-1} (@code{add-digit-to-numeric-arg})
-@itemx @key{1}, vi-like operation
-@itemx @key{M-2} @dots{} @key{M-9}
-@itemx @key{2} @dots{} @key{9}, vi-like operation
-@itemx @key{M-0}
-@itemx @key{0}, vi-like operation
-@kindex M-0 @dots{} M-9
-@kindex 0 @dots{} 9, vi-like operation
-@findex add-digit-to-numeric-arg
-Add the digit value of the invoking key to the current numeric
-argument.  Once Info is reading a numeric argument, you may just type
-the digits of the argument, without the Meta prefix.  For example, you
-might give @samp{C-l} a numeric argument of 32 by typing:
-
-@example
-@kbd{C-u 3 2 C-l}
-@end example
-
-@noindent
-or
-
-@example
-@kbd{M-3 2 C-l}
-@end example
-
-@item @key{M--} (@code{add-digit-to-numeric-arg}
-@itemx @key{-}
-@kindex M--
-@kindex -
-@cindex negative arguments
-@cindex arguments, negative
-@cindex numeric arguments, negative
-To make a negative argument, type @kbd{-}.  Typing @kbd{-} alone makes a
-negative argument with a value of -1.  If you continue to type digit or
-Meta-digit keys after @kbd{-}, the result is a negative number produced
-by those digits.
-
-@kbd{-} doesn't work when you type in the echo area, because you need to
-be able to insert the @samp{-} character itself; use @kbd{M--} instead,
-if you need to specify negative arguments in the echo area.
-@end table
-
-@samp{C-g} is used to abort the reading of a multi-character key
-sequence, to cancel lengthy operations (such as multi-file searches) and
-to cancel reading input in the echo area.
-
-@table @asis
-@item @key{C-g} (@code{abort-key})
-@itemx @key{C-u}, vi-like operation
-@cindex cancelling typeahead
-@cindex cancelling the current operation
-@kindex C-g, in Info windows
-@kindex C-u cancels typeahead, vi-like operation
-@findex abort-key
-Cancel current operation.
-@end table
-
-The @samp{q} command of Info simply quits running Info.  Under
-@samp{--vi-keys} (@pxref{--vi-keys}), you can also exit with @samp{:q}
-or @samp{ZZ}.
-
-@table @asis
-@item @key{q} (@code{quit})
-@itemx @kbd{C-x C-c}
-@itemx @kbd{:q}, vi-like operation
-@itemx @kbd{ZZ}, vi-like operation
-@cindex quitting
-@kindex q
-@kindex C-x C-c
-@kindex ZZ, vi-like operation
-@findex quit
-Exit GNU Info.
-@end table
-
-If the operating system tells GNU Info that the screen is 60 lines tall,
-and it is actually only 40 lines tall, here is a way to tell Info that
-the operating system is correct.
-
-@table @asis
-@item @kbd{M-x set-screen-height}
-@findex set-screen-height
-@cindex screen, changing the height of
-Read a height value in the echo area and set the height of the
-displayed screen to that value.
-@end table
-
-On MS-DOS/MS-Windows, this command actually tries to change the
-dimensions of the visible screen to the value you type in the echo
-area.
-
-Finally, Info provides a convenient way to display footnotes which might
-be associated with the current node that you are viewing:
-
-@table @asis
-@item @key{ESC C-f} (@code{show-footnotes})
-@kindex ESC C-f
-@findex show-footnotes
-@cindex footnotes, displaying
-Show the footnotes (if any) associated with the current node in another
-window.  You can have Info automatically display the footnotes
-associated with a node when the node is selected by setting the variable
-@code{automatic-footnotes}.  @xref{Variables, , @code{automatic-footnotes}}.
-@end table
-
-
-@node Variables
-@chapter Manipulating Variables
-
-GNU Info contains several @dfn{variables} whose values are looked at by
-various Info commands.  You can change the values of these variables,
-and thus change the behavior of Info to more closely match your
-environment and Info file reading manner.
-
-There are two ways to set the value of a variable: interactively, using
-the @code{set-variable} command described below, or in the @code{#var}
-section of the @code{.infokey} file.  @xref{Custom Key Bindings}.
-
-@table @asis
-@item @kbd{M-x set-variable}
-@cindex variables, setting
-@findex set-variable
-Read the name of a variable, and the value for it, in the echo area and
-then set the variable to that value.  Completion is available when
-reading the variable name (@pxref{The Echo Area, completion}); often,
-completion is available when reading the value to give to the variable,
-but that depends on the variable itself.  If a variable does @emph{not}
-supply multiple choices to complete over, it expects a numeric value.
-
-@item @kbd{M-x describe-variable}
-@cindex variables, describing
-@findex describe-variable
-Read the name of a variable in the echo area and then display a brief
-description of what the variable affects.
-@end table
-
-Here is a list of the variables that you can set in Info.
-
-@table @code
-@item automatic-footnotes
-@vindex automatic-footnotes
-When set to @code{On}, footnotes appear and disappear automatically;
-else, they appear at the bottom of the node text.  This variable is
-@code{Off} by default.  When a node is selected, a window containing
-the footnotes which appear in that node is created, and the footnotes
-are displayed within the new window.  The window that Info creates to
-contain the footnotes is called @samp{*Footnotes*}.  If a node is
-selected which contains no footnotes, and a @samp{*Footnotes*} window
-is on the screen, the @samp{*Footnotes*} window is deleted.  Footnote
-windows created in this fashion are not automatically tiled so that
-they can use as little of the display as is possible.
-
-@item automatic-tiling
-@vindex automatic-tiling
-When set to @code{On}, creating or deleting a window resizes other
-windows.  This variable is @code{Off} by default.  Normally, typing
-@samp{C-x 2} divides the current window into two equal parts.  When
-@code{automatic-tiling} is set to @code{On}, all of the windows are
-resized automatically, keeping an equal number of lines visible in each
-window.  There are exceptions to the automatic tiling; specifically, the
-windows @samp{*Completions*} and @samp{*Footnotes*} are @emph{not}
-resized through automatic tiling; they remain their original size.
-
-@item errors-ring-bell
-@vindex errors-ring-bell
-When set to @code{On}, errors cause the bell to ring.  The default
-setting of this variable is @code{On}.
-
-@item gc-compressed-files
-@vindex gc-compressed-files
-When set to @code{On}, Info garbage collects files which had to be
-uncompressed.  The default value of this variable is @code{Off}.
-Whenever a node is visited in Info, the Info file containing that node
-is read into core, and Info reads information about the tags and nodes
-contained in that file.  Once the tags information is read by Info, it
-is never forgotten.  However, the actual text of the nodes does not need
-to remain in core unless a particular Info window needs it.  For
-non-compressed files, the text of the nodes does not remain in core when
-it is no longer in use.  But de-compressing a file can be a time
-consuming operation, and so Info tries hard not to do it twice.
-@code{gc-compressed-files} tells Info it is okay to garbage collect the
-text of the nodes of a file which was compressed on disk.
-
-@item ISO-Latin
-@cindex ISO Latin characters
-@vindex ISO-Latin
-When set to @code{On}, Info accepts and displays ISO Latin characters.
-By default, Info assumes an ASCII character set.  @code{ISO-Latin} tells
-Info that it is running in an environment where the European standard
-character set is in use, and allows you to input such characters to
-Info, as well as display them.
-
-@item scroll-behavior
-@vindex scroll-behavior
-Control what happens when forward scrolling is requested at the end of
-a node, or when backward scrolling is requested at the beginning of a
-node.  The default value for this variable is @code{Continuous}.  There
-are three possible values for this variable:
-
-@table @code
-@item Continuous
-Try to get the first item in this node's menu, or failing that, the
-@samp{Next} node, or failing that, the @samp{Next} of the @samp{Up}.
-This behavior is identical to using the @samp{]}
-(@code{global-next-node}) and @samp{[} (@code{global-prev-node})
-commands.
-
-@item Next Only
-Only try to get the @samp{Next} node.
-
-@item Page Only
-Simply give up, changing nothing.  If @code{scroll-behavior} is
-@code{Page Only}, no scrolling command can change the node that is being
-viewed.
-@end table
-
-@item scroll-step
-@vindex scroll-step
-The number of lines to scroll when the cursor moves out of the window.
-Scrolling happens automatically if the cursor has moved out of the
-visible portion of the node text when it is time to display.  Usually
-the scrolling is done so as to put the cursor on the center line of the
-current window.  However, if the variable @code{scroll-step} has a
-nonzero value, Info attempts to scroll the node text by that many lines;
-if that is enough to bring the cursor back into the window, that is what
-is done.  The default value of this variable is 0, thus placing the
-cursor (and the text it is attached to) in the center of the window.
-Setting this variable to 1 causes a kind of ``smooth scrolling'' which
-some people prefer.
-
-@item show-index-match
-@vindex show-index-match
-When set to @code{On}, the portion of the matched search string is
-highlighted in the message which explains where the matched search
-string was found.  The default value of this variable is @code{On}.
-When Info displays the location where an index match was found,
-(@pxref{Searching Commands, , @code{next-index-match}}), the portion of the
-string that you had typed is highlighted by displaying it in the inverse
-case from its surrounding characters.
-
-@item visible-bell
-@vindex visible-bell
-When set to @code{On}, GNU Info attempts to flash the screen instead of
-ringing the bell.  This variable is @code{Off} by default.  Of course,
-Info can only flash the screen if the terminal allows it; in the case
-that the terminal does not allow it, the setting of this variable has no
-effect.  However, you can make Info perform quietly by setting the
-@code{errors-ring-bell} variable to @code{Off}.
-
-@end table
-
-
-@node Custom Key Bindings
-@chapter Customizing Key Bindings and Variables
-
-@cindex default key bindings, overriding
-@cindex overriding default key bindings
-@cindex customizing key bindings
-@cindex key bindings, customizing
-@cindex infokey
-@cindex .info
-@cindex .infokey
-@cindex _info file (MS-DOS)
-
-For those whose editor/pager of choice is not Emacs and who are not
-entirely satisfied with the --vi-keys option (@pxref{--vi-keys}), GNU
-Info provides a way to define different key-to-command bindings and
-variable settings from the defaults described in this document.
-
-On startup, GNU Info looks for a configuration file in the invoker's
-HOME directory called @file{.info}@footnote{Due to the limitations of
-DOS filesystems, the MS-DOS version of Info looks for a file
-@file{_info} instead.  If the @env{HOME} variable is not defined, Info
-additionally looks in the current directory.}.  If it is present, and
-appears to contain Info configuration data, and was created with the
-current version of the @code{infokey} command, then Info adopts the
-key bindings and variable settings contained therein.
-
-The @file{.info} file contains compact, non-textual data for reasons of
-efficiency and because its design was lifted wholesale from the GNU Less
-program, which also does it that way.  It must be created by compiling a
-textual source file using the @code{infokey} command.
-
-@menu
-* Invoking infokey::
-* infokey source format::
-@end menu
-
-
-@node Invoking infokey
-@section Invoking @command{infokey}
-
-@cindex invoking infokey
-@cindex infokey, invoking
-@cindex _infokey file (MS-DOS)
-
-@command{infokey} compiles a source file
-(@file{$HOME/.infokey}@footnote{This file is named @file{_infokey} in
-the MS-DOS version, and is looked for in the current directory if
-@env{HOME} is undefined.} by default) containing Info customizations
-into a binary format (@file{$HOME/.info} by default).  GNU Info reads
-the binary file at startup to override the default key bindings and
-variable definitions.  Synopsis:
-
-@example
-infokey [@var{option}@dots{}] [@var{input-file}]
-@end example
-
-Besides the standard @option{--help} and @option{--version}, the only
-option is @option{--output @var{file}}.  This tells @command{infokey} to
-write the binary data to @var{file} instead of @file{$HOME/.info}.
-
-
-@node infokey source format
-@section @command{infokey} source format
-
-@cindex infokey source format
-@cindex .infokey source format
-@cindex format of .infokey source
-
-The format of the source file read by @command{infokey} is most easily
-illustrated by example.  For instance, here is a sample @file{.infokey}
-source file suitable for aficionados of @command{vi} or @command{less}:
-
-@example
-#info
-j       next-line
-k       prev-line
-l       forward-char
-h       backward-char
-\kd     next-line
-\ku     prev-line
-\kr     forward-char
-\kl     backward-char
-\       scroll-forward
-\kD     scroll-forward-page-only
-b       scroll-backward
-\kU     scroll-backward-page-only
-g       beginning-of-node
-\kh     beginning-of-node
-G       end-of-node
-\ke     end-of-node
-\t      select-reference-this-line
--       history-node
-n       next-node
-p       prev-node
-u       up-node
-t       top-node
-d       dir-node
-#var
-scroll-step=1
-@end example
-
-The source file consists of one or more @dfn{sections}.
-Each section starts with a line that identifies the type of section.
-Possible sections are:
-
-@table @code
-@item #info
-Key bindings for Info windows.
-The start of this section is indicated by a line containing just
-@code{#info} by itself.  If this is the first section in the source
-file, the @code{#info} line can be omitted.  The rest of this section
-consists of lines of the form:
-
-@example
-@var{string} whitespace @var{action} [ whitespace [ # comment ] ] newline
-@end example
-
-Whitespace is any sequence of one or more spaces and/or tabs.  Comment
-is any sequence of any characters, excluding newline.  @var{string} is
-the key sequence which invokes the action.  @var{action} is the name of
-an Info command.  The characters in @var{string} are interpreted
-literally or prefixed by a caret (@code{^}) to indicate a control
-character.  A backslash followed by certain characters specifies input
-keystrokes as follows:
-
-@table @code
-@item \b
-Backspace
-@item \e
-Escape (ESC)
-@item \n
-Newline
-@item \r
-Return
-@item \t
-Tab
-@item \ku
-Up arrow
-@item \kd
-Down arrow
-@item \kl
-Left arrow
-@item \kr
-Right arrow
-@item \kU
-Page Up
-@item \kD
-Page Down
-@item \kh
-HOME
-@item \ke
-END
-@item \kx
-Delete (DEL)
-@item \m@var{x}
-Meta-@var{x} where @var{x} is any character as described above.
-@end table
-
-Backslash followed by any other character indicates that character is to
-be taken literally.  Characters which must be preceded by a backslash
-include caret, space, tab, and backslash itself.
-
-@item #echo-area
-Key bindings for the echo area.
-The start of this section is indicated by a line containing just
-@code{#echo-area} by itself.  The rest of this section has a syntax
-identical to that for the key definitions for the Info area, described
-above.
-
-@item #var
-Variable initializations.
-The start of this section is indicated by a line containing just
-@code{#var} by itself.  Following this line is a list of variable
-assignments, one per line.  Each line consists of a variable name
-(@xref{Variables},) followed by @code{=} followed by a value.
-There may be no white space between the variable name and the @code{=},
-and all characters following the @code{=}, including white space,
-are included in the value.
-@end table
-
-Blank lines and lines starting with @code{#} are ignored, except for
-the special section header lines.
-
-Key bindings defined in the @file{.info} file take precedence over GNU
-Info's default key bindings, whether or not @samp{--vi-keys} is used.  A
-default key binding may be disabled by overriding it in the @file{.info}
-file with the action @code{invalid}.  In addition, @emph{all} default
-key bindings can be disabled by adding this line @emph{anywhere} in the
-relevant section:
-
-@example
-#stop
-@end example
-
-This will cause GNU Info to ignore all the default key commands for that
-section.
-
-Beware: @code{#stop} can be dangerous.  Since it disables all default
-key bindings, you must supply enough new key bindings to enable all
-necessary actions.  Failure to bind any key to the @code{quit} command,
-for example, can lead to frustration.
-
-The order in which key bindings are defined in the @file{.info} file is
-not important, except that the command summary produced by the
-@code{get-help-window} command only displays the @emph{first} key that
-is bound to each command.
-
-
-@c the following is incomplete
-@ignore
-@c node Info for Sys Admins
-@c chapter Info for System Administrators
-
-This text describes some common ways of setting up an Info hierarchy
-from scratch, and details the various options that are available when
-installing Info.  This text is designed for the person who is installing
-GNU Info on the system; although users may find the information present
-in this section interesting, none of it is vital to understanding how to
-use GNU Info.
-
-@menu
-* Setting the INFOPATH::        Where are my Info files kept?
-* Editing the DIR node::        What goes in `DIR', and why?
-* Storing Info files::          Alternate formats allow flexibility in setups.
-* Using `localdir'::            Building DIR on the fly.
-* Example setups::              Some common ways to organize Info files.
-@end menu
-
-@c node Setting the INFOPATH
-@c section Setting the INFOPATH
-
-Where are my Info files kept?
-
-@c node Editing the DIR node
-@c section Editing the DIR node
-
-What goes in `DIR', and why?
-
-@c node Storing Info files
-@c section Storing Info files
-
-Alternate formats allow flexibility in setups.
-
-@c node Using `localdir'
-@c section Using `localdir'
-
-Building DIR on the fly.
-
-@c node Example setups
-@c section Example setups
-
-Some common ways to organize Info files.
-@end ignore
-
-
-@node Copying This Manual
-@appendix Copying This Manual
-
-@menu
-* GNU Free Documentation License::  License for copying this manual.
-@end menu
-
-@include fdl.texi
-
-
-@node Index
-@appendix Index
-
-@printindex cp
-
-@bye

Property changes on: head/contrib/texinfo/doc/info-stnd.texi
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/doc/version-stnd.texi
===================================================================
--- head/contrib/texinfo/doc/version-stnd.texi	(revision 276550)
+++ head/contrib/texinfo/doc/version-stnd.texi	(nonexistent)
@@ -1,4 +0,0 @@
-@set UPDATED 14 December 2004
-@set UPDATED-MONTH December 2004
-@set EDITION 4.8
-@set VERSION 4.8

Property changes on: head/contrib/texinfo/doc/version-stnd.texi
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/doc/README
===================================================================
--- head/contrib/texinfo/doc/README	(revision 276550)
+++ head/contrib/texinfo/doc/README	(nonexistent)
@@ -1,44 +0,0 @@
-$Id: README,v 1.4 2004/04/11 17:56:45 karl Exp $
-texinfo/doc/README
-
-  Copyright (C) 2002 Free Software Foundation, Inc.
-
-  Copying and distribution of this file, with or without modification,
-  are permitted in any medium without royalty provided the copyright
-  notice and this notice are preserved.
-
-This directory contains documentation on the Texinfo system and the TeX
-sources needed to process Texinfo sources.  We recommend using the
-texi2dvi included in this distribution to run a Texinfo manual through
-TeX to produce a DVI file.
-
-The .tex files are not installed automatically because TeX installations
-vary so widely.  Installing them in the wrong place would give a false
-sense of security.  So, you should simply cp *.tex to the appropriate
-place.  If your installation follows the TeX Directory Structure
-standard (http://tug.org/tds/), this will be the directory
-TEXMF/tex/texinfo/ for texinfo.tex, TEXMF/tex/generic/dvips/ for epsf.tex,
-and TEXMF/pdftex/plain/misc for pdfcolor.tex.  If you use the default
-installation paths, TEXMF will be /usr/local/share/texmf.  On systems
-with TeX preinstalled, as most GNU/Linux distributions offer, TEXMF
-will often be something like /usr/share/texmf.
-
-It is also possible to put these .tex files in a `local' place instead
-of overwriting existing ones, but this is more complicated.  See your TeX
-documentation in general and the texmf.cnf file in particular for information.
-
-If you add files to your TeX installations, not just replace existing
-ones, you very likely have to update your ls-R file; do this with the
-mktexlsr command.  In older versions, this was named MakeTeXls-R.
-
-You can get the latest texinfo.tex from
-ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex (and all GNU mirrors)
-ftp://tug.org/tex/texinfo.tex (and all CTAN mirrors)
-or on the FSF machines in /home/gd/gnu/doc/texinfo.tex.
-If you have problems with the version in this distribution, please check
-for a newer version.
-
-epsf.tex comes with dvips distributions, and you may already have it
-installed.  The version here is functionally identical but slightly
-nicer than the one in dvips574.  The changes have been sent to the
-epsf.tex maintainer.

Property changes on: head/contrib/texinfo/doc/README
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/doc/infokey.1
===================================================================
--- head/contrib/texinfo/doc/infokey.1	(revision 276550)
+++ head/contrib/texinfo/doc/infokey.1	(nonexistent)
@@ -1,41 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
-.TH INFOKEY "1" "December 2004" "infokey 4.8" "User Commands"
-.SH NAME
-infokey \- compile customizations for Info
-.SH SYNOPSIS
-.B infokey
-[\fIOPTION\fR]... [\fIINPUT-FILE\fR]
-.SH DESCRIPTION
-Compile infokey source file to infokey file.  Reads INPUT\-FILE (default
-$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info.
-.SH OPTIONS
-.TP
-\fB\-\-output\fR FILE
-output to FILE instead of $HOME/.info
-.TP
-\fB\-\-help\fR
-display this help and exit.
-.TP
-\fB\-\-version\fR
-display version information and exit.
-.SH "REPORTING BUGS"
-Email bug reports to bug\-texinfo@gnu.org,
-general questions and discussion to help\-texinfo@gnu.org.
-Texinfo home page: http://www.gnu.org/software/texinfo/
-.SH COPYRIGHT
-Copyright \(co 2003 Free Software Foundation, Inc.
-There is NO warranty.  You may redistribute this software
-under the terms of the GNU General Public License.
-For more information about these matters, see the files named COPYING.
-.SH "SEE ALSO"
-The full documentation for
-.B infokey
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B infokey
-programs are properly installed at your site, the command
-.IP
-.B info infokey
-.PP
-should give you access to the complete manual.

Property changes on: head/contrib/texinfo/doc/infokey.1
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/doc/install-info.1
===================================================================
--- head/contrib/texinfo/doc/install-info.1	(revision 276550)
+++ head/contrib/texinfo/doc/install-info.1	(nonexistent)
@@ -1,78 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
-.TH INSTALL-INFO "1" "December 2004" "install-info 4.8" "User Commands"
-.SH NAME
-install-info \- update info/dir entries
-.SH SYNOPSIS
-.B install-info
-[\fIOPTION\fR]... [\fIINFO-FILE \fR[\fIDIR-FILE\fR]]
-.SH DESCRIPTION
-Install or delete dir entries from INFO\-FILE in the Info directory file
-DIR\-FILE.
-.SH OPTIONS
-.TP
-\fB\-\-delete\fR
-delete existing entries for INFO\-FILE from DIR\-FILE;
-don't insert any new entries.
-.TP
-\fB\-\-dir\-file\fR=\fINAME\fR
-specify file name of Info directory file.
-This is equivalent to using the DIR\-FILE argument.
-.TP
-\fB\-\-entry\fR=\fITEXT\fR
-insert TEXT as an Info directory entry.
-TEXT should have the form of an Info menu item line
-plus zero or more extra lines starting with whitespace.
-If you specify more than one entry, they are all added.
-If you don't specify any entries, they are determined
-from information in the Info file itself.
-.TP
-\fB\-\-help\fR
-display this help and exit.
-.TP
-\fB\-\-info\-file\fR=\fIFILE\fR
-specify Info file to install in the directory.
-This is equivalent to using the INFO\-FILE argument.
-.TP
-\fB\-\-info\-dir\fR=\fIDIR\fR
-same as \fB\-\-dir\-file\fR=\fIDIR\fR/dir.
-.TP
-\fB\-\-item\fR=\fITEXT\fR
-same as \fB\-\-entry\fR TEXT.
-An Info directory entry is actually a menu item.
-.TP
-\fB\-\-quiet\fR
-suppress warnings.
-.TP
-\fB\-\-remove\fR
-same as \fB\-\-delete\fR.
-.TP
-\fB\-\-section\fR=\fISEC\fR
-put this file's entries in section SEC of the directory.
-If you specify more than one section, all the entries
-are added in each of the sections.
-If you don't specify any sections, they are determined
-from information in the Info file itself.
-.TP
-\fB\-\-version\fR
-display version information and exit.
-.SH "REPORTING BUGS"
-Email bug reports to bug\-texinfo@gnu.org,
-general questions and discussion to help\-texinfo@gnu.org.
-Texinfo home page: http://www.gnu.org/software/texinfo/
-.SH COPYRIGHT
-Copyright \(co 2004 Free Software Foundation, Inc.
-There is NO warranty.  You may redistribute this software
-under the terms of the GNU General Public License.
-For more information about these matters, see the files named COPYING.
-.SH "SEE ALSO"
-The full documentation for
-.B install-info
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B install-info
-programs are properly installed at your site, the command
-.IP
-.B info install-info
-.PP
-should give you access to the complete manual.

Property changes on: head/contrib/texinfo/doc/install-info.1
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/doc/info.texi
===================================================================
--- head/contrib/texinfo/doc/info.texi	(revision 276550)
+++ head/contrib/texinfo/doc/info.texi	(nonexistent)
@@ -1,1498 +0,0 @@
-\input texinfo.tex    @c -*-texinfo-*-
-@c We must \input texinfo.tex instead of texinfo, otherwise make
-@c distcheck in the Texinfo distribution fails, because the texinfo Info
-@c file is made first, and texi2dvi must include . first in the path.
-@comment %**start of header
-@setfilename info.info
-@settitle Info
-@syncodeindex fn cp
-@syncodeindex vr cp
-@syncodeindex ky cp
-@comment %**end of header
-
-@copying
-This file describes how to use Info, the on-line, menu-driven GNU
-documentation system.
-
-Copyright (C) 1989, 1992, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-Free Software Foundation, Inc.
-
-@quotation
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the
-license is included in the section entitled ``GNU Free Documentation
-License'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
-@end quotation
-@end copying
-
-@dircategory Texinfo documentation system
-@direntry
-* Info: (info).         How to use the documentation browsing system.
-@end direntry
-
-@titlepage
-@title Info
-@subtitle The online, hyper-text GNU documentation system
-@author Brian Fox
-@author and the GNU Texinfo community
-@page
-@vskip 0pt plus 1filll
-@insertcopying
-@end titlepage
-
-@contents
-
-@ifnottex
-@node Top
-@top Info: An Introduction
-
-The GNU Project distributes most of its on-line manuals in the
-@dfn{Info format}, which you read using an @dfn{Info reader}.  You are
-probably using an Info reader to read this now.
-
-There are two primary Info readers: @code{info}, a stand-alone program
-designed just to read Info files, and the @code{info} package in GNU
-Emacs, a general-purpose editor.  At present, only the Emacs reader
-supports using a mouse.
-
-@ifinfo
-If you are new to the Info reader and want to learn how to use it,
-type the command @kbd{h} now.  It brings you to a programmed
-instruction sequence.
-
-To read about expert-level Info commands, type @kbd{n} twice.  This
-brings you to @cite{Info for Experts}, skipping over the `Getting
-Started' chapter.
-@end ifinfo
-@end ifnottex
-
-@menu
-* Getting Started::             Getting started using an Info reader.
-* Expert Info::                 Info commands for experts.
-* Creating an Info File::       How to make your own Info file.
-* Index::                       An index of topics, commands, and variables.
-@end menu
-
-@node Getting Started, Expert Info, Top, Top
-@comment  node-name,  next,  previous,  up
-@chapter Getting Started
-
-This first part of this Info manual describes how to get around inside
-of Info.  The second part of the manual describes various advanced
-Info commands, and how to write an Info as distinct from a Texinfo
-file.  The third part briefly explains how to generate Info files from
-Texinfo files.
-
-@ifnotinfo
-This manual is primarily designed for browsing with an Info reader
-program on a computer, so that you can try Info commands while reading
-about them.  Reading it on paper or with an HTML browser is less
-effective, since you must take it on faith that the commands described
-really do what the manual says.  By all means go through this manual
-now that you have it; but please try going through the on-line version
-as well.
-
-@cindex Info reader, how to invoke
-@cindex entering Info
-There are two ways of looking at the online version of this manual:
-
-@enumerate
-@item
-Type @code{info} at your shell's command line.  This approach uses a
-stand-alone program designed just to read Info files.
-
-@item
-Type @code{emacs} at the command line; then type @kbd{C-h i}
-(@kbd{Control-h}, followed by @kbd{i}).  This approach uses the Info
-mode of the Emacs editor.
-@end enumerate
-
-In either case, then type @kbd{mInfo} (just the letters), followed by
-@key{RET}---the ``Return'' or ``Enter'' key.  At this point, you should
-be ready to follow the instructions in this manual as you read them on
-the screen.
-@c FIXME! (pesch@cygnus.com, 14 dec 1992)
-@c Is it worth worrying about what-if the beginner goes to somebody
-@c else's Emacs session, which already has an Info running in the middle
-@c of something---in which case these simple instructions won't work?
-@end ifnotinfo
-
-@menu
-* Help-Small-Screen::   Starting Info on a Small Screen.
-* Help::                How to use Info.
-* Help-P::              Returning to the Previous node.
-* Help-^L::             The Space, DEL, B and ^L commands.
-* Help-Inv::            Invisible text in Emacs Info.
-* Help-M::              Menus.
-* Help-Xref::           Following cross-references.
-* Help-Int::            Some intermediate Info commands.
-* Help-Q::              Quitting Info.
-@end menu
-
-@node Help-Small-Screen
-@section Starting Info on a Small Screen
-
-@ifnotinfo
-(In Info, you only see this section if your terminal has a small
-number of lines; most readers pass by it without seeing it.)
-@end ifnotinfo
-
-@cindex small screen, moving around
-Since your terminal has a relatively small number of lines on its
-screen, it is necessary to give you special advice at the beginning.
-
-If you see the text @samp{--All----} near the bottom right corner
-of the screen, it means the entire text you are looking at fits on the
-screen.  If you see @samp{--Top----} instead, it means that there is
-more text below that does not fit.  To move forward through the text
-and see another screen full, press @key{SPC}, the Space bar.  To move
-back up, press the key labeled @samp{Backspace} or @samp{DEL} (on some
-keyboards, this key might be labeled @samp{Delete}).
-
-@ifinfo
-Here are 40 lines of junk, so you can try @key{SPC} and @key{DEL} and
-see what they do.  At the end are instructions of what you should do
-next.
-
-@format
-This is line 20
-This is line 21
-This is line 22
-This is line 23
-This is line 24
-This is line 25
-This is line 26
-This is line 27
-This is line 28
-This is line 29
-This is line 30
-This is line 31
-This is line 32
-This is line 33
-This is line 34
-This is line 35
-This is line 36
-This is line 37
-This is line 38
-This is line 39
-This is line 40
-This is line 41
-This is line 42
-This is line 43
-This is line 44
-This is line 45
-This is line 46
-This is line 47
-This is line 48
-This is line 49
-This is line 50
-This is line 51
-This is line 52
-This is line 53
-This is line 54
-This is line 55
-This is line 56
-This is line 57
-This is line 58
-This is line 59
-@end format
-
-If you have managed to get here, go back to the beginning with
-@kbd{DEL} (or @key{BACKSPACE}), and come back here again, then you
-understand the about the @samp{Space} and @samp{Backspace} keys.  So
-now type an @kbd{n}---just one character; don't type the quotes and
-don't type the Return key afterward---to get to the normal start of
-the course.
-@end ifinfo
-
-@node Help, Help-P, Help-Small-Screen, Getting Started
-@comment  node-name,  next,  previous,  up
-@section How to use Info
-
-You are talking to the program Info, for reading documentation.
-
-  There are two ways to use Info: from within Emacs or as a
-stand-alone reader that you can invoke from a shell using the command
-@command{info}.
-
-@cindex node, in Info documents
-  Right now you are looking at one @dfn{Node} of Information.
-A node contains text describing a specific topic at a specific
-level of detail.  This node's topic is ``how to use Info''.  The mode
-line says that this is node @samp{Help} in the file @file{info}.
-
-@cindex header of Info node
-  The top line of a node is its @dfn{header}.  This node's header
-(look at it now) says that the @samp{Next} node after this one is the
-node called @samp{Help-P}.  An advanced Info command lets you go to
-any node whose name you know.  In the stand-alone Info reader program,
-the header line shows the names of this node and the info file as
-well.  In Emacs, the header line is duplicated in a special typeface,
-and the duplicate remains at the top of the window all the time even
-if you scroll through the node.
-
-  Besides a @samp{Next}, a node can have a @samp{Previous} link, or an
-@samp{Up} link, or both.  As you can see, this node has all of these
-links.
-
-@kindex n @r{(Info mode)}
-  Now it is time to move on to the @samp{Next} node, named @samp{Help-P}.
-
-@format
->> Type @kbd{n} to move there.  Type just one character;
-   do not type the quotes and do not type a @key{RET} afterward.
-@end format
-
-@noindent
-@samp{>>} in the margin means it is really time to try a command.
-
-@format
->> If you are in Emacs and have a mouse, and if you already practiced
-   typing @kbd{n} to get to the next node, click now with the middle
-   mouse button on the @samp{Next} link to do the same ``the mouse way''.
-@end format
-
-@node Help-P, Help-^L, Help, Getting Started
-@comment  node-name,  next,  previous,  up
-@section Returning to the Previous node
-
-@kindex p @r{(Info mode)}
-This node is called @samp{Help-P}.  The @samp{Previous} node, as you see,
-is @samp{Help}, which is the one you just came from using the @kbd{n}
-command.  Another @kbd{n} command now would take you to the next
-node, @samp{Help-^L}.
-
-@format
->> But do not type @kbd{n} yet.  First, try the @kbd{p} command, or
-   (in Emacs) click the middle mouse button on the @samp{Prev} link.
-   That takes you to the @samp{Previous} node.  Then use @kbd{n} to
-   return here.
-@end format
-
-  If you read this in Emacs, you will see an @samp{Info} item in the
-menu bar, close to its right edge.  Clicking the mouse on the
-@samp{Info} menu-bar item opens a menu of commands which include
-@samp{Next} and @samp{Prev} (and also some others which you didn't yet
-learn about).
-
-  This all probably seems insultingly simple so far, but @emph{please
-don't} start skimming.  Things will get complicated soon enough!
-Also, please do not try a new command until you are told it is time
-to.  You could make Info skip past an important warning that was
-coming up.
-
-@format
->> Now do an @kbd{n}, or (in Emacs) click the middle mouse button on
-   the @samp{Next} link, to get to the node @samp{Help-^L} and learn more.
-@end format
-
-@node Help-^L, Help-Inv, Help-P, Getting Started
-@comment  node-name,  next,  previous,  up
-@section The Space, DEL, B and ^L commands
-
-  This node's mode line tells you that you are now at node
-@samp{Help-^L}, and the header line tells you that @kbd{p} would get
-you back to @samp{Help-P}.  The node's title is highlighted and may be
-underlined as well; it says what the node is about.
-
-  This is a big node and it does not all fit on your display screen.
-You can tell that there is more that is not visible because you
-can see the string @samp{--Top-----} rather than @samp{--All----} near
-the bottom right corner of the screen.
-
-@kindex SPC @r{(Info mode)}
-@kindex DEL @r{(Info mode)}
-@kindex BACKSPACE @r{(Info mode)}
-@findex Info-scroll-up
-@findex Info-scroll-down
-  The @key{SPC}, @key{BACKSPACE} (or @key{DEL})@footnote{The key which
-we call ``Backspace or DEL'' in this manual is labeled differently on
-different keyboards.  Look for a key which is a little ways above the
-@key{ENTER} or @key{RET} key and which you normally use outside Emacs
-to erase the character before the cursor, i.e.@: the character you
-typed last.  It might be labeled @samp{Backspace} or @samp{<-} or
-@samp{DEL}, or sometimes @samp{Delete}.} and @kbd{b} commands exist to
-allow you to ``move around'' in a node that does not all fit on the
-screen at once.  @key{SPC} moves forward, to show what was below the
-bottom of the screen.  @key{DEL} or @key{BACKSPACE} moves backward, to
-show what was above the top of the screen (there is not anything above
-the top until you have typed some spaces).
-
-@format
->> Now try typing a @key{SPC} (afterward, type a @key{BACKSPACE} to
-   return here).
-@end format
-
-  When you type the @key{SPC}, the two lines that were at the bottom of
-the screen appear at the top, followed by more lines.  @key{DEL} or
-@key{BACKSPACE} takes the two lines from the top and moves them to the
-bottom, @emph{usually}, but if there are not a full screen's worth of
-lines above them they may not make it all the way to the bottom.
-
-  If you are reading this in Emacs, note that the header line is
-always visible, never scrolling off the display.  That way, you can
-always see the @samp{Next}, @samp{Prev}, and @samp{Up} links, and you
-can conveniently go to one of these links at any time by
-clicking the middle mouse button on the link.
-
-@cindex reading Info documents top to bottom
-@cindex Info documents as tutorials
-  @key{SPC} and @key{DEL} not only move forward and backward through
-the current node.  They also move between nodes.  @key{SPC} at the end
-of a node moves to the next node; @key{DEL} (or @key{BACKSPACE}) at
-the beginning of a node moves to the previous node.  In effect, these
-commands scroll through all the nodes in an Info file as a single
-logical sequence.  You can read an entire manual top to bottom by just
-typing @key{SPC}, and move backward through the entire manual from
-bottom to top by typing @key{DEL} (or @key{BACKSPACE}).
-
-  In this sequence, a node's subnodes appear following their parent.
-If a node has a menu, @key{SPC} takes you into the subnodes listed in
-the menu, one by one.  Once you reach the end of a node, and have seen
-all of its subnodes, @key{SPC} takes you to the next node or to the
-parent's next node.
-
-@kindex PAGEUP @r{(Info mode)}
-@kindex PAGEDOWN @r{(Info mode)}
-  Many keyboards nowadays have two scroll keys labeled @samp{PageUp}
-and @samp{PageDown} (or maybe @samp{Prior} and @samp{Next}).  If your
-keyboard has these keys, you can use them to move forward and backward
-through the text of one node, like @key{SPC} and @key{BACKSPACE} (or
-@key{DEL}).  However, @key{PAGEUP} and @key{PAGEDOWN} keys never
-scroll beyond the beginning or the end of the current node.
-
-@kindex C-l @r{(Info mode)}
-  If your screen is ever garbaged, you can tell Info to display it
-again by typing @kbd{C-l} (@kbd{Control-L}---that is, hold down
-@key{CTRL} and type @kbd{L} or @kbd{l}).
-
-@format
->> Type @kbd{C-l} now.
-@end format
-
-@kindex b @r{(Info mode)}
-  To move back to the beginning of the node you are on, you can type
-the @key{BACKSPACE} key (or @key{DEL}) many times.  You can also type
-@kbd{b} just once.  @kbd{b} stands for ``beginning.''
-
-@format
->> Try that now.  (We have put in enough verbiage to push this past
-   the first screenful, but screens are so big nowadays that perhaps it
-   isn't enough.  You may need to shrink your Emacs or Info window.)
-   Then come back, by typing @key{SPC} one or more times.
-@end format
-
-  If your screen is very tall, all of this node might fit at once.  In
-that case, @kbd{b} won't do anything.  But you could observe the
-effect of the @kbd{b} key if you use a smaller window.
-
-@kindex ? @r{(Info mode)}
-@findex Info-summary
-  You have just learned a considerable number of commands.  If you
-want to use one but have trouble remembering which, you should type
-a @kbd{?} (in Emacs it runs the @code{Info-summary} command) which
-displays a brief list of commands.  When you are finished looking at
-the list, make it go away by typing a @key{SPC} repeatedly.
-
-@format
->> Type a @key{?} now.  Press @key{SPC} to see consecutive screenfuls of
-   the list until finished.  Then type @key{SPC} several times.  If
-   you are using Emacs, the help will then go away automatically.
-@end format
-
-  (If you are using the stand-alone Info reader, type @kbd{C-x 0} to
-return here, that is---press and hold @key{CTRL}, type an @kbd{x},
-then release @key{CTRL} and @kbd{x}, and press @kbd{0}; that's a zero,
-not the letter ``o''.)
-
-  From now on, you will encounter large nodes without warning, and
-will be expected to know how to use @key{SPC} and @key{BACKSPACE} to
-move around in them without being told.  Since not all terminals have
-the same size screen, it would be impossible to warn you anyway.
-
-@format
->> Now type @kbd{n}, or click the middle mouse button on the @samp{Next} link,
-   to visit the next node.
-@end format
-
-@node Help-Inv, Help-M, Help-^L, Getting Started
-@comment  node-name,  next,  previous,  up
-@section Invisible text in Emacs Info
-
-  Before discussing menus, we need to make some remarks that are only
-relevant to users reading Info using Emacs.  Users of the stand-alone
-version can skip this node by typing @kbd{]} now.
-
-@cindex invisible text in Emacs
-  In Emacs, certain text that appears in the stand-alone version is
-normally hidden, technically because it has the @samp{invisibility}
-property.  Invisible text is really a part of the text.  It becomes
-visible (by default) after killing and yanking, it appears in printed
-output, it gets saved to file just like any other text, and so on.
-Thus it is useful to know it is there.
-
-@findex visible-mode
-You can make invisible text visible by using the command @kbd{M-x
-visible-mode}.  Visible mode is a minor mode, so using the command a
-second time will make the text invisible again.  Watch the effects of
-the command on the ``menu'' below and the top line of this node.
-
-If you prefer to @emph{always} see the invisible text, you can set
-@code{Info-hide-note-references} to @code{nil}.  Enabling Visible mode
-permanently is not a real alternative, because Emacs Info also uses
-(although less extensively) another text property that can change the
-text being displayed, the @samp{display} property.  Only the
-invisibility property is affected by Visible mode.  When, in this
-tutorial, we refer to the @samp{Emacs} behavior, we mean the
-@emph{default} Emacs behavior.
-
-Now type @kbd{]}, to learn about the @kbd{]} and @kbd{[} commands.
-
-@menu
-* ]:         Help-].               Node telling about ].
-* stuff:     Help-].               Same node.
-* Help-]::                         Yet again, same node.
-@end menu
-
-@node Help-], , , Help-Inv
-@subsection The @kbd{]} and @kbd{[} commands
-
-If you type @kbd{n} now, you get an error message saying that this
-node has no next node.  Similarly, if you type @kbd{p}, the error
-message tells you that there is no previous node.  (The exact message
-depends on the Info reader you use.)  This is because @kbd{n} and
-@kbd{p} carry you to the next and previous node @emph{at the same
-level}.  The present node is contained in a menu (see next) of the
-node you came from, and hence is considered to be at a lower level.
-It is the only node in the previous node's menu (even though it was
-listed three times). Hence it has no next or previous node that
-@kbd{n} or @kbd{p} could move to.
-
-If you systematically move through a manual by typing @kbd{n}, you run
-the risk of skipping many nodes.  You do not run this risk if you
-systematically use @kbd{@key{SPC}}, because, when you scroll to the
-bottom of a node and type another @kbd{@key{SPC}}, then this carries
-you to the following node in the manual @emph{regardless of level}.
-If you immediately want to go to that node, without having to scroll
-to the bottom of the screen first, you can type @kbd{]}.
-
-Similarly, @kbd{@key{BACKSPACE}} carries you to the preceding node
-regardless of level, after you scrolled to the beginning of the
-present node.  If you want to go to the preceding node immediately,
-you can type @kbd{[}.
-
-For instance, typing this sequence will come back here in three steps:
-@kbd{[ n [}.  To do the same backward, type @kbd{] p ]}.
-
-Now type @kbd{]} to go to the next node and learn about menus.
-
-@node Help-M, Help-Xref, Help-Inv, Getting Started
-@comment  node-name,  next,  previous,  up
-@section Menus and the @kbd{m} command
-
-@cindex menus in an Info document
-@cindex Info menus
-  With only the @kbd{n} (next), @kbd{p} (previous), @kbd{@key{SPC}},
-@kbd{@key{BACKSPACE}}, @kbd{]} and @kbd{[} commands for moving between
-nodes, nodes are restricted to a linear sequence.  Menus allow a
-branching structure.  A menu is a list of other nodes you can move to.
-It is actually just part of the text of the node formatted specially
-so that Info can interpret it.  The beginning of a menu is always
-identified by a line which starts with @w{@samp{* Menu:}}.  A node
-contains a menu if and only if it has a line in it which starts that
-way.  The only menu you can use at any moment is the one in the node
-you are in.  To use a menu in any other node, you must move to that
-node first.
-
-  After the start of the menu, each line that starts with a @samp{*}
-identifies one subtopic.  The line usually contains a brief name for
-the subtopic (followed by a @samp{:}, normally hidden in Emacs), the
-name of the node that talks about that subtopic (again, normally
-hidden in Emacs), and optionally some further description of the
-subtopic.  Lines in the menu that do not start with a @samp{*} have no
-special meaning---they are only for the human reader's benefit and do
-not define additional subtopics.  Here is an example:
-
-@example
-* Foo:  Node about FOO.      This tells about FOO.
-@end example
-
-The subtopic name is Foo, and the node describing it is @samp{Node
-about FOO}.  The rest of the line is just for the reader's
-Information.  [[ But this line is not a real menu item, simply because
-there is no line above it which starts with @w{@samp{* Menu:}}.  Also,
-in a real menu item, the @samp{*} would appear at the very start of
-the line.  This is why the ``normally hidden'' text in Emacs, namely
-@samp{: Node about FOO.}, is actually visible in this example, even
-when Visible mode is off.]]
-
-  When you use a menu to go to another node (in a way that will be
-described soon), what you specify is the subtopic name, the first
-thing in the menu line.  Info uses it to find the menu line, extracts
-the node name from it, and goes to that node.  The reason that there
-is both a subtopic name and a node name is that the node name must be
-meaningful to the computer and may therefore have to be ugly looking.
-The subtopic name can be chosen just to be convenient for the user to
-specify.  Often the node name is convenient for the user to specify
-and so both it and the subtopic name are the same.  There is an
-abbreviation for this:
-
-@example
-* Foo::   This tells about FOO.
-@end example
-
-@noindent
-This means that the subtopic name and node name are the same; they are
-both @samp{Foo}.  (The @samp{::} is normally hidden in Emacs.)
-
-@format
->> Now use @key{SPC} to find the menu in this node, then come back to
-   the front with a @kbd{b} and some @key{SPC}s.  As you see, a menu is
-   actually visible in its node.  If you cannot find a menu in a node
-   by looking at it, then the node does not have a menu and the
-   @kbd{m} command is not available.
-@end format
-
-If you keep typing @key{SPC} once the menu appears on the screen, it
-will move to another node (the first one in the menu).  If that
-happens, type @key{BACKSPACE} to come back.
-
-@kindex m @r{(Info mode)}
-  The command to go to one of the subnodes is @kbd{m}.  This is very
-different from the commands you have used: it is a command that
-prompts you for more input.
-
-  The Info commands you know do not need additional input; when you
-type one of them, Info processes it instantly and then is ready for
-another command.  The @kbd{m} command is different: it needs to know
-the @dfn{name of the subtopic}.  Once you have typed @kbd{m}, Info
-tries to read the subtopic name.
-
-  Now, in the stand-alone Info, look for the line containing many
-dashes near the bottom of the screen.  (This is the stand-alone
-equivalent for the mode line in Emacs.)  There is one more line
-beneath that one, but usually it is blank.  (In Emacs, this is the
-echo area.)  When it is blank, Info is ready for a command, such as
-@kbd{n} or @kbd{b} or @key{SPC} or @kbd{m}.  If that line contains
-text ending in a colon, it means Info is reading more input for the
-last command.  You can't type an Info command then, because Info is
-trying to read input, not commands.  You must either give the input
-and finish the command you started, or type @kbd{Control-g} to cancel
-the command.  When you have done one of those things, the input entry
-line becomes blank again.  Then you can type Info commands again.
-
-@findex Info-menu
-  The command to go to a subnode via a menu is @kbd{m}.  After you type
-the @kbd{m}, the line at the bottom of the screen says @samp{Menu item: }.
-You must then type the name of the subtopic you want, and end it with
-a @key{RET}.  In Emacs, @kbd{m} runs the command @code{Info-menu}.
-
-@cindex abbreviating Info subnodes
-  You can abbreviate the subtopic name.  If the abbreviation is not
-unique, the first matching subtopic is chosen.  Some menus put
-the shortest possible abbreviation for each subtopic name in capital
-letters, so you can see how much you need to type.  It does not
-matter whether you use upper case or lower case when you type the
-subtopic.  You should not put any spaces at the end, or inside of the
-item name, except for one space where a space appears in the item in
-the menu.
-
-@cindex completion of Info node names
-  You can also use the @dfn{completion} feature to help enter the
-subtopic name.  If you type the @key{TAB} key after entering part of a
-name, it will fill in more of the name---as much as Info can deduce
-from the part you have entered.
-
-  If you move the cursor to one of the menu subtopic lines, then you do
-not need to type the argument: you just type a @key{RET}, and it
-stands for the subtopic of the line you are on.  You can also click
-the middle mouse button directly on the subtopic line to go there.
-
-Here is a menu to give you a chance to practice.  This menu gives you
-three ways of going to one place, Help-FOO:
-
-@menu
-* Foo:  Help-FOO.       A node you can visit for fun.
-* Bar:  Help-FOO.       We have made two ways to get to the same place.
-* Help-FOO::            And yet another!
-@end menu
-
-(Turn Visible mode on if you are using Emacs.)
-
-@format
->>  Now type just an @kbd{m} and see what happens:
-@end format
-
-  Now you are ``inside'' an @kbd{m} command.  Commands cannot be used
-now; the next thing you will type must be the name of a subtopic.
-
-  You can change your mind about doing the @kbd{m} by typing
-@kbd{Control-g}.
-
-@format
->> Try that now;  notice the bottom line clear.
-@end format
-
-@format
->> Then type another @kbd{m}.
-@end format
-
-@format
->> Now type @kbd{BAR}, the item name.  Do not type @key{RET} yet.
-@end format
-
-  While you are typing the item name, you can use the @key{DEL} (or
-@key{BACKSPACE}) key to cancel one character at a time if you make a
-mistake.
-
-@format
->> Press @key{DEL} to cancel the @samp{R}.  You could type another @kbd{R}
-   to replace it.  But you do not have to, since @samp{BA} is a valid
-   abbreviation.
-@end format
-
-@format
->> Now you are ready to go.  Type a @key{RET}.
-@end format
-
-  After visiting @samp{Help-FOO}, you should return here.
-
-  Another way to move to the menu subtopic lines and between them is
-to type @key{TAB}.  Each time you type a @key{TAB}, you move to the
-next subtopic line.  To move to a previous subtopic line, type
-@kbd{M-@key{TAB}}---that is, press and hold the @key{META} key and then
-press @key{TAB}.  (On some keyboards, the @key{META} key might be labeled
-@samp{Alt}.)
-
-  Once you move cursor to a subtopic line, press @key{RET} to go to
-that subtopic's node.
-
-@cindex mouse support in Info mode
-@kindex Mouse-2 @r{(Info mode)}
-  If your terminal supports a mouse, you have yet another way of going
-to a subtopic.  Move your mouse pointer to the subtopic line,
-somewhere between the beginning @samp{*} and the colon @samp{:} which
-ends the subtopic's brief name.  You will see the subtopic's name
-change its appearance (usually, its background color will change), and
-the shape of the mouse pointer will change if your platform supports
-that.  After a while, if you leave the mouse on that spot, a small
-window will pop up, saying ``Mouse-2: go to that node'', or the same
-message may appear at the bottom of the screen.
-
-  @kbd{Mouse-2} is the second button of your mouse counting from the
-left---the middle button on a 3-button mouse.  (On a 2-button mouse,
-you may have to press both buttons together to ``press the middle
-button''.)  The message tells you pressing @kbd{Mouse-2} with the
-current position of the mouse pointer (on subtopic in the menu) will
-go to that subtopic.
-
-@findex Info-mouse-follow-nearest-node
-  More generally, @kbd{Mouse-2} in an Info buffer finds the nearest
-link to another node and goes there.  For example, near a cross
-reference it acts like @kbd{f}, in a menu it acts like @kbd{m}, on the
-node's header line it acts like @kbd{n}, @kbd{p}, or @kbd{u}, etc.  At
-end of the node's text @kbd{Mouse-2} moves to the next node, or up if
-there's no next node.
-
-@format
->> Type @kbd{n} to see more commands.
-@end format
-
-@node Help-FOO,  ,  , Help-M
-@subsection The @kbd{u} command
-
-  Congratulations!  This is the node @samp{Help-FOO}.  It has an @samp{Up}
-pointer @samp{Help-M}, the node you just came from via the @kbd{m}
-command.  This is the usual convention---the nodes you reach from a menu
-have @samp{Up} nodes that lead back to the menu.  Menus move Down in the
-tree, and @samp{Up} moves Up.  @samp{Previous}, on the other hand, is
-usually used to ``stay on the same level but go backwards''.
-
-@kindex u @r{(Info mode)}
-@findex Info-up
-  You can go back to the node @samp{Help-M} by typing the command
-@kbd{u} for ``Up'' (the Emacs command run by @kbd{u} is
-@code{Info-up}).  That puts you at the @emph{front} of the node---to
-get back to where you were reading you have to type some @key{SPC}s.
-(Some Info readers, such as the one built into Emacs, put you at the
-same place where you were reading in @samp{Help-M}.)
-
-  Another way to go Up is to click @kbd{Mouse-2} on the @samp{Up}
-pointer shown in the header line (provided that you have a mouse).
-
-@format
->> Now type @kbd{u} to move back up to @samp{Help-M}.
-@end format
-
-@node Help-Xref, Help-Int, Help-M, Getting Started
-@comment  node-name,  next,  previous,  up
-@section Following Cross-References
-
-@cindex cross references in Info documents
-  In Info documentation, you will see many @dfn{cross references}.
-Cross references look like this: @xref{Help-Cross, Cross}.  That text
-is a real, live cross reference, whose name is @samp{Cross} and which
-points to the node named @samp{Help-Cross}.  (The node name is hidden
-in Emacs.  Do @kbd{M-x visible-mode} to show or hide it.)
-
-@kindex f @r{(Info mode)}
-@findex Info-follow-reference
-  There are two ways to follow a cross reference.  You can move the
-cursor to it and press @key{RET}, just as in a menu.  @key{RET}
-follows the cross reference that the cursor is on.  Or you can type
-@kbd{f} and then specify the name of the cross reference (in this
-case, @samp{Cross}) as an argument.  In Emacs Info, @kbd{f} runs
-@code{Info-follow-reference},
-
-  In the @kbd{f} command, you select the cross reference with its
-name, so it does not matter where the cursor was.  If the cursor is on
-or near a cross reference, @kbd{f} suggests that reference name in
-parentheses as the default; typing @key{RET} will follow that
-reference.  However, if you type a different reference name, @kbd{f}
-will follow the other reference which has that name.
-
-@format
->> Type @kbd{f}, followed by @kbd{Cross}, and then @key{RET}.
-@end format
-
-  As you enter the reference name, you can use the @key{DEL} (or
-@key{BACKSPACE}) key to edit your input.  If you change your mind
-about following any reference, you can use @kbd{Control-g} to cancel
-the command.  Completion is available in the @kbd{f} command; you can
-complete among all the cross reference names in the current node by
-typing a @key{TAB}.
-
-  To get a list of all the cross references in the current node, you
-can type @kbd{?} after an @kbd{f}.  The @kbd{f} continues to await a
-cross reference name even after displaying the list, so if you don't
-actually want to follow a reference, you should type a @kbd{Control-g}
-to cancel the @kbd{f}.
-
-@format
->> Type @kbd{f?} to get a list of the cross references in this node.  Then
-   type a @kbd{Control-g} and see how the @samp{f} gives up.
-@end format
-
-  The @key{TAB} and @kbd{M-@key{TAB}} key, which move between menu
-items in a menu, also move between cross references outside of menus.
-
-  Sometimes a cross reference (or a node) can lead to another file (in
-other words another ``manual''), or, on occasion, even a file on a
-remote machine (although Info files distributed with Emacs or the
-stand-alone Info avoid using remote links).  Such a cross reference
-looks like this: @xref{Top,, Overview of Texinfo, texinfo, Texinfo:
-The GNU Documentation Format}.  (After following this link, type
-@kbd{l} to get back to this node.)  Here the name @samp{texinfo}
-between parentheses (shown in the stand-alone version) refers to the
-file name.  This file name appears in cross references and node names
-if it differs from the current file.  In Emacs, the file name is
-hidden (along with other text).  (Use @kbd{M-x visible-mode} to show
-or hide it.)
-
-  The remainder of this node applies only to the Emacs version.  If
-you use the stand-alone version, you can type @kbd{n} immediately.
-
-  To some users, switching manuals is a much bigger switch than
-switching sections.  These users like to know that they are going to
-be switching to another manual (and which one) before actually doing
-so, especially given that, if one does not notice, Info commands like
-@kbd{t} (see the next node) can have confusing results.
-
-  If you put your mouse over the cross reference and if the cross
-reference leads to a different manual, then the information appearing
-in a separate box (tool tip) or in the echo area, will mention the
-file the cross reference will carry you to (between parentheses).
-This is also true for menu subtopic names.  If you have a mouse, just
-leave it over the @samp{Overview} cross reference above and watch what
-happens.
-
-  If you always like to have that information available without having
-to move your mouse over the cross reference, set
-@code{Info-hide-note-references} to a value other than t (@pxref{Emacs
-Info Variables}).  You might also want to do that if you have a lot of
-cross references to files on remote machines and have non-permanent or
-slow access, since otherwise you might not be able to distinguish
-between local and remote links.
-
-@format
->> Now type @kbd{n} to learn more commands.
-@end format
-
-@node Help-Int, Help-Q, Help-Xref, Getting Started
-@comment  node-name,  next,  previous,  up
-@section Some intermediate Info commands
-
-  The introductory course is almost over; please continue
-a little longer to learn some intermediate-level commands.
-
-  Most Info files have an index, which is actually a large node
-containing little but a menu.  The menu has one menu item for each
-topic listed in the index.  (As a special feature, menus for indices
-may also include the line number within the node of the index entry.
-This allows Info readers to go to the exact line of an entry, not just
-the start of the containing node.)
-
-  You can get to the index from the main menu of the file with the
-@kbd{m} command; then you can use the @kbd{m} command again in the
-index node to go to the node that describes the topic you want.
-
-  There is also a short-cut Info command, @kbd{i}, which does all of
-that for you.  It searches the index for a given topic (a string) and
-goes to the node which is listed in the index for that topic.
-@xref{Info Search}, for a full explanation.
-
-@kindex l @r{(Info mode)}
-@findex Info-last
-@cindex going back in Info mode
-  If you have been moving around to different nodes and wish to
-retrace your steps, the @kbd{l} command (@kbd{l} for @dfn{last}) will
-do that, one node-step at a time.  As you move from node to node, Info
-records the nodes where you have been in a special history list.  The
-@kbd{l} command revisits nodes in the history list; each successive
-@kbd{l} command moves one step back through the history.
-
-  In Emacs, @kbd{l} runs the command @code{Info-last}.
-
-@format
->> Try typing @kbd{p p n} and then three @kbd{l}'s, pausing in between
-to see what each @kbd{l} does.  You should wind up right back here.
-@end format
-
-  Note the difference between @kbd{l} and @kbd{p}: @kbd{l} moves to
-where @emph{you} last were, whereas @kbd{p} always moves to the node
-which the header says is the @samp{Previous} node (from this node, the
-@samp{Prev} link leads to @samp{Help-Xref}).
-
-@kindex d @r{(Info mode)}
-@findex Info-directory
-@cindex go to Directory node
-  The @kbd{d} command (@code{Info-directory} in Emacs) gets you
-instantly to the Directory node.  This node, which is the first one
-you saw when you entered Info, has a menu which leads (directly or
-indirectly, through other menus), to all the nodes that exist.  The
-Directory node lists all the manuals and other Info documents that
-are, or could be, installed on your system.
-
-@format
->> Try doing a @kbd{d}, then do an @kbd{l} to return here (yes,
-   @emph{do} return).
-@end format
-
-@kindex t @r{(Info mode)}
-@findex Info-top-node
-@cindex go to Top node
-  The @kbd{t} command moves to the @samp{Top} node of the manual.
-This is useful if you want to browse the manual's main menu, or select
-some specific top-level menu item.  The Emacs command run by @kbd{t}
-is @code{Info-top-node}.
-
-  Clicking @kbd{Mouse-2} on or near a cross reference also follows the
-reference.  You can see that the cross reference is mouse-sensitive by
-moving the mouse pointer to the reference and watching how the
-underlying text and the mouse pointer change in response.
-
-@format
->> Now type @kbd{n} to see the last node of the course.
-@end format
-
-  @xref{Expert Info}, for more advanced Info features.
-
-@c If a menu appears at the end of this node, remove it.
-@c It is an accident of the menu updating command.
-
-@node Expert Info
-@chapter Info for Experts
-
-  This chapter describes various Info commands for experts.  (If you
-are using a stand-alone Info reader, there are additional commands
-specific to it, which are documented in several chapters of @ref{Top,,
-GNU Info, info-stnd, GNU Info}.)
-
-  This chapter also explains how to write an Info as distinct from a
-Texinfo file.  (However, in most cases, writing a Texinfo file is
-better, since you can use it to make a printed manual or produce other
-formats, such as HTML and DocBook, as well as for generating Info
-files.)  @xref{Top,, Overview of Texinfo, texinfo, Texinfo: The GNU
-Documentation Format}.
-
-@menu
-* Advanced::             Advanced Info commands: g, e, and 1 - 9.
-* Info Search::          How to search Info documents for specific subjects.
-* Add::                  Describes how to add new nodes to the hierarchy.
-                           Also tells what nodes look like.
-* Menus::                How to add to or create menus in Info nodes.
-* Cross-refs::           How to add cross-references to Info nodes.
-* Tags::                 How to make tags tables for Info files.
-* Checking::             Checking an Info File
-* Emacs Info Variables:: Variables modifying the behavior of Emacs Info.
-@end menu
-
-@node Advanced, Info Search,  , Expert Info
-@comment  node-name,  next,  previous,  up
-@section Advanced Info Commands
-
-Here are some more Info commands that make it easier to move around.
-
-@subheading @kbd{g} goes to a node by name
-
-@kindex g @r{(Info mode)}
-@findex Info-goto-node
-@cindex go to a node by name
-  If you know a node's name, you can go there by typing @kbd{g}, the
-name, and @key{RET}.  Thus, @kbd{gTop@key{RET}} would go to the node
-called @samp{Top} in this file.  (This is equivalent to @kbd{t}, see
-@ref{Help-Int}.)  @kbd{gAdvanced@key{RET}} would come back here.
-@kbd{g} in Emacs runs the command @code{Info-goto-node}.
-
-  Unlike @kbd{m}, @kbd{g} does not allow the use of abbreviations.
-But it does allow completion, so you can type @key{TAB} to complete a
-partial node name.
-
-@cindex go to another Info file
-  To go to a node in another file, you can include the file name in the
-node name by putting it at the front, in parentheses.  Thus,
-@kbd{g(dir)Top@key{RET}} would go to the Info Directory node, which is
-the node @samp{Top} in the Info file @file{dir}.  Likewise,
-@kbd{g(emacs)Top@key{RET}} goes to the top node of the Emacs manual.
-
-  The node name @samp{*} specifies the whole file.  So you can look at
-all of the current file by typing @kbd{g*@key{RET}} or all of any
-other file with @kbd{g(@var{filename})@key{RET}}.
-
-@subheading @kbd{1}--@kbd{9} choose a menu subtopic by its number
-
-@kindex 1 @r{through} 9 @r{(Info mode)}
-@findex Info-nth-menu-item
-@cindex select @var{n}'th menu item
-  If you begrudge each character of type-in which your system requires,
-you might like to use the commands @kbd{1}, @kbd{2}, @kbd{3}, @kbd{4},
-@dots{}, @kbd{9}.  They are short for the @kbd{m} command together
-with a name of a menu subtopic.  @kbd{1} goes through the first item
-in the current node's menu; @kbd{2} goes through the second item, etc.
-In the stand-alone reader, @kbd{0} goes through the last menu item;
-this is so you need not count how many entries are there.  In Emacs,
-the digit keys run the command @code{Info-nth-menu-item}.
-
-  If your display supports multiple fonts, colors or underlining, and
-you are using Emacs' Info mode to read Info files, the third, sixth
-and ninth menu items have a @samp{*} that stands out, either in color
-or in some other attribute, such as underline; this makes it easy to
-see at a glance which number to use for an item.
-
-  Some terminals don't support either multiple fonts, colors or
-underlining.  If you need to actually count items, it is better to use
-@kbd{m} instead, and specify the name, or use @key{TAB} to quickly
-move between menu items.
-
-@subheading @kbd{e} makes Info document editable
-
-@kindex e @r{(Info mode)}
-@findex Info-edit
-@cindex edit Info document
-  The Info command @kbd{e} changes from Info mode to an ordinary
-Emacs editing mode, so that you can edit the text of the current node.
-Type @kbd{C-c C-c} to switch back to Info.  The @kbd{e} command is allowed
-only if the variable @code{Info-enable-edit} is non-@code{nil}.
-
-  The @kbd{e} command only works in Emacs, where it runs the command
-@code{Info-edit}.  The stand-alone Info reader doesn't allow you to
-edit the Info file, so typing @kbd{e} there goes to the end of the
-current node.
-
-@subheading @kbd{M-n} creates a new independent Info buffer in Emacs
-
-@kindex M-n @r{(Info mode)}
-@findex clone-buffer
-@cindex multiple Info buffers
-  If you are reading Info in Emacs, you can select a new independent
-Info buffer in another window by typing @kbd{M-n}.  The new buffer
-starts out as an exact copy of the old one, but you will be able to
-move independently between nodes in the two buffers.  (In Info mode,
-@kbd{M-n} runs the Emacs command @code{clone-buffer}.)
-
-  In Emacs Info, you can also produce new Info buffers by giving a
-numeric prefix argument to the @kbd{m} and @kbd{g} commands.  @kbd{C-u
-m} and @kbd{C-u g} go to a new node in exactly the same way that
-@kbd{m} and @kbd{g} do, but they do so in a new Info buffer which they
-select in another window.
-
-@node Info Search, Add, Advanced, Expert Info
-@comment  node-name,  next,  previous,  up
-@section How to search Info documents for specific subjects
-
-@cindex searching Info documents
-@cindex Info document as a reference
-  The commands which move between and inside nodes allow you to read
-the entire manual or its large portions.  But what if you need to find
-some information in the manual as fast as you can, and you don't know
-or don't remember in what node to look for it?  This need arises when
-you use a manual as a @dfn{reference}, or when it is impractical to
-read the entire manual before you start using the programs it
-describes.
-
-  Info has powerful searching facilities that let you find things
-quickly.  You can search either the manual indices or its text.
-
-@kindex i @r{(Info mode)}
-@findex Info-index
-  Since most subjects related to what the manual describes should be
-indexed, you should try the index search first.  The @kbd{i} command
-prompts you for a subject and then looks up that subject in the
-indices.  If it finds an index entry with the subject you typed, it
-goes to the node to which that index entry points.  You should browse
-through that node to see whether the issue you are looking for is
-described there.  If it isn't, type @kbd{,} one or more times to go
-through additional index entries which match your subject.
-
-  The @kbd{i} command finds all index entries which include the string
-you typed @emph{as a substring}.  For each match, Info shows in the
-echo area the full index entry it found.  Often, the text of the full
-index entry already gives you enough information to decide whether it
-is relevant to what you are looking for, so we recommend that you read
-what Info shows in the echo area before looking at the node it
-displays.
-
-  Since @kbd{i} looks for a substring, you can search for subjects even
-if you are not sure how they are spelled in the index.  For example,
-suppose you want to find something that is pertinent to commands which
-complete partial input (e.g., when you type @key{TAB}).  If you want
-to catch index entries that refer to ``complete'', ``completion'', and
-``completing'', you could type @kbd{icomplet@key{RET}}.
-
-  Info documents which describe programs should index the commands,
-options, and key sequences that the program provides.  If you are
-looking for a description of a command, an option, or a key, just type
-their names when @kbd{i} prompts you for a topic.  For example, if you
-want to read the description of what the @kbd{C-f} key does, type
-@kbd{i C - f @key{RET}}.  Here @kbd{C-f} are 3 literal characters
-@samp{C}, @samp{-}, and @samp{f}, not the ``Control-f'' command key
-you type inside Emacs to run the command bound to @kbd{C-f}.
-
-  In Emacs, @kbd{i} runs the command @code{Info-index}.
-
-@findex info-apropos
-If you don't know what manual documents something, try the @kbd{M-x
-info-apropos} command.  It prompts for a string and then looks up that
-string in all the indices of all the Info documents installed on your
-system.
-
-@kindex s @r{(Info mode)}
-@findex Info-search
-  The @kbd{s} command allows you to search a whole file for a string.
-It switches to the next node if and when that is necessary.  You
-type @kbd{s} followed by the string to search for, terminated by
-@key{RET}.  To search for the same string again, just @kbd{s} followed
-by @key{RET} will do.  The file's nodes are scanned in the order
-they are in in the file, which has no necessary relationship to the
-order that they may be in the tree structure of menus and @samp{next}
-pointers.  But normally the two orders are not very different.  In any
-case, you can always do a @kbd{b} to find out what node you have
-reached, if the header is not visible (this can happen, because @kbd{s}
-puts your cursor at the occurrence of the string, not at the beginning
-of the node).
-
-@kindex M-s @r{(Info mode)}
-  In Emacs, @kbd{Meta-s} is equivalent to @kbd{s}.  That is for
-compatibility with other GNU packages that use @kbd{M-s} for a similar
-kind of search command.  Both @kbd{s} and @kbd{M-s} run in Emacs the
-command @code{Info-search}.
-
-
-@node Add, Menus, Info Search, Expert Info
-@comment  node-name,  next,  previous,  up
-@section Adding a new node to Info
-
-To add a new topic to the list in the Info directory, you must:
-
-@enumerate
-@item
-Create some nodes, in some file, to document that topic.
-@item
-Put that topic in the menu in the directory.  @xref{Menus, Menu}.
-@end enumerate
-
-  Usually, the way to create the nodes is with Texinfo (@pxref{Top,,
-Overview of Texinfo, texinfo, Texinfo: The GNU Documentation Format});
-this has the advantage that you can also make a printed manual or HTML
-from them.  You would use the @samp{@@dircategory} and
-@samp{@@direntry} commands to put the manual into the Info directory.
-However, if you want to edit an Info file manually and install it
-manually, here is how.
-
-@cindex node delimiters
-  The new node can live in an existing documentation file, or in a new
-one.  It must have a @samp{^_} character before it (invisible to the
-user; this node has one but you cannot see it), and it ends with either
-a @samp{^_}, a @samp{^L} (``formfeed''), or the end of file.@footnote{If
-you put in a @samp{^L} to end a new node, be sure that there is a
-@samp{^_} after it to start the next one, since @samp{^L} cannot
-@emph{start} a node.  Also, a nicer way to make a node boundary be a
-page boundary as well is to put a @samp{^L} @emph{right after} the
-@samp{^_}.}
-
-  The @samp{^_} starting a node must be followed by a newline or a
-@samp{^L} newline, after which comes the node's header line.  The
-header line must give the node's name (by which Info finds it), and
-state the names of the @samp{Next}, @samp{Previous}, and @samp{Up}
-nodes (if there are any).  As you can see, this node's @samp{Up} node
-is the node @samp{Expert Info}.  The @samp{Next} node is @samp{Menus}.
-
-@cindex node header line format
-@cindex format of node headers
-  The keywords @dfn{Node}, @dfn{Next}, @dfn{Previous}, and @dfn{Up}
-may appear in any order, anywhere in the header line, but the
-recommended order is the one in this sentence.  Each keyword must be
-followed by a colon, spaces and tabs, and then the appropriate name.
-The name may be terminated with a tab, a comma, or a newline.  A space
-does not end it; node names may contain spaces.  The case of letters
-in the names is insignificant.
-
-@cindex node name format
-@cindex Directory node
-  A node name has two forms.  A node in the current file is named by
-what appears after the @samp{Node: } in that node's first line.  For
-example, this node's name is @samp{Add}.  A node in another file is
-named by @samp{(@var{filename})@var{node-within-file}}, as in
-@samp{(info)Add} for this node.  If the file name starts with ``./'',
-then it is relative to the current directory; otherwise, it is
-relative starting from the standard directory for Info files of your
-site.  The name @samp{(@var{filename})Top} can be abbreviated to just
-@samp{(@var{filename})}.  By convention, the name @samp{Top} is used
-for the ``highest'' node in any single file---the node whose @samp{Up}
-points out of the file.  The @samp{Directory} node is @file{(dir)}, it
-points to a file @file{dir} which holds a large menu listing all the
-Info documents installed on your site.  The @samp{Top} node of a
-document file listed in the @samp{Directory} should have an @samp{Up:
-(dir)} in it.
-
-@cindex unstructured documents
-  The node name @kbd{*} is special: it refers to the entire file.
-Thus, @kbd{g*} shows you the whole current file.  The use of the
-node @kbd{*} is to make it possible to make old-fashioned,
-unstructured files into nodes of the tree.
-
-  The @samp{Node:} name, in which a node states its own name, must not
-contain a file name, since when Info searches for a node, it does not
-expect a file name to be there.  The @samp{Next}, @samp{Previous} and
-@samp{Up} names may contain them.  In this node, since the @samp{Up}
-node is in the same file, it was not necessary to use one.
-
-  Note that the nodes in this file have a file name in the header
-line.  The file names are ignored by Info, but they serve as comments
-to help identify the node for the user.
-
-@node Menus, Cross-refs, Add, Expert Info
-@comment  node-name,  next,  previous,  up
-@section How to Create Menus
-
-  Any node in the Info hierarchy may have a @dfn{menu}---a list of subnodes.
-The @kbd{m} command searches the current node's menu for the topic which it
-reads from the terminal.
-
-@cindex menu and menu entry format
-  A menu begins with a line starting with @w{@samp{* Menu:}}.  The
-rest of the line is a comment.  After the starting line, every line
-that begins with a @samp{* } lists a single topic.  The name of the
-topic---what the user must type at the @kbd{m}'s command prompt to
-select this topic---comes right after the star and space, and is
-followed by a colon, spaces and tabs, and the name of the node which
-discusses that topic.  The node name, like node names following
-@samp{Next}, @samp{Previous} and @samp{Up}, may be terminated with a
-tab, comma, or newline; it may also be terminated with a period.
-
-  If the node name and topic name are the same, then rather than
-giving the name twice, the abbreviation @samp{* @var{name}::} may be
-used (and should be used, whenever possible, as it reduces the visual
-clutter in the menu).
-
-  It is considerate to choose the topic names so that they differ
-from each other very near the beginning---this allows the user to type
-short abbreviations.  In a long menu, it is a good idea to capitalize
-the beginning of each item name which is the minimum acceptable
-abbreviation for it (a long menu is more than 5 or so entries).
-
-  The nodes listed in a node's menu are called its ``subnodes'', and it
-is their ``superior''.  They should each have an @samp{Up:} pointing at
-the superior.  It is often useful to arrange all or most of the subnodes
-in a sequence of @samp{Next} and @samp{Previous} pointers so that
-someone who wants to see them all need not keep revisiting the Menu.
-
-  The Info Directory is simply the menu of the node @samp{(dir)Top}---that
-is, node @samp{Top} in file @file{.../info/dir}.  You can put new entries
-in that menu just like any other menu.  The Info Directory is @emph{not} the
-same as the file directory called @file{info}.  It happens that many of
-Info's files live in that file directory, but they do not have to; and
-files in that directory are not automatically listed in the Info
-Directory node.
-
-  Also, although the Info node graph is claimed to be a ``hierarchy'',
-in fact it can be @emph{any} directed graph.  Shared structures and
-pointer cycles are perfectly possible, and can be used if they are
-appropriate to the meaning to be expressed.  There is no need for all
-the nodes in a file to form a connected structure.  In fact, this file
-has two connected components.  You are in one of them, which is under
-the node @samp{Top}; the other contains the node @samp{Help} which the
-@kbd{h} command goes to.  In fact, since there is no garbage
-collector, nothing terrible happens if a substructure is not pointed
-to, but such a substructure is rather useless since nobody can
-ever find out that it exists.
-
-@node Cross-refs, Tags, Menus, Expert Info
-@comment  node-name,  next,  previous,  up
-@section Creating Cross References
-
-@cindex cross reference format
-  A cross reference can be placed anywhere in the text, unlike a menu
-item which must go at the front of a line.  A cross reference looks
-like a menu item except that it has @samp{*note} instead of @samp{*}.
-It @emph{cannot} be terminated by a @samp{)}, because @samp{)}'s are
-so often part of node names.  If you wish to enclose a cross reference
-in parentheses, terminate it with a period first.  Here are two
-examples of cross references pointers:
-
-@example
-*Note details: commands.  (See *note 3: Full Proof.)
-@end example
-
-@noindent
-@emph{These are just examples.}  The places they ``lead to'' do not
-really exist!
-
-@menu
-* Help-Cross::                  Target of a cross-reference.
-@end menu
-
-
-@node Help-Cross,  ,  , Cross-refs
-@subsection The node reached by the cross reference in Info
-
-  This is the node reached by the cross reference named @samp{Cross}.
-
-  While this node is specifically intended to be reached by a cross
-reference, most cross references lead to nodes that ``belong''
-someplace else far away in the structure of an Info document.  So you
-cannot expect this node to have a @samp{Next}, @samp{Previous} or
-@samp{Up} links pointing back to where you came from.  In general, the
-@kbd{l} (el) command is the only way to get back there.
-
-@format
->> Type @kbd{l} to return to the node where the cross reference was.
-@end format
-
-@node Help-Q,  , Help-Int, Getting Started
-@comment  node-name,  next,  previous,  up
-@section Quitting Info
-
-@kindex q @r{(Info mode)}
-@findex Info-exit
-@cindex quitting Info mode
-  To get out of Info, back to what you were doing before, type @kbd{q}
-for @dfn{Quit}.  This runs @code{Info-exit} in Emacs.
-
-  This is the end of the basic course on using Info.  You have learned
-how to move in an Info document, and how to follow menus and cross
-references.  This makes you ready for reading manuals top to bottom,
-as new users should do when they learn a new package.
-
-  Another set of Info commands is useful when you need to find
-something quickly in a manual---that is, when you need to use a manual
-as a reference rather than as a tutorial.  We urge you to learn
-these search commands as well.  If you want to do that now, follow this
-cross reference to @ref{Info Search}.
-
-Yet another set of commands are meant for experienced users; you can
-find them by looking in the Directory node for documentation on Info.
-Finding them will be a good exercise in using Info in the usual
-manner.
-
-@format
->> Type @kbd{d} to go to the Info directory node; then type
-   @kbd{mInfo} and Return, to get to the node about Info and
-   see what other help is available.
-@end format
-
-
-@node Tags, Checking, Cross-refs, Expert Info
-@comment  node-name,  next,  previous,  up
-@section Tags Tables for Info Files
-
-@cindex tags tables in info files
-  You can speed up the access to nodes of a large Info file by giving
-it a tags table.  Unlike the tags table for a program, the tags table for
-an Info file lives inside the file itself and is used
-automatically whenever Info reads in the file.
-
-@findex Info-tagify
-  To make a tags table, go to a node in the file using Emacs Info mode and type
-@kbd{M-x Info-tagify}.  Then you must use @kbd{C-x C-s} to save the
-file.  Info files produced by the @code{makeinfo} command that is part
-of the Texinfo package always have tags tables to begin with.
-
-@cindex stale tags tables
-@cindex update Info tags table
-  Once the Info file has a tags table, you must make certain it is up
-to date.  If you edit an Info file directly (as opposed to editing its
-Texinfo source), and, as a result of deletion of text, any node moves back
-more than a thousand characters in the file from the position
-recorded in the tags table, Info will no longer be able to find that
-node.  To update the tags table, use the @code{Info-tagify} command
-again.
-
-  An Info file tags table appears at the end of the file and looks like
-this:
-
-@example
-^_^L
-Tag Table:
-File: info, Node: Cross-refs^?21419
-File: info,  Node: Tags^?22145
-^_
-End Tag Table
-@end example
-
-@noindent
-Note that it contains one line per node, and this line contains
-the beginning of the node's header (ending just after the node name),
-a @samp{DEL} character, and the character position in the file of the
-beginning of the node.
-
-
-@node Checking, Emacs Info Variables, Tags, Expert Info
-@section Checking an Info File
-
-When creating an Info file, it is easy to forget the name of a node when
-you are making a pointer to it from another node.  If you put in the
-wrong name for a node, this is not detected until someone tries to go
-through the pointer using Info.  Verification of the Info file is an
-automatic process which checks all pointers to nodes and reports any
-pointers which are invalid.  Every @samp{Next}, @samp{Previous}, and
-@samp{Up} is checked, as is every menu item and every cross reference.  In
-addition, any @samp{Next} which does not have a @samp{Previous} pointing
-back is reported.  Only pointers within the file are checked, because
-checking pointers to other files would be terribly slow.  But those are
-usually few.
-
-@findex Info-validate
-To check an Info file, do @kbd{M-x Info-validate} while looking at any
-node of the file with Emacs Info mode.
-
-@node Emacs Info Variables, , Checking, Expert Info
-@section Emacs Info-mode Variables
-
-The following variables may modify the behavior of Info-mode in Emacs;
-you may wish to set one or several of these variables interactively, or
-in your @file{~/.emacs} init file.  @xref{Examining, Examining and Setting
-Variables, Examining and Setting Variables, emacs, The GNU Emacs
-Manual}.  The stand-alone Info reader program has its own set of
-variables, described in @ref{Variables,, Manipulating Variables,
-info-stnd, GNU Info}.
-
-@vtable @code
-@item Info-directory-list
-The list of directories to search for Info files.  Each element is a
-string (directory name) or @code{nil} (try default directory).  If not
-initialized Info uses the environment variable @env{INFOPATH} to
-initialize it, or @code{Info-default-directory-list} if there is no
-@env{INFOPATH} variable in the environment.
-
-If you wish to customize the Info directory search list for both Emacs
-info and stand-alone Info, it is best to set the @env{INFOPATH}
-environment variable, since that applies to both programs.
-
-@item Info-additional-directory-list
-A list of additional directories to search for Info documentation files.
-These directories are not searched for merging the @file{dir} file.
-
-@item Info-fontify
-When set to a non-@code{nil} value, enables highlighting of Info
-files.  The default is @code{t}.  You can change how the highlighting
-looks by customizing the faces @code{info-node}, @code{info-xref},
-@code{info-header-xref}, @code{info-header-node}, @code{info-menu-5},
-@code{info-menu-header}, and @code{info-title-@var{n}-face} (where
-@var{n} is the level of the section, a number between 1 and 4).  To
-customize a face, type @kbd{M-x customize-face @key{RET} @var{face}
-@key{RET}}, where @var{face} is one of the face names listed here.
-
-@item Info-use-header-line
-If non-@code{nil}, Emacs puts in the Info buffer a header line showing
-the @samp{Next}, @samp{Prev}, and @samp{Up} links.  A header line does
-not scroll with the rest of the buffer, making these links always
-visible.
-
-@item Info-hide-note-references
-As explained in earlier nodes, the Emacs version of Info normally
-hides some text in menus and cross-references.  You can completely
-disable this feature, by setting this option to @code{nil}.  Setting
-it to a value that is neither @code{nil} nor @code{t} produces an
-intermediate behavior, hiding a limited amount of text, but showing
-all text that could potentially be useful.
-
-@item Info-scroll-prefer-subnodes
-If set to a non-@code{nil} value, @key{SPC} and @key{BACKSPACE} (or
-@key{DEL}) keys in a menu visit subnodes of the current node before
-scrolling to its end or beginning, respectively.  For example, if the
-node's menu appears on the screen, the next @key{SPC} moves to a
-subnode indicated by the following menu item.  Setting this option to
-@code{nil} results in behavior similar to the stand-alone Info reader
-program, which visits the first subnode from the menu only when you
-hit the end of the current node.  The default is @code{nil}.
-
-@item Info-enable-active-nodes
-When set to a non-@code{nil} value, allows Info to execute Lisp code
-associated with nodes.  The Lisp code is executed when the node is
-selected.  The Lisp code to be executed should follow the node
-delimiter (the @samp{DEL} character) and an @samp{execute: } tag, like
-this:
-
-@example
-^_execute: (message "This is an active node!")
-@end example
-
-@item Info-enable-edit
-Set to @code{nil}, disables the @samp{e} (@code{Info-edit}) command.  A
-non-@code{nil} value enables it.  @xref{Add, Edit}.
-@end vtable
-
-
-@node Creating an Info File
-@chapter Creating an Info File from a Texinfo File
-
-@code{makeinfo} is a utility that converts a Texinfo file into an Info
-file; @code{texinfo-format-region} and @code{texinfo-format-buffer} are
-GNU Emacs functions that do the same.
-
-@xref{Top,, Overview of Texinfo, texinfo, Texinfo: The GNU
-Documentation Format}, to learn how to write a Texinfo file.
-
-@xref{Creating an Info File,,, texinfo, Texinfo: The GNU Documentation
-Format}, to learn how to create an Info file from a Texinfo file.
-
-@xref{Installing an Info File,,, texinfo, Texinfo: The GNU
-Documentation Format}, to learn how to install an Info file after you
-have created one.
-
-@node Index
-@unnumbered Index
-
-This is an alphabetical listing of all the commands, variables, and
-topics discussed in this document.
-
-@printindex cp
-
-@bye
-
-@ignore
-   arch-tag: 965c1638-01d6-4156-9227-b10418b9d8e8
-@end ignore

Property changes on: head/contrib/texinfo/doc/info.texi
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/doc/texinfo.5
===================================================================
--- head/contrib/texinfo/doc/texinfo.5	(revision 276550)
+++ head/contrib/texinfo/doc/texinfo.5	(nonexistent)
@@ -1,51 +0,0 @@
-.\" texinfo(5)
-.\" $Id: texinfo.5,v 1.2 2004/04/11 17:56:45 karl Exp $
-.\"
-.\" Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
-.\"
-.\" Permission is granted to make and distribute verbatim copies of this
-.\" manual provided the copyright notice and this permission notice are
-.\" preserved on all copies.
-.\"
-.\" Permission is granted to copy and distribute modified versions of
-.\" this manual under the conditions for verbatim copying, provided that
-.\" the entire resulting derived work is distributed under the terms of a
-.\" permission notice identical to this one.
-.\"
-.\" Permission is granted to copy and distribute translations of this
-.\" manual into another language, under the above conditions for modified
-.\" versions, except that this permission notice may be stated in a
-.\" translation approved by the Foundation.
-.\"
-.TH TEXINFO 5 "GNU Texinfo" "FSF"
-.SH NAME
-texinfo \- software documentation system
-.SH DESCRIPTION
-Texinfo is a documentation system that uses a single source file to
-produce both online information and printed output.  It is primarily
-designed for writing software manuals.
-.PP
-For a full description of the Texinfo language and associated tools,
-please see the Texinfo manual (written in Texinfo itself).  Most likely,
-running this command from your shell:
-.RS
-.I info texinfo
-.RE
-or this key sequence from inside Emacs:
-.RS
-.I M-x info RET m texinfo RET
-.RE
-will get you there.
-.SH AVAILABILITY
-ftp://ftp.gnu.org/gnu/texinfo/
-.br
-or any GNU mirror site.
-.SH "REPORTING BUGS"
-Please send bug reports to bug-texinfo@gnu.org,
-general questions and discussion to help-texinfo@gnu.org.
-.SH "SEE ALSO"
-info(1), install-info(1), makeinfo(1), texi2dvi(1), texindex(1).
-.br
-emacs(1), tex(1).
-.br
-info(5).

Property changes on: head/contrib/texinfo/doc/texinfo.5
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/doc/texinfo.txi
===================================================================
--- head/contrib/texinfo/doc/texinfo.txi	(revision 276550)
+++ head/contrib/texinfo/doc/texinfo.txi	(nonexistent)
@@ -1,20513 +0,0 @@
-\input texinfo.tex    @c -*-texinfo-*-
-@c $Id: texinfo.txi,v 1.128 2004/12/29 15:06:41 karl Exp $
-@c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
-@c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
-
-@c Everything between the start/end of header lines will be passed by
-@c Emacs's {texinfo,makeinfo}-format region commands.  See the `start of
-@c header' node for more info.
-@c %**start of header
-
-@c makeinfo and texinfo.tex ignore all text before @setfilename.
-@c
-@c Ordinarily, the setfilename argument ends with .info.  But
-@c texinfo.info-13 is too long for 14-character filesystems.
-@setfilename texinfo
-
-@c Automake automatically updates version.texi to @set VERSION and
-@c @set UPDATED to appropriate values.
-@include version.texi
-@settitle GNU Texinfo @value{VERSION}
-
-@c Define a new index for options.
-@defcodeindex op
-@c Put everything except function (command, in this case) names in one
-@c index (arbitrarily chosen to be the concept index).
-@syncodeindex op cp
-@syncodeindex vr cp
-@syncodeindex pg cp
-
-@paragraphindent 2
-@c finalout
-
-@comment %**end of header
-
-@copying
-This manual is for GNU Texinfo (version @value{VERSION}, @value{UPDATED}),
-a documentation system that can produce both online information and a
-printed manual from a single source.
-
-Copyright (C) 1988, 1990, 1991, 1992, 1993, 1995, 1996, 1997, 1998,
-1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-@quotation
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
-and with the Back-Cover Texts as in (a) below.  A copy of the license is
-included in the section entitled ``GNU Free Documentation License.''
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-@end quotation
-@end copying
-
-@dircategory Texinfo documentation system
-@direntry
-* Texinfo: (texinfo).           The GNU documentation format.
-* install-info: (texinfo)Invoking install-info. Update info/dir entries.
-* texi2dvi: (texinfo)Format with texi2dvi.      Print Texinfo documents.
-* texi2pdf: (texinfo)PDF Output.                PDF output for Texinfo.
-* texindex: (texinfo)Format with tex/texindex.  Sort Texinfo index files.
-* makeinfo: (texinfo)Invoking makeinfo.         Translate Texinfo source.
-@end direntry
-
-@c Before release, run C-u C-c C-u C-a (texinfo-all-menus-update with a
-@c prefix arg).  This updates the node pointers, which texinfmt.el needs.
-
-@c Set smallbook if printing in smallbook format so the example of the
-@c smallbook font is actually written using smallbook; in bigbook, a kludge
-@c is used for TeX output.  Do this through the -t option to texi2dvi,
-@c so this same source can be used for other paper sizes as well.
-@c smallbook
-@c set smallbook
-@c @@clear smallbook
-
-@c If you like blank pages, add through texi2dvi -t.
-@c setchapternewpage odd
-
-@c Currently undocumented command, 5 December 1993:
-@c nwnode          (Same as node, but no warnings; for `makeinfo'.)
-
-
-@shorttitlepage GNU Texinfo
-
-@titlepage
-@title Texinfo
-@subtitle The GNU Documentation Format
-@subtitle for Texinfo version @value{VERSION}, @value{UPDATED}
-
-@author Robert J. Chassell
-@author Richard M. Stallman
-
-@c Include the Distribution inside the titlepage so
-@c that headings are turned off.
-
-@page
-@vskip 0pt plus 1filll
-@insertcopying
-
-@sp 1
-Published by the Free Software Foundation @*
-59 Temple Place Suite 330 @*
-Boston, MA 02111-1307 @*
-USA @*
-ISBN 1-882114-67-1 @c for version 4.0, September 1999.
-@c ISBN 1-882114-65-5 is for version 3.12, March 1998.
-@c ISBN 1-882114-64-7 is for edition 2.24 of November 1996.
-@c ISBN 1-882114-63-9 is for edition 2.20 of 28 February 1995.
-
-@sp 1
-Cover art by Etienne Suvasa.
-@end titlepage
-
-
-@summarycontents
-@contents
-
-
-@ifnottex
-@node Top
-@top Texinfo
-
-@insertcopying
-
-The first part of this master menu lists the major nodes in this Info
-document, including the @@-command and concept indices.  The rest of
-the menu lists all the lower level nodes in the document.
-
-@end ifnottex
-
-@menu
-* Copying Conditions::            Your rights.
-* Overview::                      Texinfo in brief.
-* Texinfo Mode::                  Using the GNU Emacs Texinfo mode.
-* Beginning a File::              What is at the beginning of a Texinfo file?
-* Ending a File::                 What is at the end of a Texinfo file?
-* Structuring::                   Creating chapters, sections, appendices, etc.
-* Nodes::                         Writing nodes, the basic unit of Texinfo.
-* Menus::                         Writing menus.
-* Cross References::              Writing cross references.
-* Marking Text::                  Marking words and phrases as code,
-                                    keyboard input, meta-syntactic
-                                    variables, and the like.
-* Quotations and Examples::       Block quotations, examples, etc.
-* Lists and Tables::              Itemized or numbered lists, and tables.
-* Special Displays::              Floating figures and footnotes.
-* Indices::                       Creating indices.
-* Insertions::                    Inserting @@-signs, braces, etc.
-* Breaks::                        Forcing or preventing line and page breaks.
-* Definition Commands::           Describing functions and the like uniformly.
-* Conditionals::                  Specifying text for only some output cases.
-* Internationalization::          Supporting languages other than English.
-* Defining New Texinfo Commands:: User-defined macros and aliases.
-* Hardcopy::                            Output for paper, with @TeX{}.
-* Creating and Installing Info Files::  Details on Info output.
-* Generating HTML::               Details on HTML output.
-
-* Command List::                  All the Texinfo @@-commands.
-* Tips::                          Hints on how to write a Texinfo document.
-* Sample Texinfo Files::          Complete examples, including full texts.
-* Include Files::                 How to incorporate other Texinfo files.
-* Headings::                      How to write page headings and footings.
-* Catching Mistakes::             How to find formatting mistakes.
-* Copying This Manual::           The GNU Free Documentation License.
-* Command and Variable Index::    A menu containing commands and variables.
-* Concept Index::                 A menu covering many topics.
-
-@detailmenu
- --- The Detailed Node Listing ---
-
-Overview of Texinfo
-
-* Reporting Bugs::              Submitting effective bug reports.
-* Using Texinfo::               Create printed or online output.
-* Output Formats::              Overview of the supported output formats.
-* Info Files::                  What is an Info file?
-* Printed Books::               Characteristics of a printed book or manual.
-* Formatting Commands::         @@-commands are used for formatting.
-* Conventions::                 General rules for writing a Texinfo file.
-* Comments::                    Writing comments and ignored text in general.
-* Minimum::                     What a Texinfo file must have.
-* Six Parts::                   Usually, a Texinfo file has six parts.
-* Short Sample::                A short sample Texinfo file.
-* History::                     Acknowledgements, contributors and genesis.
-
-Using Texinfo Mode
-
-* Texinfo Mode Overview::       How Texinfo mode can help you.
-* Emacs Editing::               Texinfo mode adds to GNU Emacs' general
-                                  purpose editing features.
-* Inserting::                   How to insert frequently used @@-commands.
-* Showing the Structure::       How to show the structure of a file.
-* Updating Nodes and Menus::    How to update or create new nodes and menus.
-* Info Formatting::             How to format for Info.
-* Printing::                    How to format and print part or all of a file.
-* Texinfo Mode Summary::        Summary of all the Texinfo mode commands.
-
-Updating Nodes and Menus
-
-* Updating Commands::           Five major updating commands.
-* Updating Requirements::       How to structure a Texinfo file for
-                                  using the updating command.
-* Other Updating Commands::     How to indent descriptions, insert
-                                  missing nodes lines, and update
-                                  nodes in sequence.
-
-Beginning a Texinfo File
-
-* Sample Beginning::            A sample beginning for a Texinfo file.
-* Texinfo File Header::         The first lines.
-* Document Permissions::        Ensuring your manual is free.
-* Titlepage & Copyright Page::  Creating the title and copyright pages.
-* Contents::                    How to create a table of contents.
-* The Top Node::                Creating the `Top' node and master menu.
-* Global Document Commands::    Affecting formatting throughout.
-* Software Copying Permissions::  Ensure that you and others continue to
-                                   have the right to use and share software.
-
-Texinfo File Header
-
-* First Line::                  The first line of a Texinfo file.
-* Start of Header::             Formatting a region requires this.
-* setfilename::                 Tell Info the name of the Info file.
-* settitle::                    Create a title for the printed work.
-* End of Header::               Formatting a region requires this.
-
-Document Permissions
-
-* copying::                     Declare the document's copying permissions.
-* insertcopying::               Where to insert the permissions.
-
-Title and Copyright Pages
-
-* titlepage::                   Create a title for the printed document.
-* titlefont center sp::         The @code{@@titlefont}, @code{@@center},
-                                 and @code{@@sp} commands.
-* title subtitle author::       The @code{@@title}, @code{@@subtitle},
-                                 and @code{@@author} commands.
-* Copyright::                   How to write the copyright notice and
-                                 include copying permissions.
-* end titlepage::               Turn on page headings after the title and
-                                 copyright pages.
-* headings on off::             An option for turning headings on and off
-                                 and double or single sided printing.
-
-The `Top' Node and Master Menu
-
-* Top Node Example::
-* Master Menu Parts::
-
-Global Document Commands
-
-* documentdescription::         Document summary for the HTML output.
-* setchapternewpage::           Start chapters on right-hand pages.
-* paragraphindent::             Specify paragraph indentation.
-* firstparagraphindent::        Suppress indentation of the first paragraph.
-* exampleindent::               Specify environment indentation.
-
-Ending a Texinfo File
-
-* Printing Indices & Menus::    How to print an index in hardcopy and
-                                 generate index menus in Info.
-* File End::                    How to mark the end of a file.
-
-Chapter Structuring
-
-* Tree Structuring::            A manual is like an upside down tree @dots{}
-* Structuring Command Types::   How to divide a manual into parts.
-* makeinfo top::                The @code{@@top} command, part of the `Top' node.
-* chapter::
-* unnumbered & appendix::
-* majorheading & chapheading::
-* section::
-* unnumberedsec appendixsec heading::
-* subsection::
-* unnumberedsubsec appendixsubsec subheading::
-* subsubsection::               Commands for the lowest level sections.
-* Raise/lower sections::        How to change commands' hierarchical level.
-
-Nodes
-
-* Two Paths::                   Different commands to structure
-                                 Info output and printed output.
-* Node Menu Illustration::      A diagram, and sample nodes and menus.
-* node::                        Creating nodes, in detail.
-* makeinfo Pointer Creation::   Letting makeinfo determine node pointers.
-* anchor::                      Defining arbitrary cross-reference targets.
-
-The @code{@@node} Command
-
-* Node Names::                  How to choose node and pointer names.
-* Writing a Node::              How to write an @code{@@node} line.
-* Node Line Tips::              Keep names short.
-* Node Line Requirements::      Keep names unique, without @@-commands.
-* First Node::                  How to write a `Top' node.
-* makeinfo top command::        How to use the @code{@@top} command.
-
-Menus
-
-* Menu Location::               Menus go at the ends of short nodes.
-* Writing a Menu::              What is a menu?
-* Menu Parts::                  A menu entry has three parts.
-* Less Cluttered Menu Entry::   Two part menu entry.
-* Menu Example::                Two and three part menu entries.
-* Other Info Files::            How to refer to a different Info file.
-
-Cross References
-
-* References::                  What cross references are for.
-* Cross Reference Commands::    A summary of the different commands.
-* Cross Reference Parts::       A cross reference has several parts.
-* xref::                        Begin a reference with `See' @dots{}
-* Top Node Naming::             How to refer to the beginning of another file.
-* ref::                         A reference for the last part of a sentence.
-* pxref::                       How to write a parenthetical cross reference.
-* inforef::                     How to refer to an Info-only file.
-* uref::                        How to refer to a uniform resource locator.
-
-@code{@@xref}
-
-* Reference Syntax::            What a reference looks like and requires.
-* One Argument::                @code{@@xref} with one argument.
-* Two Arguments::               @code{@@xref} with two arguments.
-* Three Arguments::             @code{@@xref} with three arguments.
-* Four and Five Arguments::     @code{@@xref} with four and five arguments.
-
-Marking Words and Phrases
-
-* Indicating::                  How to indicate definitions, files, etc.
-* Emphasis::                    How to emphasize text.
-
-Indicating Definitions, Commands, etc.
-
-* Useful Highlighting::         Highlighting provides useful information.
-* code::                        Indicating program code.
-* kbd::                         Showing keyboard input.
-* key::                         Specifying keys.
-* samp::                        A literal sequence of characters.
-* verb::                        A verbatim sequence of characters.
-* var::                         Indicating metasyntactic variables.
-* env::                         Indicating environment variables.
-* file::                        Indicating file names.
-* command::                     Indicating command names.
-* option::                      Indicating option names.
-* dfn::                         Specifying definitions.
-* cite::                        Referring to books not in the  Info system.
-* abbr::                        Indicating abbreviations.
-* acronym::                     Indicating acronyms.
-* indicateurl::                 Indicating a World Wide Web reference.
-* email::                       Indicating an electronic mail address.
-
-Emphasizing Text
-
-* emph & strong::               How to emphasize text in Texinfo.
-* Smallcaps::                   How to use the small caps font.
-* Fonts::                       Various font commands for printed output.
-
-Quotations and Examples
-
-* Block Enclosing Commands::    Different constructs for different purposes.
-* quotation::                   Writing a quotation.
-* example::                     Writing an example in a fixed-width font.
-* verbatim::                    Writing a verbatim example.
-* verbatiminclude::             Including a file verbatim.
-* lisp::                        Illustrating Lisp code.
-* small::                       Examples in a smaller font.
-* display::                     Writing an example in the current font.
-* format::                      Writing an example without narrowed margins.
-* exdent::                      Undo indentation on a line.
-* flushleft & flushright::      Pushing text flush left or flush right.
-* noindent::                    Preventing paragraph indentation.
-* indent::                      Forcing paragraph indentation.
-* cartouche::                   Drawing rounded rectangles around examples.
-
-Lists and Tables
-
-* Introducing Lists::           Texinfo formats lists for you.
-* itemize::                     How to construct a simple list.
-* enumerate::                   How to construct a numbered list.
-* Two-column Tables::           How to construct a two-column table.
-* Multi-column Tables::         How to construct generalized tables.
-
-Making a Two-column Table
-
-* table::                       How to construct a two-column table.
-* ftable vtable::               Automatic indexing for two-column tables.
-* itemx::                       How to put more entries in the first column.
-
-@code{@@multitable}: Multi-column Tables
-
-* Multitable Column Widths::    Defining multitable column widths.
-* Multitable Rows::             Defining multitable rows, with examples.
-
-Special Displays
-
-* Floats::                      Figures, tables, and the like.
-* Images::                      Including graphics and images.
-* Footnotes::                   Writing footnotes.
-
-Floats
-
-* float::                       Producing floating material.
-* caption shortcaption::        Specifying descriptions for floats.
-* listoffloats::                A table of contents for floats.
-
-Inserting Images
-
-* Image Syntax::
-* Image Scaling::
-
-Footnotes
-
-* Footnote Commands::           How to write a footnote in Texinfo.
-* Footnote Styles::             Controlling how footnotes appear in Info.
-
-Indices
-
-* Index Entries::               Choose different words for index entries.
-* Predefined Indices::          Use different indices for different kinds
-                                 of entries.
-* Indexing Commands::           How to make an index entry.
-* Combining Indices::           How to combine indices.
-* New Indices::                 How to define your own indices.
-
-Combining Indices
-
-* syncodeindex::                How to merge two indices, using @code{@@code}
-                                 font for the merged-from index.
-* synindex::                    How to merge two indices, using the
-                                 default font of the merged-to index.
-
-Special Insertions
-
-* Atsign Braces Comma::         Inserting @@ and @{@} and ,.
-* Inserting Space::             How to insert the right amount of space
-                                 within a sentence.
-* Inserting Accents::           How to insert accents and special characters.
-* Dots Bullets::                How to insert dots and bullets.
-* TeX and copyright::           How to insert the @TeX{} logo
-                                 and the copyright symbol.
-* euro::                        How to insert the Euro currency symbol.
-* pounds::                      How to insert the pounds currency symbol.
-* minus::                       How to insert a minus sign.
-* math::                        How to format a mathematical expression.
-* Glyphs::                      How to indicate results of evaluation,
-                                 expansion of macros, errors, etc.
-
-Inserting @@ and @{@} and @comma{}
-
-* Inserting an Atsign::
-* Inserting Braces::
-* Inserting a Comma::
-
-Inserting Space
-
-* Not Ending a Sentence::       Sometimes a . doesn't end a sentence.
-* Ending a Sentence::           Sometimes it does.
-* Multiple Spaces::             Inserting multiple spaces.
-* dmn::                         How to format a dimension.
-
-Inserting Ellipsis and Bullets
-
-* dots::                        How to insert dots @dots{}
-* bullet::                      How to insert a bullet.
-
-Inserting @TeX{} and Legal Symbols: @copyright{}, @registeredsymbol{}
-
-* tex::                         The @TeX{} logos.
-* copyright symbol::            The copyright symbol (c in a circle).
-* registered symbol::           The registered symbol (R in a circle).
-
-Glyphs for Examples
-
-* Glyphs Summary::
-* result::                      How to show the result of expression.
-* expansion::                   How to indicate an expansion.
-* Print Glyph::                 How to indicate printed output.
-* Error Glyph::                 How to indicate an error message.
-* Equivalence::                 How to indicate equivalence.
-* Point Glyph::                 How to indicate the location of point.
-
-Glyphs Summary
-
-* result::
-* expansion::
-* Print Glyph::
-* Error Glyph::
-* Equivalence::
-* Point Glyph::
-
-Forcing and Preventing Breaks
-
-* Break Commands::              Summary of break-related commands.
-* Line Breaks::                 Forcing line breaks.
-* - and hyphenation::           Helping @TeX{} with hyphenation points.
-* w::                           Preventing unwanted line breaks in text.
-* tie::                         Inserting an unbreakable but varying space.
-* sp::                          Inserting blank lines.
-* page::                        Forcing the start of a new page.
-* group::                       Preventing unwanted page breaks.
-* need::                        Another way to prevent unwanted page breaks.
-
-Definition Commands
-
-* Def Cmd Template::            Writing descriptions using definition commands.
-* Def Cmd Continuation Lines::  Continuing the heading over source lines.
-* Optional Arguments::          Handling optional and repeated arguments.
-* deffnx::                      Group two or more `first' lines.
-* Def Cmds in Detail::          Reference for all the definition commands.
-* Def Cmd Conventions::         Conventions for writing definitions.
-* Sample Function Definition::  An example.
-
-The Definition Commands
-
-* Functions Commands::          Commands for functions and similar entities.
-* Variables Commands::          Commands for variables and similar entities.
-* Typed Functions::             Commands for functions in typed languages.
-* Typed Variables::             Commands for variables in typed languages.
-* Data Types::                  The definition command for data types.
-* Abstract Objects::            Commands for object-oriented programming.
-
-Object-Oriented Programming
-
-* Variables: Object-Oriented Variables.
-* Methods: Object-Oriented Methods.
-
-Conditionally Visible Text
-
-* Conditional Commands::        Text for a given format.
-* Conditional Not Commands::    Text for any format other than a given one.
-* Raw Formatter Commands::      Using raw formatter commands.
-* set clear value::             Variable tests and substitutions.
-* Conditional Nesting::         Using conditionals inside conditionals.
-
-@code{@@set}, @code{@@clear}, and @code{@@value}
-
-* set value::                   Expand a flag variable to a string.
-* ifset ifclear::               Format a region if a flag is set.
-* value Example::               An easy way to update edition information.
-
-Internationalization
-
-* documentlanguage::            Declaring the current language.
-* documentencoding::            Declaring the input encoding.
-
-Defining New Texinfo Commands
-
-* Defining Macros::             Defining and undefining new commands.
-* Invoking Macros::             Using a macro, once you've defined it.
-* Macro Details::               Limitations of Texinfo macros.
-* alias::                       Command aliases.
-* definfoenclose::              Customized highlighting.
-
-Formatting and Printing Hardcopy
-
-* Use TeX::                     Use @TeX{} to format for hardcopy.
-* Format with tex/texindex::    How to format with explicit shell commands.
-* Format with texi2dvi::        A simpler way to format.
-* Print with lpr::              How to print.
-* Within Emacs::                How to format and print from an Emacs shell.
-* Texinfo Mode Printing::       How to format and print in Texinfo mode.
-* Compile-Command::             How to print using Emacs's compile command.
-* Requirements Summary::        @TeX{} formatting requirements summary.
-* Preparing for TeX::           What to do before you use @TeX{}.
-* Overfull hboxes::             What are and what to do with overfull hboxes.
-* smallbook::                   How to print small format books and manuals.
-* A4 Paper::                    How to print on A4 or A5 paper.
-* pagesizes::                   How to print with customized page sizes.
-* Cropmarks and Magnification:: How to print marks to indicate the size
-                                 of pages and how to print scaled up output.
-* PDF Output::                  Portable Document Format output.
-* Obtaining TeX::               How to Obtain @TeX{}.
-
-Creating and Installing Info Files
-
-* Creating an Info File::
-* Installing an Info File::
-
-Creating an Info File
-
-* makeinfo advantages::         @code{makeinfo} provides better error checking.
-* Invoking makeinfo::           How to run @code{makeinfo} from a shell.
-* makeinfo options::            Specify fill-column and other options.
-* Pointer Validation::          How to check that pointers point somewhere.
-* makeinfo in Emacs::           How to run @code{makeinfo} from Emacs.
-* texinfo-format commands::     Two Info formatting commands written
-                                 in Emacs Lisp are an alternative
-                                 to @code{makeinfo}.
-* Batch Formatting::            How to format for Info in Emacs Batch mode.
-* Tag and Split Files::         How tagged and split files help Info
-                                 to run better.
-
-Installing an Info File
-
-* Directory File::              The top level menu for all Info files.
-* New Info File::               Listing a new Info file.
-* Other Info Directories::      How to specify Info files that are
-                                 located in other directories.
-* Installing Dir Entries::      How to specify what menu entry to add
-                                 to the Info directory.
-* Invoking install-info::       @code{install-info} options.
-
-Generating HTML
-
-* HTML Translation::       Details of the HTML output.
-* HTML Splitting::         How HTML output is split.
-* HTML CSS::               Influencing HTML output with Cascading Style Sheets.
-* HTML Xref::              Cross-references in HTML output.
-
-HTML Cross-references
-
-* Link Basics:       HTML Xref Link Basics.
-* Node Expansion:    HTML Xref Node Name Expansion.
-* Command Expansion: HTML Xref Command Expansion.
-* 8-bit Expansion:   HTML Xref 8-bit Character Expansion.
-* Mismatch:          HTML Xref Mismatch.
-
-@@-Command List
-
-* Command Syntax::    General syntax for varieties of @@-commands.
-
-Sample Texinfo Files
-
-* Short Sample Texinfo File::
-* GNU Sample Texts::
-* Verbatim Copying License::
-* All-permissive Copying License::
-
-Copying This Manual
-
-* GNU Free Documentation License::  License for copying this manual.
-
-Include Files
-
-* Using Include Files::         How to use the @code{@@include} command.
-* texinfo-multiple-files-update::  How to create and update nodes and
-                                     menus when using included files.
-* Include Files Requirements::  @code{texinfo-multiple-files-update} needs.
-* Sample Include File::         A sample outer file with included files
-                                     within it; and a sample included file.
-* Include Files Evolution::     How use of the @code{@@include} command
-                                     has changed over time.
-
-Page Headings
-
-* Headings Introduced::         Conventions for using page headings.
-* Heading Format::              Standard page heading formats.
-* Heading Choice::              How to specify the type of page heading.
-* Custom Headings::             How to create your own headings and footings.
-
-Formatting Mistakes
-
-* makeinfo Preferred::          @code{makeinfo} finds errors.
-* Debugging with Info::         How to catch errors with Info formatting.
-* Debugging with TeX::          How to catch errors with @TeX{} formatting.
-* Using texinfo-show-structure::  How to use @code{texinfo-show-structure}.
-* Using occur::                 How to list all lines containing a pattern.
-* Running Info-Validate::       How to find badly referenced nodes.
-
-Finding Badly Referenced Nodes
-
-* Using Info-validate::         How to run @code{Info-validate}.
-* Unsplit::                     How to create an unsplit file.
-* Tagifying::                   How to tagify a file.
-* Splitting::                   How to split a file manually.
-
-Copying This Manual
-
-* GNU Free Documentation License::  License for copying this manual.
-
-@end detailmenu
-@end menu
-
-@c Reward readers for getting to the end of the menu :).
-@c Contributed by Arnold Robbins.
-@quotation
-Documentation is like sex: when it is good, it is very, very good; and
-when it is bad, it is better than nothing.
----Dick Brandon
-@end quotation
-
-
-@node Copying Conditions
-@unnumbered Texinfo Copying Conditions
-@cindex Copying conditions
-@cindex Conditions for copying Texinfo
-
-The programs currently being distributed that relate to Texinfo include
-@code{makeinfo}, @code{info}, @code{texindex}, and @file{texinfo.tex}.
-These programs are @dfn{free}; this means that everyone is free to use
-them and free to redistribute them on a free basis.  The Texinfo-related
-programs are not in the public domain; they are copyrighted and there
-are restrictions on their distribution, but these restrictions are
-designed to permit everything that a good cooperating citizen would want
-to do.  What is not allowed is to try to prevent others from further
-sharing any version of these programs that they might get from you.
-
-Specifically, we want to make sure that you have the right to give away
-copies of the programs that relate to Texinfo, that you receive source
-code or else can get it if you want it, that you can change these
-programs or use pieces of them in new free programs, and that you know
-you can do these things.
-
-To make sure that everyone has such rights, we have to forbid you to
-deprive anyone else of these rights.  For example, if you distribute
-copies of the Texinfo related programs, you must give the recipients all
-the rights that you have.  You must make sure that they, too, receive or
-can get the source code.  And you must tell them their rights.
-
-Also, for our own protection, we must make certain that everyone finds
-out that there is no warranty for the programs that relate to Texinfo.
-If these programs are modified by someone else and passed on, we want
-their recipients to know that what they have is not what we distributed,
-so that any problems introduced by others will not reflect on our
-reputation.
-
-The precise conditions of the licenses for the programs currently being
-distributed that relate to Texinfo are found in the General Public
-Licenses that accompany them.  This manual specifically is covered by
-the GNU Free Documentation License (@pxref{GNU Free Documentation
-License}).
-
-
-@node Overview
-@chapter Overview of Texinfo
-@cindex Overview of Texinfo
-@cindex Texinfo overview
-
-@dfn{Texinfo}@footnote{The first syllable of ``Texinfo'' is pronounced
-like ``speck'', not ``hex''.  This odd pronunciation is derived from,
-but is not the same as, the pronunciation of @TeX{}.  In the word
-@TeX{}, the @samp{X} is actually the Greek letter ``chi'' rather than
-the English letter ``ex''.  Pronounce @TeX{} as if the @samp{X} were the
-last sound in the name `Bach'; but pronounce Texinfo as if the @samp{x}
-were a `k'.  Spell ``Texinfo'' with a capital ``T'' and the other
-letters in lower case.}  is a documentation system that uses a single
-source file to produce both online information and printed output.  This
-means that instead of writing two different documents, one for the
-online information and the other for a printed work, you need write only
-one document.  Therefore, when the work is revised, you need revise only
-that one document.
-
-@menu
-* Reporting Bugs::              Submitting effective bug reports.
-* Using Texinfo::               Create printed or online output.
-* Output Formats::              Overview of the supported output formats.
-* Info Files::                  What is an Info file?
-* Printed Books::               Characteristics of a printed book or manual.
-* Formatting Commands::         @@-commands are used for formatting.
-* Conventions::                 General rules for writing a Texinfo file.
-* Comments::                    Writing comments and ignored text in general.
-* Minimum::                     What a Texinfo file must have.
-* Six Parts::                   Usually, a Texinfo file has six parts.
-* Short Sample::                A short sample Texinfo file.
-* History::                     Acknowledgements, contributors and genesis.
-@end menu
-
-
-@node Reporting Bugs
-@section Reporting Bugs
-
-@cindex Bugs, reporting
-@cindex Suggestions for Texinfo, making
-@cindex Reporting bugs
-We welcome bug reports and suggestions for any aspect of the Texinfo system,
-programs, documentation, installation, anything.  Please email them to
-@email{bug-texinfo@@gnu.org}.  You can get the latest version of Texinfo
-from @uref{ftp://ftp.gnu.org/gnu/texinfo/} and its mirrors worldwide.
-
-@cindex Checklist for bug reports
-For bug reports, please include enough information for the maintainers
-to reproduce the problem.  Generally speaking, that means:
-
-@itemize @bullet
-@item the version number of Texinfo and the program(s) or manual(s) involved.
-@item hardware and operating system names and versions.
-@item the contents of any input files necessary to reproduce the bug.
-@item a description of the problem and samples of any erroneous output.
-@item any unusual options you gave to @command{configure}.
-@item anything else that you think would be helpful.
-@end itemize
-
-When in doubt whether something is needed or not, include it.  It's
-better to include too much than to leave out something important.
-
-@cindex Patches, contributing
-Patches are most welcome; if possible, please make them with
-@samp{@w{diff -c}} (@pxref{Top,, Overview, diff, Comparing and Merging
-Files}) and include @file{ChangeLog} entries (@pxref{Change Log,,,
-emacs, The GNU Emacs Manual}).
-
-When sending patches, if possible please do not encode or split them in
-any way; it's much easier to deal with one plain text message, however
-large, than many small ones.  @uref{ftp://ftp.gnu.org/gnu/sharutils/,
-GNU shar} is a convenient way of packaging multiple and/or binary files
-for email.
-
-
-@node Using Texinfo
-@section Using Texinfo
-
-@cindex Using Texinfo in general
-@cindex Texinfo, introduction to
-@cindex Introduction to Texinfo
-
-Using Texinfo, you can create a printed document (via the @TeX{}
-typesetting system) the normal features of a book, including chapters,
-sections, cross references, and indices.  From the same Texinfo source
-file, you can create an Info file with special features to make
-documentation browsing easy.  You can also create from that same
-source file an HTML output file suitable for use with a web browser,
-or an XML file.  See the next section (@pxref{Output Formats}) for
-details and the exact commands to generate output from the source.
-
-@TeX{} works with virtually all printers; Info works with virtually all
-computer terminals; the HTML output works with virtually all web
-browsers.  Thus Texinfo can be used by almost any computer user.
-
-@cindex Source file format
-A Texinfo source file is a plain @sc{ascii} file containing text
-interspersed with @dfn{@@-commands} (words preceded by an @samp{@@})
-that tell the typesetting and formatting programs what to do.  You can
-edit a Texinfo file with any text editor, but it is especially
-convenient to use GNU Emacs since that editor has a special mode,
-called Texinfo mode, that provides various Texinfo-related features.
-(@xref{Texinfo Mode}.)
-
-You can use Texinfo to create both online help and printed manuals;
-moreover, Texinfo is freely redistributable.  For these reasons, Texinfo
-is the official documentation format of the GNU project.  More
-information is available at the @uref{http://www.gnu.org/doc/, GNU
-documentation web page}.
-
-
-@node Output Formats
-@section Output Formats
-@cindex Output formats
-@cindex Back-end output formats
-
-Here is a brief overview of the output formats currently supported by
-Texinfo.
-
-@table @asis
-@item Info
-@cindex Info output
-(Generated via @command{makeinfo}.)  This format is essentially a
-plain text transliteration of the Texinfo source.  It adds a few
-control characters to separate nodes and provide navigational
-information for menus, cross-references, indices, and so on.  See the
-next section (@pxref{Info Files}) for more details on this format.
-The Emacs Info subsystem (@pxref{Top,,Getting Started,info, Info}),
-and the standalone @command{info} program (@pxref{Top
-,, Info Standalone, info-stnd, GNU Info}), among others, can read these
-files.  @xref{Creating and Installing Info Files}.
-
-@item Plain text
-@cindex Plain text output
-(Generated via @command{makeinfo --no-headers}.)  This is almost the
-same as Info output, except the navigational control characters are
-omitted.  Also, standard output is used by default.
-
-@item HTML
-@cindex HTML output
-@cindex W3 consortium
-@cindex Mozilla
-@cindex Lynx
-@cindex Emacs-W3
-(Generated via @command{makeinfo --html}.)  This is the Hyper Text
-Markup Language that has become the most commonly used language for
-writing documents on the World Wide Web.  Web browsers, such as
-Mozilla, Lynx, and Emacs-W3, can render this language online.  There
-are many versions of HTML; @command{makeinfo} tries to use a subset
-of the language that can be interpreted by any common browser.  For
-details of the HTML language and much related information, see
-@uref{http://www.w3.org/MarkUp/}.  @xref{Generating HTML}.
-
-@item DVI
-@cindex DVI output
-@pindex dvips
-@pindex xdvi
-(Generated via @command{texi2dvi}.)  This DeVice Independent binary
-format is output by the @TeX{} typesetting program
-(@uref{http://tug.org}).  This is then read by a DVI `driver', which
-writes the actual device-specific commands that can be viewed or
-printed, notably Dvips for translation to PostScript (@pxref{Invoking
-Dvips,,, dvips, Dvips}) and Xdvi for viewing on an X display
-(@uref{http://sourceforge.net/projects/xdvi/}).  @xref{Hardcopy}.
-
-Be aware that the Texinfo language is very different from and much
-stricter than @TeX{}'s usual languages, plain @TeX{} and @LaTeX{}.
-For more information on @TeX{} in general, please see the book
-@cite{@TeX{} for the Impatient}, available from
-@uref{http://savannah.gnu.org/projects/teximpatient}.
-
-@item PDF
-@cindex PDF output
-@cindex Beebe, Nelson
-@pindex pdftex
-(Generated via @command{texi2dvi --pdf} or @command{texi2pdf}.)  This
-was developed by Adobe Systems for portable document interchange,
-based on their previous PostScript language.  It can represent the exact
-appearance of a document, including fonts, and supporting arbitrary
-scaling.  It is intended to be platform-independent and easily
-viewable, among other design goals; for a discussion, see
-@uref{http://tug.org/TUGboat/Articles/tb22-3/tb72beebeI.pdf}.  Texinfo
-uses the @command{pdftex} program, a variant of @TeX{}, to output PDF;
-see @uref{http://tug.org/applications/pdftex}.  @xref{PDF Output}.
-
-@item XML
-@cindex XML output
-@cindex DTD, for Texinfo XML
-@pindex texinfo.dtd
-(Generated via @command{makeinfo --xml}.)  XML is a generic syntax
-specification usable for any sort of content (see, for example,
-@uref{http://www.w3.org/XML/}).  The @command{makeinfo} xml output,
-unlike all the formats above, interprets very little of the Texinfo
-source.  Rather, it merely translates the Texinfo markup commands into
-XML syntax, for processing by further XML tools.  The particular
-syntax output is defined in the file @file{texinfo.dtd} included in
-the Texinfo source distribution.
-
-@item Docbook
-@cindex Docbook output
-(Generated via @command{makeinfo --docbook}.)  This is an XML-based
-format developed some years ago, primarily for technical
-documentation.  It therefore bears some resemblance, in broad
-outlines, to Texinfo.  See @uref{http://www.docbook.org}.  If you want
-to convert from Docbook @emph{to} Texinfo, please see
-@uref{http://docbook2X.sourceforge.net}.
-
-@end table
-
-@cindex Man page output, not supported
-From time to time, proposals are made to generate traditional Unix man
-pages from Texinfo source.  However, because man pages have a very
-strict conventional format, generating a good man page requires a
-completely different source than the typical Texinfo applications of
-writing a good user tutorial and/or a good reference manual.  This
-makes generating man pages incompatible with the Texinfo design goal
-of not having to document the same information in different ways for
-different output formats.  You might as well just write the man page
-directly.
-
-@pindex help2man
-@cindex O'Dea, Brendan
-Man pages still have their place, and if you wish to support them, you
-may find the program @command{help2man} to be useful; it generates a
-traditional man page from the @samp{--help} output of a program.  In
-fact, this is currently used to generate man pages for the programs in
-the Texinfo distribution.  It is GNU software written by Brendan
-O'Dea, available from @uref{ftp://ftp.gnu.org/gnu/help2man/}.
-
-@cindex Output formats, supporting more
-@cindex SGML-tools output format
-If you are a programmer and would like to contribute to the GNU project
-by implementing additional output formats for Texinfo, that would be
-excellent.  But please do not write a separate translator texi2foo for
-your favorite format foo!  That is the hard way to do the job, and makes
-extra work in subsequent maintenance, since the Texinfo language is
-continually being enhanced and updated.  Instead, the best approach is
-modify @code{makeinfo} to generate the new format.
-
-
-@node Info Files
-@section Info Files
-@cindex Info files
-
-An Info file is a Texinfo file formatted so that the Info documentation
-reading program can operate on it.  (@code{makeinfo}
-and @code{texinfo-format-buffer} are two commands that convert a Texinfo file
-into an Info file.)
-
-Info files are divided into pieces called @dfn{nodes}, each of which
-contains the discussion of one topic.  Each node has a name, and
-contains both text for the user to read and pointers to other nodes,
-which are identified by their names.  The Info program displays one node
-at a time, and provides commands with which the user can move to other
-related nodes.
-
-@xref{Top,,, info, GNU Info}, for more information about using Info.
-
-Each node of an Info file may have any number of child nodes that
-describe subtopics of the node's topic.  The names of child
-nodes are listed in a @dfn{menu} within the parent node; this
-allows you to use certain Info commands to move to one of the child
-nodes.  Generally, an Info file is organized like a book.  If a node
-is at the logical level of a chapter, its child nodes are at the level
-of sections; likewise, the child nodes of sections are at the level
-of subsections.
-
-All the children of any one parent are linked together in a
-bidirectional chain of `Next' and `Previous' pointers.  The `Next'
-pointer provides a link to the next section, and the `Previous' pointer
-provides a link to the previous section.  This means that all the nodes
-that are at the level of sections within a chapter are linked together.
-Normally the order in this chain is the same as the order of the
-children in the parent's menu.  Each child node records the parent node
-name as its `Up' pointer.  The last child has no `Next' pointer, and the
-first child has the parent both as its `Previous' and as its `Up'
-pointer.@footnote{In some documents, the first child has no `Previous'
-pointer.  Occasionally, the last child has the node name of the next
-following higher level node as its `Next' pointer.}
-
-The book-like structuring of an Info file into nodes that correspond
-to chapters, sections, and the like is a matter of convention, not a
-requirement.  The `Up', `Previous', and `Next' pointers of a node can
-point to any other nodes, and a menu can contain any other nodes.
-Thus, the node structure can be any directed graph.  But it is usually
-more comprehensible to follow a structure that corresponds to the
-structure of chapters and sections in a printed book or report.@refill
-
-In addition to menus and to `Next', `Previous', and `Up' pointers, Info
-provides pointers of another kind, called references, that can be
-sprinkled throughout the text.  This is usually the best way to
-represent links that do not fit a hierarchical structure.@refill
-
-Usually, you will design a document so that its nodes match the
-structure of chapters and sections in the printed output.  But
-occasionally there are times when this is not right for the material
-being discussed.  Therefore, Texinfo uses separate commands to specify
-the node structure for the Info file and the section structure for the
-printed output.@refill
-
-Generally, you enter an Info file through a node that by convention is
-named `Top'.  This node normally contains just a brief summary of the
-file's purpose, and a large menu through which the rest of the file is
-reached.  From this node, you can either traverse the file
-systematically by going from node to node, or you can go to a specific
-node listed in the main menu, or you can search the index menus and then
-go directly to the node that has the information you want.  Alternatively,
-with the standalone Info program, you can specify specific menu items on
-the command line (@pxref{Top,,, info, Info}).
-
-If you want to read through an Info file in sequence, as if it were a
-printed manual, you can hit @key{SPC} repeatedly, or you get the whole
-file with the advanced Info command @kbd{g *}.  (@inforef{Advanced,
-Advanced Info commands, info}.)@refill
-
-@c !!! dir file may be located in one of many places:
-@c     /usr/local/emacs/info            mentioned in info.c DEFAULT_INFOPATH
-@c     /usr/local/lib/emacs/info        mentioned in info.c DEFAULT_INFOPATH
-@c     /usr/gnu/info                    mentioned in info.c DEFAULT_INFOPATH
-@c     /usr/local/info
-@c     /usr/local/lib/info
-The @file{dir} file in the @file{info} directory serves as the
-departure point for the whole Info system.  From it, you can reach the
-`Top' nodes of each of the documents in a complete Info system.@refill
-
-@cindex URI syntax for Info
-If you wish to refer to an Info file in a URI, you can use the
-(unofficial) syntax exemplified in the following.  This works with
-Emacs/W3, for example:
-@example
-info:///usr/info/emacs#Dissociated%20Press
-info:emacs#Dissociated%20Press
-info://localhost/usr/info/emacs#Dissociated%20Press
-@end example
-
-The @command{info} program itself does not follow URI's of any kind.
-
-
-@node Printed Books
-@section Printed Books
-@cindex Printed book and manual characteristics
-@cindex Manual characteristics, printed
-@cindex Book characteristics, printed
-@cindex Texinfo printed book characteristics
-@cindex Characteristics, printed books or manuals
-
-@cindex Knuth, Donald
-A Texinfo file can be formatted and typeset as a printed book or manual.
-To do this, you need @TeX{}, a powerful, sophisticated typesetting
-program written by Donald Knuth.@footnote{You can also use the
-@pindex texi2roff@r{, unsupported software}
-@uref{ftp://tug.org/texi2roff.tar.gz, @code{texi2roff}} program if you
-do not have @TeX{}; since Texinfo is designed for use with @TeX{},
-@code{texi2roff} is not described here.  @code{texi2roff} is not part of
-the standard GNU distribution and is not maintained or up-to-date with
-all the Texinfo features described in this manual.}
-
-A Texinfo-based book is similar to any other typeset, printed work: it
-can have a title page, copyright page, table of contents, and preface,
-as well as chapters, numbered or unnumbered sections and subsections,
-page headers, cross references, footnotes, and indices.@refill
-
-You can use Texinfo to write a book without ever having the intention
-of converting it into online information.  You can use Texinfo for
-writing a printed novel, and even to write a printed memo, although
-this latter application is not recommended since electronic mail is so
-much easier.@refill
-
-@TeX{} is a general purpose typesetting program.  Texinfo provides a
-file @file{texinfo.tex} that contains information (definitions or
-@dfn{macros}) that @TeX{} uses when it typesets a Texinfo file.
-(@file{texinfo.tex} tells @TeX{} how to convert the Texinfo @@-commands
-to @TeX{} commands, which @TeX{} can then process to create the typeset
-document.)  @file{texinfo.tex} contains the specifications for printing
-a document.  You can get the latest version of @file{texinfo.tex} from
-@uref{ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex}.
-
-In the United States, documents are most often printed on 8.5 inch by 11
-inch pages (216@dmn{mm} by 280@dmn{mm}); this is the default size.  But
-you can also print for 7 inch by 9.25 inch pages (178@dmn{mm} by
-235@dmn{mm}, the @code{@@smallbook} size; or on A4 or A5 size paper
-(@code{@@afourpaper}, @code{@@afivepaper}).  (@xref{smallbook, ,
-Printing ``Small'' Books}.  Also, see @ref{A4 Paper, ,Printing on A4
-Paper}.)
-
-By changing the parameters in @file{texinfo.tex}, you can change the
-size of the printed document.  In addition, you can change the style in
-which the printed document is formatted; for example, you can change the
-sizes and fonts used, the amount of indentation for each paragraph, the
-degree to which words are hyphenated, and the like.  By changing the
-specifications, you can make a book look dignified, old and serious, or
-light-hearted, young and cheery.
-
-@TeX{} is freely distributable.  It is written in a superset of Pascal
-called WEB and can be compiled either in Pascal or (by using a
-conversion program that comes with the @TeX{} distribution) in C.
-(@xref{TeX Mode, ,@TeX{} Mode, emacs, The GNU Emacs Manual}, for information
-about @TeX{}.)@refill
-
-@TeX{} is very powerful and has a great many features.  Because a
-Texinfo file must be able to present information both on a
-character-only terminal in Info form and in a typeset book, the
-formatting commands that Texinfo supports are necessarily limited.
-
-To get a copy of @TeX{}, see
-@ref{Obtaining TeX, , How to Obtain @TeX{}}.
-
-
-@node Formatting Commands
-@section @@-commands
-@cindex @@-commands
-@cindex Formatting commands
-
-In a Texinfo file, the commands that tell @TeX{} how to typeset the
-printed manual and tell @code{makeinfo} and
-@code{texinfo-format-buffer} how to create an Info file are preceded
-by @samp{@@}; they are called @dfn{@@-commands}.  For example,
-@code{@@node} is the command to indicate a node and @code{@@chapter}
-is the command to indicate the start of a chapter.@refill
-
-@quotation Note
-Almost all @@ command names are entirely lower case.
-@end quotation
-
-The Texinfo @@-commands are a strictly limited set of constructs.  The
-strict limits make it possible for Texinfo files to be understood both
-by @TeX{} and by the code that converts them into Info files.  You can
-display Info files on any terminal that displays alphabetic and
-numeric characters.  Similarly, you can print the output generated by
-@TeX{} on a wide variety of printers.@refill
-
-Depending on what they do or what arguments@footnote{The word
-@dfn{argument} comes from the way it is used in mathematics and does not
-refer to a dispute between two people; it refers to the information
-presented to the command.  According to the @cite{Oxford English
-Dictionary}, the word derives from the Latin for @dfn{to make clear,
-prove}; thus it came to mean `the evidence offered as proof', which is
-to say, `the information offered', which led to its mathematical
-meaning.  In its other thread of derivation, the word came to mean `to
-assert in a manner against which others may make counter assertions',
-which led to the meaning of `argument' as a dispute.} they take, you
-need to write @@-commands on lines of their own or as part of
-sentences:
-
-@itemize @bullet
-@item
-Write a command such as @code{@@quotation} at the beginning of a line as
-the only text on the line.  (@code{@@quotation} begins an indented
-environment.)
-
-@item
-Write a command such as @code{@@chapter} at the beginning of a line
-followed by the command's arguments, in this case the chapter title, on
-the rest of the line.  (@code{@@chapter} creates chapter titles.)@refill
-
-@item
-Write a command such as @code{@@dots@{@}} wherever you wish but usually
-within a sentence. (@code{@@dots@{@}} creates dots @dots{})@refill
-
-@item
-Write a command such as @code{@@code@{@var{sample-code}@}} wherever you
-wish (but usually within a sentence) with its argument,
-@var{sample-code} in this example, between the braces.  (@code{@@code}
-marks text as being code.)@refill
-
-@item
-Write a command such as @code{@@example} on a line of its own; write the
-body-text on following lines; and write the matching @code{@@end}
-command, @code{@@end example} in this case, on a line of its own
-after the body-text. (@code{@@example} @dots{} @code{@@end example}
-indents and typesets body-text as an example.)  It's usually ok to
-indent environment commands like this, but in complicated and
-hard-to-define circumstances the extra spaces cause extra space to
-appear in the output, so beware.
-@end itemize
-
-@noindent
-@cindex Braces, when to use
-As a general rule, a command requires braces if it mingles among other
-text; but it does not need braces if it starts a line of its own.  The
-non-alphabetic commands, such as @code{@@:}, are exceptions to the rule;
-they do not need braces.@refill
-
-As you gain experience with Texinfo, you will rapidly learn how to
-write the different commands: the different ways to write commands
-actually make it easier to write and read Texinfo files than if all
-commands followed exactly the same syntax.  @xref{Command Syntax, ,
-@@-Command Syntax}, for all the details.
-
-
-@node Conventions
-@section General Syntactic Conventions
-@cindex General syntactic conventions
-@cindex Syntactic conventions
-@cindex Conventions, syntactic
-@cindex Characters, basic input
-
-This section describes the general conventions used in all Texinfo documents.
-
-@itemize @bullet
-@item
-@cindex Source files, characters used
-All printable @sc{ascii} characters except @samp{@@}, @samp{@{} and
-@samp{@}} can appear in a Texinfo file and stand for themselves.
-@samp{@@} is the escape character which introduces commands, while
-@samp{@{} and @samp{@}} are used to surround arguments to certain
-commands.  To put one of these special characters into the document, put
-an @samp{@@} character in front of it, like this: @samp{@@@@},
-@samp{@@@{}, and @samp{@@@}}.
-
-@item
-@cindex Paragraph separator
-@cindex Blank lines, as paragraph separator
-@cindex Newlines, as blank lines
-Separate paragraphs with one or more blank lines.  Currently Texinfo
-only recognizes newline characters as end of line, not the CRLF
-sequence used on some systems; so a @dfn{blank line} means exactly two
-consecutive newlines.  Sometimes blank lines are useful or convenient
-in other cases as well; you can use the @code{@@noindent} to inhibit
-paragraph indentation if required (@pxref{noindent,,@code{@@noindent}}).
-
-@item
-@cindex Quotation characters (`'), in source
-Use doubled single-quote characters to begin and end quotations:
-@w{@t{`@w{}`@dots{}'@w{}'}}.  @TeX{} converts two single quotes to
-left- and right-hand doubled quotation marks,
-@c this comes out as "like this" in Info, which is just confusing.
-@iftex
-``like this'',
-@end iftex
-and Info converts doubled single-quote characters to @sc{ascii}
-double-quotes: @w{@t{`@w{}`@dots{}'@w{}'}} becomes @w{@t{"@dots{}"}}.
-
-You may occasionally need to produce two consecutive single quotes;
-for example, in documenting a computer language such as Maxima where
-@t{'@w{}'} is a valid command.  You can do this with the input
-@t{'@@w@{@}'}; the empty @code{@@w} command stops the combination into
-the double-quote characters.
-
-@cindex Unicode quotation characters
-@cindex Grave accent, vs.@: left quote
-The left quote character (@t{`}, ASCII code 96) used in Texinfo is a
-grave accent in ANSI and ISO character set standards.  We use it as a
-quote character because that is how @TeX{} is set up, by default.  We
-hope to eventually support the various quotation characters in
-Unicode.
-
-@item
-@cindex Multiple dashes in source
-@cindex Dashes in source
-@cindex Hyphens in source, two or three in a row
-@cindex Em dash, producing
-@cindex En dash, producing
-Use three hyphens in a row, @samp{---}, to produce a long dash---like
-this (called an @dfn{em dash}), used for punctuation in sentences.
-Use two hyphens, @samp{--}, to produce a medium dash (called an
-@dfn{en dash}), used primarily for numeric ranges, as in ``June
-25--26''.  Use a single hyphen, @samp{-}, to produce a standard hyphen
-used in compound words.  For display on the screen, Info reduces three
-hyphens to two and two hyphens to one (not transitively!).  Of course,
-any number of hyphens in the source remain as they are in literal
-contexts, such as @code{@@code} and @code{@@example}.
-
-@item
-@cindex Tabs; don't use!
-@strong{Caution:} Last and most important, do not use tab characters
-in a Texinfo file (except in verbatim modes)!  @TeX{} uses
-variable-width fonts, which means that it is impractical at best to
-define a tab to work in all circumstances.  Consequently, @TeX{}
-treats tabs like single spaces, and that is not what they look like in
-the source.  Furthermore, @code{makeinfo} does nothing special with
-tabs, and thus a tab character in your input file will usually appear
-differently in the output.
-
-@noindent
-To avoid this problem, Texinfo mode causes GNU Emacs to insert multiple
-spaces when you press the @key{TAB} key.
-
-@noindent
-Also, you can run @code{untabify} in Emacs to convert tabs in a region
-to multiple spaces, or use the @code{unexpand} command from the shell.
-
-@end itemize
-
-@node Comments
-@section Comments
-
-@cindex Comments
-@findex comment
-@findex c @r{(comment)}
-
-You can write comments in a Texinfo file that will not appear in
-either the Info file or the printed manual by using the
-@code{@@comment} command (which may be abbreviated to @code{@@c}).
-Such comments are for the person who revises the Texinfo file.  All the
-text on a line that follows either @code{@@comment} or @code{@@c} is a
-comment; the rest of the line does not appear in either the Info file
-or the printed manual.
-
-Often, you can write the @code{@@comment} or @code{@@c} in the middle of
-a line, and only the text that follows after the @code{@@comment} or
-@code{@@c} command does not appear; but some commands, such as
-@code{@@settitle} and @code{@@setfilename}, work on a whole line.  You
-cannot use @code{@@comment} or @code{@@c} in a line beginning with such
-a command.
-
-@cindex Ignored text
-@cindex Unprocessed text
-@findex ignore
-You can write long stretches of text that will not appear in either
-the Info file or the printed manual by using the @code{@@ignore} and
-@code{@@end ignore} commands.  Write each of these commands on a line
-of its own, starting each command at the beginning of the line.  Text
-between these two commands does not appear in the processed output.
-You can use @code{@@ignore} and @code{@@end ignore} for writing
-comments.
-
-Text enclosed by @code{@@ignore} or by failing @code{@@ifset} or
-@code{@@ifclear} conditions is ignored in the sense that it will not
-contribute to the formatted output.  However, @TeX{} and makeinfo must
-still parse the ignored text, in order to understand when to @emph{stop}
-ignoring text from the source file; that means that you may still get
-error messages if you have invalid Texinfo commands within ignored text.
-
-
-@node Minimum
-@section What a Texinfo File Must Have
-@cindex Minimal Texinfo file (requirements)
-@cindex Must have in Texinfo file
-@cindex Required in Texinfo file
-@cindex Texinfo file minimum
-
-By convention, the namea of a Texinfo file ends with (in order of
-preference) one of the extensions @file{.texinfo}, @file{.texi},
-@file{.txi}, or @file{.tex}.  The longer extensions are preferred since
-they describe more clearly to a human reader the nature of the file.
-The shorter extensions are for operating systems that cannot handle long
-file names.
-
-In order to be made into a printed manual and an Info file, a Texinfo
-file @strong{must} begin with lines like this:
-
-@example
-@group
-\input texinfo
-@@setfilename @var{info-file-name}
-@@settitle @var{name-of-manual}
-@end group
-@end example
-
-@noindent
-The contents of the file follow this beginning, and then you
-@strong{must} end a Texinfo file with a line like this:
-
-@example
-@@bye
-@end example
-
-@findex \input @r{(raw @TeX{} startup)}
-@noindent
-Here's an explanation:
-
-@itemize @bullet
-@item
-The @samp{\input texinfo} line tells @TeX{} to use the
-@file{texinfo.tex} file, which tells @TeX{} how to translate the Texinfo
-@@-commands into @TeX{} typesetting commands.  (Note the use of the
-backslash, @samp{\}; this is correct for @TeX{}.)
-
-@item
-The @code{@@setfilename} line provides a name for the Info file and
-tells @TeX{} to open auxiliary files.  @strong{All text before
-@code{@@setfilename} is ignored!}
-
-@item
-The @code{@@settitle} line specifies a title for the page headers (or
-footers) of the printed manual, and the default document description for
-the @samp{<head>} in HTML format.  Strictly speaking, @code{@@settitle}
-is optional---if you don't mind your document being titled `Untitled'.
-
-@item
-The @code{@@bye} line at the end of the file on a line of its own tells
-the formatters that the file is ended and to stop formatting.
-
-@end itemize
-
-Typically, you will not use quite such a spare format, but will include
-mode setting and start-of-header and end-of-header lines at the
-beginning of a Texinfo file, like this:
-
-@example
-@group
-\input texinfo   @@c -*-texinfo-*-
-@@c %**start of header
-@@setfilename @var{info-file-name}
-@@settitle @var{name-of-manual}
-@@c %**end of header
-@end group
-@end example
-
-@noindent
-In the first line, @samp{-*-texinfo-*-} causes Emacs to switch into
-Texinfo mode when you edit the file.
-
-The @code{@@c} lines which surround the @code{@@setfilename} and
-@code{@@settitle} lines are optional, but you need them in order to
-run @TeX{} or Info on just part of the file.  (@xref{Start of Header}.)
-
-Furthermore, you will usually provide a Texinfo file with a title page,
-indices, and the like, all of which are explained in this manual.  But
-the minimum, which can be useful for short documents, is just the three
-lines at the beginning and the one line at the end.
-
-
-@node Six Parts
-@section Six Parts of a Texinfo File
-
-Generally, a Texinfo file contains more than the minimal beginning and
-end described in the previous section---it usually contains the six
-parts listed below.  These are described fully in the following sections.
-
-@table @r
-@item 1. Header
-The @dfn{Header} names the file, tells @TeX{} which definitions file to
-use, and other such housekeeping tasks.
-
-@item 2. Summary and Copyright
-The @dfn{Summary and Copyright} segment describes the document and
-contains the copyright notice and copying permissions.  This is done
-with the @code{@@copying} command.
-
-@item 3. Title and Copyright
-The @dfn{Title and Copyright} segment contains the title and copyright
-pages for the printed manual.  The segment must be enclosed between
-@code{@@titlepage} and @code{@@end titlepage} commands.  The title and
-copyright page appear only in the printed manual.
-
-@item 4. `Top' Node and Master Menu
-The `Top' node starts off the online output; it does not appear in the
-printed manual.  We recommend including the copying permissions here as
-well as the segments above.  And it contains at least a top-level menu
-listing the chapters, and possibly a @dfn{Master Menu} listing all the
-nodes in the entire document.
-
-@item 5. Body
-The @dfn{Body} of the document is typically structured like a
-traditional book or encyclopedia, but it may be free form.
-
-@item 6. End
-The @dfn{End} segment contains commands for printing indices and
-generating the table of contents, and the @code{@@bye} command on a line
-of its own.
-@end table
-
-
-@node Short Sample
-@section A Short Sample Texinfo File
-@cindex Sample Texinfo file, with comments
-
-Here is a very short but complete Texinfo file, in the six conventional
-parts enumerated in the previous section, so you can see how Texinfo
-source appears in practice.  The first three parts of the file, from
-@samp{\input texinfo} through to @samp{@@end titlepage}, look more
-intimidating than they are: most of the material is standard
-boilerplate; when writing a manual, you simply change the names as
-appropriate.
-
-@xref{Beginning a File}, for full documentation on the commands listed
-here.  @xref{GNU Sample Texts}, for the full texts to be used in GNU
-manuals.
-
-In the following, the sample text is @emph{indented}; comments on it are
-not.  The complete file, without interspersed comments, is shown in
-@ref{Short Sample Texinfo File}.
-
-@subheading Part 1: Header
-
-@noindent
-The header does not appear in either the Info file or the
-printed output.  It sets various parameters, including the
-name of the Info file and the title used in the header.
-
-@example
-@group
-\input texinfo   @@c -*-texinfo-*-
-@@c %**start of header
-@@setfilename sample.info
-@@settitle Sample Manual 1.0
-@@c %**end of header
-@end group
-@end example
-
-@subheading Part 2: Summary Description and Copyright
-
-@noindent
-A real manual includes more text here, according to the license under
-which it is distributed.  @xref{GNU Sample Texts}.
-
-@example
-@group
-@@copying
-This is a short example of a complete Texinfo file, version 1.0.
-
-Copyright @@copyright@{@} 2004 Free Software Foundation, Inc.
-@@end copying
-@end group
-@end example
-
-@subheading Part 3: Titlepage, Contents, Copyright
-
-@noindent
-The titlepage segment does not appear in the online output, only in the
-printed manual.  We use the @code{@@insertcopying} command to
-include the permission text from the previous section, instead of
-writing it out again; it is output on the back of the title page.  The
-@code{@@contents} command generates a table of contents.
-
-@example
-@group
-@@titlepage
-@@title Sample Title
-@end group
-
-@group
-@@c The following two commands start the copyright page.
-@@page
-@@vskip 0pt plus 1filll
-@@insertcopying
-@@end titlepage
-@end group
-
-@@c Output the table of contents at the beginning.
-@@contents
-@end example
-
-@subheading Part 4: `Top' Node and Master Menu
-
-@noindent
-The `Top' node contains the master menu for the Info file.  Since the
-printed manual uses a table of contents rather than a menu, it
-excludes the `Top' node.  We also include the copying text again for
-the benefit of online readers.  Since the copying text begins with
-a brief description of the manual, no other text is needed in this
-case.  The @samp{@@top} command itself helps @command{makeinfo}
-determine the relationships between nodes.
-
-@example
-@@ifnottex
-@@node Top
-@@top Short Sample
-
-@@insertcopying
-@@end ifnottex
-
-@group
-@@menu
-* First Chapter::    The first chapter is the
-                       only chapter in this sample.
-* Index::            Complete index.
-@@end menu
-@end group
-@end example
-
-
-@subheading Part 5: The Body of the Document
-
-@noindent
-The body segment contains all the text of the document, but not the
-indices or table of contents.  This example illustrates a node and a
-chapter containing an enumerated list.
-
-@example
-@group
-@@node First Chapter
-@@chapter First Chapter
-
-@@cindex chapter, first
-@end group
-
-@group
-This is the first chapter.
-@@cindex index entry, another
-@end group
-
-@group
-Here is a numbered list.
-
-@@enumerate
-@@item
-This is the first item.
-
-@@item
-This is the second item.
-@@end enumerate
-@end group
-@end example
-
-
-@subheading Part 6: The End of the Document
-
-@noindent
-The end segment contains commands for generating an index in a node and
-unnumbered chapter of its own, and the @code{@@bye} command that marks
-the end of the document.
-
-@example
-@group
-@@node Index
-@@unnumbered Index
-@end group
-
-@group
-@@printindex cp
-
-@@bye
-@end group
-@end example
-
-
-@subheading Some Results
-
-Here is what the contents of the first chapter of the sample look like:
-
-@sp 1
-@need 700
-@quotation
-This is the first chapter.
-
-Here is a numbered list.
-
-@enumerate
-@item
-This is the first item.
-
-@item
-This is the second item.
-@end enumerate
-@end quotation
-
-
-@node History
-@section History
-
-@cindex Stallman, Richard M.
-@cindex Chassell, Robert J.
-@cindex Fox, Brian
-@cindex Berry, Karl
-Richard M.@: Stallman invented the Texinfo format, wrote the initial
-processors, and created Edition 1.0 of this manual.  @w{Robert J.@:}
-Chassell greatly revised and extended the manual, starting with Edition
-1.1.  Brian Fox was responsible for the standalone Texinfo distribution
-until version 3.8, and wrote the standalone @command{makeinfo} and
-@command{info} programs.  Karl Berry has continued maintenance since
-Texinfo 3.8 (manual edition 2.22).
-
-@cindex Pinard, Fran@,{c}ois
-@cindex Zuhn, David D.
-@cindex Weisshaus, Melissa
-@cindex Zaretskii, Eli
-@cindex Schwab, Andreas
-@cindex Weinberg, Zack
-Our thanks go out to all who helped improve this work, particularly the
-indefatigable Eli Zaretskii and Andreas Schwab, who have provided
-patches beyond counting.  Fran@,{c}ois Pinard and @w{David D.@: Zuhn},
-tirelessly recorded and reported mistakes and obscurities.  Zack
-Weinberg did the impossible by implementing the macro syntax in
-@file{texinfo.tex}.  Special thanks go to Melissa Weisshaus for her
-frequent reviews of nearly similar editions.  Dozens of others have
-contributed patches and suggestions, they are gratefully acknowledged in
-the @file{ChangeLog} file.  Our mistakes are our own.
-
-@cindex Scribe
-@cindex Reid, Brian
-@cindex History of Texinfo
-@cindex Texinfo history
-A bit of history: in the 1970's at CMU, Brian Reid developed a program
-and format named Scribe to mark up documents for printing.  It used the
-@code{@@} character to introduce commands, as Texinfo does.  Much more
-consequentially, it strived to describe document contents rather than
-formatting, an idea wholeheartedly adopted by Texinfo.
-
-@cindex Bolio
-@cindex Bo@TeX{}
-Meanwhile, people at MIT developed another, not too dissimilar format
-called Bolio.  This then was converted to using @TeX{} as its typesetting
-language: Bo@TeX{}.  The earliest Bo@TeX{} version seems to have been
-0.02 on October 31, 1984.
-
-Bo@TeX{} could only be used as a markup language for documents to be
-printed, not for online documents.  Richard Stallman (RMS) worked on
-both Bolio and Bo@TeX{}.  He also developed a nifty on-line help format
-called Info, and then combined Bo@TeX{} and Info to create Texinfo, a
-mark up language for text that is intended to be read both online and
-as printed hard copy.
-
-
-@node Texinfo Mode
-@chapter Using Texinfo Mode
-@cindex Texinfo mode
-@cindex Mode, using Texinfo
-@cindex GNU Emacs
-@cindex Emacs
-
-You may edit a Texinfo file with any text editor you choose.  A Texinfo
-file is no different from any other @sc{ascii} file.  However, GNU Emacs
-comes with a special mode, called Texinfo mode, that provides Emacs
-commands and tools to help ease your work.
-
-This chapter describes features of GNU Emacs' Texinfo mode but not any
-features of the Texinfo formatting language.  So if you are reading this
-manual straight through from the beginning, you may want to skim through
-this chapter briefly and come back to it after reading succeeding
-chapters which describe the Texinfo formatting language in detail.
-
-@menu
-* Texinfo Mode Overview::       How Texinfo mode can help you.
-* Emacs Editing::               Texinfo mode adds to GNU Emacs' general
-                                  purpose editing features.
-* Inserting::                   How to insert frequently used @@-commands.
-* Showing the Structure::       How to show the structure of a file.
-* Updating Nodes and Menus::    How to update or create new nodes and menus.
-* Info Formatting::             How to format for Info.
-* Printing::                    How to format and print part or all of a file.
-* Texinfo Mode Summary::        Summary of all the Texinfo mode commands.
-@end menu
-
-@node Texinfo Mode Overview
-@section Texinfo Mode Overview
-
-Texinfo mode provides special features for working with Texinfo files.
-You can:
-
-@itemize @bullet
-@item
-Insert frequently used @@-commands. @refill
-
-@item
-Automatically create @code{@@node} lines.
-
-@item
-Show the structure of a Texinfo source file.@refill
-
-@item
-Automatically create or update the `Next',
-`Previous', and `Up' pointers of a node.
-
-@item
-Automatically create or update menus.@refill
-
-@item
-Automatically create a master menu.@refill
-
-@item
-Format a part or all of a file for Info.@refill
-
-@item
-Typeset and print part or all of a file.@refill
-@end itemize
-
-Perhaps the two most helpful features are those for inserting frequently
-used @@-commands and for creating node pointers and menus.@refill
-
-@node Emacs Editing
-@section The Usual GNU Emacs Editing Commands
-
-In most cases, the usual Text mode commands work the same in Texinfo
-mode as they do in Text mode.  Texinfo mode adds new editing commands
-and tools to GNU Emacs' general purpose editing features.  The major
-difference concerns filling.  In Texinfo mode, the paragraph
-separation variable and syntax table are redefined so that Texinfo
-commands that should be on lines of their own are not inadvertently
-included in paragraphs.  Thus, the @kbd{M-q} (@code{fill-paragraph})
-command will refill a paragraph but not mix an indexing command on a
-line adjacent to it into the paragraph.@refill
-
-In addition, Texinfo mode sets the @code{page-delimiter} variable to
-the value of @code{texinfo-chapter-level-regexp}; by default, this is
-a regular expression matching the commands for chapters and their
-equivalents, such as appendices.  With this value for the page
-delimiter, you can jump from chapter title to chapter title with the
-@kbd{C-x ]} (@code{forward-page}) and @kbd{C-x [}
-(@code{backward-page}) commands and narrow to a chapter with the
-@kbd{C-x p} (@code{narrow-to-page}) command.  (@xref{Pages, , ,emacs,
-The GNU Emacs Manual}, for details about the page commands.)@refill
-
-You may name a Texinfo file however you wish, but the convention is to
-end a Texinfo file name with one of the extensions
-@file{.texinfo}, @file{.texi}, @file{.txi}, or @file{.tex}.  A longer
-extension is preferred, since it is explicit, but a shorter extension
-may be necessary for operating systems that limit the length of file
-names.  GNU Emacs automatically enters Texinfo mode when you visit a
-file with a @file{.texinfo}, @file{.texi} or @file{.txi}
-extension.  Also, Emacs switches to Texinfo mode
-when you visit a
-file that has @samp{-*-texinfo-*-} in its first line.  If ever you are
-in another mode and wish to switch to Texinfo mode, type @code{M-x
-texinfo-mode}.@refill
-
-Like all other Emacs features, you can customize or enhance Texinfo
-mode as you wish.  In particular, the keybindings are very easy to
-change.  The keybindings described here are the default or standard
-ones.@refill
-
-@node Inserting
-@comment  node-name,  next,  previous,  up
-@section Inserting Frequently Used Commands
-@cindex Inserting frequently used commands
-@cindex Frequently used commands, inserting
-@cindex Commands, inserting them
-
-Texinfo mode provides commands to insert various frequently used
-@@-commands into the buffer.  You can use these commands to save
-keystrokes.@refill
-
-The insert commands are invoked by typing @kbd{C-c} twice and then the
-first letter of the @@-command:@refill
-
-@table @kbd
-@item  C-c C-c c
-@itemx M-x texinfo-insert-@@code
-@findex texinfo-insert-@@code
-Insert @code{@@code@{@}} and put the
-cursor between the braces.@refill
-
-@item  C-c C-c d
-@itemx M-x texinfo-insert-@@dfn
-@findex texinfo-insert-@@dfn
-Insert @code{@@dfn@{@}} and put the
-cursor between the braces.@refill
-
-@item  C-c C-c e
-@itemx M-x texinfo-insert-@@end
-@findex texinfo-insert-@@end
-Insert @code{@@end} and attempt to insert the correct following word,
-such as @samp{example} or @samp{table}.  (This command does not handle
-nested lists correctly, but inserts the word appropriate to the
-immediately preceding list.)@refill
-
-@item  C-c C-c i
-@itemx M-x texinfo-insert-@@item
-@findex texinfo-insert-@@item
-Insert @code{@@item} and put the
-cursor at the beginning of the next line.@refill
-
-@item  C-c C-c k
-@itemx M-x texinfo-insert-@@kbd
-@findex texinfo-insert-@@kbd
-Insert @code{@@kbd@{@}} and put the
-cursor between the braces.@refill
-
-@item  C-c C-c n
-@itemx M-x texinfo-insert-@@node
-@findex texinfo-insert-@@node
-Insert @code{@@node} and a comment line
-listing the sequence for the `Next',
-`Previous', and `Up' nodes.
-Leave point after the @code{@@node}.@refill
-
-@item  C-c C-c o
-@itemx M-x texinfo-insert-@@noindent
-@findex texinfo-insert-@@noindent
-Insert @code{@@noindent} and put the
-cursor at the beginning of the next line.@refill
-
-@item  C-c C-c s
-@itemx M-x texinfo-insert-@@samp
-@findex texinfo-insert-@@samp
-Insert @code{@@samp@{@}} and put the
-cursor between the braces.@refill
-
-@item  C-c C-c t
-@itemx M-x texinfo-insert-@@table
-@findex texinfo-insert-@@table
-Insert @code{@@table} followed by a @key{SPC}
-and leave the cursor after the @key{SPC}.@refill
-
-@item  C-c C-c v
-@itemx M-x texinfo-insert-@@var
-@findex texinfo-insert-@@var
-Insert @code{@@var@{@}} and put the
-cursor between the braces.@refill
-
-@item  C-c C-c x
-@itemx M-x texinfo-insert-@@example
-@findex texinfo-insert-@@example
-Insert @code{@@example} and put the
-cursor at the beginning of the next line.@refill
-
-@c M-@{  was the binding for texinfo-insert-braces;
-@c in Emacs 19, backward-paragraph will take this binding.
-@item C-c C-c @{
-@itemx M-x texinfo-insert-braces
-@findex texinfo-insert-braces
-Insert @code{@{@}} and put the cursor between the braces.@refill
-
-@item C-c C-c @}
-@itemx C-c C-c ]
-@itemx M-x up-list
-@findex up-list
-Move from between a pair of braces forward past the closing brace.
-Typing @kbd{C-c C-c ]} is easier than typing @kbd{C-c C-c @}}, which
-is, however, more mnemonic; hence the two keybindings.  (Also, you can
-move out from between braces by typing @kbd{C-f}.)@refill
-@end table
-
-To put a command such as @w{@code{@@code@{@dots{}@}}} around an
-@emph{existing} word, position the cursor in front of the word and type
-@kbd{C-u 1 C-c C-c c}.  This makes it easy to edit existing plain text.
-The value of the prefix argument tells Emacs how many words following
-point to include between braces---@samp{1} for one word, @samp{2} for
-two words, and so on.  Use a negative argument to enclose the previous
-word or words.  If you do not specify a prefix argument, Emacs inserts
-the @@-command string and positions the cursor between the braces.  This
-feature works only for those @@-commands that operate on a word or words
-within one line, such as @code{@@kbd} and @code{@@var}.@refill
-
-This set of insert commands was created after analyzing the frequency
-with which different @@-commands are used in the @cite{GNU Emacs
-Manual} and the @cite{GDB Manual}.  If you wish to add your own insert
-commands, you can bind a keyboard macro to a key, use abbreviations,
-or extend the code in @file{texinfo.el}.@refill
-
-@findex texinfo-start-menu-description
-@cindex Menu description, start
-@cindex Description for menu, start
-@kbd{C-c C-c C-d} (@code{texinfo-start-menu-description}) is an insert
-command that works differently from the other insert commands.  It
-inserts a node's section or chapter title in the space for the
-description in a menu entry line.  (A menu entry has three parts, the
-entry name, the node name, and the description.  Only the node name is
-required, but a description helps explain what the node is about.
-@xref{Menu Parts, , The Parts of a Menu}.)@refill
-
-To use @code{texinfo-start-menu-description}, position point in a menu
-entry line and type @kbd{C-c C-c C-d}.  The command looks for and copies
-the title that goes with the node name, and inserts the title as a
-description; it positions point at beginning of the inserted text so you
-can edit it.  The function does not insert the title if the menu entry
-line already contains a description.@refill
-
-This command is only an aid to writing descriptions; it does not do the
-whole job.  You must edit the inserted text since a title tends to use
-the same words as a node name but a useful description uses different
-words.@refill
-
-@node Showing the Structure
-@comment  node-name,  next,  previous,  up
-@section Showing the Section Structure of a File
-@cindex Showing the section structure of a file
-@cindex Section structure of a file, showing it
-@cindex Structure of a file, showing it
-@cindex Outline of file structure, showing it
-@cindex Contents-like outline of file structure
-@cindex File section structure, showing it
-@cindex Texinfo file section structure, showing it
-
-You can show the section structure of a Texinfo file by using the
-@kbd{C-c C-s} command (@code{texinfo-show-structure}).  This command
-shows the section structure of a Texinfo file by listing the lines
-that begin with the @@-commands for @code{@@chapter},
-@code{@@section}, and the like.  It constructs what amounts
-to a table of contents.  These lines are displayed in another buffer
-called the @samp{*Occur*} buffer.  In that buffer, you can position
-the cursor over one of the lines and use the @kbd{C-c C-c} command
-(@code{occur-mode-goto-occurrence}), to jump to the corresponding spot
-in the Texinfo file.@refill
-
-@table @kbd
-@item  C-c C-s
-@itemx M-x texinfo-show-structure
-@findex texinfo-show-structure
-Show the @code{@@chapter}, @code{@@section}, and such lines of a
-Texinfo file.@refill
-
-@item  C-c C-c
-@itemx M-x occur-mode-goto-occurrence
-@findex occur-mode-goto-occurrence
-Go to the line in the Texinfo file corresponding to the line under the
-cursor in the @file{*Occur*} buffer.@refill
-@end table
-
-If you call @code{texinfo-show-structure} with a prefix argument by
-typing @w{@kbd{C-u C-c C-s}}, it will list not only those lines with the
-@@-commands for @code{@@chapter}, @code{@@section}, and the like, but
-also the @code{@@node} lines.  You can use @code{texinfo-show-structure}
-with a prefix argument to check whether the `Next', `Previous', and `Up'
-pointers of an @code{@@node} line are correct.
-
-Often, when you are working on a manual, you will be interested only
-in the structure of the current chapter.  In this case, you can mark
-off the region of the buffer that you are interested in by using the
-@kbd{C-x n n} (@code{narrow-to-region}) command and
-@code{texinfo-show-structure} will work on only that region.  To see
-the whole buffer again, use @w{@kbd{C-x n w}} (@code{widen}).
-(@xref{Narrowing, , , emacs, The GNU Emacs Manual}, for more
-information about the narrowing commands.)@refill
-
-@vindex page-delimiter
-@cindex Page delimiter in Texinfo mode
-In addition to providing the @code{texinfo-show-structure} command,
-Texinfo mode sets the value of the page delimiter variable to match
-the chapter-level @@-commands.  This enables you to use the @kbd{C-x
-]} (@code{forward-page}) and @kbd{C-x [} (@code{backward-page})
-commands to move forward and backward by chapter, and to use the
-@kbd{C-x p} (@code{narrow-to-page}) command to narrow to a chapter.
-@xref{Pages, , , emacs, The GNU Emacs Manual}, for more information
-about the page commands.@refill
-
-@node Updating Nodes and Menus
-@comment  node-name,  next,  previous,  up
-@section Updating Nodes and Menus
-@cindex Updating nodes and menus
-@cindex Create nodes, menus automatically
-@cindex Insert nodes, menus automatically
-@cindex Automatically insert nodes, menus
-
-Texinfo mode provides commands for automatically creating or updating
-menus and node pointers.  The commands are called ``update'' commands
-because their most frequent use is for updating a Texinfo file after you
-have worked on it; but you can use them to insert the `Next',
-`Previous', and `Up' pointers into an @code{@@node} line that has none
-and to create menus in a file that has none.
-
-If you do not use the updating commands, you need to write menus and
-node pointers by hand, which is a tedious task.@refill
-
-@menu
-* Updating Commands::           Five major updating commands.
-* Updating Requirements::       How to structure a Texinfo file for
-                                  using the updating command.
-* Other Updating Commands::     How to indent descriptions, insert
-                                  missing nodes lines, and update
-                                  nodes in sequence.
-@end menu
-
-@node Updating Commands
-@subsection The Updating Commands
-
-You can use the updating commands to:@refill
-
-@itemize @bullet
-@item
-insert or update the `Next', `Previous', and `Up' pointers of a
-node,@refill
-
-@item
-insert or update the menu for a section, and@refill
-
-@item
-create a master menu for a Texinfo source file.@refill
-@end itemize
-
-You can also use the commands to update all the nodes and menus in a
-region or in a whole Texinfo file.@refill
-
-The updating commands work only with conventional Texinfo files, which
-are structured hierarchically like books.  In such files, a structuring
-command line must follow closely after each @code{@@node} line, except
-for the `Top' @code{@@node} line.  (A @dfn{structuring command line} is
-a line beginning with @code{@@chapter}, @code{@@section}, or other
-similar command.)
-
-You can write the structuring command line on the line that follows
-immediately after an @code{@@node} line or else on the line that
-follows after a single @code{@@comment} line or a single
-@code{@@ifinfo} line.  You cannot interpose more than one line between
-the @code{@@node} line and the structuring command line; and you may
-interpose only an @code{@@comment} line or an @code{@@ifinfo} line.
-
-Commands which work on a whole buffer require that the `Top' node be
-followed by a node with an @code{@@chapter} or equivalent-level command.
-The menu updating commands will not create a main or master menu for a
-Texinfo file that has only @code{@@chapter}-level nodes!  The menu
-updating commands only create menus @emph{within} nodes for lower level
-nodes.  To create a menu of chapters, you must provide a `Top'
-node.
-
-The menu updating commands remove menu entries that refer to other Info
-files since they do not refer to nodes within the current buffer.  This
-is a deficiency.  Rather than use menu entries, you can use cross
-references to refer to other Info files.  None of the updating commands
-affect cross references.@refill
-
-Texinfo mode has five updating commands that are used most often: two
-are for updating the node pointers or menu of a single node (or a
-region); two are for updating every node pointer and menu in a file;
-and one, the @code{texinfo-master-menu} command, is for creating a
-master menu for a complete file, and optionally, for updating every
-node and menu in the whole Texinfo file.@refill
-
-The @code{texinfo-master-menu} command is the primary command:@refill
-
-@table @kbd
-@item C-c C-u m
-@itemx M-x texinfo-master-menu
-@findex texinfo-master-menu
-Create or update a master menu that includes all the other menus
-(incorporating the descriptions from pre-existing menus, if
-any).@refill
-
-With an argument (prefix argument, @kbd{C-u,} if interactive), first create or
-update all the nodes and all the regular menus in the buffer before
-constructing the master menu.  (@xref{The Top Node, , The Top Node and
-Master Menu}, for more about a master menu.)@refill
-
-For @code{texinfo-master-menu} to work, the Texinfo file must have a
-`Top' node and at least one subsequent node.@refill
-
-After extensively editing a Texinfo file, you can type the following:
-
-@example
-C-u M-x texinfo-master-menu
-@exdent or
-C-u C-c C-u m
-@end example
-
-@noindent
-This updates all the nodes and menus completely and all at once.@refill
-@end table
-
-The other major updating commands do smaller jobs and are designed for
-the person who updates nodes and menus as he or she writes a Texinfo
-file.@refill
-
-@need 1000
-The commands are:@refill
-
-@table @kbd
-@item C-c C-u C-n
-@itemx M-x texinfo-update-node
-@findex texinfo-update-node
-Insert the `Next', `Previous', and `Up' pointers for the node that point is
-within (i.e., for the @code{@@node} line preceding point).  If the
-@code{@@node} line has pre-existing `Next', `Previous', or `Up'
-pointers in it, the old pointers are removed and new ones inserted.
-With an argument (prefix argument, @kbd{C-u}, if interactive), this command
-updates all @code{@@node} lines in the region (which is the text
-between point and mark).@refill
-
-@item C-c C-u C-m
-@itemx M-x texinfo-make-menu
-@findex texinfo-make-menu
-Create or update the menu in the node that point is within.
-With an argument (@kbd{C-u} as prefix argument, if
-interactive), the command makes or updates menus for the
-nodes which are either within or a part of the
-region.@refill
-
-Whenever @code{texinfo-make-menu} updates an existing menu, the
-descriptions from that menu are incorporated into the new menu.  This
-is done by copying descriptions from the existing menu to the entries
-in the new menu that have the same node names.  If the node names are
-different, the descriptions are not copied to the new menu.@refill
-
-@item C-c C-u C-e
-@itemx M-x texinfo-every-node-update
-@findex texinfo-every-node-update
-Insert or update the `Next', `Previous', and `Up' pointers for every
-node in the buffer.@refill
-
-@item C-c C-u C-a
-@itemx M-x texinfo-all-menus-update
-@findex texinfo-all-menus-update
-Create or update all the menus in the buffer.  With an argument
-(@kbd{C-u} as prefix argument, if interactive), first insert
-or update all the node
-pointers before working on the menus.@refill
-
-If a master menu exists, the @code{texinfo-all-menus-update} command
-updates it; but the command does not create a new master menu if none
-already exists.  (Use the @code{texinfo-master-menu} command for
-that.)@refill
-
-When working on a document that does not merit a master menu, you can
-type the following:
-
-@example
-C-u C-c C-u C-a
-@exdent or
-C-u M-x texinfo-all-menus-update
-@end example
-
-@noindent
-This updates all the nodes and menus.@refill
-@end table
-
-The @code{texinfo-column-for-description} variable specifies the
-column to which menu descriptions are indented.  By default, the value
-is 32 although it is often useful to reduce it to as low as 24.  You
-can set the variable via customization (@pxref{Changing an Option,,,
-emacs, The GNU Emacs Manual}) or with the @kbd{M-x set-variable}
-command (@pxref{Examining, , Examining and Setting Variables, emacs,
-The GNU Emacs Manual}).
-
-Also, the @code{texinfo-indent-menu-description} command may be used to
-indent existing menu descriptions to a specified column.  Finally, if
-you wish, you can use the @code{texinfo-insert-node-lines} command to
-insert missing @code{@@node} lines into a file.  (@xref{Other Updating
-Commands}, for more information.)@refill
-
-@node Updating Requirements
-@subsection Updating Requirements
-@cindex Updating requirements
-@cindex Requirements for updating commands
-
-To use the updating commands, you must organize the Texinfo file
-hierarchically with chapters, sections, subsections, and the like.
-When you construct the hierarchy of the manual, do not `jump down'
-more than one level at a time: you can follow the `Top' node with a
-chapter, but not with a section; you can follow a chapter with a
-section, but not with a subsection.  However, you may `jump up' any
-number of levels at one time---for example, from a subsection to a
-chapter.@refill
-
-Each @code{@@node} line, with the exception of the line for the `Top'
-node, must be followed by a line with a structuring command such as
-@code{@@chapter}, @code{@@section}, or
-@code{@@unnumberedsubsec}.@refill
-
-Each @code{@@node} line/structuring-command line combination
-must look either like this:
-
-@example
-@group
-@@node     Comments,  Minimum, Conventions, Overview
-@@comment  node-name, next,    previous,    up
-@@section Comments
-@end group
-@end example
-
-or like this (without the @code{@@comment} line):
-
-@example
-@group
-@@node Comments, Minimum, Conventions, Overview
-@@section Comments
-@end group
-@end example
-
-or like this (without the explicit node pointers):
-
-@example
-@group
-@@node Comments
-@@section Comments
-@end group
-@end example
-
-@noindent
-In this example, `Comments' is the name of both the node and the
-section.  The next node is called `Minimum' and the previous node is
-called `Conventions'.  The `Comments' section is within the `Overview'
-node, which is specified by the `Up' pointer.  (Instead of an
-@code{@@comment} line, you may also write an @code{@@ifinfo} line.)
-
-If a file has a `Top' node, it must be called @samp{top} or @samp{Top}
-and be the first node in the file.
-
-The menu updating commands create a menu of sections within a chapter,
-a menu of subsections within a section, and so on.  This means that
-you must have a `Top' node if you want a menu of chapters.@refill
-
-Incidentally, the @code{makeinfo} command will create an Info file for a
-hierarchically organized Texinfo file that lacks `Next', `Previous' and
-`Up' pointers.  Thus, if you can be sure that your Texinfo file will be
-formatted with @code{makeinfo}, you have no need for the update node
-commands.  (@xref{Creating an Info File}, for more information about
-@code{makeinfo}.)  However, both @code{makeinfo} and the
-@code{texinfo-format-@dots{}} commands require that you insert menus in
-the file.
-
-
-@node Other Updating Commands
-@subsection Other Updating Commands
-
-In addition to the five major updating commands, Texinfo mode
-possesses several less frequently used updating commands:@refill
-
-@table @kbd
-@item M-x texinfo-insert-node-lines
-@findex texinfo-insert-node-lines
-Insert @code{@@node} lines before the @code{@@chapter},
-@code{@@section}, and other sectioning commands wherever they are
-missing throughout a region in a Texinfo file.@refill
-
-With an argument (@kbd{C-u} as prefix argument, if interactive), the
-@code{texinfo-insert-node-lines} command not only inserts
-@code{@@node} lines but also inserts the chapter or section titles as
-the names of the corresponding nodes.  In addition, it inserts the
-titles as node names in pre-existing @code{@@node} lines that lack
-names.  Since node names should be more concise than section or
-chapter titles, you must manually edit node names so inserted.@refill
-
-For example, the following marks a whole buffer as a region and inserts
-@code{@@node} lines and titles throughout:@refill
-
-@example
-C-x h C-u M-x texinfo-insert-node-lines
-@end example
-
-This command inserts titles as node names in @code{@@node} lines; the
-@code{texinfo-start-menu-description} command (@pxref{Inserting,
-Inserting Frequently Used Commands}) inserts titles as descriptions in
-menu entries, a different action.  However, in both cases, you need to
-edit the inserted text.
-
-@item M-x texinfo-multiple-files-update
-@findex texinfo-multiple-files-update @r{(in brief)}
-Update nodes and menus in a document built from several separate files.
-With @kbd{C-u} as a prefix argument, create and insert a master menu in
-the outer file.  With a numeric prefix argument, such as @kbd{C-u 2}, first
-update all the menus and all the `Next', `Previous', and `Up' pointers
-of all the included files before creating and inserting a master menu in
-the outer file.  The @code{texinfo-multiple-files-update} command is
-described in the appendix on @code{@@include} files.
-@xref{texinfo-multiple-files-update}.
-
-@item M-x texinfo-indent-menu-description
-@findex texinfo-indent-menu-description
-Indent every description in the menu following point to the specified
-column.  You can use this command to give yourself more space for
-descriptions.  With an argument (@kbd{C-u} as prefix argument, if
-interactive), the @code{texinfo-indent-menu-description} command indents
-every description in every menu in the region.  However, this command
-does not indent the second and subsequent lines of a multi-line
-description.@refill
-
-@item M-x texinfo-sequential-node-update
-@findex texinfo-sequential-node-update
-Insert the names of the nodes immediately following and preceding the
-current node as the `Next' or `Previous' pointers regardless of those
-nodes' hierarchical level.  This means that the `Next' node of a
-subsection may well be the next chapter.  Sequentially ordered nodes are
-useful for novels and other documents that you read through
-sequentially.  (However, in Info, the @kbd{g *} command lets
-you look through the file sequentially, so sequentially ordered nodes
-are not strictly necessary.)  With an argument (prefix argument, if
-interactive), the @code{texinfo-sequential-node-update} command
-sequentially updates all the nodes in the region.@refill
-@end table
-
-@node Info Formatting
-@comment  node-name,  next,  previous,  up
-@section Formatting for Info
-@cindex Formatting for Info
-@cindex Running an Info formatter
-@cindex Info formatting
-
-Texinfo mode provides several commands for formatting part or all of a
-Texinfo file for Info.  Often, when you are writing a document, you
-want to format only part of a file---that is, a region.@refill
-
-You can use either the @code{texinfo-format-region} or the
-@code{makeinfo-region} command to format a region:@refill
-
-@table @kbd
-@findex texinfo-format-region
-@item  C-c C-e C-r
-@itemx M-x texinfo-format-region
-@itemx C-c C-m C-r
-@itemx M-x makeinfo-region
-Format the current region for Info.@refill
-@end table
-
-You can use either the @code{texinfo-format-buffer} or the
-@code{makeinfo-buffer} command to format a whole buffer:@refill
-
-@table @kbd
-@findex texinfo-format-buffer
-@item  C-c C-e C-b
-@itemx M-x texinfo-format-buffer
-@itemx C-c C-m C-b
-@itemx M-x makeinfo-buffer
-Format the current buffer for Info.@refill
-@end table
-
-@need 1000
-For example, after writing a Texinfo file, you can type the following:
-
-@example
-C-u C-c C-u m
-@exdent or
-C-u M-x texinfo-master-menu
-@end example
-
-@noindent
-This updates all the nodes and menus.  Then type the following to create
-an Info file:
-
-@example
-C-c C-m C-b
-@exdent or
-M-x makeinfo-buffer
-@end example
-
-For @TeX{} or the Info formatting commands to work, the file @emph{must}
-include a line that has @code{@@setfilename} in its header.
-
-@xref{Creating an Info File}, for details about Info formatting.@refill
-
-@node Printing
-@comment node-name,  next,  previous,  up
-@section Printing
-@cindex Formatting for printing
-@cindex Printing a region or buffer
-@cindex Region formatting and printing
-@cindex Buffer formatting and printing
-@cindex Part of file formatting and printing
-
-Typesetting and printing a Texinfo file is a multi-step process in which
-you first create a file for printing (called a DVI file), and then
-print the file.  Optionally, you may also create indices.  To do this,
-you must run the @code{texindex} command after first running the
-@code{tex} typesetting command; and then you must run the @code{tex}
-command again.  Or else run the @code{texi2dvi} command which
-automatically creates indices as needed (@pxref{Format with texi2dvi}).
-
-Often, when you are writing a document, you want to typeset and print
-only part of a file to see what it will look like.  You can use the
-@code{texinfo-tex-region} and related commands for this purpose.  Use
-the @code{texinfo-tex-buffer} command to format all of a
-buffer.@refill
-
-@table @kbd
-@item  C-c C-t C-b
-@itemx M-x texinfo-tex-buffer
-@findex texinfo-tex-buffer
-Run @code{texi2dvi} on the buffer.  In addition to running @TeX{} on the
-buffer, this command automatically creates or updates indices as
-needed.@refill
-
-@item  C-c C-t C-r
-@itemx M-x texinfo-tex-region
-@findex texinfo-tex-region
-Run @TeX{} on the region.@refill
-
-@item C-c C-t C-i
-@itemx M-x texinfo-texindex
-Run @code{texindex} to sort the indices of a Texinfo file formatted with
-@code{texinfo-tex-region}.  The @code{texinfo-tex-region} command does
-not run @code{texindex} automatically; it only runs the @code{tex}
-typesetting command.  You must run the @code{texinfo-tex-region} command
-a second time after sorting the raw index files with the @code{texindex}
-command.  (Usually, you do not format an index when you format a region,
-only when you format a buffer.  Now that the @code{texi2dvi} command
-exists, there is little or no need for this command.)@refill
-
-@item C-c C-t C-p
-@itemx M-x texinfo-tex-print
-@findex texinfo-tex-print
-Print the file (or the part of the file) previously formatted with
-@code{texinfo-tex-buffer} or @code{texinfo-tex-region}.@refill
-@end table
-
-For @code{texinfo-tex-region} or @code{texinfo-tex-buffer} to work, the
-file @emph{must} start with a @samp{\input texinfo} line and must
-include an @code{@@settitle} line.  The file must end with @code{@@bye}
-on a line by itself.  (When you use @code{texinfo-tex-region}, you must
-surround the @code{@@settitle} line with start-of-header and
-end-of-header lines.)@refill
-
-@xref{Hardcopy}, for a description of the other @TeX{} related
-commands, such as @code{tex-show-print-queue}.@refill
-
-@node Texinfo Mode Summary
-@comment  node-name,  next,  previous,  up
-@section Texinfo Mode Summary
-
-In Texinfo mode, each set of commands has default keybindings that
-begin with the same keys.  All the commands that are custom-created
-for Texinfo mode begin with @kbd{C-c}.  The keys are somewhat
-mnemonic.@refill
-
-@subheading Insert Commands
-
-The insert commands are invoked by typing @kbd{C-c} twice and then the
-first letter of the @@-command to be inserted.  (It might make more
-sense mnemonically to use @kbd{C-c C-i}, for `custom insert', but
-@kbd{C-c C-c} is quick to type.)@refill
-
-@example
-C-c C-c c       @r{Insert} @samp{@@code}.
-C-c C-c d       @r{Insert} @samp{@@dfn}.
-C-c C-c e       @r{Insert} @samp{@@end}.
-C-c C-c i       @r{Insert} @samp{@@item}.
-C-c C-c n       @r{Insert} @samp{@@node}.
-C-c C-c s       @r{Insert} @samp{@@samp}.
-C-c C-c v       @r{Insert} @samp{@@var}.
-C-c C-c @{       @r{Insert braces.}
-C-c C-c ]
-C-c C-c @}       @r{Move out of enclosing braces.}
-
-@group
-C-c C-c C-d     @r{Insert a node's section title}
-               @r{in the space for the description}
-               @r{in a menu entry line.}
-@end group
-@end example
-
-@subheading Show Structure
-
-The @code{texinfo-show-structure} command is often used within a
-narrowed region.@refill
-
-@example
-C-c C-s         @r{List all the headings.}
-@end example
-
-@subheading The Master Update Command
-
-The @code{texinfo-master-menu} command creates a master menu; and can
-be used to update every node and menu in a file as well.@refill
-
-@c Probably should use @tables in this section.
-@example
-@group
-C-c C-u m
-M-x texinfo-master-menu
-               @r{Create or update a master menu.}
-@end group
-
-@group
-C-u C-c C-u m   @r{With @kbd{C-u} as a prefix argument, first}
-               @r{create or update all nodes and regular}
-               @r{menus, and then create a master menu.}
-@end group
-@end example
-
-@subheading Update Pointers
-
-The update pointer commands are invoked by typing @kbd{C-c C-u} and
-then either @kbd{C-n} for @code{texinfo-update-node} or @kbd{C-e} for
-@code{texinfo-every-node-update}.@refill
-
-@example
-C-c C-u C-n     @r{Update a node.}
-C-c C-u C-e     @r{Update every node in the buffer.}
-@end example
-
-@subheading Update Menus
-
-Invoke the  update menu commands by typing @kbd{C-c C-u}
-and then either @kbd{C-m} for @code{texinfo-make-menu} or
-@kbd{C-a} for @code{texinfo-all-menus-update}.  To update
-both nodes and menus at the same time, precede @kbd{C-c C-u
-C-a} with @kbd{C-u}.@refill
-
-@example
-C-c C-u C-m     @r{Make or update a menu.}
-
-@group
-C-c C-u C-a     @r{Make or update all}
-               @r{menus in a buffer.}
-@end group
-
-@group
-C-u C-c C-u C-a @r{With @kbd{C-u} as a prefix argument,}
-               @r{first create or update all nodes and}
-               @r{then create or update all menus.}
-@end group
-@end example
-
-@subheading Format for Info
-
-The Info formatting commands that are written in Emacs Lisp are
-invoked by typing @kbd{C-c C-e} and then either @kbd{C-r} for a region
-or @kbd{C-b} for the whole buffer.@refill
-
-The Info formatting commands that are written in C and based on the
-@code{makeinfo} program are invoked by typing @kbd{C-c C-m} and then
-either @kbd{C-r} for a region or @kbd{C-b} for the whole buffer.@refill
-
-@need 800
-@noindent
-Use the @code{texinfo-format@dots{}} commands:
-
-@example
-@group
-C-c C-e C-r     @r{Format the region.}
-C-c C-e C-b     @r{Format the buffer.}
-@end group
-@end example
-
-@need 750
-@noindent
-Use @code{makeinfo}:
-
-@example
-C-c C-m C-r     @r{Format the region.}
-C-c C-m C-b     @r{Format the buffer.}
-C-c C-m C-l     @r{Recenter the @code{makeinfo} output buffer.}
-C-c C-m C-k     @r{Kill the @code{makeinfo} formatting job.}
-@end example
-
-@subheading Typeset and Print
-
-The @TeX{} typesetting and printing commands are invoked by typing
-@kbd{C-c C-t} and then another control command: @kbd{C-r} for
-@code{texinfo-tex-region}, @kbd{C-b} for @code{texinfo-tex-buffer},
-and so on.@refill
-
-@example
-C-c C-t C-r     @r{Run @TeX{} on the region.}
-C-c C-t C-b     @r{Run} @code{texi2dvi} @r{on the buffer.}
-C-c C-t C-i     @r{Run} @code{texindex}.
-C-c C-t C-p     @r{Print the DVI file.}
-C-c C-t C-q     @r{Show the print queue.}
-C-c C-t C-d     @r{Delete a job from the print queue.}
-C-c C-t C-k     @r{Kill the current @TeX{} formatting job.}
-C-c C-t C-x     @r{Quit a currently stopped @TeX{} formatting job.}
-C-c C-t C-l     @r{Recenter the output buffer.}
-@end example
-
-@subheading Other Updating Commands
-
-The remaining updating commands do not have standard keybindings because
-they are rarely used.
-
-@example
-@group
-M-x texinfo-insert-node-lines
-               @r{Insert missing @code{@@node} lines in region.}
-               @r{With @kbd{C-u} as a prefix argument,}
-               @r{use section titles as node names.}
-@end group
-
-@group
-M-x texinfo-multiple-files-update
-               @r{Update a multi-file document.}
-               @r{With @kbd{C-u 2} as a prefix argument,}
-               @r{create or update all nodes and menus}
-               @r{in all included files first.}
-@end group
-
-@group
-M-x texinfo-indent-menu-description
-               @r{Indent descriptions.}
-@end group
-
-@group
-M-x texinfo-sequential-node-update
-               @r{Insert node pointers in strict sequence.}
-@end group
-@end example
-
-
-@node Beginning a File
-@chapter Beginning a Texinfo File
-@cindex Beginning a Texinfo file
-@cindex Texinfo file beginning
-@cindex File beginning
-
-Certain pieces of information must be provided at the beginning of a
-Texinfo file, such as the name for the output file(s), the title of the
-document, and the Top node.  A table of contents is also generally
-produced here.
-
-This chapter expands on the minimal complete Texinfo source file
-previously given (@pxref{Six Parts}).  It describes the numerous
-commands for handling the traditional frontmatter items in Texinfo.
-
-@cindex Frontmatter, text in
-Straight text outside of any command before the Top node should be
-avoided.  Such text is treated differently in the different output
-formats: visible in @TeX{} and HTML, by default not shown in Info
-readers, and so on.
-
-@menu
-* Sample Beginning::            A sample beginning for a Texinfo file.
-* Texinfo File Header::         The first lines.
-* Document Permissions::        Ensuring your manual is free.
-* Titlepage & Copyright Page::  Creating the title and copyright pages.
-* Contents::                    How to create a table of contents.
-* The Top Node::                Creating the `Top' node and master menu.
-* Global Document Commands::    Affecting formatting throughout.
-* Software Copying Permissions::  Ensure that you and others continue to
-                                   have the right to use and share software.
-@end menu
-
-
-@node Sample Beginning
-@section Sample Texinfo File Beginning
-
-@cindex Example beginning of Texinfo file
-
-The following sample shows what is needed.  The elements given here are
-explained in more detail in the following sections.  Other commands are
-often included at the beginning of Texinfo files, but the ones here are
-the most critical.
-
-@xref{GNU Sample Texts}, for the full texts to be used in GNU manuals.
-
-@example
-\input texinfo   @@c -*-texinfo-*-
-@@c %**start of header
-@@setfilename @var{infoname}.info
-@@settitle @var{name-of-manual} @var{version}
-@@c %**end of header
-
-@@copying
-This manual is for @var{program}, version @var{version}.
-
-Copyright @@copyright@{@} @var{years} @var{copyright-owner}.
-
-@group
-@@quotation
-Permission is granted to @dots{}
-@@end quotation
-@@end copying
-@end group
-
-@group
-@@titlepage
-@@title @var{name-of-manual-when-printed}
-@@subtitle @var{subtitle-if-any}
-@@subtitle @var{second-subtitle}
-@@author @var{author}
-@end group
-
-@group
-@@c  The following two commands
-@@c  start the copyright page.
-@@page
-@@vskip 0pt plus 1filll
-@@insertcopying
-@end group
-
-Published by @dots{}
-@@end titlepage
-
-@@c So the toc is printed at the start.
-@@contents
-
-@@ifnottex
-@@node Top
-@@top @var{title}
-
-@@insertcopying
-@@end ifnottex
-
-@group
-@@menu
-* First Chapter::    Getting started @dots{}
-* Second Chapter::          @dots{}
- @dots{}
-* Copying::          Your rights and freedoms.
-@@end menu
-@end group
-
-@group
-@@node First Chapter
-@@chapter First Chapter
-
-@@cindex first chapter
-@@cindex chapter, first
-@dots{}
-@end group
-@end example
-
-
-@node Texinfo File Header
-@section Texinfo File Header
-@cindex Header for Texinfo files
-@cindex Texinfo file header
-
-Texinfo files start with at least three lines that provide Info and
-@TeX{} with necessary information.  These are the @code{\input texinfo}
-line, the @code{@@settitle} line, and the @code{@@setfilename} line.
-
-Also, if you want to format just part of the Texinfo file, you must
-write the @code{@@settitle} and @code{@@setfilename} lines between
-start-of-header and end-of-header lines.  The start- and end-of-header
-lines are optional, but they do no harm, so you might as well always
-include them.
-
-Any command that affects document formatting as a whole makes sense to
-include in the header.  @code{@@synindex} (@pxref{synindex}), for
-instance, is another command often included in the header.  @xref{GNU
-Sample Texts}, for complete sample texts.
-
-Thus, the beginning of a Texinfo file generally looks like this:
-
-@example
-@group
-\input texinfo   @@c -*-texinfo-*-
-@@c %**start of header
-@@setfilename sample.info
-@@settitle Sample Manual 1.0
-@@c %**end of header
-@end group
-@end example
-
-@menu
-* First Line::                  The first line of a Texinfo file.
-* Start of Header::             Formatting a region requires this.
-* setfilename::                 Tell Info the name of the Info file.
-* settitle::                    Create a title for the printed work.
-* End of Header::               Formatting a region requires this.
-@end menu
-
-
-@node First Line
-@subsection The First Line of a Texinfo File
-@cindex First line of a Texinfo file
-@cindex Beginning line of a Texinfo file
-@cindex Header of a Texinfo file
-
-Every Texinfo file that is to be the top-level input to @TeX{} must begin
-with a line that looks like this:
-
-@example
-\input texinfo   @@c -*-texinfo-*-
-@end example
-
-@noindent
-This line serves two functions:
-
-@enumerate
-@item
-When the file is processed by @TeX{}, the @samp{\input texinfo} command
-tells @TeX{} to load the macros needed for processing a Texinfo file.
-These are in a file called @file{texinfo.tex}, which should have been
-installed on your system along with either the @TeX{} or Texinfo
-software.  @TeX{} uses the backslash, @samp{\}, to mark the beginning of
-a command, exactly as Texinfo uses @samp{@@}.  The @file{texinfo.tex}
-file causes the switch from @samp{\} to @samp{@@}; before the switch
-occurs, @TeX{} requires @samp{\}, which is why it appears at the
-beginning of the file.
-
-@item
-When the file is edited in GNU Emacs, the @samp{-*-texinfo-*-} mode
-specification tells Emacs to use Texinfo mode.
-@end enumerate
-
-
-@node Start of Header
-@subsection Start of Header
-@cindex Start of header line
-
-A start-of-header line is a Texinfo comment that looks like this:
-
-@example
-@@c %**start of header
-@end example
-
-Write the start-of-header line on the second line of a Texinfo file.
-Follow the start-of-header line with @code{@@setfilename} and
-@code{@@settitle} lines and, optionally, with other commands that
-globally affect the document formatting, such as @code{@@synindex} or
-@code{@@footnotestyle}; and then by an end-of-header line (@pxref{End of
-Header}).
-
-The start- and end-of-header lines allow you to format only part of a
-Texinfo file for Info or printing.  @xref{texinfo-format commands}.
-
-The odd string of characters, @samp{%**}, is to ensure that no other
-comment is accidentally taken for a start-of-header line.  You can
-change it if you wish by setting the @code{tex-start-of-header} and/or
-@code{tex-end-of-header} Emacs variables.  @xref{Texinfo Mode Printing}.
-
-
-@node setfilename
-@subsection @code{@@setfilename}: Set the output file name
-@findex setfilename
-@cindex Texinfo requires @code{@@setfilename}
-
-In order to serve as the primary input file for either @code{makeinfo}
-or @TeX{}, a Texinfo file must contain a line that looks like this:
-
-@example
-@@setfilename @var{info-file-name}
-@end example
-
-Write the @code{@@setfilename} command at the beginning of a line and
-follow it on the same line by the Info file name.  Do not write anything
-else on the line; anything on the line after the command is considered
-part of the file name, including what would otherwise be a
-comment.
-
-@cindex Ignored before @code{@@setfilename}
-@cindex @samp{\input} source line ignored
-The Info formatting commands ignore everything written before the
-@code{@@setfilename} line, which is why the very first line of
-the file (the @code{\input} line) does not show up in the output.
-
-The @code{@@setfilename} line specifies the name of the output file to
-be generated.  This name must be different from the name of the Texinfo
-file.  There are two conventions for choosing the name: you can either
-remove the extension (such as @samp{.texi}) entirely from the input file
-name, or, preferably, replace it with the @samp{.info} extension.
-
-@cindex Length of file names
-@cindex File name collision
-@cindex Info file name, choosing
-Although an explicit @samp{.info} extension is preferable, some
-operating systems cannot handle long file names.  You can run into a
-problem even when the file name you specify is itself short enough.
-This occurs because the Info formatters split a long Info file into
-short indirect subfiles, and name them by appending @samp{-1},
-@samp{-2}, @dots{}, @samp{-10}, @samp{-11}, and so on, to the original
-file name.  (@xref{Tag and Split Files}.)  The subfile name
-@file{texinfo.info-10}, for example, is too long for old systems with a
-14-character limit on filenames; so the Info file name for this document
-is @file{texinfo} rather than @file{texinfo.info}.  When @code{makeinfo}
-is running on operating systems such as MS-DOS which impose severe
-limits on file names, it may remove some characters from the original
-file name to leave enough space for the subfile suffix, thus producing
-files named @file{texin-10}, @file{gcc.i12}, etc.
-
-When producing HTML output, @code{makeinfo} will replace any extension
-with @samp{html}, or add @samp{.html} if the given name has no
-extension.
-
-@pindex texinfo.cnf
-The @code{@@setfilename} line produces no output when you typeset a
-manual with @TeX{}, but it is nevertheless essential: it opens the
-index, cross-reference, and other auxiliary files used by Texinfo, and
-also reads @file{texinfo.cnf} if that file is present on your system
-(@pxref{Preparing for TeX,, Preparing for @TeX{}}).
-
-
-@node settitle
-@subsection @code{@@settitle}: Set the document title
-@findex settitle
-
-In order to be made into a printed manual, a Texinfo file must contain
-a line that looks like this:
-
-@example
-@@settitle @var{title}
-@end example
-
-Write the @code{@@settitle} command at the beginning of a line and
-follow it on the same line by the title.  This tells @TeX{} the title to
-use in a header or footer.  Do not write anything else on the line;
-anything on the line after the command is considered part of the title,
-including what would otherwise be a comment.
-
-The @code{@@settitle} command should precede everything that generates
-actual output.  The best place for it is right after the
-@code{@@setfilename} command (see the previous section).
-
-@cindex <title> HTML tag
-In the HTML file produced by @command{makeinfo}, @var{title} serves as
-the document @samp{<title>}.  It also becomes the default document
-description in the @samp{<head>} part (@pxref{documentdescription}).
-
-The title in the @code{@@settitle} command does not affect the title as
-it appears on the title page.  Thus, the two do not need not match
-exactly.  A practice we recommend is to include the version or edition
-number of the manual in the @code{@@settitle} title; on the title page,
-the version number generally appears as a @code{@@subtitle} so it would
-be omitted from the @code{@@title}.  @xref{titlepage}.
-
-Conventionally, when @TeX{} formats a Texinfo file for double-sided
-output, the title is printed in the left-hand (even-numbered) page
-headings and the current chapter title is printed in the right-hand
-(odd-numbered) page headings.  (@TeX{} learns the title of each chapter
-from each @code{@@chapter} command.)  By default, no page footer is
-printed.
-
-Even if you are printing in a single-sided style, @TeX{} looks for an
-@code{@@settitle} command line, in case you include the manual title
-in the heading.
-
-@TeX{} prints page headings only for that text that comes after the
-@code{@@end titlepage} command in the Texinfo file, or that comes
-after an @code{@@headings} command that turns on headings.
-(@xref{headings on off, , The @code{@@headings} Command}, for more
-information.)
-
-You may, if you wish, create your own, customized headings and footings.
-@xref{Headings}, for a detailed discussion of this.
-
-
-@node End of Header
-@subsection End of Header
-@cindex End of header line
-
-Follow the header lines with an @w{end-of-header} line, which is a
-Texinfo comment that looks like this:
-
-@example
-@@c %**end of header
-@end example
-
-@xref{Start of Header}.
-
-
-@node Document Permissions
-@section Document Permissions
-@cindex Document Permissions
-@cindex Copying Permissions
-
-The copyright notice and copying permissions for a document need to
-appear in several places in the various Texinfo output formats.
-Therefore, Texinfo provides a command (@code{@@copying}) to declare
-this text once, and another command (@code{@@insertcopying}) to
-insert the text at appropriate points.
-
-@menu
-* copying::                     Declare the document's copying permissions.
-* insertcopying::               Where to insert the permissions.
-@end menu
-
-
-@node copying
-@subsection @code{@@copying}: Declare Copying Permissions
-@findex copying
-
-The @code{@@copying} command should be given very early in the document;
-the recommended location is right after the header material
-(@pxref{Texinfo File Header}).  It conventionally consists of a sentence
-or two about what the program is, identification of the documentation
-itself, the legal copyright line, and the copying permissions.  Here is
-a skeletal example:
-
-@example
-@@copying
-This manual is for @var{program} (version @var{version}, updated
-@var{date}), which @dots{}
-
-Copyright @@copyright@{@} @var{years} @var{copyright-owner}.
-
-@@quotation
-Permission is granted to @dots{}
-@@end quotation
-@@end copying
-@end example
-
-The @code{@@quotation} has no legal significance; it's there to improve
-readability in some contexts.
-
-@xref{GNU Sample Texts}, for the full text to be used in GNU manuals.
-@xref{GNU Free Documentation License}, for the license itself under
-which GNU and other free manuals are distributed.  You need to include
-the license as an appendix to your document.
-
-The text of @code{@@copying} is output as a comment at the beginning of
-Info, HTML, and XML output files.  It is @emph{not} output implicitly in
-plain text or @TeX{}; it's up to you to use @code{@@insertcopying} to
-emit the copying information.  See the next section for details.
-
-@findex copyright
-The @code{@@copyright@{@}} command generates a @samp{c} inside a circle
-in output formats that support this (print and HTML).  In the other
-formats (Info and plain text), it generates @samp{(C)}.  The copyright
-notice itself has the following legally defined sequence:
-
-@example
-Copyright @copyright{} @var{years} @var{copyright-owner}.
-@end example
-
-@cindex Copyright word, always in English
-The word `Copyright' must always be written in English, even if the
-document is otherwise written in another language.  This is due to
-international law.
-
-@cindex Years, in copyright line
-The list of years should include all years in which a version was
-completed (even if it was released in a subsequent year).  Ranges are
-not allowed; each year must be written out individually and in full,
-separated by commas.
-
-@cindex Copyright holder for FSF works
-@cindex Holder of copyright for FSF works
-@cindex Owner of copyright for FSF works
-The copyright owner (or owners) is whoever holds legal copyright on the
-work.  In the case of works assigned to the FSF, the owner is `Free
-Software Foundation, Inc.'.
-
-The copyright `line' may actually be split across multiple
-lines, both in the source document and in the output.  This often
-happens for documents with a long history, having many different years
-of publication.
-
-@xref{Copyright Notices,,,maintain,GNU Maintenance Instructions}, for
-additional information.
-
-
-@node insertcopying
-@subsection @code{@@insertcopying}: Include Permissions Text
-@findex insertcopying
-@cindex Copying text, including
-@cindex Permissions text, including
-@cindex Including permissions text
-
-The @code{@@insertcopying} command is simply written on a line by
-itself, like this:
-
-@example
-@@insertcopying
-@end example
-
-This inserts the text previously defined by @code{@@copying}.  To meet
-legal requirements, it must be used on the copyright page in the printed
-manual (@pxref{Copyright}).
-
-We also strongly recommend using @code{@@insertcopying} in the Top node
-of your manual (@pxref{The Top Node}), although it is not required
-legally.  Here's why:
-
-The @code{@@copying} command itself causes the permissions text to
-appear in an Info file @emph{before} the first node.  The text is also
-copied into the beginning of each split Info output file, as is legally
-necessary.  This location implies a human reading the manual using Info
-does @emph{not} see this text (except when using the advanced Info
-command @kbd{g *}).  Therefore, an explicit @code{@@insertcopying}
-in the Top node makes it apparent to readers that the manual is free.
-
-Similarly, the @code{@@copying} text is automatically included at the
-beginning of each HTML output file, as an HTML comment.  Again, this
-text is not visible (unless the reader views the HTML source).  And
-therefore again, the @code{@@insertcopying} in the Top node is valuable
-because it makes the copying permissions visible and thus promotes
-freedom.
-
-The permissions text defined by @code{@@copying} also appears
-automatically at the beginning of the XML output file.
-
-
-@node Titlepage & Copyright Page
-@section Title and Copyright Pages
-
-In hard copy output, the manual's name and author are usually printed on
-a title page.  Copyright information is usually printed on the back of
-the title page.
-
-The title and copyright pages appear in the printed manual, but not in
-the Info file.  Because of this, it is possible to use several slightly
-obscure @TeX{} typesetting commands that cannot be used in an Info file.
-In addition, this part of the beginning of a Texinfo file contains the
-text of the copying permissions that appears in the printed manual.
-
-@cindex Title page, for plain text
-@cindex Copyright page, for plain text
-You may wish to include titlepage-like information for plain text
-output.  Simply place any such leading material between
-@code{@@ifplaintext} and @code{@@end ifplaintext}; @command{makeinfo}
-includes this when writing plain text (@samp{--no-headers}), along with
-an @code{@@insertcopying}.
-
-@menu
-* titlepage::                   Create a title for the printed document.
-* titlefont center sp::         The @code{@@titlefont}, @code{@@center},
-                                 and @code{@@sp} commands.
-* title subtitle author::       The @code{@@title}, @code{@@subtitle},
-                                 and @code{@@author} commands.
-* Copyright::                   How to write the copyright notice and
-                                 include copying permissions.
-* end titlepage::               Turn on page headings after the title and
-                                 copyright pages.
-* headings on off::             An option for turning headings on and off
-                                 and double or single sided printing.
-@end menu
-
-
-@node titlepage
-@subsection @code{@@titlepage}
-@cindex Title page
-@findex titlepage
-
-Start the material for the title page and following copyright page
-with @code{@@titlepage} on a line by itself and end it with
-@code{@@end titlepage} on a line by itself.
-
-The @code{@@end titlepage} command starts a new page and turns on page
-numbering.  (@xref{Headings, , Page Headings}, for details about how to
-generate page headings.)  All the material that you want to appear on
-unnumbered pages should be put between the @code{@@titlepage} and
-@code{@@end titlepage} commands.  You can force the table of contents to
-appear there with the @code{@@setcontentsaftertitlepage} command
-(@pxref{Contents}).
-
-@findex page@r{, within @code{@@titlepage}}
-By using the @code{@@page} command you can force a page break within the
-region delineated by the @code{@@titlepage} and @code{@@end titlepage}
-commands and thereby create more than one unnumbered page.  This is how
-the copyright page is produced.  (The @code{@@titlepage} command might
-perhaps have been better named the @code{@@titleandadditionalpages}
-command, but that would have been rather long!)
-
-When you write a manual about a computer program, you should write the
-version of the program to which the manual applies on the title page.
-If the manual changes more frequently than the program or is independent
-of it, you should also include an edition number@footnote{We have found
-that it is helpful to refer to versions of independent manuals as
-`editions' and versions of programs as `versions'; otherwise, we find we
-are liable to confuse each other in conversation by referring to both
-the documentation and the software with the same words.} for the manual.
-This helps readers keep track of which manual is for which version of
-the program.  (The `Top' node should also contain this information; see
-@ref{The Top Node}.)
-
-Texinfo provides two main methods for creating a title page.  One method
-uses the @code{@@titlefont}, @code{@@sp}, and @code{@@center} commands
-to generate a title page in which the words on the page are
-centered.
-
-The second method uses the @code{@@title}, @code{@@subtitle}, and
-@code{@@author} commands to create a title page with black rules under
-the title and author lines and the subtitle text set flush to the
-right hand side of the page.  With this method, you do not specify any
-of the actual formatting of the title page.  You specify the text
-you want, and Texinfo does the formatting.
-
-You may use either method, or you may combine them; see the examples in
-the sections below.
-
-@findex shorttitlepage
-@cindex Bastard title page
-@cindex Title page, bastard
-For extremely simple documents, and for the bastard title page in
-traditional book frontmatter, Texinfo also provides a command
-@code{@@shorttitlepage} which takes the rest of the line as the title.
-The argument is typeset on a page by itself and followed by a blank
-page.
-
-
-@node titlefont center sp
-@subsection @code{@@titlefont}, @code{@@center}, and @code{@@sp}
-@findex titlefont
-@findex center
-@findex sp @r{(titlepage line spacing)}
-
-You can use the @code{@@titlefont}, @code{@@sp}, and @code{@@center}
-commands to create a title page for a printed document.  (This is the
-first of the two methods for creating a title page in Texinfo.)
-
-Use the @code{@@titlefont} command to select a large font suitable for
-the title itself.  You can use @code{@@titlefont} more than once if you
-have an especially long title.
-
-For HTML output, each @code{@@titlefont} command produces an
-@code{<h1>} heading, but the HTML document @code{<title>} is not
-affected.  For that, you must put an @code{@@settitle} command before
-the @code{@@titlefont} command (@pxref{settitle}).
-
-@need 700
-For example:
-
-@example
-@@titlefont@{Texinfo@}
-@end example
-
-Use the @code{@@center} command at the beginning of a line to center
-the remaining text on that line.  Thus,
-
-@example
-@@center @@titlefont@{Texinfo@}
-@end example
-
-@noindent
-centers the title, which in this example is ``Texinfo'' printed
-in the title font.
-
-Use the @code{@@sp} command to insert vertical space.  For example:
-
-@example
-@@sp 2
-@end example
-
-@noindent
-This inserts two blank lines on the printed page.  (@xref{sp, ,
-@code{@@sp}}, for more information about the @code{@@sp}
-command.)
-
-A template for this method looks like this:
-
-@example
-@group
-@@titlepage
-@@sp 10
-@@center @@titlefont@{@var{name-of-manual-when-printed}@}
-@@sp 2
-@@center @var{subtitle-if-any}
-@@sp 2
-@@center @var{author}
-@dots{}
-@@end titlepage
-@end group
-@end example
-
-The spacing of the example fits an 8.5 by 11 inch manual.
-
-You can in fact use these commands anywhere, not just on a title page,
-but since they are not logical markup commands, we don't recommend
-them.
-
-@node title subtitle author
-@subsection @code{@@title}, @code{@@subtitle}, and @code{@@author}
-@findex title
-@findex subtitle
-@findex author
-
-You can use the @code{@@title}, @code{@@subtitle}, and @code{@@author}
-commands to create a title page in which the vertical and horizontal
-spacing is done for you automatically.  This contrasts with the method
-described in the previous section, in which the @code{@@sp} command is
-needed to adjust vertical spacing.
-
-Write the @code{@@title}, @code{@@subtitle}, or @code{@@author}
-commands at the beginning of a line followed by the title, subtitle,
-or author.  These commands are only effective in @TeX{} output; it's
-an error to use them anywhere except within @code{@@titlepage}.
-
-The @code{@@title} command produces a line in which the title is set
-flush to the left-hand side of the page in a larger than normal font.
-The title is underlined with a black rule.  Only a single line is
-allowed; the @code{@@*} command may not be used to break the title into
-two lines.  To handle very long titles, you may find it profitable to
-use both @code{@@title} and @code{@@titlefont}; see the final example in
-this section.
-
-The @code{@@subtitle} command sets subtitles in a normal-sized font
-flush to the right-hand side of the page.
-
-The @code{@@author} command sets the names of the author or authors in
-a middle-sized font flush to the left-hand side of the page on a line
-near the bottom of the title page.  The names are underlined with a
-black rule that is thinner than the rule that underlines the title.
-(The black rule only occurs if the @code{@@author} command line is
-followed by an @code{@@page} command line.)
-
-There are two ways to use the @code{@@author} command: you can write
-the name or names on the remaining part of the line that starts with
-an @code{@@author} command:
-
-@example
-@@author by Jane Smith and John Doe
-@end example
-
-@noindent
-or you can write the names one above each other by using two (or more)
-@code{@@author} commands:
-
-@example
-@group
-@@author Jane Smith
-@@author John Doe
-@end group
-@end example
-
-@noindent
-(Only the bottom name is underlined with a black rule.)
-
-@need 950
-A template for this method looks like this:
-
-@example
-@group
-@@titlepage
-@@title @var{name-of-manual-when-printed}
-@@subtitle @var{subtitle-if-any}
-@@subtitle @var{second-subtitle}
-@@author @var{author}
-@@page
-@dots{}
-@@end titlepage
-@end group
-@end example
-
-You may also combine the @code{@@titlefont} method described in the
-previous section and @code{@@title} method described in this one.  This
-may be useful if you have a very long title.  Here is a real-life example:
-
-@example
-@group
-@@titlepage
-@@titlefont@{GNU Software@}
-@@sp 1
-@@title for MS-Windows and MS-DOS
-@@subtitle Edition @@value@{e@} for Release @@value@{cde@}
-@@author by Daniel Hagerty, Melissa Weisshaus
-@@author and Eli Zaretskii
-@end group
-@end example
-
-@noindent
-(The use of @code{@@value} here is explained in @ref{value Example}.
-
-
-@node Copyright
-@subsection Copyright Page
-@cindex Copyright page
-@cindex Printed permissions
-@cindex Permissions, printed
-
-By international treaty, the copyright notice for a book must be either
-on the title page or on the back of the title page.  When the copyright
-notice is on the back of the title page, that page is customarily not
-numbered.  Therefore, in Texinfo, the information on the copyright page
-should be within @code{@@titlepage} and @code{@@end titlepage}
-commands.
-
-@findex vskip @r{@TeX{} vertical skip}
-@findex filll @r{@TeX{} dimension}
-Use the @code{@@page} command to cause a page break.  To push the
-copyright notice and the other text on the copyright page towards the
-bottom of the page, use the following incantantion after @code{@@page}:
-
-@example
-@@vskip 0pt plus 1filll
-@end example
-
-@noindent
-This is a @TeX{} command that is not supported by the Info formatting
-commands.  The @code{@@vskip} command inserts whitespace.  The @samp{0pt
-plus 1filll} means to put in zero points of mandatory whitespace, and as
-much optional whitespace as needed to push the following text to the
-bottom of the page.  Note the use of three @samp{l}s in the word
-@samp{filll}; this is correct.
-
-To insert the copyright text itself, write @code{@@insertcopying}
-next (@pxref{Document Permissions}):
-
-@example
-@@insertcopying
-@end example
-
-Follow the copying text by the publisher, ISBN numbers, cover art
-credits, and other such information.
-
-Here is an example putting all this together:
-
-@example
-@@titlepage
-@dots{}
-@@page
-@@vskip 0pt plus 1filll
-@@insertcopying
-
-Published by @dots{}
-
-Cover art by @dots{}
-@@end titlepage
-@end example
-
-
-@node end titlepage
-@subsection Heading Generation
-@findex end titlepage
-@cindex Headings, page, begin to appear
-@cindex Titlepage end starts headings
-@cindex End titlepage starts headings
-
-Like all @code{@@end} commands (@pxref{Quotations and Examples}), the @code{@@end titlepage} command
-must be written at the beginning of a line by itself, with only one
-space between the @code{@@end} and the @code{titlepage}.  It not only
-marks the end of the title and copyright pages, but also causes @TeX{}
-to start generating page headings and page numbers.
-
-To repeat what is said elsewhere,  Texinfo has two standard page heading
-formats, one for documents which are printed on one side of each sheet of paper
-(single-sided printing), and the other for documents which are printed on both
-sides of each sheet (double-sided printing).
-You can specify these formats in different ways:
-
-@itemize @bullet
-@item
-The conventional way is to write an @code{@@setchapternewpage} command
-before the title page commands, and then have the @code{@@end
-titlepage} command start generating page headings in the manner desired.
-(@xref{setchapternewpage}.)
-
-@item
-Alternatively, you can use the @code{@@headings} command to prevent page
-headings from being generated or to start them for either single or
-double-sided printing.  (Write an @code{@@headings} command immediately
-after the @code{@@end titlepage} command.  @xref{headings on off, , The
-@code{@@headings} Command}, for more information.)@refill
-
-@item
-Or, you may specify your own page heading and footing format.
-@xref{Headings, , Page Headings}, for detailed
-information about page headings and footings.
-@end itemize
-
-Most documents are formatted with the standard single-sided or
-double-sided format, using @code{@@setchapternewpage odd} for
-double-sided printing and no @code{@@setchapternewpage} command for
-single-sided printing.
-
-
-@node headings on off
-@subsection The @code{@@headings} Command
-@findex headings
-
-The @code{@@headings} command is rarely used.  It specifies what kind of
-page headings and footings to print on each page.  Usually, this is
-controlled by the @code{@@setchapternewpage} command.  You need the
-@code{@@headings} command only if the @code{@@setchapternewpage} command
-does not do what you want, or if you want to turn off pre-defined page
-headings prior to defining your own.  Write an @code{@@headings} command
-immediately after the @code{@@end titlepage} command.@refill
-
-You can use @code{@@headings} as follows:@refill
-
-@table @code
-@item @@headings off
-Turn off printing of page headings.@refill
-
-@item @@headings single
-Turn on page headings appropriate for single-sided printing.
-@refill
-
-@item @@headings double
-@itemx @@headings on
-Turn on page headings appropriate for double-sided printing.  The two
-commands, @code{@@headings on} and @code{@@headings double}, are
-synonymous.@refill
-
-@item @@headings singleafter
-@itemx @@headings doubleafter
-Turn on @code{single} or @code{double} headings, respectively, after the
-current page is output.
-
-@item @@headings on
-Turn on page headings: @code{single} if @samp{@@setchapternewpage
-on}, @code{double} otherwise.
-@end table
-
-For example, suppose you write @code{@@setchapternewpage off} before the
-@code{@@titlepage} command to tell @TeX{} to start a new chapter on the
-same page as the end of the last chapter.  This command also causes
-@TeX{} to typeset page headers for single-sided printing.  To cause
-@TeX{} to typeset for double sided printing, write @code{@@headings
-double} after the @code{@@end titlepage} command.
-
-You can stop @TeX{} from generating any page headings at all by
-writing @code{@@headings off} on a line of its own immediately after the
-line containing the @code{@@end titlepage} command, like this:@refill
-
-@example
-@@end titlepage
-@@headings off
-@end example
-
-@noindent
-The @code{@@headings off} command overrides the @code{@@end titlepage}
-command, which would otherwise cause @TeX{} to print page
-headings.@refill
-
-You can also specify your own style of page heading and footing.
-@xref{Headings, , Page Headings}, for more information.@refill
-
-
-@node Contents
-@section Generating a Table of Contents
-@cindex Table of contents
-@cindex Contents, Table of
-@cindex Short table of contents
-@findex contents
-@findex summarycontents
-@findex shortcontents
-
-The @code{@@chapter}, @code{@@section}, and other structuring commands
-(@pxref{Structuring}) supply the information to make up a
-table of contents, but they do not cause an actual table to appear in
-the manual.  To do this, you must use the @code{@@contents} and/or
-@code{@@summarycontents} command(s).
-
-@table @code
-@item @@contents
-Generates a table of contents in a printed manual, including all
-chapters, sections, subsections, etc., as well as appendices and
-unnumbered chapters.  Headings generated by @code{@@majorheading},
-@code{@@chapheading}, and the other @code{@@@dots{}heading} commands
-do not appear in the table of contents (@pxref{Structuring Command
-Types}).
-
-@item @@shortcontents
-@itemx @@summarycontents
-(@code{@@summarycontents} is a synonym for @code{@@shortcontents}.)
-
-Generates a short or summary table of contents that lists only the
-chapters, appendices, and unnumbered chapters.  Sections, subsections
-and subsubsections are omitted.  Only a long manual needs a short
-table of contents in addition to the full table of contents.
-
-@end table
-
-Both contents commands should be written on a line by themselves, and
-are best placed near the beginning of the file, after the @code{@@end
-titlepage} (@pxref{titlepage}).  The contents commands automatically
-generate a chapter-like heading at the top of the first table of
-contents page, so don't include any sectioning command such as
-@code{@@unnumbered} before them.
-
-Since an Info file uses menus instead of tables of contents, the Info
-formatting commands ignore the contents commands.  But the contents are
-included in plain text output (generated by @code{makeinfo
---no-headers}), unless @code{makeinfo} is writing its output to standard
-output.
-
-When @code{makeinfo} writes a short table of contents while producing
-html output, the links in the short table of contents point to
-corresponding entries in the full table of contents rather than the text
-of the document. The links in the full table of contents point to the
-main text of the document.
-
-In the past, the contents commands were sometimes placed at the end of
-the file, after any indices and just before the @code{@@bye}, but we
-no longer recommend this.
-
-@findex setcontentsaftertitlepage
-@findex setshortcontentsaftertitlepage
-@cindex Contents, after title page
-@cindex Table of contents, after title page
-However, since many existing Texinfo documents still do have the
-@code{@@contents} at the end of the manual, if you are a user printing
-a manual, you may wish to force the contents to be printed after the
-title page.  You can do this by specifying
-@code{@@setcontentsaftertitlepage} and/or
-@code{@@setshortcontentsaftertitlepage}.  The first prints only the
-main contents after the @code{@@end titlepage}; the second prints both
-the short contents and the main contents.  In either case, any
-subsequent @code{@@contents} or @code{@@shortcontents} is ignored
-(unless, erroneously, no @code{@@end titlepage} is ever encountered).
-
-You need to include the @code{@@set@dots{}contentsaftertitlepage}
-commands early in the document (just after @code{@@setfilename}, for
-example).  We recommend using @command{texi2dvi} (@pxref{Format with
-texi2dvi}) to specify this without altering the source file at all.  For
-example:
-@example
-texi2dvi --texinfo=@@setcontentsaftertitlepage foo.texi
-@end example
-
-
-@node The Top Node
-@section The `Top' Node and Master Menu
-@cindex Top node
-@cindex Node, `Top'
-
-The `Top' node is the node in which a reader enters an Info manual.  As
-such, it should begin with the @code{@@insertcopying} command
-(@pxref{Document Permissions}) to provide a brief description of the
-manual (including the version number) and copying permissions, and end
-with a master menu for the whole manual.  Of course you should include
-any other general information you feel a reader would find helpful.
-
-@findex top
-It is also conventional to write an @code{@@top} sectioning command line
-containing the title of the document immediately after the @code{@@node
-Top} line (@pxref{makeinfo top command, , The @code{@@top} Sectioning
-Command}).
-
-The contents of the `Top' node should appear only in the online output;
-none of it should appear in printed output, so enclose it between
-@code{@@ifnottex} and @code{@@end ifnottex} commands.  (@TeX{} does not
-print either an @code{@@node} line or a menu; they appear only in Info;
-strictly speaking, you are not required to enclose these parts between
-@code{@@ifnottex} and @code{@@end ifnottext}, but it is simplest to do
-so.  @xref{Conditionals, , Conditionally Visible Text}.)
-
-@menu
-* Top Node Example::
-* Master Menu Parts::
-@end menu
-
-
-@node Top Node Example
-@subsection Top Node Example
-
-@cindex Top node example
-
-Here is an example of a Top node.
-
-@example
-@group
-@@ifnottex
-@@node Top
-@@top Sample Title
-
-@@insertcopying
-@end group
-
-Additional general information.
-
-@group
-@@menu
-* First Chapter::
-* Second Chapter::
-@dots{}
-* Index::
-@end group
-@@end menu
-@end example
-
-
-@node Master Menu Parts
-@subsection Parts of a Master Menu
-@cindex Master menu
-@cindex Menu, master
-@cindex Parts of a master menu
-
-A @dfn{master menu} is a detailed main menu listing all the nodes in a
-file.
-
-A master menu is enclosed in @code{@@menu} and @code{@@end menu}
-commands and does not appear in the printed document.
-
-Generally, a master menu is divided into parts.
-
-@itemize @bullet
-@item
-The first part contains the major nodes in the Texinfo file: the nodes
-for the chapters, chapter-like sections, and the appendices.
-
-@item
-The second part contains nodes for the indices.
-
-@item
-The third and subsequent parts contain a listing of the other, lower
-level nodes, often ordered by chapter.  This way, rather than go
-through an intermediary menu, an inquirer can go directly to a
-particular node when searching for specific information.  These menu
-items are not required; add them if you think they are a
-convenience.  If you do use them, put @code{@@detailmenu} before the
-first one, and @code{@@end detailmenu} after the last; otherwise,
-@code{makeinfo} will get confused.
-@end itemize
-
-Each section in the menu can be introduced by a descriptive line.  So
-long as the line does not begin with an asterisk, it will not be
-treated as a menu entry.  (@xref{Writing a Menu}, for more
-information.)
-
-For example, the master menu for this manual looks like the following
-(but has many more entries):
-
-@example
-@group
-@@menu
-* Copying Conditions::  Your rights.
-* Overview::            Texinfo in brief.
-@dots{}
-@end group
-@group
-* Command and Variable Index::
-* Concept Index::
-@end group
-
-@group
-@@detailmenu
---- The Detailed Node Listing ---
-
-Overview of Texinfo
-
-* Reporting Bugs:: @dots{}
-@dots{}
-@end group
-
-@group
-Beginning a Texinfo File
-
-* Sample Beginning:: @dots{}
-@dots{}
-@@end detailmenu
-@@end menu
-@end group
-@end example
-
-
-@node Global Document Commands
-@section Global Document Commands
-@cindex Global Document Commands
-
-Besides the basic commands mentioned in the previous sections, here are
-additional commands which affect the document as a whole.  They are
-generally all given before the Top node, if they are given at all.
-
-@menu
-* documentdescription::         Document summary for the HTML output.
-* setchapternewpage::           Start chapters on right-hand pages.
-* paragraphindent::             Specify paragraph indentation.
-* firstparagraphindent::        Suppress indentation of the first paragraph.
-* exampleindent::               Specify environment indentation.
-@end menu
-
-
-@node documentdescription
-@subsection @code{@@documentdescription}: Summary Text
-@cindex Document description
-@cindex Description of document
-@cindex Summary of document
-@cindex Abstract of document
-@cindex <meta> HTML tag, and document description
-@findex documentdescription
-
-When producing HTML output for a document, @command{makeinfo} writes a
-@samp{<meta>} element in the @samp{<head>} to give some idea of the
-content of the document.  By default, this @dfn{description} is the title
-of the document, taken from the @code{@@settitle} command
-(@pxref{settitle}).  To change this, use the @code{@@documentdescription}
-environment, as in:
-
-@example
-@@documentdescription
-descriptive text.
-@@end documentdescription
-@end example
-
-@noindent
-This will produce the following output in the @samp{<head>} of the HTML:
-
-@example
-<meta name=description content="descriptive text.">
-@end example
-
-@code{@@documentdescription} must be specified before the first node of
-the document.
-
-
-@node setchapternewpage
-@subsection @code{@@setchapternewpage}:
-@cindex Starting chapters
-@cindex Pages, starting odd
-@findex setchapternewpage
-
-In an officially bound book, text is usually printed on both sides of
-the paper, chapters start on right-hand pages, and right-hand pages have
-odd numbers.  But in short reports, text often is printed only on one
-side of the paper.  Also in short reports, chapters sometimes do not
-start on new pages, but are printed on the same page as the end of the
-preceding chapter, after a small amount of vertical whitespace.
-
-You can use the @code{@@setchapternewpage} command with various
-arguments to specify how @TeX{} should start chapters and whether it
-should format headers for printing on one or both sides of the paper
-(single-sided or double-sided printing).
-
-Write the @code{@@setchapternewpage} command at the beginning of a
-line followed by its argument.
-
-For example, you would write the following to cause each chapter to
-start on a fresh odd-numbered page:
-
-@example
-@@setchapternewpage odd
-@end example
-
-You can specify one of three alternatives with the
-@code{@@setchapternewpage} command:
-
-@table @asis
-
-@item @code{@@setchapternewpage off}
-Cause @TeX{} to typeset a new chapter on the same page as the last
-chapter, after skipping some vertical whitespace.  Also, cause @TeX{} to
-format page headers for single-sided printing.
-
-@item @code{@@setchapternewpage on}
-Cause @TeX{} to start new chapters on new pages and to format page
-headers for single-sided printing.  This is the form most often used for
-short reports or personal printing. This is the default.
-
-@item @code{@@setchapternewpage odd}
-Cause @TeX{} to start new chapters on new, odd-numbered pages
-(right-handed pages) and to typeset for double-sided printing.  This is
-the form most often used for books and manuals.
-@end table
-
-Texinfo does not have an @code{@@setchapternewpage even} command,
-because there is no printing tradition of starting chapters or books on
-an even-numbered page.
-
-If you don't like the default headers that @code{@@setchapternewpage}
-sets, you can explicit control them with the @code{@@headings} command.
-@xref{headings on off, , The @code{@@headings} Command}.
-
-At the beginning of a manual or book, pages are not numbered---for
-example, the title and copyright pages of a book are not numbered.  By
-convention, table of contents and frontmatter pages are numbered with
-roman numerals and not in sequence with the rest of the document.
-
-Since an Info file does not have pages, the @code{@@setchapternewpage}
-command has no effect on it.
-
-We recommend not including any @code{@@setchapternewpage} command in
-your manual sources at all, since the desired output is not intrinsic to
-the document.  For a particular hard copy run, if you don't want the
-default option (no blank pages, same headers on all pages) use the
-@option{--texinfo} option to @command{texi2dvi} to specify the output
-you want.
-
-
-@node paragraphindent
-@subsection @code{@@paragraphindent}: Paragraph Indenting
-@cindex Indenting paragraphs, control of
-@cindex Paragraph indentation control
-@findex paragraphindent
-
-The Texinfo processors may insert whitespace at the beginning of the
-first line of each paragraph, thereby indenting that paragraph.  You can
-use the @code{@@paragraphindent} command to specify this indentation.
-Write an @code{@@paragraphindent} command at the beginning of a line
-followed by either @samp{asis} or a number:
-
-@example
-@@paragraphindent @var{indent}
-@end example
-
-The indentation is according to the value of @var{indent}:
-
-@table @asis
-@item @code{asis}
-Do not change the existing indentation (not implemented in @TeX{}).
-
-@item @code{none}
-@itemx 0
-Omit all indentation.
-
-@item @var{n}
-Indent by @var{n} space characters in Info output, by @var{n} ems in
-@TeX{}.
-
-@end table
-
-The default value of @var{indent} is 3.  @code{@@paragraphindent} is
-ignored for HTML output.
-
-It is best to write the @code{@@paragraphindent} command before the
-end-of-header line at the beginning of a Texinfo file, so the region
-formatting commands indent paragraphs as specified.  @xref{Start of
-Header}.
-
-A peculiarity of the @code{texinfo-format-buffer} and
-@code{texinfo-format-region} commands is that they do not indent (nor
-fill) paragraphs that contain @code{@@w} or @code{@@*} commands.
-
-
-@node firstparagraphindent
-@subsection @code{@@firstparagraphindent}: Indenting After Headings
-@cindex First paragraph, suppressing indentation of
-@cindex Suppressing first paragraph indentation
-@cindex Preventing first paragraph indentation
-@cindex Indenting, suppressing of first paragraph
-@cindex Headings, indentation after
-@findex firstparagraphindent
-
-As you can see in the present manual, the first paragraph in any
-section is not indented by default.  Typographically, indentation is a
-paragraph separator, which means that it is unnecessary when a new
-section begins.  This indentation is controlled with the
-@code{@@firstparagraphindent} command:
-
-@example
-@@firstparagraphindent @var{word}
-@end example
-
-The first paragraph after a heading is indented according to the value
-of @var{word}:
-
-@table @asis
-@item @code{none}
-Prevents the first paragraph from being indented (default).
-This option is ignored by @command{makeinfo} if
-@code{@@paragraphindent asis} is in effect.
-
-@item @code{insert}
-Include normal paragraph indentation.  This respects the paragraph
-indentation set by a @code{@@paragraphindent} command
-(@pxref{paragraphindent}).
-@end table
-
-For HTML and XML output, the @code{@@firstparagraphindent} setting is
-ignored.
-
-It is best to write the @code{@@paragraphindent} command before the
-end-of-header line at the beginning of a Texinfo file, so the region
-formatting commands indent paragraphs as specified.  @xref{Start of
-Header}.
-
-
-@node exampleindent
-@subsection @code{@@exampleindent}: Environment Indenting
-@cindex Indenting environments
-@cindex Environment indentation
-@cindex Example indentation
-@findex exampleindent
-
-The Texinfo processors indent each line of @code{@@example} and similar
-environments.  You can use the @code{@@exampleindent} command to specify
-this indentation.  Write an @code{@@exampleindent} command at the
-beginning of a line followed by either @samp{asis} or a number:
-
-@example
-@@exampleindent @var{indent}
-@end example
-
-@code{@@exampleindent} is ignored for HTML output.  Otherwise, the
-indentation is according to the value of @var{indent}:
-
-@table @asis
-@item @code{asis}
-Do not change the existing indentation (not implemented in @TeX{}).
-
-@item 0
-Omit all indentation.
-
-@item @var{n}
-Indent environments by @var{n} space characters in Info output, by
-@var{n} ems in @TeX{}.
-
-@end table
-
-The default value of @var{indent} is 5 spaces in Info, and 0.4@dmn{in}
-in @TeX{}, which is somewhat less.  (The reduction is to help @TeX{}
-fit more characters onto physical lines.)
-
-It is best to write the @code{@@exampleindent} command before the
-end-of-header line at the beginning of a Texinfo file, so the region
-formatting commands indent paragraphs as specified.  @xref{Start of
-Header}.
-
-
-@node Software Copying Permissions
-@section Software Copying Permissions
-@cindex Software copying permissions
-@cindex Copying software
-@cindex Distribution
-@cindex License agreement
-
-If the Texinfo file has a section containing the ``General Public
-License'' and the distribution information and a warranty disclaimer for
-the software that is documented, we recommend placing this right after
-the `Top' node.  The General Public License is very important to Project
-GNU software.  It ensures that you and others will continue to have a
-right to use and share the software.
-
-The copying and distribution information and the disclaimer are followed
-by an introduction or else by the first chapter of the manual.
-
-@cindex Introduction, as part of file
-Although an introduction is not a required part of a Texinfo file, it
-is very helpful.  Ideally, it should state clearly and concisely what
-the file is about and who would be interested in reading it.  In
-general, an introduction would follow the licensing and distribution
-information, although sometimes people put it earlier in the document.
-
-
-@node Ending a File
-@chapter Ending a Texinfo File
-@cindex Ending a Texinfo file
-@cindex Texinfo file ending
-@cindex File ending
-@findex bye
-
-The end of a Texinfo file should include commands to create indices,
-and the @code{@@bye} command to mark the last line to be processed.
-
-For example:
-
-@example
-@@node Index
-@@unnumbered Index
-
-@@printindex cp
-
-@@bye
-@end example
-
-@menu
-* Printing Indices & Menus::    How to print an index in hardcopy and
-                                 generate index menus in Info.
-* File End::                    How to mark the end of a file.
-@end menu
-
-
-@node Printing Indices & Menus
-@section Printing Indices and Menus
-@cindex Printing an index
-@cindex Indices, printing and menus
-@cindex Generating menus with indices
-@cindex Menus generated with indices
-
-To print an index means to include it as part of a manual or Info file.
-This does not happen automatically just because you use @code{@@cindex}
-or other index-entry generating commands in the Texinfo file; those just
-cause the raw data for the index to be accumulated.  To generate an
-index, you must include the @code{@@printindex} command at the place in
-the document where you want the index to appear.  Also, as part of the
-process of creating a printed manual, you must run a program called
-@code{texindex} (@pxref{Hardcopy}) to sort the raw data to produce a
-sorted index file.  The sorted index file is what is actually used to
-print the index.
-
-Texinfo offers six separate types of predefined index, which suffice
-in most cases.  @xref{Indices}, for information on this, as well
-defining your own new indices, combining indices, and, most
-importantly advice on writing the actual index entries.  This section
-focuses on printing indices, which is done with the
-@code{@@printindex} command.
-
-@findex printindex
-@code{@@printindex} takes one argument, a two-letter index
-abbreviation.  It reads the corresponding sorted index file (for
-printed output), and formats it appropriately into an index.
-
-The @code{@@printindex} command does not generate a chapter heading
-for the index, since different manuals have different needs.
-Consequently, you should precede the @code{@@printindex} command with
-a suitable section or chapter command (usually @code{@@appendix} or
-@code{@@unnumbered}) to supply the chapter heading and put the index
-into the table of contents.  Precede the chapter heading with an
-@code{@@node} line as usual.
-
-For example:
-
-@smallexample
-@group
-@@node Variable Index
-@@unnumbered Variable Index
-
-@@printindex vr
-@end group
-
-@group
-@@node Concept Index
-@@unnumbered Concept Index
-
-@@printindex cp
-@end group
-@end smallexample
-
-If you have more than one index, we recommend placing the concept index last.
-
-@itemize
-@item
-In printed output, @code{@@printindex} produces a traditional
-two-column index, with dot leaders between the index terms and page
-numbers.
-
-@item
-In Info output, @code{@@printindex} produces a special menu containing
-the line number of the entry, relative to the start of the node.  Info
-readers can use this to go to the exact line of an entry, not just the
-containing node.  (Older Info readers will just go to the node.)
-Here's an example:
-
-@smallexample
-* First index entry:   Top.   (line  7)
-@end smallexample
-
-@noindent The actual number of spaces is variable, to right-justify
-the line number; it's been reduced here to make the line fit in the
-printed manual.
-
-@item
-In plain text output, @code{@@printindex} produces the same menu, but
-the line numbers are relative to the start of the file, since that's
-more convenient for that format.
-
-@item
-In HTML and Docbook output, @code{@@printindex} produces links
-to the index entries.
-
-@item
-In XML output, it simply records the index to be printed.
-@end itemize
-
-It's not possible to generate an index when writing to standard
-output; @command{makeinfo} generates a warning in this case.
-
-
-@node File End
-@section @code{@@bye} File Ending
-@findex bye
-
-An @code{@@bye} command terminates Texinfo processing.  None of the
-formatters read anything following @code{@@bye}.  The @code{@@bye}
-command should be on a line by itself.
-
-If you wish, you may follow the @code{@@bye} line with notes. These
-notes will not be formatted and will not appear in either Info or a
-printed manual; it is as if text after @code{@@bye} were within
-@code{@@ignore} @dots{} @code{@@end ignore}.  Also, you may follow the
-@code{@@bye} line with a local variables list for Emacs.
-@xref{Compile-Command, , Using Local Variables and the Compile Command},
-for more information.
-
-
-@node Structuring
-@chapter Chapter Structuring
-@cindex Chapter structuring
-@cindex Structuring of chapters
-
-The @dfn{chapter structuring} commands divide a document into a hierarchy of
-chapters, sections, subsections, and subsubsections.  These commands
-generate large headings; they also provide information for the table
-of contents of a printed manual (@pxref{Contents, , Generating a Table
-of Contents}).@refill
-
-The chapter structuring commands do not create an Info node structure,
-so normally you should put an @code{@@node} command immediately before
-each chapter structuring command (@pxref{Nodes}).  The only time you
-are likely to use the chapter structuring commands without using the
-node structuring commands is if you are writing a document that
-contains no cross references and will never be transformed into Info
-format.@refill
-
-It is unlikely that you will ever write a Texinfo file that is
-intended only as an Info file and not as a printable document.  If you
-do, you might still use chapter structuring commands to create a
-heading at the top of each node---but you don't need to.@refill
-
-@menu
-* Tree Structuring::            A manual is like an upside down tree @dots{}
-* Structuring Command Types::   How to divide a manual into parts.
-* makeinfo top::                The @code{@@top} command, part of the `Top' node.
-* chapter::
-* unnumbered & appendix::
-* majorheading & chapheading::
-* section::
-* unnumberedsec appendixsec heading::
-* subsection::
-* unnumberedsubsec appendixsubsec subheading::
-* subsubsection::               Commands for the lowest level sections.
-* Raise/lower sections::        How to change commands' hierarchical level.
-@end menu
-
-
-@node Tree Structuring
-@section Tree Structure of Sections
-@cindex Tree structuring
-
-A Texinfo file is usually structured like a book with chapters,
-sections, subsections, and the like.  This structure can be visualized
-as a tree (or rather as an upside-down tree) with the root at the top
-and the levels corresponding to chapters, sections, subsection, and
-subsubsections.@refill
-
-Here is a diagram that shows a Texinfo file with three chapters,
-each of which has two sections.@refill
-
-@example
-@group
-                         Top
-                          |
-        -------------------------------------
-       |                  |                  |
-    Chapter 1          Chapter 2          Chapter 3
-       |                  |                  |
-    --------           --------           --------
-   |        |         |        |         |        |
-Section  Section   Section  Section   Section  Section
-  1.1      1.2       2.1      2.2       3.1      3.2
-
-@end group
-@end example
-
-In a Texinfo file that has this structure, the beginning of Chapter 2
-looks like this:@refill
-
-@example
-@group
-@@node    Chapter 2,  Chapter 3, Chapter 1, top
-@@chapter Chapter 2
-@end group
-@end example
-
-The chapter structuring commands are described in the sections that
-follow; the @code{@@node} and @code{@@menu} commands are described in
-following chapters. (@xref{Nodes}, and see @ref{Menus}.)@refill
-
-
-@node Structuring Command Types
-@section Structuring Command Types
-
-The chapter structuring commands fall into four groups or series, each
-of which contains structuring commands corresponding to the
-hierarchical levels of chapters, sections, subsections, and
-subsubsections.@refill
-
-The four groups are the @code{@@chapter} series, the
-@code{@@unnumbered} series, the @code{@@appendix} series, and the
-@code{@@heading} series.@refill
-
-Each command produces titles that have a different appearance on the
-printed page or Info file; only some of the commands produce
-titles that are listed in the table of contents of a printed book or
-manual.@refill
-
-@itemize @bullet
-@item
-The @code{@@chapter} and @code{@@appendix} series of commands produce
-numbered or lettered entries both in the body of a printed work and in
-its table of contents.@refill
-
-@item
-The @code{@@unnumbered} series of commands produce unnumbered entries
-both in the body of a printed work and in its table of contents.  The
-@code{@@top} command, which has a special use, is a member of this
-series (@pxref{makeinfo top, , @code{@@top}}).  An @code{@@unnumbered}
-section should be associated with a node and be a normal part of the
-document structure.
-
-@item
-The @code{@@heading} series of commands produce simple unnumbered
-headings that do not appear in a table of contents, are not associated
-with nodes, and cannot be cross-referenced.  The heading commands
-never start a new page.
-
-@item
-The @code{@@majorheading} command is similar to @code{@@chapheading},
-except that it generates a larger vertical whitespace before the
-heading.
-
-@item
-When an @code{@@setchapternewpage} command says to do so, the
-@code{@@chapter}, @code{@@unnumbered}, and @code{@@appendix} commands
-start new pages in the printed manual; the @code{@@heading} commands
-do not.@refill
-@end itemize
-
-Here are the four groups of chapter structuring commands:
-
-@tex
-{\globaldefs = 1 \smallfonts}
-@end tex
-
-@multitable @columnfractions .19 .30 .29 .22
-@item                        @tab                              @tab                       @tab No new page
-@item @i{Numbered}           @tab @i{Unnumbered}               @tab @i{Lettered/numbered} @tab @i{Unnumbered}
-@item In contents            @tab In contents                  @tab In contents           @tab Not in contents
-@item                        @tab @code{@@top}                 @tab                       @tab @code{@@majorheading}
-@item @code{@@chapter}       @tab @code{@@unnumbered}          @tab @code{@@appendix} @tab @code{@@chapheading}
-@item @code{@@section}       @tab @code{@@unnumberedsec}       @tab @code{@@appendixsec} @tab @code{@@heading}
-@item @code{@@subsection}    @tab @code{@@unnumberedsubsec}    @tab @code{@@appendixsubsec} @tab @code{@@subheading}
-@item @code{@@subsubsection} @tab @code{@@unnumberedsubsubsec} @tab @code{@@appendixsubsubsec} @tab @code{@@subsubheading}
-@end multitable
-@tex
-{\globaldefs = 1 \textfonts}
-@end tex
-
-
-@node makeinfo top
-@section @code{@@top}
-
-The @code{@@top} command is a special sectioning command that you use
-only after an @samp{@@node Top} line at the beginning of a Texinfo file.
-The @code{@@top} command tells the @code{makeinfo} formatter which node
-is the `Top' node, so it can use it as the root of the node tree if your
-manual uses implicit node pointers.  It has the same typesetting effect as
-@code{@@unnumbered} (@pxref{unnumbered & appendix, , @code{@@unnumbered}
-and @code{@@appendix}}).  For detailed information, see @ref{makeinfo
-top command, , The @code{@@top} Command}.
-
-The @code{@@top} node and its menu (if any) is conventionally wrapped in
-an @code{@@ifnottex} conditional so that it will appear only in Info and
-HTML output, not @TeX{}.
-
-
-@node chapter
-@comment  node-name,  next,  previous,  up
-@section @code{@@chapter}
-@findex chapter
-
-@code{@@chapter} identifies a chapter in the document.  Write the
-command at the beginning of a line and follow it on the same line by
-the title of the chapter.@refill
-
-For example, this chapter in this manual is entitled ``Chapter
-Structuring''; the @code{@@chapter} line looks like this:@refill
-
-@example
-@@chapter Chapter Structuring
-@end example
-
-In @TeX{}, the @code{@@chapter} command creates a chapter in the
-document, specifying the chapter title.  The chapter is numbered
-automatically.@refill
-
-In Info, the @code{@@chapter} command causes the title to appear on a
-line by itself, with a line of asterisks inserted underneath.  Thus,
-in Info, the above example produces the following output:@refill
-
-@example
-Chapter Structuring
-*******************
-@end example
-
-@findex centerchap
-Texinfo also provides a command @code{@@centerchap}, which is analogous
-to @code{@@unnumbered}, but centers its argument in the printed output.
-This kind of stylistic choice is not usually offered by Texinfo.
-@c but the Hacker's Dictionary wanted it ...
-
-
-@node unnumbered & appendix
-@section @code{@@unnumbered} and @code{@@appendix}
-@findex unnumbered
-@findex appendix
-
-Use the @code{@@unnumbered} command to create a chapter that appears
-in a printed manual without chapter numbers of any kind.  Use the
-@code{@@appendix} command to create an appendix in a printed manual
-that is labelled by letter instead of by number.@refill
-
-For Info file output, the @code{@@unnumbered} and @code{@@appendix}
-commands are equivalent to @code{@@chapter}: the title is printed on a
-line by itself with a line of asterisks underneath.  (@xref{chapter, ,
-@code{@@chapter}}.)@refill
-
-To create an appendix or an unnumbered chapter, write an
-@code{@@appendix} or @code{@@unnumbered} command at the beginning of a
-line and follow it on the same line by the title, as you would if you
-were creating a chapter.@refill
-
-
-@node majorheading & chapheading
-@section @code{@@majorheading}, @code{@@chapheading}
-@findex majorheading
-@findex chapheading
-
-The @code{@@majorheading} and @code{@@chapheading} commands put
-chapter-like headings in the body of a document.@refill
-
-However, neither command causes @TeX{} to produce a numbered heading
-or an entry in the table of contents; and neither command causes
-@TeX{} to start a new page in a printed manual.@refill
-
-In @TeX{}, an @code{@@majorheading} command generates a larger vertical
-whitespace before the heading than an @code{@@chapheading} command but
-is otherwise the same.
-
-In Info,
-the @code{@@majorheading} and
-@code{@@chapheading} commands are equivalent to
-@code{@@chapter}: the title is printed on a line by itself with a line
-of asterisks underneath.  (@xref{chapter, , @code{@@chapter}}.)@refill
-
-
-@node section
-@comment  node-name,  next,  previous,  up
-@section @code{@@section}
-@findex section
-
-In a printed manual, an @code{@@section} command identifies a
-numbered section within a chapter.  The section title appears in the
-table of contents.  In Info, an @code{@@section} command provides a
-title for a segment of text, underlined with @samp{=}.@refill
-
-This section is headed with an @code{@@section} command and looks like
-this in the Texinfo file:@refill
-
-@example
-@@section @@code@{@@@@section@}
-@end example
-
-To create a section, write the @code{@@section} command at the
-beginning of a line and follow it on the same line by the section
-title.@refill
-
-Thus,
-
-@example
-@@section This is a section
-@end example
-
-@noindent
-produces
-
-@example
-@group
-This is a section
-=================
-@end group
-@end example
-
-@noindent
-in Info.
-
-
-@node unnumberedsec appendixsec heading
-@comment  node-name,  next,  previous,  up
-@section @code{@@unnumberedsec}, @code{@@appendixsec}, @code{@@heading}
-@findex unnumberedsec
-@findex appendixsec
-@findex heading
-
-The @code{@@unnumberedsec}, @code{@@appendixsec}, and @code{@@heading}
-commands are, respectively, the unnumbered, appendix-like, and
-heading-like equivalents of the @code{@@section} command.
-(@xref{section, , @code{@@section}}.)@refill
-
-@table @code
-@item @@unnumberedsec
-The @code{@@unnumberedsec} command may be used within an
-unnumbered chapter or within a regular chapter or appendix to
-provide an unnumbered section.@refill
-
-@item @@appendixsec
-@itemx @@appendixsection
-@code{@@appendixsection} is a longer spelling of the
-@code{@@appendixsec} command; the two are synonymous.@refill
-@findex appendixsection
-
-Conventionally, the @code{@@appendixsec} or @code{@@appendixsection}
-command is used only within appendices.@refill
-
-@item @@heading
-You may use the @code{@@heading} command anywhere you wish for a
-section-style heading that will not appear in the table of contents.@refill
-@end table
-
-
-@node subsection
-@comment  node-name,  next,  previous,  up
-@section The @code{@@subsection} Command
-@findex subsection
-
-Subsections are to sections as sections are to chapters.
-(@xref{section, , @code{@@section}}.)  In Info, subsection titles are
-underlined with @samp{-}.  For example,@refill
-
-@example
-@@subsection This is a subsection
-@end example
-
-@noindent
-produces
-
-@example
-@group
-This is a subsection
---------------------
-@end group
-@end example
-
-In a printed manual, subsections are listed in the table of contents
-and are numbered three levels deep.@refill
-
-@node unnumberedsubsec appendixsubsec subheading
-@comment  node-name,  next,  previous,  up
-@section The @code{@@subsection}-like Commands
-@cindex Subsection-like commands
-@findex unnumberedsubsec
-@findex appendixsubsec
-@findex subheading
-
-The @code{@@unnumberedsubsec}, @code{@@appendixsubsec}, and
-@code{@@subheading} commands are, respectively, the unnumbered,
-appendix-like, and heading-like equivalents of the @code{@@subsection}
-command.  (@xref{subsection, , @code{@@subsection}}.)@refill
-
-In Info, the @code{@@subsection}-like commands generate a title
-underlined with hyphens.  In a printed manual, an @code{@@subheading}
-command produces a heading like that of a subsection except that it is
-not numbered and does not appear in the table of contents.  Similarly,
-an @code{@@unnumberedsubsec} command produces an unnumbered heading like
-that of a subsection and an @code{@@appendixsubsec} command produces a
-subsection-like heading labelled with a letter and numbers; both of
-these commands produce headings that appear in the table of
-contents.@refill
-
-@node subsubsection
-@section The `subsub' Commands
-@cindex Subsub commands
-@findex subsubsection
-@findex unnumberedsubsubsec
-@findex appendixsubsubsec
-@findex subsubheading
-
-The fourth and lowest level sectioning commands in Texinfo are the
-`subsub' commands.  They are:@refill
-
-@table @code
-@item @@subsubsection
-Subsubsections are to subsections as subsections are to sections.
-(@xref{subsection, , @code{@@subsection}}.)  In a printed manual,
-subsubsection titles appear in the table of contents and are numbered
-four levels deep.@refill
-
-@item @@unnumberedsubsubsec
-Unnumbered subsubsection titles appear in the table of contents of a
-printed manual, but lack numbers.  Otherwise, unnumbered
-subsubsections are the same as subsubsections.  In Info, unnumbered
-subsubsections look exactly like ordinary subsubsections.@refill
-
-@item @@appendixsubsubsec
-Conventionally, appendix commands are used only for appendices and are
-lettered and numbered appropriately in a printed manual.  They also
-appear in the table of contents.  In Info, appendix subsubsections look
-exactly like ordinary subsubsections.@refill
-
-@item @@subsubheading
-The @code{@@subsubheading} command may be used anywhere that you need
-a small heading that will not appear in the table of contents.  In
-Info, subsubheadings look exactly like ordinary subsubsection
-headings.@refill
-@end table
-
-In Info,  `subsub' titles are underlined with periods.
-For example,@refill
-
-@example
-@@subsubsection This is a subsubsection
-@end example
-
-@noindent
-produces
-
-@example
-@group
-This is a subsubsection
-.......................
-@end group
-@end example
-
-
-@node Raise/lower sections
-@section @code{@@raisesections} and @code{@@lowersections}
-@findex raisesections
-@findex lowersections
-@cindex Raising and lowering sections
-@cindex Lowering and raising sections
-@cindex Sections, raising and lowering
-
-The @code{@@raisesections} and @code{@@lowersections} commands
-implicitly raise and lower the hierarchical level of following
-chapters, sections and the other sectioning commands.
-
-That is, the @code{@@raisesections} command changes sections to
-chapters, subsections to sections, and so on.  Conversely, the
-@code{@@lowersections} command changes chapters to sections, sections
-to subsections, and so on.  Thus, an @code{@@lowersections} command
-cancels an @code{@@raisesections} command, and vice versa.
-
-@cindex Include files, and section levels
-You can use @code{@@lowersections} to include text written as an outer
-or standalone Texinfo file in another Texinfo file as an inner,
-included file.  Typical usage looks like this:
-
-@example
-@@lowersections
-@@include somefile.texi
-@@raisesections
-@end example
-
-@noindent (Without the @code{@@raisesections}, all the subsequent
-sections in the document would be lowered.)
-
-If the included file being lowered has a @code{@@top} node, you'll
-need to conditionalize its inclusion with a flag (@pxref{set value}).
-
-Another difficulty can arise with documents that use the (recommended)
-feature of @command{makeinfo} for implicitly determining node
-pointers.  Since @command{makeinfo} must assume a hierarchically
-organized document to determine the pointers, you cannot just
-arbitrarily sprinkle @code{@@raisesections} and @code{@@lowersections}
-commands in the document.  The final result has to have menus that
-take the raising and lowering into account.  Therefore, as a practical
-matter, you generally only want to raise or lower large chunks,
-usually in external files as shown above.
-
-Repeated use of the commands continue to raise or lower the
-hierarchical level a step at a time.  An attempt to raise above
-`chapter' reproduces chapter commands; an attempt to lower below
-`subsubsection' reproduces subsubsection commands.  Also, lowered
-subsubsections and raised chapters will not work with
-@command{makeinfo}'s feature of implicitly determining node pointers,
-since the menu structure won't be correct.
-
-Write each @code{@@raisesections} and @code{@@lowersections} command
-on a line of its own.
-
-
-@node Nodes
-@chapter Nodes
-
-@dfn{Nodes} are the primary segments of a Texinfo file.  They do not
-in and of themselves impose a hierarchical or any other kind of
-structure on a file.  Nodes contain @dfn{node pointers} that name
-other nodes, and can contain @dfn{menus} which are lists of nodes.  In
-Info, the movement commands can carry you to a pointed-to node or to a
-node listed in a menu.
-
-Node pointers and menus provide structure for Info files just as
-chapters, sections, subsections, and the like, provide structure for
-printed books.
-
-Because node names are used in cross-references, it is not desirable
-to casually change them.  Such name changes invalidate references from
-other manuals, from mail archives, and so on.
-
-@menu
-* Two Paths::                   Different commands to structure
-                                 Info output and printed output.
-* Node Menu Illustration::      A diagram, and sample nodes and menus.
-* node::                        Creating nodes, in detail.
-* makeinfo Pointer Creation::   Letting makeinfo determine node pointers.
-* anchor::                      Defining arbitrary cross-reference targets.
-@end menu
-
-
-@node Two Paths
-@section Two Paths
-
-The node and menu commands and the chapter structuring commands are
-technically independent of each other:
-
-@itemize @bullet
-@item
-In Info, node and menu commands provide structure.  The chapter
-structuring commands generate headings with different kinds of
-underlining---asterisks for chapters, hyphens for sections, and so on;
-they do nothing else.@refill
-
-@item
-In @TeX{}, the chapter structuring commands generate chapter and section
-numbers and tables of contents.  The node and menu commands provide
-information for cross references; they do nothing else.@refill
-@end itemize
-
-You can use node pointers and menus to structure an Info file any way
-you want; and you can write a Texinfo file so that its Info output has a
-different structure than its printed output.  However, virtually all
-Texinfo files are written such that the structure for the Info output
-corresponds to the structure for the printed output.  It is neither
-convenient nor understandable to the reader to do otherwise.@refill
-
-Generally, printed output is structured in a tree-like hierarchy in
-which the chapters are the major limbs from which the sections branch
-out.  Similarly, node pointers and menus are organized to create a
-matching structure in the Info output.@refill
-
-
-@node Node Menu Illustration
-@section Node and Menu Illustration
-
-Here is a copy of the diagram shown earlier that illustrates a Texinfo
-file with three chapters, each of which contains two sections.@refill
-
-The ``root'' is at the top of the diagram and the ``leaves'' are at the
-bottom.  This is how such a diagram is drawn conventionally; it
-illustrates an upside-down tree.  For this reason, the root node is
-called the `Top' node, and `Up' node pointers carry you closer to the
-root.@refill
-
-@example
-@group
-                         Top
-                          |
-        -------------------------------------
-       |                  |                  |
-    Chapter 1          Chapter 2          Chapter 3
-       |                  |                  |
-    --------           --------           --------
-   |        |         |        |         |        |
-Section  Section   Section  Section   Section  Section
-  1.1      1.2       2.1      2.2       3.1      3.2
-@end group
-@end example
-
-The fully-written command to start Chapter 2 would be this:
-
-@example
-@group
-@@node     Chapter 2,  Chapter 3, Chapter 1, Top
-@@comment  node-name,  next,      previous,  up
-@end group
-@end example
-
-@noindent
-This @code{@@node} line says that the name of this node is ``Chapter
-2'', the name of the `Next' node is ``Chapter 3'', the name of the
-`Previous' node is ``Chapter 1'', and the name of the `Up' node is
-``Top''.  You can omit writing out these node names if your document is
-hierarchically organized (@pxref{makeinfo Pointer Creation}), but the
-pointer relationships still obtain.
-
-@quotation Note
-@strong{Please Note:} `Next' refers to the next node at the same
-hierarchical level in the manual, not necessarily to the next node
-within the Texinfo file.  In the Texinfo file, the subsequent node may
-be at a lower level---a section-level node most often follows a
-chapter-level node, for example.  `Next' and `Previous' refer to nodes
-at the @emph{same} hierarchical level.  (The `Top' node contains the
-exception to this rule.  Since the `Top' node is the only node at that
-level, `Next' refers to the first following node, which is almost always
-a chapter or chapter-level node.)@refill
-@end quotation
-
-To go to Sections 2.1 and 2.2 using Info, you need a menu inside Chapter
-2.  (@xref{Menus}.)  You would write the menu just
-before the beginning of Section 2.1, like this:@refill
-
-@example
-@group
-   @@menu
-   * Sect. 2.1::    Description of this section.
-   * Sect. 2.2::
-   @@end menu
-@end group
-@end example
-
-Write the node for Sect. 2.1 like this:@refill
-
-@example
-@group
-   @@node     Sect. 2.1, Sect. 2.2, Chapter 2, Chapter 2
-   @@comment  node-name, next,      previous,  up
-@end group
-@end example
-
-In Info format, the `Next' and `Previous' pointers of a node usually
-lead to other nodes at the same level---from chapter to chapter or from
-section to section (sometimes, as shown, the `Previous' pointer points
-up); an `Up' pointer usually leads to a node at the level above (closer
-to the `Top' node); and a `Menu' leads to nodes at a level below (closer
-to `leaves').  (A cross reference can point to a node at any level;
-see @ref{Cross References}.)@refill
-
-Usually, an @code{@@node} command and a chapter structuring command are
-used in sequence, along with indexing commands.  (You may follow the
-@code{@@node} line with a comment line that reminds you which pointer is
-which.)@refill
-
-Here is the beginning of the chapter in this manual called ``Ending a
-Texinfo File''.  This shows an @code{@@node} line followed by a comment
-line, an @code{@@chapter} line, and then by indexing lines.@refill
-
-@example
-@group
-@@node    Ending a File, Structuring, Beginning a File, Top
-@@comment node-name,     next,        previous,         up
-@@chapter Ending a Texinfo File
-@@cindex Ending a Texinfo file
-@@cindex Texinfo file ending
-@@cindex File ending
-@end group
-@end example
-
-
-@node node
-@section The @code{@@node} Command
-
-@cindex Node, defined
-@findex node
-
-A @dfn{node} is a segment of text that begins at an @code{@@node}
-command and continues until the next @code{@@node} command.  The
-definition of node is different from that for chapter or section.  A
-chapter may contain sections and a section may contain subsections;
-but a node cannot contain subnodes; the text of a node continues only
-until the next @code{@@node} command in the file.  A node usually
-contains only one chapter structuring command, the one that follows
-the @code{@@node} line.  On the other hand, in printed output nodes
-are used only for cross references, so a chapter or section may
-contain any number of nodes.  Indeed, a chapter usually contains
-several nodes, one for each section, subsection, and
-subsubsection.
-
-To create a node, write an @code{@@node} command at the beginning of a
-line, and follow it with up to four arguments, separated by commas, on
-the rest of the same line.  The first argument is required; it is the
-name of this node.  The subsequent arguments are the names of the
-`Next', `Previous', and `Up' pointers, in that order, and may be omitted
-if your Texinfo document is hierarchically organized (@pxref{makeinfo
-Pointer Creation}).
-
-You may insert spaces before each name if you wish; the spaces are
-ignored.  You must write the name of the node and (if present) the names
-of the `Next', `Previous', and `Up' pointers all on the same line.
-Otherwise, the formatters fail.  (@inforef{Top, info, info}, for more
-information about nodes in Info.)
-
-Usually, you write one of the chapter-structuring command lines
-immediately after an @code{@@node} line---for example, an
-@code{@@section} or @code{@@subsection} line.  (@xref{Structuring
-Command Types}.)
-
-@quotation Note
-The GNU Emacs Texinfo mode updating commands work
-only with Texinfo files in which @code{@@node} lines are followed by chapter
-structuring lines.  @xref{Updating Requirements}.
-@end quotation
-
-@TeX{} uses @code{@@node} lines to identify the names to use for cross
-references.  For this reason, you must write @code{@@node} lines in a
-Texinfo file that you intend to format for printing, even if you do not
-intend to format it for Info.  (Cross references, such as the one at the
-end of this sentence, are made with @code{@@xref} and related commands;
-see @ref{Cross References}.)
-
-@menu
-* Node Names::                  How to choose node and pointer names.
-* Writing a Node::              How to write an @code{@@node} line.
-* Node Line Tips::              Keep names short.
-* Node Line Requirements::      Keep names unique, without @@-commands.
-* First Node::                  How to write a `Top' node.
-* makeinfo top command::        How to use the @code{@@top} command.
-@end menu
-
-
-@node Node Names
-@subsection Choosing Node and Pointer Names
-
-@cindex Node names, choosing
-The name of a node identifies the node.  The pointers enable
-you to reach other nodes and consist simply of the names of those nodes.
-
-Normally, a node's `Up' pointer contains the name of the node whose menu
-mentions that node.  The node's `Next' pointer contains the name of the
-node that follows that node in that menu and its `Previous' pointer
-contains the name of the node that precedes it in that menu.  When a
-node's `Previous' node is the same as its `Up' node, both node pointers
-name the same node.
-
-Usually, the first node of a Texinfo file is the `Top' node, and its
-`Up' and `Previous' pointers point to the @file{dir} file, which
-contains the main menu for all of Info.
-
-The `Top' node itself contains the main or master menu for the manual.
-Also, it is helpful to include a brief description of the manual in the
-`Top' node.  @xref{First Node}, for information on how to write the
-first node of a Texinfo file.
-
-Even when you explicitly specify all pointers, that does not mean you
-can write the nodes in the Texinfo source file in an arbitrary order!
-Because @TeX{} processes the file sequentially, irrespective of node
-pointers, you must write the nodes in the order you wish them to appear
-in the printed output.
-
-
-@node Writing a Node
-@subsection How to Write an @code{@@node} Line
-@cindex Writing an @code{@@node} line
-@cindex @code{@@node} line writing
-@cindex Node line writing
-
-The easiest way to write an @code{@@node} line is to write @code{@@node}
-at the beginning of a line and then the name of the node, like
-this:@refill
-
-@example
-@@node @var{node-name}
-@end example
-
-If you are using GNU Emacs, you can use the update node commands
-provided by Texinfo mode to insert the names of the pointers; or you
-can leave the pointers out of the Texinfo file and let @code{makeinfo}
-insert node pointers into the Info file it creates.  (@xref{Texinfo
-Mode}, and @ref{makeinfo Pointer Creation}.)@refill
-
-Alternatively, you can insert the `Next', `Previous', and `Up'
-pointers yourself.  If you do this, you may find it helpful to use the
-Texinfo mode keyboard command @kbd{C-c C-c n}.  This command inserts
-@samp{@@node} and a comment line listing the names of the pointers in
-their proper order.  The comment line helps you keep track of which
-arguments are for which pointers.  This comment line is especially useful
-if you are not familiar with Texinfo.@refill
-
-The template for a fully-written-out node line with `Next', `Previous',
-and `Up' pointers looks like this:@refill
-
-@example
-@@node @var{node-name}, @var{next}, @var{previous}, @var{up}
-@end example
-
-If you wish, you can ignore @code{@@node} lines altogether in your first
-draft and then use the @code{texinfo-insert-node-lines} command to
-create @code{@@node} lines for you.  However, we do not recommend this
-practice.  It is better to name the node itself at the same time that
-you write a segment so you can easily make cross references.  A large
-number of cross references are an especially important feature of a good
-Info file.
-
-After you have inserted an @code{@@node} line, you should immediately
-write an @@-command for the chapter or section and insert its name.
-Next (and this is important!), put in several index entries.  Usually,
-you will find at least two and often as many as four or five ways of
-referring to the node in the index.  Use them all.  This will make it
-much easier for people to find the node.
-
-
-@node Node Line Tips
-@subsection @code{@@node} Line Tips
-
-Here are three suggestions:
-
-@itemize @bullet
-@item
-Try to pick node names that are informative but short.@refill
-
-In the Info file, the file name, node name, and pointer names are all
-inserted on one line, which may run into the right edge of the window.
-(This does not cause a problem with Info, but is ugly.)@refill
-
-@item
-Try to pick node names that differ from each other near the beginnings
-of their names.  This way, it is easy to use automatic name completion in
-Info.@refill
-
-@item
-By convention, node names are capitalized just as they would be for
-section or chapter titles---initial and significant words are
-capitalized; others are not.@refill
-@end itemize
-
-
-@node Node Line Requirements
-@subsection @code{@@node} Line Requirements
-
-@cindex Node line requirements
-@cindex Restrictions on node names
-Here are several requirements for @code{@@node} lines:
-
-@itemize @bullet
-@cindex Unique nodename requirement
-@cindex Node name must be unique
-@item
-All the node names for a single Info file must be unique.
-
-Duplicates confuse the Info movement commands.  This means, for
-example, that if you end every chapter with a summary, you must name
-each summary node differently.  You cannot just call each one
-``Summary''.  You may, however, duplicate the titles of chapters, sections,
-and the like.  Thus you can end each chapter in a book with a section
-called ``Summary'', so long as the node names for those sections are all
-different.
-
-@item
-A pointer name must be the name of a node.
-
-The node to which a pointer points may come before or after the
-node containing the pointer.
-
-@cindex @@-commands in nodename
-@cindex Node name, should not contain @@-commands
-@item
-@@-commands in node names are not allowed.  This includes punctuation
-characters that are escaped with a @samp{@@}, such as @code{@@} and
-@code{@{}, and accent commands such as @samp{@@'}.  (For a few cases
-when this is useful, Texinfo has limited support for using
-@w{@@-commands} in node names; see @ref{Pointer Validation}.)  Perhaps
-this limitation will be removed some day.
-
-@item
-@cindex Colon in nodename
-@cindex Comma in nodename
-@cindex Parentheses in nodename
-@cindex Period in nodename
-@cindex Characters, invalid in node name
-@cindex Invalid characters in node names
-@cindex Node names, invalid characters in
-Unfortunately, you cannot use periods, commas, colons or parentheses
-within a node name; these confuse the Texinfo processors.  Perhaps
-this limitation will be removed some day, too.
-
-@need 700
-For example, the following is a section title in this manual:
-
-@smallexample
-@@code@{@@@@unnumberedsec@}, @@code@{@@@@appendixsec@}, @@code@{@@@@heading@}
-@end smallexample
-
-@noindent
-But the corresponding node name lacks the commas and the @@'s:
-
-@smallexample
-unnumberedsec appendixsec heading
-@end smallexample
-
-@cindex Case in node name
-@item
-Case is significant in node names.
-
-@cindex White space in node name
-@cindex Spaces in node name
-Spaces before and after names on the @samp{@@node} line are ignored,
-but spaces ``inside'' a name are significant.  For example:
-
-@example
-@@node  foo bar,
-@@node foo bar ,
-@@node  foo bar ,
-@end example
-
-@noindent all define the same node, @samp{foo bar}.  References to the
-node should all use that name, without the leading or trailing spaces,
-but with the internal spaces.
-@end itemize
-
-
-@node First Node
-@subsection The First Node
-@cindex Top node is first
-@cindex First node
-
-The first node of a Texinfo file is the @dfn{Top} node, except in an
-included file (@pxref{Include Files}).  The Top node should contain a
-short summary, copying permissions, and a master menu.  @xref{The Top
-Node}, for more information on the Top node contents and examples.
-
-Here is a description of the node pointers to be used in the Top node:
-
-@itemize @bullet
-
-@item
-@cindex Up node of Top node
-@cindex (dir) as Up node of Top node
-The Top node (which must be named @samp{top} or @samp{Top}) should have
-as its `Up' node the name of a node in another file, where there is a
-menu that leads to this file.  Specify the file name in parentheses.
-
-Usually, all Info files are installed in the same Info directory tree;
-in this case, use @samp{(dir)} as the parent of the Top node; this is
-short for @samp{(dir)top}, and specifies the Top node in the @file{dir}
-file, which contains the main menu for the Info system as a whole.
-
-@item
-@cindex Previous node of Top node
-On the other hand, do not define the `Previous' node of the Top node to
-be @samp{(dir)}, as it causes confusing behavior for users: if you are
-in the Top node and hits @key{DEL} to go backwards, you wind up in the
-middle of the some other entry in the @file{dir} file, which has nothing
-to do with what you were reading.
-
-@item
-@cindex Next node of Top node
-The `Next' node of the Top node should be the first chapter in your
-document.
-
-@end itemize
-
-@xref{Installing an Info File}, for more information about installing
-an Info file in the @file{info} directory.
-
-For concreteness, here is an example with explicit pointers (which you
-can maintain automatically with the texinfo mode commands):
-
-Or you can leave the pointers off entirely and let the tools implicitly
-define them.  This is recommended.  Thus:
-
-@example
-@@node Top
-@end example
-
-
-@node makeinfo top command
-@subsection The @code{@@top} Sectioning Command
-@findex top @r{(@@-command)}
-
-A special sectioning command, @code{@@top} should be used with the
-@code{@@node Top} line.  The @code{@@top} sectioning command tells
-@code{makeinfo} that it marks the `Top' node in the file.  It provides
-the information that @code{makeinfo} needs to insert node pointers
-automatically.  Write the @code{@@top} command at the beginning of the
-line immediately following the @code{@@node Top} line.  Write the title
-on the remaining part of the same line as the @code{@@top} command.
-
-In Info, the @code{@@top} sectioning command causes the title to appear
-on a line by itself, with a line of asterisks inserted underneath, as
-other sectioning commands do.
-
-In @TeX{} and @code{texinfo-format-buffer}, the @code{@@top}
-sectioning command is merely a synonym for @code{@@unnumbered}.
-Neither of these formatters require an @code{@@top} command, and do
-nothing special with it.  You can use @code{@@chapter} or
-@code{@@unnumbered} after the @code{@@node Top} line when you use
-these formatters.  Also, you can use @code{@@chapter} or
-@code{@@unnumbered} when you use the Texinfo updating commands to
-create or update pointers and menus.
-
-Thus, in practice, a Top node starts like this:
-
-@example
-@@node Top
-@@top Your Manual Title
-@end example
-
-
-@node makeinfo Pointer Creation
-@section Creating Pointers with @code{makeinfo}
-@cindex Creating pointers with @code{makeinfo}
-@cindex Pointer creation with @code{makeinfo}
-@cindex Automatic pointer creation with @code{makeinfo}
-
-The @code{makeinfo} program has a feature for automatically determining
-node pointers for a hierarchically organized document.
-
-When you take advantage of this feature, you do not need to write the
-`Next', `Previous', and `Up' pointers after the name of a node.
-However, you must write a sectioning command, such as @code{@@chapter}
-or @code{@@section}, on the line immediately following each truncated
-@code{@@node} line (except that comment lines may intervene).
-
-In addition, you must follow the `Top' @code{@@node} line with a line
-beginning with @code{@@top} to mark the `Top' node in the
-file.  @xref{makeinfo top, , @code{@@top}}.
-
-Finally, you must write the name of each node (except for the `Top'
-node) in a menu that is one or more hierarchical levels above the
-node's hierarchical level.
-
-This implicit node pointer insertion feature in @code{makeinfo}
-relieves you from the need to update menus and pointers manually or
-with Texinfo mode commands.  (@xref{Updating Nodes and Menus}.)
-
-In most cases, you will want to take advantage of this feature and not
-redundantly specify node pointers.  However, Texinfo documents are not
-required to be organized hierarchically or in fact to contain
-sectioning commands at all (for example, if you never intend the
-document to be printed).  The special procedure for handling the short
-text before a menu (@pxref{Menus}) also disables this
-feature, for that group of nodes.  In those cases, you will need to
-explicitly specify the pointers.
-
-
-@node anchor
-@section @code{@@anchor}: Defining Arbitrary Cross-reference Targets
-
-@findex anchor
-@cindex Anchors
-@cindex Cross-reference targets, arbitrary
-@cindex Targets for cross-references, arbitrary
-
-An @dfn{anchor} is a position in your document, labeled so that
-cross-references can refer to it, just as they can to nodes.  You create
-an anchor with the @code{@@anchor} command, and give the label as a
-normal brace-delimited argument.  For example:
-
-@example
-This marks the @@anchor@{x-spot@}spot.
-@dots{}
-@@xref@{x-spot,,the spot@}.
-@end example
-
-@noindent produces:
-
-@example
-This marks the spot.
-@dots{}
-See [the spot], page 1.
-@end example
-
-As you can see, the @code{@@anchor} command itself produces no output.
-This example defines an anchor `x-spot' just before the word `spot'.
-You can refer to it later with an @code{@@xref} or other cross-reference
-command, as shown.  @xref{Cross References}, for details on the
-cross-reference commands.
-
-It is best to put @code{@@anchor} commands just before the position you
-wish to refer to; that way, the reader's eye is led on to the correct
-text when they jump to the anchor.  You can put the @code{@@anchor}
-command on a line by itself if that helps readability of the source.
-Spaces are always ignored after @code{@@anchor}.
-
-Anchor names and node names may not conflict.  Anchors and nodes are
-given similar treatment in some ways; for example, the @code{goto-node}
-command in standalone Info takes either an anchor name or a node name as
-an argument.  (@xref{goto-node,,,info-stnd,GNU Info}.)
-
-
-@node Menus
-@chapter Menus
-@cindex Menus
-@findex menu
-
-@dfn{Menus} contain pointers to subordinate nodes.  In online output,
-you use menus to go to such nodes.  Menus have no effect in printed
-manuals and do not appear in them.
-
-A node with a menu should not contain much text.  If you find yourself
-writing a lot of before a menu, we generally recommend moving most of
-the text into a new subnode---all but a paragraph or two.  Otherwise,
-a reader with a terminal that displays only a few lines may miss the
-menu and its associated text.  As a practical matter, it is best to
-locate a menu within 20 or so lines of the beginning of the node.
-
-@menu
-* Menu Location::               Menus go at the ends of short nodes.
-* Writing a Menu::              What is a menu?
-* Menu Parts::                  A menu entry has three parts.
-* Less Cluttered Menu Entry::   Two part menu entry.
-* Menu Example::                Two and three part menu entries.
-* Other Info Files::            How to refer to a different Info file.
-@end menu
-
-
-@node Menu Location
-@section Menu Location
-@cindex Menu location
-@cindex Location of menus
-
-A menu must be located at the end of a node, without any regular text
-or additional commands between the @code{@@end menu} and the beginning
-of the next node.  (As a consequence, there may be at most one menu in
-a node.)
-
-@cindex Info format, and menus
-This is actually a useful restriction, since a reader who uses the
-menu could easily miss any such text.  Technically, it is necessary
-because in Info format, there is no marker for the end of a menu, so
-Info-reading programs would have no way to know when the menu ends and
-normal text resumes.
-
-@cindex Hierarchical documents, and menus
-Technically, menus can carry you to any node, regardless of the
-structure of the document; even to nodes in a different Info file.
-However, we do not recommend ever making use of this, because the
-@command{makeinfo} implicit pointer creation feature (@pxref{makeinfo
-Pointer Creation}) and GNU Emacs Texinfo mode updating commands work
-only to create menus of subordinate nodes in a hierarchically
-structured document.  Instead, use cross references to refer to
-arbitrary nodes.
-
-In the past, we recommended using a @samp{@@heading} command within an
-@code{@@ifinfo} conditional instead of the normal sectioning commands
-after a very short node with a menu.  This had the advantage of making
-the printed output look better, because there was no very short text
-between two headings on the page.  But aside from not working with
-@command{makeinfo}'s implicit pointer creation, it also makes the XML
-output incorrect, since it does not reflect the true document
-structure.  So, unfortunately we can no longer recommend this.
-
-
-@node Writing a Menu
-@section Writing a Menu
-@cindex Writing a menu
-@cindex Menu writing
-
-A menu consists of an @code{@@menu} command on a line by itself
-followed by menu entry lines or menu comment lines and then by an
-@code{@@end menu} command on a line by itself.
-
-A menu looks like this:
-
-@example
-@group
-@@menu
-Larger Units of Text
-
-* Files::                       All about handling files.
-* Multiples: Buffers.           Multiple buffers; editing
-                                 several files at once.
-@@end menu
-@end group
-@end example
-
-In a menu, every line that begins with an @w{@samp{* }} is a @dfn{menu
-entry}.  (Note the space after the asterisk.)  A line that does not
-start with an @w{@samp{* }} may also appear in a menu.  Such a line is
-not a menu entry but is a menu comment line that appears in the Info
-file.  In the example above, the line @samp{Larger Units of Text} is a
-menu comment line; the two lines starting with @w{@samp{* }} are menu
-@cindex Spaces, in menus
-entries.  Space characters in a menu are preserved as-is; this allows
-you to format the menu as you wish.
-
-
-@node Menu Parts
-@section The Parts of a Menu
-@cindex Parts of a menu
-@cindex Menu parts
-@cindex @code{@@menu} parts
-
-A menu entry has three parts, only the second of which is required:
-
-@enumerate
-@item
-The menu entry name (optional).
-
-@item
-The name of the node (required).
-
-@item
-A description of the item (optional).
-@end enumerate
-
-The template for a menu entry looks like this:@refill
-
-@example
-* @var{menu-entry-name}: @var{node-name}.   @var{description}
-@end example
-
-Follow the menu entry name with a single colon and follow the node name
-with tab, comma, period, or newline.@refill
-
-In Info, a user selects a node with the @kbd{m} (@code{Info-menu})
-command.  The menu entry name is what the user types after the @kbd{m}
-command.@refill
-
-The third part of a menu entry is a descriptive phrase or sentence.
-Menu entry names and node names are often short; the description
-explains to the reader what the node is about.  A useful description
-complements the node name rather than repeats it.  The description,
-which is optional, can spread over two or more lines; if it does, some
-authors prefer to indent the second line while others prefer to align it
-with the first (and all others).  It's up to you.
-
-
-@node Less Cluttered Menu Entry
-@comment  node-name,  next,  previous,  up
-@section Less Cluttered Menu Entry
-@cindex Two part menu entry
-@cindex Double-colon menu entries
-@cindex Menu entries with two colons
-@cindex Less cluttered menu entry
-@cindex Uncluttered menu entry
-
-When the menu entry name and node name are the same, you can write
-the name immediately after the asterisk and space at the beginning of
-the line and follow the name with two colons.@refill
-
-@need 800
-For example, write
-
-@example
-* Name::                                    @var{description}
-@end example
-
-@need 800
-@noindent
-instead of
-
-@example
-* Name: Name.                               @var{description}
-@end example
-
-You should use the node name for the menu entry name whenever possible,
-since it reduces visual clutter in the menu.@refill
-
-@node Menu Example
-@comment  node-name,  next,  previous,  up
-@section A Menu Example
-@cindex Menu example
-@cindex Example menu
-
-A menu looks like this in Texinfo:@refill
-
-@example
-@group
-@@menu
-* menu entry name: Node name.   A short description.
-* Node name::                   This form is preferred.
-@@end menu
-@end group
-@end example
-
-@need 800
-@noindent
-This produces:
-
-@example
-@group
-* menu:
-
-* menu entry name: Node name.   A short description.
-* Node name::                   This form is preferred.
-@end group
-@end example
-
-@need 700
-Here is an example as you might see it in a Texinfo file:@refill
-
-@example
-@group
-@@menu
-Larger Units of Text
-
-* Files::                       All about handling files.
-* Multiples: Buffers.           Multiple buffers; editing
-                                 several files at once.
-@@end menu
-@end group
-@end example
-
-@need 800
-@noindent
-This produces:
-
-@example
-@group
-* menu:
-Larger Units of Text
-
-* Files::                       All about handling files.
-* Multiples: Buffers.           Multiple buffers; editing
-                                 several files at once.
-@end group
-@end example
-
-In this example, the menu has two entries.  @samp{Files} is both a menu
-entry name and the name of the node referred to by that name.
-@samp{Multiples} is the menu entry name; it refers to the node named
-@samp{Buffers}. The line @samp{Larger Units of Text} is a comment; it
-appears in the menu, but is not an entry.@refill
-
-Since no file name is specified with either @samp{Files} or
-@samp{Buffers}, they must be the names of nodes in the same Info file
-(@pxref{Other Info Files, , Referring to Other Info Files}).@refill
-
-@node Other Info Files
-@comment  node-name,  next,  previous,  up
-@section Referring to Other Info Files
-@cindex Referring to other Info files
-@cindex Nodes in other Info files
-@cindex Other Info files' nodes
-@cindex Going to other Info files' nodes
-@cindex Info; other files' nodes
-
-You can create a menu entry that enables a reader in Info to go to a
-node in another Info file by writing the file name in parentheses just
-before the node name.  In this case, you should use the three-part menu
-entry format, which saves the reader from having to type the file
-name.@refill
-
-@need 800
-The format looks like this:@refill
-
-@example
-@group
-@@menu
-* @var{first-entry-name}:(@var{filename})@var{nodename}.     @var{description}
-* @var{second-entry-name}:(@var{filename})@var{second-node}. @var{description}
-@@end menu
-@end group
-@end example
-
-For example, to refer directly to the @samp{Outlining} and
-@samp{Rebinding} nodes in the @cite{Emacs Manual}, you would write a
-menu like this:@refill
-
-@example
-@group
-@@menu
-* Outlining: (emacs)Outline Mode. The major mode for
-                                 editing outlines.
-* Rebinding: (emacs)Rebinding.    How to redefine the
-                                 meaning of a key.
-@@end menu
-@end group
-@end example
-
-If you do not list the node name, but only name the file, then Info
-presumes that you are referring to the `Top' node.@refill
-
-The @file{dir} file that contains the main menu for Info has menu
-entries that list only file names.  These take you directly to the `Top'
-nodes of each Info document.  (@xref{Installing an Info File}.)
-
-@need 700
-For example:
-
-@example
-@group
-* Info: (info).         Documentation browsing system.
-* Emacs: (emacs).       The extensible, self-documenting
-                       text editor.
-@end group
-@end example
-
-@noindent
-(The @file{dir} top level directory for the Info system is an Info file,
-not a Texinfo file, but a menu entry looks the same in both types of
-file.)@refill
-
-The GNU Emacs Texinfo mode menu updating commands only work with nodes
-within the current buffer, so you cannot use them to create menus that
-refer to other files.  You must write such menus by hand.
-
-
-@node Cross References
-@chapter Cross References
-@cindex Making cross references
-@cindex Cross references
-@cindex References
-
-@dfn{Cross references} are used to refer the reader to other parts of the
-same or different Texinfo files.  In Texinfo, nodes and anchors are the
-places to which cross references can refer.
-
-@menu
-* References::                  What cross references are for.
-* Cross Reference Commands::    A summary of the different commands.
-* Cross Reference Parts::       A cross reference has several parts.
-* xref::                        Begin a reference with `See' @dots{}
-* Top Node Naming::             How to refer to the beginning of another file.
-* ref::                         A reference for the last part of a sentence.
-* pxref::                       How to write a parenthetical cross reference.
-* inforef::                     How to refer to an Info-only file.
-* uref::                        How to refer to a uniform resource locator.
-@end menu
-
-@node References
-@section What References Are For
-
-Often, but not always, a printed document should be designed so that
-it can be read sequentially.  People tire of flipping back and forth
-to find information that should be presented to them as they need
-it.@refill
-
-However, in any document, some information will be too detailed for
-the current context, or incidental to it; use cross references to
-provide access to such information.  Also, an online help system or a
-reference manual is not like a novel; few read such documents in
-sequence from beginning to end.  Instead, people look up what they
-need.  For this reason, such creations should contain many cross
-references to help readers find other information that they may not
-have read.@refill
-
-In a printed manual, a cross reference results in a page reference,
-unless it is to another manual altogether, in which case the cross
-reference names that manual.@refill
-
-In Info, a cross reference results in an entry that you can follow
-using the Info @samp{f} command.  (@inforef{Help-Xref, Following
-cross-references, info}.)
-
-The various cross reference commands use nodes (or anchors,
-@pxref{anchor,,@code{@@anchor}}) to define cross reference locations.
-This is evident in Info, in which a cross reference takes you to the
-specified location.  @TeX{} also uses nodes to define cross reference
-locations, but the action is less obvious.  When @TeX{} generates a DVI
-file, it records each node's page number and uses the page numbers in making
-references.  Thus, if you are writing a manual that will only be
-printed, and will not be used online, you must nonetheless write
-@code{@@node} lines to name the places to which you make cross
-references.@refill
-
-@need 800
-@node Cross Reference Commands
-@comment  node-name,  next,  previous,  up
-@section Different Cross Reference Commands
-@cindex Different cross reference commands
-
-There are four different cross reference commands:@refill
-
-@table @code
-@item @@xref
-Used to start a sentence in the printed manual saying @w{`See @dots{}'}
-or an Info cross-reference saying @samp{*Note @var{name}: @var{node}.}.
-
-@item @@ref
-Used within or, more often, at the end of a sentence; same as
-@code{@@xref} for Info; produces just the reference in the printed
-manual without a preceding `See'.@refill
-
-@item @@pxref
-Used within parentheses to make a reference that suits both an Info
-file and a printed book.  Starts with a lower case `see' within the
-printed manual. (@samp{p} is for `parenthesis'.)@refill
-
-@item @@inforef
-Used to make a reference to an Info file for which there is no printed
-manual.@refill
-@end table
-
-@noindent
-(The @code{@@cite} command is used to make references to books and
-manuals for which there is no corresponding Info file and, therefore,
-no node to which to point.   @xref{cite, , @code{@@cite}}.)@refill
-
-@node Cross Reference Parts
-@comment  node-name,  next,  previous,  up
-@section Parts of a Cross Reference
-@cindex Cross reference parts
-@cindex Parts of a cross reference
-
-A cross reference command requires only one argument, which is the
-name of the node to which it refers.  But a cross reference command
-may contain up to four additional arguments.  By using these
-arguments, you can provide a cross reference name for Info, a topic
-description or section title for the printed output, the name of a
-different Info file, and the name of a different printed
-manual.@refill
-
-Here is a simple cross reference example:@refill
-
-@example
-@@xref@{Node name@}.
-@end example
-
-@noindent
-which produces
-
-@example
-*Note Node name::.
-@end example
-
-@noindent
-and
-
-@quotation
-See Section @var{nnn} [Node name], page @var{ppp}.
-@end quotation
-
-@need 700
-Here is an example of a full five-part cross reference:@refill
-
-@example
-@group
-@@xref@{Node name, Cross Reference Name, Particular Topic,
-info-file-name, A Printed Manual@}, for details.
-@end group
-@end example
-
-@noindent
-which produces
-
-@example
-*Note Cross Reference Name: (info-file-name)Node name,
-for details.
-@end example
-
-@noindent
-in Info and
-
-@quotation
-See section ``Particular Topic'' in @i{A Printed Manual}, for details.
-@end quotation
-
-@noindent
-in a printed book.
-
-The five possible arguments for a cross reference are:@refill
-
-@enumerate
-@item
-The node or anchor name (required).  This is the location to which the
-cross reference takes you.  In a printed document, the location of the
-node provides the page reference only for references within the same
-document.@refill
-
-@item
-The cross reference name for the Info reference, if it is to be different
-from the node name.  If you include this argument, it becomes
-the first part of the cross reference.  It is usually omitted.@refill
-
-@item
-A topic description or section name.  Often, this is the title of the
-section.  This is used as the name of the reference in the printed
-manual.  If omitted, the node name is used.@refill
-
-@item
-The name of the Info file in which the reference is located, if it is
-different from the current file.  You need not include any @samp{.info}
-suffix on the file name, since Info readers try appending it
-automatically.
-
-@item
-The name of a printed manual from a different Texinfo file.@refill
-@end enumerate
-
-The template for a full five argument cross reference looks like
-this:@refill
-
-@example
-@group
-@@xref@{@var{node-name}, @var{cross-reference-name}, @var{title-or-topic},
-@var{info-file-name}, @var{printed-manual-title}@}.
-@end group
-@end example
-
-Cross references with one, two, three, four, and five arguments are
-described separately following the description of @code{@@xref}.@refill
-
-Write a node name in a cross reference in exactly the same way as in
-the @code{@@node} line, including the same capitalization; otherwise, the
-formatters may not find the reference.@refill
-
-You can write cross reference commands within a paragraph, but note
-how Info and @TeX{} format the output of each of the various commands:
-write @code{@@xref} at the beginning of a sentence; write
-@code{@@pxref} only within parentheses, and so on.@refill
-
-@node xref
-@comment  node-name,  next,  previous,  up
-@section @code{@@xref}
-@findex xref
-@cindex Cross references using @code{@@xref}
-@cindex References using @code{@@xref}
-
-The @code{@@xref} command generates a cross reference for the
-beginning of a sentence.  The Info formatting commands convert it into
-an Info cross reference, which the Info @samp{f} command can use to
-bring you directly to another node.  The @TeX{} typesetting commands
-convert it into a page reference, or a reference to another book or
-manual.@refill
-
-@menu
-* Reference Syntax::            What a reference looks like and requires.
-* One Argument::                @code{@@xref} with one argument.
-* Two Arguments::               @code{@@xref} with two arguments.
-* Three Arguments::             @code{@@xref} with three arguments.
-* Four and Five Arguments::     @code{@@xref} with four and five arguments.
-@end menu
-
-@node Reference Syntax
-@subsection What a Reference Looks Like and Requires
-
-Most often, an Info cross reference looks like this:@refill
-
-@example
-*Note @var{node-name}::.
-@end example
-
-@noindent
-or like this
-
-@example
-*Note @var{cross-reference-name}: @var{node-name}.
-@end example
-
-@noindent
-In @TeX{}, a cross reference looks like this:
-
-@quotation
-See Section @var{section-number} [@var{node-name}], page @var{page}.
-@end quotation
-
-@noindent
-or like this
-
-@quotation
-See Section @var{section-number} [@var{title-or-topic}], page @var{page}.
-@end quotation
-
-The @code{@@xref} command does not generate a period or comma to end
-the cross reference in either the Info file or the printed output.
-You must write that period or comma yourself; otherwise, Info will not
-recognize the end of the reference.  (The @code{@@pxref} command works
-differently.  @xref{pxref, , @code{@@pxref}}.)@refill
-
-@quotation Caution
-A period or comma @strong{must} follow the closing
-brace of an @code{@@xref}.  It is required to terminate the cross
-reference.  This period or comma will appear in the output, both in
-the Info file and in the printed manual.@refill
-@end quotation
-
-@code{@@xref} must refer to an Info node by name.  Use @code{@@node}
-to define the node (@pxref{Writing a Node}).@refill
-
-@code{@@xref} is followed by several arguments inside braces, separated by
-commas.  Whitespace before and after these commas is ignored.@refill
-
-A cross reference requires only the name of a node; but it may contain
-up to four additional arguments.  Each of these variations produces a
-cross reference that looks somewhat different.@refill
-
-@quotation Note
-Commas separate arguments in a cross reference;
-avoid including them in the title or other part lest the formatters
-mistake them for separators.@refill
-@end quotation
-
-@node One Argument
-@subsection @code{@@xref} with One Argument
-
-The simplest form of @code{@@xref} takes one argument, the name of
-another node in the same Info file.    The Info formatters produce
-output that the Info readers can use to jump to the reference; @TeX{}
-produces output that specifies the page and section number for you.@refill
-
-@need 700
-@noindent
-For example,
-
-@example
-@@xref@{Tropical Storms@}.
-@end example
-
-@noindent
-produces
-
-@example
-*Note Tropical Storms::.
-@end example
-
-@noindent
-and
-
-@quotation
-See Section 3.1 [Tropical Storms], page 24.
-@end quotation
-
-@noindent
-(Note that in the preceding example the closing brace is followed by a
-period.)@refill
-
-You can write a clause after the cross reference, like this:@refill
-
-@example
-@@xref@{Tropical Storms@}, for more info.
-@end example
-
-@noindent
-which produces
-
-@example
-*Note Tropical Storms::, for more info.
-@end example
-
-@noindent
-and
-
-@quotation
-See Section 3.1 [Tropical Storms], page 24, for more info.
-@end quotation
-
-@noindent
-(Note that in the preceding example the closing brace is followed by a
-comma, and then by the clause, which is followed by a period.)@refill
-
-@node Two Arguments
-@subsection @code{@@xref} with Two Arguments
-
-With two arguments, the second is used as the name of the Info cross
-reference, while the first is still the name of the node to which the
-cross reference points.@refill
-
-@need 750
-@noindent
-The template is like this:
-
-@example
-@@xref@{@var{node-name}, @var{cross-reference-name}@}.
-@end example
-
-@need 700
-@noindent
-For example,
-
-@example
-@@xref@{Electrical Effects, Lightning@}.
-@end example
-
-@noindent
-produces:
-
-@example
-*Note Lightning: Electrical Effects.
-@end example
-
-@noindent
-and
-
-@quotation
-See Section 5.2 [Electrical Effects], page 57.
-@end quotation
-
-@noindent
-(Note that in the preceding example the closing brace is followed by a
-period; and that the node name is printed, not the cross reference name.)
-
-You can write a clause after the cross reference, like this:@refill
-
-@example
-@@xref@{Electrical Effects, Lightning@}, for more info.
-@end example
-
-@noindent
-which produces
-@example
-*Note Lightning: Electrical Effects, for more info.
-@end example
-
-@noindent
-and
-
-@quotation
-See Section 5.2 [Electrical Effects], page 57, for more info.
-@end quotation
-
-@noindent
-(Note that in the preceding example the closing brace is followed by a
-comma, and then by the clause, which is followed by a period.)@refill
-
-@node Three Arguments
-@subsection @code{@@xref} with Three Arguments
-
-A third argument replaces the node name in the @TeX{} output.  The third
-argument should be the name of the section in the printed output, or
-else state the topic discussed by that section.  Often, you will want to
-use initial upper case letters so it will be easier to read when the
-reference is printed.  Use a third argument when the node name is
-unsuitable because of syntax or meaning.@refill
-
-Remember to avoid placing a comma within the title or topic section of
-a cross reference, or within any other section.  The formatters divide
-cross references into arguments according to the commas; a comma
-within a title or other section will divide it into two arguments.  In
-a reference, you need to write a title such as ``Clouds, Mist, and
-Fog'' without the commas.@refill
-
-Also, remember to write a comma or period after the closing brace of an
-@code{@@xref} to terminate the cross reference.  In the following
-examples, a clause follows a terminating comma.@refill
-
-
-@need 750
-@noindent
-The template is like this:
-
-@example
-@group
-@@xref@{@var{node-name}, @var{cross-reference-name}, @var{title-or-topic}@}.
-@end group
-@end example
-
-@need 700
-@noindent
-For example,
-
-@example
-@group
-@@xref@{Electrical Effects, Lightning, Thunder and Lightning@},
-for details.
-@end group
-@end example
-
-@noindent
-produces
-
-@example
-*Note Lightning: Electrical Effects, for details.
-@end example
-
-@noindent
-and
-
-@quotation
-See Section 5.2 [Thunder and Lightning], page 57, for details.
-@end quotation
-
-If a third argument is given and the second one is empty, then the
-third argument serves both.  (Note how two commas, side by side, mark
-the empty second argument.)@refill
-
-@example
-@group
-@@xref@{Electrical Effects, , Thunder and Lightning@},
-for details.
-@end group
-@end example
-
-@noindent
-produces
-
-@example
-*Note Thunder and Lightning: Electrical Effects, for details.
-@end example
-
-@noindent
-and
-
-@quotation
-See Section 5.2 [Thunder and Lightning], page 57, for details.
-@end quotation
-
-As a practical matter, it is often best to write cross references with
-just the first argument if the node name and the section title are the
-same, and with the first and third arguments if the node name and title
-are different.@refill
-
-Here are several examples from @cite{The GNU Awk User's Guide}:@refill
-
-@smallexample
-@@xref@{Sample Program@}.
-@@xref@{Glossary@}.
-@@xref@{Case-sensitivity, ,Case-sensitivity in Matching@}.
-@@xref@{Close Output, , Closing Output Files and Pipes@},
-  for more information.
-@@xref@{Regexp, , Regular Expressions as Patterns@}.
-@end smallexample
-
-@node Four and Five Arguments
-@subsection @code{@@xref} with Four and Five Arguments
-
-In a cross reference, a fourth argument specifies the name of another
-Info file, different from the file in which the reference appears, and
-a fifth argument specifies its title as a printed manual.@refill
-
-Remember that a comma or period must follow the closing brace of an
-@code{@@xref} command to terminate the cross reference.  In the
-following examples, a clause follows a terminating comma.@refill
-
-@need 800
-@noindent
-The template is:
-
-@example
-@group
-@@xref@{@var{node-name}, @var{cross-reference-name}, @var{title-or-topic},
-@var{info-file-name}, @var{printed-manual-title}@}.
-@end group
-@end example
-
-@need 700
-@noindent
-For example,
-
-@example
-@@xref@{Electrical Effects, Lightning, Thunder and Lightning,
-weather, An Introduction to Meteorology@}, for details.
-@end example
-
-@noindent
-produces
-
-@example
-*Note Lightning: (weather)Electrical Effects, for details.
-@end example
-
-@noindent
-The name of the Info file is enclosed in parentheses and precedes
-the name of the node.
-
-@noindent
-In a printed manual, the reference looks like this:@refill
-
-@quotation
-See section ``Thunder and Lightning'' in @i{An Introduction to
-Meteorology}, for details.
-@end quotation
-
-@noindent
-The title of the printed manual is typeset in italics; and the
-reference lacks a page number since @TeX{} cannot know to which page a
-reference refers when that reference is to another manual.@refill
-
-Often, you will leave out the second argument when you use the long
-version of @code{@@xref}.  In this case, the third argument, the topic
-description, will be used as the cross reference name in Info.@refill
-
-@noindent
-The template looks like this:
-
-@example
-@@xref@{@var{node-name}, , @var{title-or-topic}, @var{info-file-name},
-@var{printed-manual-title}@}, for details.
-@end example
-
-@noindent
-which produces
-
-@example
-*Note @var{title-or-topic}: (@var{info-file-name})@var{node-name}, for details.
-@end example
-
-@noindent
-and
-
-@quotation
-See section @var{title-or-topic} in @var{printed-manual-title}, for details.
-@end quotation
-
-@need 700
-@noindent
-For example,
-
-@example
-@@xref@{Electrical Effects, , Thunder and Lightning,
-weather, An Introduction to Meteorology@}, for details.
-@end example
-
-@noindent
-produces
-
-@example
-@group
-*Note Thunder and Lightning: (weather)Electrical Effects,
-for details.
-@end group
-@end example
-
-@noindent
-and
-
-@quotation
-See section ``Thunder and Lightning'' in @i{An Introduction to
-Meteorology}, for details.
-@end quotation
-
-On rare occasions, you may want to refer to another Info file that
-is within a single printed manual---when multiple Texinfo files are
-incorporated into the same @TeX{} run but make separate Info files.
-In this case, you need to specify only the fourth argument, and not
-the fifth.@refill
-
-@node Top Node Naming
-@section Naming a `Top' Node
-@cindex Naming a `Top' Node in references
-@cindex @samp{@r{Top}} node naming for references
-
-In a cross reference, you must always name a node.  This means that in
-order to refer to a whole manual, you must identify the `Top' node by
-writing it as the first argument to the @code{@@xref} command.  (This
-is different from the way you write a menu entry; see @ref{Other Info
-Files, , Referring to Other Info Files}.)  At the same time, to
-provide a meaningful section topic or title in the printed cross
-reference (instead of the word `Top'), you must write an appropriate
-entry for the third argument to the @code{@@xref} command.
-@refill
-
-@noindent
-Thus, to make a cross reference to @cite{The GNU Make Manual},
-write:@refill
-
-@example
-@@xref@{Top, , Overview, make, The GNU Make Manual@}.
-@end example
-
-@noindent
-which produces
-
-@example
-*Note Overview: (make)Top.
-@end example
-
-@noindent
-and
-
-@quotation
-See section ``Overview'' in @i{The GNU Make Manual}.
-@end quotation
-
-@noindent
-In this example, @samp{Top} is the name of the first node, and
-@samp{Overview} is the name of the first section of the manual.
-
-
-@node ref
-@section @code{@@ref}
-@cindex Cross references using @code{@@ref}
-@cindex References using @code{@@ref}
-@findex ref
-
-@code{@@ref} is nearly the same as @code{@@xref} except that it does
-not generate a `See' in the printed output, just the reference itself.
-This makes it useful as the last part of a sentence.
-
-@noindent For example,
-
-@cindex Hurricanes
-@example
-For more information, see @@ref@{Hurricanes@}.
-@end example
-
-@noindent produces (in Info):
-
-@example
-For more information, see *Note Hurricanes::.
-@end example
-
-@noindent and (in printed output):
-
-@quotation
-For more information, see Section 8.2 [Hurricanes], page 123.
-@end quotation
-
-The @code{@@ref} command sometimes tempts writers to express
-themselves in a manner that is suitable for a printed manual but looks
-awkward in the Info format.  Bear in mind that your audience will be
-using both the printed and the Info format.  For example:
-
-@cindex Sea surges
-@example
-Sea surges are described in @@ref@{Hurricanes@}.
-@end example
-
-@noindent looks ok in the printed output:
-
-@quotation
-Sea surges are described in Section 6.7 [Hurricanes], page 72.
-@end quotation
-
-@noindent but is awkward to read in Info:
-
-@example
-Sea surges are described in *Note Hurricanes::.
-@end example
-
-As a general rule, you should write a period or comma immediately
-after an @code{@@ref} command with two or more arguments.
-
-If there is no such following punctuation, @command{makeinfo} will
-generate a (grammatically incorrect) period in the Info output;
-otherwise, the cross-reference would fail completely, due to the
-current syntax of Info format.
-
-
-@node pxref
-@section @code{@@pxref}
-@cindex Cross references using @code{@@pxref}
-@cindex References using @code{@@pxref}
-@findex pxref
-
-The parenthetical reference command, @code{@@pxref}, is nearly the
-same as @code{@@xref}, but you use it @emph{only} inside parentheses
-and you do @emph{not} type a comma or period (or anything else) after
-the command's closing brace.  The command differs from @code{@@xref}
-in two ways:
-
-@enumerate
-@item
-@TeX{} typesets the reference for the printed manual with a lower case
-`see' rather than an upper case `See'.@refill
-
-@item
-The Info formatting commands automatically end the reference with a
-closing colon or period.@refill
-@end enumerate
-
-Because one type of formatting automatically inserts closing
-punctuation and the other does not, you should use @code{@@pxref}
-@emph{only} inside parentheses as part of another sentence.  Also, you
-yourself should not insert punctuation after the reference (or any
-other text), as you do with @code{@@xref}.  In the Info
-output, such text would follow a period, which is grammatically wrong.
-
-@code{@@pxref} is designed so that the output looks right and works
-right between parentheses both in printed output and in an Info file.
-In a printed manual, a closing comma or period should not follow a
-cross reference within parentheses; such punctuation is wrong.  But in
-an Info file, suitable closing punctuation must follow the cross
-reference so Info can recognize its end.  @code{@@pxref} spares you
-the need to use complicated methods to put a terminator into one form
-of the output and not the other.@refill
-
-@noindent
-With one argument, a parenthetical cross reference looks like
-this:@refill
-
-@cindex Flooding
-@example
-@dots{} storms cause flooding (@@pxref@{Hurricanes@}) @dots{}
-@end example
-
-@need 800
-@noindent
-which produces
-
-@example
-@group
-@dots{} storms cause flooding (*Note Hurricanes::) @dots{}
-@end group
-@end example
-
-@noindent
-and
-
-@quotation
-@dots{} storms cause flooding (see Section 6.7 [Hurricanes], page 72) @dots{}
-@end quotation
-
-With two arguments, a parenthetical cross reference has this
-template:@refill
-
-@example
-@dots{} (@@pxref@{@var{node-name}, @var{cross-reference-name}@}) @dots{}
-@end example
-
-@noindent
-which produces
-
-@example
-@dots{} (*Note @var{cross-reference-name}: @var{node-name}.) @dots{}
-@end example
-
-@noindent
-and
-
-@need 1500
-@quotation
-@dots{} (see Section @var{nnn} [@var{node-name}], page @var{ppp}) @dots{}
-@end quotation
-
-@code{@@pxref} can be used with up to five arguments just like
-@code{@@xref} (@pxref{xref, , @code{@@xref}}).@refill
-
-@quotation Caution
-Use @code{@@pxref} only as a parenthetical
-reference.  Do not try to use @code{@@pxref} as a clause in a sentence.
-It will look bad in either the Info file, the printed output, or
-both.@refill
-@end quotation
-
-Parenthetical cross references look best at the ends of sentences.
-Although they technically work in the middle of a sentence, that
-location breaks up the flow of reading.
-
-
-@node inforef
-@section @code{@@inforef}
-@cindex Cross references using @code{@@inforef}
-@cindex References using @code{@@inforef}
-@findex inforef
-
-@code{@@inforef} is used for making cross references to Info
-documents---even from a printed manual.  This might be because you
-want to refer to conditional @code{@@ifinfo} text
-(@pxref{Conditionals}), or because printed output is not available
-(perhaps because there is no Texinfo source), among other
-possibilities.
-
-The command takes either two or three arguments, in the following
-order:@refill
-
-@enumerate
-@item
-The node name.
-
-@item
-The cross reference name (optional).
-
-@item
-The Info file name.
-@end enumerate
-
-@noindent
-Separate the arguments with commas, as with @code{@@xref}.  Also, you
-must terminate the reference with a comma or period after the
-@samp{@}}, as you do with @code{@@xref}.@refill
-
-@noindent
-The template is:
-
-@example
-@@inforef@{@var{node-name}, @var{cross-reference-name}, @var{info-file-name}@},
-@end example
-
-@need 800
-@noindent
-For example,
-
-@example
-@group
-@@inforef@{Advanced, Advanced Info commands, info@},
-for more information.
-@end group
-@end example
-
-@need 800
-@noindent
-produces (in Info):
-
-@example
-@group
-*Note Advanced Info commands: (info)Advanced,
-for more information.
-@end group
-@end example
-
-@need 800
-@noindent
-and (in the printed output):
-
-@quotation
-See Info file @file{info}, node @samp{Advanced}, for more information.
-@end quotation
-
-(This particular example is not realistic, since the Info manual is
-written in Texinfo, so all formats are available.)
-
-The converse of @code{@@inforef} is @code{@@cite}, which is used to
-refer to printed works for which no Info form exists.  @xref{cite, ,
-@code{@@cite}}.
-
-
-@node uref
-@section @code{@@url}, @code{@@uref@{@var{url}[, @var{text}][, @var{replacement}]@}}
-@findex uref
-@cindex Uniform resource locator, referring to
-@cindex URL, referring to
-
-@cindex @code{href}, producing HTML
-@code{@@uref} produces a reference to a uniform resource locator (url).
-It takes one mandatory argument, the url, and two optional arguments
-which control the text that is displayed.  In HTML output, @code{@@uref}
-produces a link you can follow.
-
-@code{@@url} is a synonym for @code{@@uref}.  Originally, @code{@@url}
-had the meaning of @code{@@indicateurl}
-(@pxref{indicateurl,,@code{@@indicateurl}}), but in actual practice it
-was misused the vast majority of the time.  So we've changed the
-definitions.
-
-The second argument, if specified, is the text to display (the default
-is the url itself); in Info and DVI output, but not in HTML output, the
-url is also output.
-
-@cindex Man page, reference to
-The third argument, if specified, is the text to display, but in this
-case the url is @emph{not} output in any format.  This is useful when
-the text is already sufficiently referential, as in a man page.  If
-the third argument is given, the second argument is ignored.
-
-If the url is long enough to cause problems with line breaking, you
-may find it useful to insert @code{@@/} at places where a line break
-would be acceptable (after @samp{/} characters, for instance).  This
-tells @TeX{} to allow (but not force) a line break at those places.
-@xref{Line Breaks}.
-
-Here is an example of the simple one argument form, where the url is
-both the target and the text of the link:
-
-@example
-The official GNU ftp site is @@uref@{ftp://ftp.gnu.org/gnu@}.
-@end example
-
-@noindent produces:
-@display
-The official GNU ftp site is @uref{ftp://ftp.gnu.org/gnu}.
-@end display
-
-
-An example of the two-argument form:
-@example
-The official @@uref@{ftp://ftp.gnu.org/gnu, GNU ftp site@}
-holds programs and texts.
-@end example
-
-@noindent produces:
-@display
-The official @uref{ftp://ftp.gnu.org/gnu, GNU ftp site}
-holds programs and texts.
-@end display
-
-@noindent that is, the Info output is this:
-@example
-The official GNU ftp site (ftp://ftp.gnu.org/gnu)
-holds programs and texts.
-@end example
-
-@noindent and the HTML output is this:
-@example
-The official <a href="ftp://ftp.gnu.org/gnu">GNU ftp site</a>
-holds programs and texts.
-@end example
-
-
-An example of the three-argument form:
-@example
-The @@uref@{/man.cgi/1/ls,,ls(1)@} program @dots{}
-@end example
-
-@noindent produces:
-@display
-The @uref{/man.cgi/1/ls,,ls(1)} program @dots{}
-@end display
-
-@noindent but with HTML:
-@example
-The <a href="/man.cgi/1/ls">ls(1)</a> program @dots{}
-@end example
-
-To merely indicate a url without creating a link people can follow, use
-@code{@@indicateurl} (@pxref{indicateurl, @code{@@indicateurl}}).
-
-Some people prefer to display url's in the unambiguous format:
-
-@display
-<URL:http://@var{host}/@var{path}>
-@end display
-
-@noindent
-@cindex <URL: convention, not used
-You can use this form in the input file if you wish.  We feel it's not
-necessary to include the @samp{<URL:} and @samp{>} in the output,
-since any software that tries to detect url's in text already has to
-detect them without the @samp{<URL:} to be useful.
-
-
-@node Marking Text
-@chapter Marking Words and Phrases
-@cindex Paragraph, marking text within
-@cindex Marking words and phrases
-@cindex Words and phrases, marking them
-@cindex Marking text within a paragraph
-@cindex Text, marking up
-
-In Texinfo, you can mark words and phrases in a variety of ways.
-The Texinfo formatters use this information to determine how to
-highlight the text.
-You can specify, for example, whether a word or phrase is a
-defining occurrence, a metasyntactic variable, or a symbol used in a
-program.  Also, you can emphasize text, in several different ways.
-
-@menu
-* Indicating::                  How to indicate definitions, files, etc.
-* Emphasis::                    How to emphasize text.
-@end menu
-
-
-@node Indicating
-@section Indicating Definitions, Commands, etc.
-@cindex Highlighting text
-@cindex Indicating commands, definitions, etc.
-
-Texinfo has commands for indicating just what kind of object a piece of
-text refers to.  For example, metasyntactic variables are marked by
-@code{@@var}, and code by @code{@@code}.  Since the pieces of text are
-labelled by commands that tell what kind of object they are, it is easy
-to change the way the Texinfo formatters prepare such text.  (Texinfo is
-an @emph{intentional} formatting language rather than a @emph{typesetting}
-formatting language.)@refill
-
-For example, in a printed manual,
-code is usually illustrated in a typewriter font;
-@code{@@code} tells @TeX{} to typeset this text in this font.  But it
-would be easy to change the way @TeX{} highlights code to use another
-font, and this change would not affect how keystroke examples are
-highlighted.  If straight typesetting commands were used in the body
-of the file and you wanted to make a change, you would need to check
-every single occurrence to make sure that you were changing code and
-not something else that should not be changed.@refill
-
-@menu
-* Useful Highlighting::         Highlighting provides useful information.
-* code::                        Indicating program code.
-* kbd::                         Showing keyboard input.
-* key::                         Specifying keys.
-* samp::                        Indicating a literal sequence of characters.
-* verb::                        Indicating a verbatim sequence of characters.
-* var::                         Indicating metasyntactic variables.
-* env::                         Indicating environment variables.
-* file::                        Indicating file names.
-* command::                     Indicating command names.
-* option::                      Indicating option names.
-* dfn::                         Specifying definitions.
-* cite::                        Referring to books not in the Info system.
-* abbr::                        Indicating abbreviations.
-* acronym::                     Indicating acronyms.
-* indicateurl::                 Indicating an example URL.
-* email::                       Indicating an electronic mail address.
-@end menu
-
-
-@node Useful Highlighting
-@subsection Highlighting Commands are Useful
-
-The highlighting commands can be used to extract useful information
-from the file, such as lists of functions or file names.  It is
-possible, for example, to write a program in Emacs Lisp (or a keyboard
-macro) to insert an index entry after every paragraph that contains
-words or phrases marked by a specified command.  You could do this to
-construct an index of functions if you had not already made the
-entries.@refill
-
-The commands serve a variety of purposes:@refill
-
-@table @code
-@item @@code@{@var{sample-code}@}
-Indicate text that is a literal example of a piece of a program.
-@xref{code,,@code{@@code}}.
-
-@item @@kbd@{@var{keyboard-characters}@}
-Indicate keyboard input.
-@xref{kbd,,@code{@@kbd}}.
-
-@item @@key@{@var{key-name}@}
-Indicate the conventional name for a key on a keyboard.
-@xref{key,,@code{@@key}}.
-
-@item @@samp@{@var{text}@}
-Indicate text that is a literal example of a sequence of characters.
-@xref{samp,,@code{@@samp}}.
-
-@item @@verb@{@var{text}@}
-Write a verbatim sequence of characters.
-@xref{verb,,@code{@@verb}}.
-
-@item @@var@{@var{metasyntactic-variable}@}
-Indicate a metasyntactic variable.
-@xref{var,,@code{@@var}}.
-
-@item @@env@{@var{environment-variable}@}
-Indicate an environment variable.
-@xref{env,,@code{@@kenv}}.
-
-@item @@file@{@var{file-name}@}
-Indicate the name of a file.
-@xref{file,,@code{@@file}}.
-
-@item @@command@{@var{command-name}@}
-Indicate the name of a command.
-@xref{command,,@code{@@command}}.
-
-@item @@option@{@var{option}@}
-Indicate a command-line option.
-@xref{option,,@code{@@option}}.
-
-@item @@dfn@{@var{term}@}
-Indicate the introductory or defining use of a term.
-@xref{dfn,,@code{@@dfn}}.
-
-@item @@cite@{@var{reference}@}
-Indicate the name of a book.
-@xref{cite,,@code{@@cite}}.
-
-@item @@abbr@{@var{abbreviation}@}
-Indicate an abbreviation.
-
-@item @@acronym@{@var{acronym}@}
-Indicate an acronym.
-@xref{acronym,,@code{@@acronym}}.
-
-@item @@indicateurl@{@var{uniform-resource-locator}@}
-Indicate an example (that is, nonfunctional) uniform resource locator.
-@xref{indicateurl,,@code{@@indicateurl}}.  (Use @code{@@url}
-(@pxref{uref,,@code{@@url}}) for live url's.)
-
-@item @@email@{@var{email-address}[, @var{displayed-text}]@}
-Indicate an electronic mail address.
-@xref{email,,@code{@@email}}.
-
-@ignore
-@item @@ctrl@{@var{ctrl-char}@}
-Use for an @sc{ascii} control character.@refill
-@end ignore
-@end table
-
-
-@node code
-@subsection @code{@@code}@{@var{sample-code}@}
-@findex code
-
-@cindex Syntactic tokens, indicating
-Use the @code{@@code} command to indicate text that is a piece of a
-program and which consists of entire syntactic tokens.  Enclose the
-text in braces.
-
-@cindex Expressions in a program, indicating
-@cindex Keywords, indicating
-@cindex Reserved words, indicating
-Thus, you should use @code{@@code} for an expression in a program, for
-the name of a variable or function used in a program, or for a
-keyword in a programming language.
-
-Use @code{@@code} for command names in languages that resemble
-programming languages, such as Texinfo.  For example, @code{@@code} and
-@code{@@samp} are produced by writing @samp{@@code@{@@@@code@}} and
-@samp{@@code@{@@@@samp@}} in the Texinfo source, respectively.
-
-@cindex Case, not altering in @code{@@code}
-It is incorrect to alter the case of a word inside an @code{@@code}
-command when it appears at the beginning of a sentence.  Most computer
-languages are case sensitive.  In C, for example, @code{Printf} is
-different from the identifier @code{printf}, and most likely is a
-misspelling of it.  Even in languages which are not case sensitive, it
-is confusing to a human reader to see identifiers spelled in different
-ways.  Pick one spelling and always use that.  If you do not want to
-start a sentence with a command name written all in lower case, you
-should rearrange the sentence.
-
-In the printed manual, @code{@@code} causes @TeX{} to typeset the
-argument in a typewriter face.  In the Info file, it causes the Info
-formatting commands to use single quotation marks around the text.
-
-@need 700
-For example,
-
-@example
-The function returns @@code@{nil@}.
-@end example
-
-@noindent
-produces this in the printed manual:
-
-@quotation
-The function returns @code{nil}.
-@end quotation
-
-@iftex
-@noindent
-and this in the Info file:
-@example
-The function returns `nil'.
-@end example
-@end iftex
-
-Here are some cases for which it is preferable not to use @code{@@code}:
-
-@itemize @bullet
-@item
-For shell command names such as @command{ls} (use @code{@@command}).
-
-@item
-For shell options such as @samp{-c} when such options stand alone (use
-@code{@@option}).
-
-@item
-Also, an entire shell command often looks better if written using
-@code{@@samp} rather than @code{@@code}.  In this case, the rule is to
-choose the more pleasing format.
-
-@item
-For environment variable such as @env{TEXINPUTS} (use @code{@@env}).
-
-@item
-For a string of characters shorter than a syntactic token.  For example,
-if you are writing about @samp{goto-ch}, which is just a part of the
-name for the @code{goto-char} Emacs Lisp function, you should use
-@code{@@samp}.
-
-@item
-In general, when writing about the characters used in a token; for
-example, do not use @code{@@code} when you are explaining what letters
-or printable symbols can be used in the names of functions.  (Use
-@code{@@samp}.)  Also, you should not use @code{@@code} to mark text
-that is considered input to programs unless the input is written in a
-language that is like a programming language.  For example, you should
-not use @code{@@code} for the keystroke commands of GNU Emacs (use
-@code{@@kbd} instead) although you may use @code{@@code} for the names
-of the Emacs Lisp functions that the keystroke commands invoke.
-
-@end itemize
-
-Since @code{@@command}, @code{@@option}, and @code{@@env} were
-introduced relatively recently, it is acceptable to use @code{@@code} or
-@code{@@samp} for command names, options, and environment variables.
-The new commands allow you to express the markup more precisely, but
-there is no real harm in using the older commands, and of course the
-long-standing manuals do so.
-
-
-@node kbd
-@subsection @code{@@kbd}@{@var{keyboard-characters}@}
-@findex kbd
-@cindex Keyboard input
-
-Use the @code{@@kbd} command for characters of input to be typed by
-users.  For example, to refer to the characters @kbd{M-a}, write:
-
-@example
-@@kbd@{M-a@}
-@end example
-
-@noindent
-and to refer to the characters @kbd{M-x shell}, write:
-
-@example
-@@kbd@{M-x shell@}
-@end example
-
-@cindex User input
-@cindex Slanted typewriter font, for @code{@@kbd}
-By default, the @code{@@kbd} command produces a different font
-(slanted typewriter instead of normal typewriter) in the printed
-manual, so users can distinguish the characters that they are supposed
-to type from those that the computer outputs.
-
-In Info output, @code{@@kbd} is usually the same as @code{@@code},
-producing `quotes' around its argument.  However, in typewriter-like
-contexts such as the @code{@@example} environment (@pxref{example})
-and @code{@@code} command itself, the quotes are omitted, since Info
-format cannot use distinguishing fonts.
-
-@findex kbdinputstyle
-Since the usage of @code{@@kbd} varies from manual to manual, you can
-control the font switching with the @code{@@kbdinputstyle} command.
-This command has no effect on Info output.  Write this command at the
-beginning of a line with a single word as an argument, one of the
-following:
-
-@vindex distinct@r{, value for @code{@@kbdinputstyle}}
-@vindex example@r{, value for @code{@@kbdinputstyle}}
-@vindex code@r{, value for @code{@@kbdinputstyle}}
-@table @samp
-@item code
-Always use the same font for @code{@@kbd} as @code{@@code}.
-@item example
-Use the distinguishing font for @code{@@kbd} only in @code{@@example}
-and similar environments.
-@item distinct
-(the default) Always use the distinguishing font for @code{@@kbd}.
-@end table
-
-You can embed another @@-command inside the braces of an @code{@@kbd}
-command.  Here, for example, is the way to describe a command that
-would be described more verbosely as ``press the @samp{r} key and then
-press the @key{RETURN} key'':
-
-@example
-@@kbd@{r @@key@{RET@}@}
-@end example
-
-@noindent
-This produces: @kbd{r @key{RET}}.  (The present manual accepts the
-default for @code{@@kbdinputstyle}.)
-
-You also use the @code{@@kbd} command if you are spelling out the letters
-you type; for example:
-
-@example
-To give the @@code@{logout@} command,
-type the characters @@kbd@{l o g o u t @@key@{RET@}@}.
-@end example
-
-@noindent
-This produces:
-
-@quotation
-To give the @code{logout} command,
-type the characters @kbd{l o g o u t @key{RET}}.
-@end quotation
-
-(Also, this example shows that you can add spaces for clarity.  If you
-explicitly want to mention a space character as one of the characters of
-input, write @kbd{@@key@{SPC@}} for it.)@refill
-
-
-@node key
-@comment  node-name,  next,  previous,  up
-@subsection @code{@@key}@{@var{key-name}@}
-@findex key
-
-Use the @code{@@key} command for the conventional name for a key on a
-keyboard, as in:@refill
-
-@example
-@@key@{RET@}
-@end example
-
-You can use the @code{@@key} command within the argument of an
-@code{@@kbd} command when the sequence of characters to be typed
-includes one or more keys that are described by name.@refill
-
-@need 700
-For example, to produce @kbd{C-x @key{ESC}} you would type:@refill
-
-@example
-@@kbd@{C-x @@key@{ESC@}@}
-@end example
-
-Here is a list of the recommended names for keys:
-@cindex Recommended names for keys
-@cindex Keys, recommended names
-@cindex Names recommended for keys
-@cindex Abbreviations for keys
-
-@quotation
-@table @t
-@item SPC
-Space
-@item RET
-Return
-@item LFD
-Linefeed (however, since most keyboards nowadays do not have a Linefeed key,
-it might be better to call this character @kbd{C-j}.
-@item TAB
-Tab
-@item BS
-Backspace
-@item ESC
-Escape
-@item DEL
-Delete
-@item SHIFT
-Shift
-@item CTRL
-Control
-@item META
-Meta
-@end table
-@end quotation
-
-@cindex META key
-There are subtleties to handling words like `meta' or `ctrl' that are
-names of modifier keys.  When mentioning a character in which the
-modifier key is used, such as @kbd{Meta-a}, use the @code{@@kbd} command
-alone; do not use the @code{@@key} command; but when you are referring
-to the modifier key in isolation, use the @code{@@key} command.  For
-example, write @samp{@@kbd@{Meta-a@}} to produce @kbd{Meta-a} and
-@samp{@@key@{META@}} to produce @key{META}.
-
-@c I don't think this is a good explanation.
-@c I think it will puzzle readers more than it clarifies matters.  -- rms.
-@c In other words, use @code{@@kbd} for what you do, and use @code{@@key}
-@c for what you talk about: ``Press @code{@@kbd@{M-a@}} to move point to
-@c the beginning of the sentence.  The @code{@@key@{META@}} key is often in
-@c the lower left of the keyboard.''@refill
-
-@node samp
-@subsection @code{@@samp}@{@var{text}@}
-@findex samp
-
-Use the @code{@@samp} command to indicate text that is a literal example
-or `sample' of a sequence of characters in a file, string, pattern, etc.
-Enclose the text in braces.  The argument appears within single
-quotation marks in both the Info file and the printed manual; in
-addition, it is printed in a fixed-width font.@refill
-
-@example
-To match @@samp@{foo@} at the end of the line,
-use the regexp @@samp@{foo$@}.
-@end example
-
-@noindent
-produces
-
-@quotation
-To match @samp{foo} at the end of the line, use the regexp
-@samp{foo$}.@refill
-@end quotation
-
-Any time you are referring to single characters, you should use
-@code{@@samp} unless @code{@@kbd} or @code{@@key} is more appropriate.
-Also, you may use @code{@@samp} for entire statements in C and for entire
-shell commands---in this case, @code{@@samp} often looks better than
-@code{@@code}.  Basically, @code{@@samp} is a catchall for whatever is
-not covered by @code{@@code}, @code{@@kbd}, or @code{@@key}.@refill
-
-Only include punctuation marks within braces if they are part of the
-string you are specifying.  Write punctuation marks outside the braces
-if those punctuation marks are part of the English text that surrounds
-the string.  In the following sentence, for example, the commas and
-period are outside of the braces:@refill
-
-@example
-@group
-In English, the vowels are @@samp@{a@}, @@samp@{e@},
-@@samp@{i@}, @@samp@{o@}, @@samp@{u@}, and sometimes
-@@samp@{y@}.
-@end group
-@end example
-
-@noindent
-This produces:
-
-@quotation
-In English, the vowels are @samp{a}, @samp{e},
-@samp{i}, @samp{o}, @samp{u},  and sometimes
-@samp{y}.
-@end quotation
-
-
-@node verb
-@subsection @code{@@verb}@{<char>@var{text}<char>@}
-@findex verb
-@cindex Verbatim in-line text
-
-@cindex Delimiter character, for verbatim
-Use the @code{@@verb} command to print a verbatim sequence of
-characters.
-
-Like @LaTeX{}'s @code{\verb} command, the verbatim text can be quoted using
-any unique delimiter character.  Enclose the verbatim text, including the
-delimiters, in braces.  Text is printed in a fixed-width font:
-
-@example
-How many @@verb@{|@@|@}-escapes does one need to print this
-@@verb@{.@@a @@b @@c.@} string or @@verb@{+@@'e@?`@!`@{@}\+@} this?
-@end example
-
-@noindent
-produces
-
-@example
-How many @verb{|@|}-escapes does one need to print this
-@verb{.@a @b @c.} string or these @verb{+@'e?`{}!`\+} this?
-@end example
-
-This is in contrast to @code{@@samp} (see the previous section),
-@code{@@code}, and similar commands; in those cases, the argument is
-normal Texinfo text, where the three characters @code{@@@{@}} are
-special.  With @code{@@verb}, nothing is special except the delimiter
-character you choose.
-
-It is not reliable to use @code{@@verb} inside other Texinfo
-constructs.  In particular, it does not work to use @code{@@verb} in
-anything related to cross-referencing, such as section titles or
-figure captions.
-
-
-@node var
-@subsection @code{@@var}@{@var{metasyntactic-variable}@}
-@findex var
-
-Use the @code{@@var} command to indicate metasyntactic variables.  A
-@dfn{metasyntactic variable} is something that stands for another piece of
-text.  For example, you should use a metasyntactic variable in the
-documentation of a function to describe the arguments that are passed
-to that function.@refill
-
-Do not use @code{@@var} for the names of particular variables in
-programming languages.  These are specific names from a program, so
-@code{@@code} is correct for them (@pxref{code}).  For example, the
-Emacs Lisp variable @code{texinfo-tex-command} is not a metasyntactic
-variable; it is properly formatted using @code{@@code}.
-
-Do not use @code{@@var} for environment variables either; @code{@@env}
-is correct for them (see the next section).
-
-The effect of @code{@@var} in the Info file is to change the case of the
-argument to all upper case.  In the printed manual and HTML output, the
-argument is printed in slanted type.
-
-@need 700
-For example,
-
-@example
-To delete file @@var@{filename@},
-type @@samp@{rm @@var@{filename@}@}.
-@end example
-
-@noindent
-produces
-
-@quotation
-To delete file @var{filename}, type @samp{rm @var{filename}}.
-@end quotation
-
-@noindent
-(Note that @code{@@var} may appear inside @code{@@code},
-@code{@@samp}, @code{@@file}, etc.)@refill
-
-Write a metasyntactic variable all in lower case without spaces, and
-use hyphens to make it more readable.  Thus, the Texinfo source for
-the illustration of how to begin a Texinfo manual looks like
-this:@refill
-
-@example
-@group
-\input texinfo
-@@@@setfilename @@var@{info-file-name@}
-@@@@settitle @@var@{name-of-manual@}
-@end group
-@end example
-
-@noindent
-This produces:
-
-@example
-@group
-\input texinfo
-@@setfilename @var{info-file-name}
-@@settitle @var{name-of-manual}
-@end group
-@end example
-
-In some documentation styles, metasyntactic variables are shown with
-angle brackets, for example:@refill
-
-@example
-@dots{}, type rm <filename>
-@end example
-
-@noindent
-However, that is not the style that Texinfo uses.  (You can, of
-course, modify the sources to @file{texinfo.tex} and the Info formatting commands
-to output the @code{<@dots{}>} format if you wish.)@refill
-
-
-@node env
-@subsection @code{@@env}@{@var{environment-variable}@}
-@findex env
-
-Use the @code{@@env} command to indicate environment variables, as used
-by many operating systems, including GNU.  Do not use it for
-metasyntactic variables; use @code{@@var} instead (see the previous
-section).
-
-@code{@@env} is equivalent to @code{@@code} in its effects.
-For example:
-
-@example
-The @@env@{PATH@} environment variable @dots{}
-@end example
-@noindent produces
-@quotation
-The @env{PATH} environment variable @dots{}
-@end quotation
-
-
-@node file
-@subsection @code{@@file}@{@var{file-name}@}
-@findex file
-
-Use the @code{@@file} command to indicate text that is the name of a
-file, buffer, or directory, or is the name of a node in Info.  You can
-also use the command for file name suffixes.  Do not use @code{@@file}
-for symbols in a programming language; use @code{@@code}.
-
-Currently, @code{@@file} is equivalent to @code{@@samp} in its effects.
-For example,@refill
-
-@example
-The @@file@{.el@} files are in
-the @@file@{/usr/local/emacs/lisp@} directory.
-@end example
-
-@noindent
-produces
-
-@quotation
-The @file{.el} files are in
-the @file{/usr/local/emacs/lisp} directory.
-@end quotation
-
-
-@node command
-@subsection @code{@@command}@{@var{command-name}@}
-@findex command
-@cindex Command names, indicating
-@cindex Program names, indicating
-
-Use the @code{@@command} command to indicate command names, such as
-@command{ls} or @command{cc}.
-
-@code{@@command} is equivalent to @code{@@code} in its effects.
-For example:
-
-@example
-The command @@command@{ls@} lists directory contents.
-@end example
-@noindent produces
-@quotation
-The command @command{ls} lists directory contents.
-@end quotation
-
-You should write the name of a program in the ordinary text font, rather
-than using @code{@@command}, if you regard it as a new English word,
-such as `Emacs' or `Bison'.
-
-When writing an entire shell command invocation, as in @samp{ls -l},
-you should use either @code{@@samp} or @code{@@code} at your discretion.
-
-
-@node option
-@subsection @code{@@option}@{@var{option-name}@}
-@findex option
-
-Use the @code{@@option} command to indicate a command-line option; for
-example, @option{-l} or @option{--version} or
-@option{--output=@var{filename}}.
-
-@code{@@option} is equivalent to @code{@@samp} in its effects.
-For example:
-
-@example
-The option @@option@{-l@} produces a long listing.
-@end example
-@noindent produces
-@quotation
-The option @option{-l} produces a long listing.
-@end quotation
-
-In tables, putting options inside @code{@@code} produces a
-more pleasing effect.
-
-@node dfn
-@comment  node-name,  next,  previous,  up
-@subsection @code{@@dfn}@{@var{term}@}
-@findex dfn
-
-Use the @code{@@dfn} command to identify the introductory or defining
-use of a technical term.  Use the command only in passages whose
-purpose is to introduce a term which will be used again or which the
-reader ought to know.  Mere passing mention of a term for the first
-time does not deserve @code{@@dfn}.  The command generates italics in
-the printed manual, and double quotation marks in the Info file.  For
-example:@refill
-
-@example
-Getting rid of a file is called @@dfn@{deleting@} it.
-@end example
-
-@noindent
-produces
-
-@quotation
-Getting rid of a file is called @dfn{deleting} it.
-@end quotation
-
-As a general rule, a sentence containing the defining occurrence of a
-term should be a definition of the term.  The sentence does not need
-to say explicitly that it is a definition, but it should contain the
-information of a definition---it should make the meaning clear.
-
-@node cite
-@subsection @code{@@cite}@{@var{reference}@}
-@findex cite
-
-Use the @code{@@cite} command for the name of a book that lacks a
-companion Info file.  The command produces italics in the printed
-manual, and quotation marks in the Info file.
-
-If a book is written in Texinfo, it is better to use a cross reference
-command since a reader can easily follow such a reference in Info.
-@xref{xref, , @code{@@xref}}.
-
-
-@ignore
-@c node ctrl, , cite, Indicating
-@comment  node-name,  next,  previous,  up
-@c subsection @code{@@ctrl}@{@var{ctrl-char}@}
-@findex ctrl
-
-The @code{@@ctrl} command is seldom used.  It describes an @sc{ascii}
-control character by inserting the actual character into the Info
-file.
-
-Usually, in Texinfo, you talk what you type as keyboard entry by
-describing it with @code{@@kbd}: thus, @samp{@@kbd@{C-a@}} for
-@kbd{C-a}.  Use @code{@@kbd} in this way when talking about a control
-character that is typed on the keyboard by the user.  When talking
-about a control character appearing in a file or a string, do not use
-@code{@@kbd} since the control character is not typed.  Also, do not
-use @samp{C-} but spell out @code{control-}, as in @samp{control-a},
-to make it easier for a reader to understand.@refill
-
-@code{@@ctrl} is an idea from the beginnings of Texinfo which may not
-really fit in to the scheme of things.  But there may be times when
-you want to use the command.  The pattern is
-@code{@@ctrl@{@var{ch}@}}, where @var{ch} is an @sc{ascii} character
-whose control-equivalent is wanted.  For example, to specify
-@samp{control-f}, you would enter@refill
-
-@example
-@@ctrl@{f@}
-@end example
-
-@noindent
-produces
-
-@quotation
-@ctrl{f}
-@end quotation
-
-In the Info file, this generates the specified control character, output
-literally into the file.  This is done so a user can copy the specified
-control character (along with whatever else he or she wants) into another
-Emacs buffer and use it.  Since the `control-h',`control-i', and
-`control-j' characters are formatting characters, they should not be
-indicated with @code{@@ctrl}.@refill
-
-In a printed manual, @code{@@ctrl} generates text to describe or
-identify that control character: an uparrow followed by the character
-@var{ch}.@refill
-@end ignore
-
-
-@node abbr
-@subsection @code{@@abbr}@{@var{abbreviation}[, @var{meaning}]@}
-@findex abbr
-
-@cindex Abbreviations, tagging
-You can use the @code{@@abbr} command for general abbreviations.  The
-abbreviation is given as the single argument in braces, as in
-@samp{@@abbr@{Comput.@}}.  As a matter of style, or for particular
-abbreviations, you may prefer to omit periods, as in
-@samp{@@abbr@{Mr@} Stallman}.
-
-@code{@@abbr} accepts an optional second argument, intended to be used
-for the meaning of the abbreviation.
-
-If the abbreviation ends with a lowercase letter and a period, and is
-not at the end of a sentence, and has no second argument, remember to
-use the @code{@@.} command (@pxref{Not Ending a
-Sentence}) to get the correct spacing.  However, you do not have to
-use @code{@@.} within the abbreviation itself; Texinfo automatically
-assumes periods within the abbreivation do not end a sentence.
-
-@cindex <abbr> tag
-In @TeX{} and in the Info output, the first argument is printed as-is;
-if the second argument is present, it is printed in parentheses after
-the abbreviation.  In HTML and XML, the @code{<abbr>} tag is
-used; in Docbook, the @code{<abbrev>} tag is used.  For instance:
-
-@example
-@@abbr@{Comput. J., Computer Journal@}
-@end example
-
-@noindent produces:
-
-@display
-@abbr{Comput. J., Computer Journal}
-@end display
-
-For abbreviations consisting of all capital letters, you may prefer to
-use the @code{@@acronym} command instead.  See the next section for
-more on the usage of these two commands.
-
-
-@node acronym
-@subsection @code{@@acronym}@{@var{acronym}[, @var{meaning}]@}
-@findex acronym
-
-@cindex NASA, as acronym
-@cindex Acronyms, tagging
-Use the @code{@@acronym} command for abbreviations written in all
-capital letters, such as `@acronym{NASA}'.  The abbreviation is given as
-the single argument in braces, as in @samp{@@acronym@{NASA@}}.  As
-a matter of style, or for particular acronyms, you may prefer to
-use periods, as in @samp{@@acronym@{N.A.S.A.@}}.
-
-@code{@@acronym} accepts an optional second argument, intended to be
-used for the meaning of the acronym.
-
-If the acronym is at the end of a sentence, and if there is no second
-argument, remember to use the @code{@@.} or similar command
-(@pxref{Ending a Sentence}) to get the correct spacing.
-
-@cindex <acronym> tag
-In @TeX{}, the acronym is printed in slightly smaller font.  In the
-Info output, the argument is printed as-is.  In either format, if the
-second argument is present, it is printed in parentheses after the
-acronym.  In HTML, Docbook, and XML, the @code{<acronym>} tag is
-used.  
-
-For instance (since GNU is a recursive acronym, we use
-@code{@@acronym} recursively):
-
-@example
-@@acronym@{GNU, @@acronym@{GNU@}'s Not Unix@}
-@end example
-
-@noindent produces:
-
-@display
-@acronym{GNU, @acronym{GNU}'s Not Unix}
-@end display
-
-In some circumstances, it is conventional to print family names in all
-capitals.  Don't use @code{@@acronym} for this, since a name is not an
-acronym.  Use @code{@@sc} instead (@pxref{Smallcaps}).
-
-@code{@@abbr} and @code{@@acronym} are closely related commands: they
-both signal to the reader that a shortened form is being used, and
-possibly give a meaning.  When choosing whether to use these two
-commands, please bear the following in mind.
-
-@itemize @minus
-@item
-In standard English usage, acronyms are a subset of abbreviations:
-they include pronounceable words like `@acronym{NATO}', `radar', and
-`snafu', and some sources also include syllable acronyms like
-`Usenet', hybrids like `@acronym{SIGGRAPH}', and unpronounceable
-initialisms like `@acronym{FBI}'.
-
-@item
-In Texinfo, an acronym (but not an abbreviation) should consist only
-of capital letters and periods, no lowercase.
-
-@item
-In @TeX{}, an acronym (but not an abbreviation) is printed in a
-slightly smaller font.
-
-@item
-Some browsers place a dotted bottom border under abbreviations but not
-acronyms.
-
-@item
-It's not essential to use these commands for all abbreviations.  Text
-is perfectly readable without them, and for common abbreviations like
-`etc.@:', we consider them to be overkill.
-
-@end itemize
-
-
-@node indicateurl
-@subsection @code{@@indicateurl}@{@var{uniform-resource-locator}@}
-@findex indicateurl
-@cindex Uniform resource locator, indicating
-@cindex URL, indicating
-
-Use the @code{@@indicateurl} command to indicate a uniform resource
-locator on the World Wide Web.  This is analogous to @code{@@file},
-@code{@@var}, etc., and is purely for markup purposes.  It does not
-produce a link you can follow in HTML output (use the @code{@@uref}
-command for that, @pxref{uref,, @code{@@uref}}).  It is useful for
-url's which do not actually exist.  For example:
-
-@example
-For example, the url might be @@indicateurl@{http://example.org/path@}.
-@end example
-
-@noindent which produces:
-
-@display
-For example, the url might be @indicateurl{http://example.org/path}.
-@end display
-
-
-@node email
-@subsection @code{@@email}@{@var{email-address}[, @var{displayed-text}]@}
-@findex email
-
-Use the @code{@@email} command to indicate an electronic mail address.
-It takes one mandatory argument, the address, and one optional argument, the
-text to display (the default is the address itself).
-
-@cindex Mailto link
-In Info, the address is shown in angle brackets, preceded by the text
-to display if any.  In @TeX{}, the angle brackets are omitted.  In
-HTML output, @code{@@email} produces a @samp{mailto} link that usually
-brings up a mail composition window.  For example:
-
-@example
-Send bug reports to @@email@{bug-texinfo@@@@gnu.org@},
-suggestions to the @@email@{bug-texinfo@@@@gnu.org, same place@}.
-@end example
-@noindent produces
-@display
-Send bug reports to @email{bug-texinfo@@gnu.org},
-suggestions to the @email{bug-texinfo@@gnu.org, same place}.
-@end display
-
-
-@node Emphasis
-@comment node-name,  next,  previous,  up
-@section Emphasizing Text
-@cindex Emphasizing text
-
-Usually, Texinfo changes the font to mark words in the text according to
-what category the words belong to; an example is the @code{@@code} command.
-Most often, this is the best way to mark words.
-However, sometimes you will want to emphasize text without indicating a
-category.  Texinfo has two commands to do this.  Also, Texinfo has
-several commands that specify the font in which @TeX{} will typeset
-text.  These commands have no effect on Info and only one of them,
-the @code{@@r} command, has any regular use.@refill
-
-@menu
-* emph & strong::               How to emphasize text in Texinfo.
-* Smallcaps::                   How to use the small caps font.
-* Fonts::                       Various font commands for printed output.
-@end menu
-
-@node emph & strong
-@subsection @code{@@emph}@{@var{text}@} and @code{@@strong}@{@var{text}@}
-@cindex Emphasizing text, font for
-@findex emph
-@findex strong
-
-The @code{@@emph} and @code{@@strong} commands are for emphasis;
-@code{@@strong} is stronger.  In printed output, @code{@@emph} produces
-@emph{italics} and @code{@@strong} produces @strong{bold}.
-
-For example,
-
-@example
-@group
-@@strong@{Caution:@} @@samp@{rm * .[^.]*@}
-removes @@emph@{all@} files in the directory.
-@end group
-@end example
-
-@noindent
-produces the following in printed output and HTML:
-
-@quotation
-@strong{Caution}: @samp{rm * .[^.]*}
-removes @emph{all} files in the directory.
-@end quotation
-
-@noindent
-and the following in Info:
-
-@example
-*Caution:* `rm * .[^.]*' removes _all_
-files in the directory.
-@end example
-
-The @code{@@strong} command is seldom used except to mark what is, in
-effect, a typographical element, such as the word `Caution' in the
-preceding example.
-
-In the Info output, @code{@@emph} surrounds the text with underscores
-(@samp{_}), and @code{@@strong} puts asterisks around the text.
-
-@quotation Caution
-Do not use @code{@@strong} with the word @samp{Note}; Info will
-mistake the combination for a cross reference.  (It's usually
-redundant, anyway.)  Use a phrase such as @strong{Please notice} or
-@strong{Caution} instead, or the optional argument to
-@code{@@quotation}---@samp{Note} is allowable there.
-@end quotation
-
-
-@node Smallcaps
-@subsection @code{@@sc}@{@var{text}@}: The Small Caps Font
-@cindex Small caps font
-@findex sc @r{(small caps font)}
-
-Use the @samp{@@sc} command to set text in @sc{a small caps font}
-(where possible).  Write the text you want to be in small caps between
-braces in lower case, like this:
-
-@example
-Richard @@sc@{Stallman@} founded @@acronym@{GNU@}.
-@end example
-
-@noindent
-This produces:
-
-@display
-Richard @sc{Stallman} founded @acronym{GNU}.
-@end display
-
-As shown here, we recommend using @code{@@acronym} for actual
-acronyms (@pxref{acronym}), and reserving @code{@@sc} for special
-cases where you want small caps.  The output is not the same
-(@code{@@acronym} prints in a smaller text font, not the small caps
-font), but more importantly it describes the actual text more
-accurately.
-
-Family names are one case where small capitals are sometimes desirable,
-also as shown here.
-
-@cindex <small> tag
-@TeX{} typesets any uppercase letters between the braces of an
-@code{@@sc} command in full-size capitals; only lowercase letters are
-printed in the small caps font.  In the Info output, the argument to
-@code{@@sc} is printed in all upper case.  In HTML, the argument is
-uppercased and the output marked with the @code{<small>} tag to reduce
-the font size.
-
-Since it's redundant to mark all-uppercase text with @code{@@sc},
-@command{makeinfo} warns about such usage.
-
-We recommend using regular mixed case wherever possible.
-
-
-@node Fonts
-@subsection Fonts for Printing, Not Info
-@cindex Fonts for printing, not Info
-
-Texinfo provides a number of font commands that specify font changes
-in the printed manual and (where possible) in the HTML output, but
-have no effect in the Info file.  All the commands apply to an
-argument that follows, surrounded by braces.
-
-@table @code
-@item @@b
-@findex b @r{(bold font)}
-@cindex Bold font
-selects @b{bold} face;
-
-@item @@i
-@findex i @r{(italic font)}
-@cindex Italic font
-selects an @i{italic} font;
-
-@item @@r
-@findex r @r{(roman font)}
-@cindex Roman font
-@cindex Default font
-selects a @r{roman} font, which is the usual font in which text is
-printed.  It may or may not be seriffed.
-
-@item @@sansserif
-@findex sansserif @r{(sans serif font)}
-@cindex Sans serif font
-selects a @sansserif{sans serif} font;
-
-@item @@slanted
-@findex slanted @r{(slanted font)}
-@cindex Slanted font
-@cindex Oblique font
-rselects a @slanted{slanted} font;
-
-@item @@t
-@findex t @r{(typewriter font)}
-@cindex Monospace font
-@cindex Fixed-width font
-@cindex Typewriter font
-selects the @t{fixed-width}, typewriter-style font used by @code{@@code};
-
-@end table
-
-(The commands with longer names were invented much later than the
-others, when it did not seem desirable to use very short names for
-such an infrequently needed feature.)
-
-@cindex <lineannotation> Docbook tag
-Only the @code{@@r} command has much use: in example-like
-environments, you can use the @code{@@r} command to write comments in
-the standard roman font instead of the fixed-width font.  This looks
-better in printed output, and produces a @code{<lineannotation>} tag
-in Docbook output.
-
-For example,
-
-@example
-@group
-@@lisp
-(+ 2 2)    ; @@r@{Add two plus two.@}
-@@end lisp
-@end group
-@end example
-
-@noindent
-produces
-
-@lisp
-(+ 2 2)    ; @r{Add two plus two.}
-@end lisp
-
-In general, you should avoid using the other font commands.  Some of
-them are only useful when documenting functionality with specific font
-effects, such as in \TeX\ and related packages.
-
-
-@node Quotations and Examples
-@chapter Quotations and Examples
-
-Quotations and examples are blocks of text consisting of one or more
-whole paragraphs that are set off from the bulk of the text and
-treated differently.  They are usually indented in the output.
-
-@findex end
-In Texinfo, you always begin a quotation or example by writing an
-@@-command at the beginning of a line by itself, and end it by writing
-an @code{@@end} command that is also at the beginning of a line by
-itself.  For instance, you begin an example by writing @code{@@example}
-by itself at the beginning of a line and end the example by writing
-@code{@@end example} on a line by itself, at the beginning of that
-line, and with only one space between the @code{@@end} and the
-@code{example}.
-
-@menu
-* Block Enclosing Commands::    Different constructs for different purposes.
-* quotation::                   Writing a quotation.
-* example::                     Writing an example in a fixed-width font.
-* verbatim::                    Writing a verbatim example.
-* verbatiminclude::             Including a file verbatim.
-* lisp::                        Illustrating Lisp code.
-* small::                       Examples in a smaller font.
-* display::                     Writing an example in the current font.
-* format::                      Writing an example without narrowed margins.
-* exdent::                      Undo indentation on a line.
-* flushleft & flushright::      Pushing text flush left or flush right.
-* noindent::                    Preventing paragraph indentation.
-* indent::                      Forcing paragraph indentation.
-* cartouche::                   Drawing rounded rectangles around examples.
-@end menu
-
-
-@node Block Enclosing Commands
-@section Block Enclosing Commands
-
-Here are commands for quotations and examples, explained further in the
-following sections:
-
-@table @code
-@item @@quotation
-Indicate text that is quoted. The text is filled, indented (from both
-margins), and printed in a roman font by default.
-
-@item @@example
-Illustrate code, commands, and the like. The text is printed
-in a fixed-width font, and indented but not filled.
-
-@item @@verbatim
-Mark a piece of text that is to be printed verbatim; no character
-substitutions are made and all commands are ignored, until the next
-@code{@@end verbatim}.  The text is printed in a fixed-width font,
-and not indented or filled.  Extra spaces and blank lines are
-significant, and tabs are expanded.
-
-@item @@smallexample
-Same as @code{@@example}, except that in @TeX{} this command typesets
-text in a smaller font.
-
-@item @@lisp
-Like @code{@@example}, but specifically for illustrating Lisp code. The
-text is printed in a fixed-width font, and indented but not filled.
-
-@item @@smalllisp
-Is to @code{@@lisp} as @code{@@smallexample} is to @code{@@example}.
-
-@item @@display
-Display illustrative text.  The text is indented but not filled, and
-no font is selected (so, by default, the font is roman).@refill
-
-@item @@smalldisplay
-Is to @code{@@display} as @code{@@smallexample} is to @code{@@example}.
-
-@item @@format
-Like @code{@@display} (the text is not filled and no font is selected),
-but the text is not indented.
-
-@item @@smallformat
-Is to @code{@@format} as @code{@@smallexample} is to @code{@@example}.
-@end table
-
-The @code{@@exdent} command is used within the above constructs to
-undo the indentation of a line.
-
-The @code{@@flushleft} and @code{@@flushright} commands are used to line
-up the left or right margins of unfilled text.@refill
-
-The @code{@@noindent} command may be used after one of the above
-constructs to prevent the following text from being indented as a new
-paragraph.
-
-You can use the @code{@@cartouche} environment around one of the above
-constructs to highlight the example or quotation by drawing a box with
-rounded corners around it.  @xref{cartouche, , Drawing Cartouches Around
-Examples}.
-
-
-@node quotation
-@section @code{@@quotation}: Block quotations
-@cindex Quotations
-@findex quotation
-
-The text of a quotation is processed normally (regular font, text is
-filled) except that:
-
-@itemize @bullet
-@item
-the margins are closer to the center of the page, so the whole of the
-quotation is indented;
-
-@item
-and the first lines of paragraphs are indented no more than other lines.
-
-@end itemize
-
-@quotation
-This is an example of text written between an @code{@@quotation}
-command and an @code{@@end quotation} command.  An @code{@@quotation}
-command is most often used to indicate text that is excerpted from
-another (real or hypothetical) printed work.
-@end quotation
-
-Write an @code{@@quotation} command as text on a line by itself.  This
-line will disappear from the output.  Mark the end of the quotation
-with a line beginning with and containing only @code{@@end quotation}.
-The @code{@@end quotation} line will likewise disappear from the
-output.
-
-@code{@@quotation} takes one optional argument, given on the remainder
-of the line.  This text, if present, is included at the beginning of
-the quotation in bold or otherwise emphasized, and followed with a
-@samp{:}.  For example:
-
-@example
-@@quotation Note
-This is
-a foo.
-@@end quotation
-@end example
-
-@noindent
-produces
-
-@quotation Note
-This is
-a foo.
-@end quotation
-
-If the @code{@@quotation} argument is exactly one of these words:
-
-@example
-Caution  Important  Note  Tip  Warning
-@end example
-
-@cindex <note> Docbook tag
-@cindex <blockquote> HTML tag
-@noindent then the Docbook output uses corresponding special tags
-(@code{<note>}, etc.) instead of the default @code{<blockquote>}.
-HTML output always uses @code{<blockquote>}.
-
-
-@node example
-@section @code{@@example}: Example Text
-@cindex Examples, formatting them
-@cindex Formatting examples
-@findex example
-
-The @code{@@example} environment is used to indicate an example that
-is not part of the running text, such as computer input or output.
-Write an @code{@@example} command at the beginning of a line by
-itself.  Mark the end of the example with an @code{@@end example}
-command, also written at the beginning of a line by itself.
-
-An @code{@@example} environment has the following characteristics:
-
-@itemize
-@item Each line in the input file is a line in the output; that is,
-the source text is not filled as it normally is.
-@item Extra spaces and blank lines are significant.
-@item The output is indented.
-@item The output uses a fixed-width font.
-@item Texinfo commands @emph{are} expanded; if you want the output to
-be the input verbatim, use the @code{@@verbatim} environment instead
-(@pxref{verbatim,,@code{@@verbatim}}).
-@end itemize
-
-For example,
-
-@example
-@@example
-cp foo @@var@{dest1@}; \
- cp foo @@var@{dest2@}
-@@end example
-@end example
-
-@noindent
-produces
-
-@example
-cp foo @var{dest1}; \
- cp foo @var{dest2}
-@end example
-
-The lines containing @code{@@example} and @code{@@end example} will
-disappear from the output.  To make the output look good, you should
-put a blank line before the @code{@@example} and another blank line
-after the @code{@@end example}.  Blank lines inside the beginning
-@code{@@example} and the ending @code{@@end example}, on the other
-hand, do appear in the output.
-
-@quotation Caution
-Do not use tabs in the lines of an example!  (Or anywhere else in
-Texinfo, except in verbatim environments.)  @TeX{} treats tabs as
-single spaces, and that is not what they look like.  In Emacs, you can
-use @kbd{M-x untabify} to convert tabs in a region to multiple spaces.
-@end quotation
-
-Examples are often, logically speaking, ``in the middle'' of a
-paragraph, and the text that continues afterwards should not be
-indented, as in the example above.  The @code{@@noindent} command
-prevents a piece of text from being indented as if it were a new
-paragraph (@pxref{noindent,,@code{@@noindent}}.
-
-If you want to embed code fragments within sentences, instead of
-displaying them, use the @code{@@code} command or its relatives
-(@pxref{code,,@code{@@code}}).
-
-If you wish to write a ``comment'' on a line of an example in the
-normal roman font, you can use the @code{@@r} command (@pxref{Fonts}).
-
-
-@node verbatim
-@section @code{@@verbatim}: Literal Text
-@findex verbatim
-@cindex Verbatim environment
-
-Use the @code{@@verbatim} environment for printing of text that may
-contain special characters or commands that should not be interpreted,
-such as computer input or output (@code{@@example} interprets its text
-as regular Texinfo commands).  This is especially useful for including
-automatically generated output in a Texinfo manual.  Here is an example;
-the output you see is just the same as the input, with a line
-@code{@@verbatim} before and a line @code{@@end verbatim} after.
-
-@verbatim
-This is an example of text written in a @verbatim
-block.  No character substitutions are made.  All commands
-are ignored, until `<at>end verbatim'.
-
-In the printed manual, the text is typeset in a
-fixed-width font, and not indented or filled.  All
-spaces and blank lines are significant, including tabs.
-@end verbatim
-
-Write a @code{@@verbatim} command at the beginning of a line by itself.
-This line will disappear from the output.  Mark the end of the verbatim
-block with a @code{@@end verbatim} command, also written at the
-beginning of a line by itself.  The @code{@@end verbatim} will also
-disappear from the output.
-
-For example:
-@c oops, got to trick this a bit: can't use @end verbatim inside @verbatim
-
-@example
-@exdent @t{@@verbatim}
-@exdent @t{@{}
-@exdent @key{TAB}@t{@@command with strange characters: @@'e}
-@exdent @t{expand@key{TAB}me}
-@exdent @t{@}}
-@exdent @t{@@end verbatim}
-@end example
-
-@noindent
-produces
-
-@verbatim
-{
-        @command with strange characters: @'e
-expand	me
-}
-@end verbatim
-
-Since the lines containing @code{@@verbatim} and @code{@@end verbatim}
-produce no output, typically you should put a blank line before the
-@code{@@verbatim} and another blank line after the @code{@@end
-verbatim}.  Blank lines between the beginning @code{@@verbatim} and
-the ending @code{@@end verbatim} will appear in the output.
-
-It is not reliable to use @code{@@verbatim} inside other Texinfo constructs.
-
-
-@node verbatiminclude
-@section @code{@@verbatiminclude} @var{file}: Include a File Verbatim
-@cindex Verbatim, include file
-@cindex Including a file verbatim
-@findex verbatiminclude
-
-You can include the exact contents of a file in the document with the
-@code{@@verbatiminclude} command:
-
-@example
-@@verbatiminclude @var{filename}
-@end example
-
-The contents of @var{filename} is printed in a verbatim environment
-(@pxref{verbatim,,@code{@@verbatim}}).  Generally, the file is printed
-exactly as it is, with all special characters and white space
-retained.  No indentation is added; if you want indentation, enclose
-the @code{@@verbatiminclude} within @code{@@example}
-(@pxref{example,,@code{@@example}}).
-
-The name of the file is taken literally, with a single exception:
-@code{@@value@{@var{var}@}} references are expanded.  This makes it
-possible to reliably include files in other directories in a
-distribution, for instance:
-
-@example
-@@include @@value@{top_srcdir@}/NEWS
-@end example
-
-@noindent (You still have to get @code{top_srcdir} defined in the
-first place.)
-
-
-@node lisp
-@section @code{@@lisp}: Marking a Lisp Example
-@findex lisp
-@cindex Lisp example
-
-The @code{@@lisp} command is used for Lisp code.  It is synonymous
-with the @code{@@example} command.
-
-@lisp
-This is an example of text written between an
-@code{@@lisp} command and an @code{@@end lisp} command.
-@end lisp
-
-Use @code{@@lisp} instead of @code{@@example} to preserve information
-regarding the nature of the example.  This is useful, for example, if
-you write a function that evaluates only and all the Lisp code in a
-Texinfo file.  Then you can use the Texinfo file as a Lisp
-library.@footnote{It would be straightforward to extend Texinfo to work
-in a similar fashion for C, Fortran, or other languages.}
-
-Mark the end of @code{@@lisp} with @code{@@end lisp} on a line by
-itself.
-
-
-@node small
-@section @code{@@small@dots{}} Block Commands
-@cindex Small examples
-@cindex Examples in smaller fonts
-@cindex Lisp examples in smaller fonts
-@findex smalldisplay
-@findex smallexample
-@findex smallformat
-@findex smalllisp
-
-In addition to the regular @code{@@example} and @code{@@lisp} commands,
-Texinfo has ``small'' example-style commands.  These are
-@code{@@smalldisplay}, @code{@@smallexample}, @code{@@smallformat}, and
-@code{@@smalllisp}.
-
-In Info, the @code{@@small@dots{}} commands are equivalent to their
-non-small companion commands.
-
-In @TeX{}, however, the @code{@@small@dots{}} commands typeset text in
-a smaller font than the non-small example commands.  Consequently,
-many examples containing long lines fit on a page without needing to
-be shortened.
-
-Mark the end of an @code{@@small@dots{}} block with a corresponding
-@code{@@end small@dots{}}.  For example, pair @code{@@smallexample} with
-@code{@@end smallexample}.
-
-Here is an example of the font used by the @code{@@small@dots{}}
-commands (in Info, the output will be the same as usual):
-
-@smallexample
-@dots{} to make sure that you have the freedom to
-distribute copies of free software (and charge for
-this service if you wish), that you receive source
-code or can get it if you want it, that you can
-change the software or use pieces of it in new free
-programs; and that you know you can do these things.
-@end smallexample
-
-The @code{@@small@dots{}} commands make it easier to prepare manuals
-without forcing you to edit examples by hand to fit them onto narrower
-pages.
-
-As a general rule, a printed document looks much better if you use
-only one of (for instance) @code{@@example} or @code{@@smallexample}
-consistently within a chapter.
-
-
-@node display
-@section @code{@@display} and @code{@@smalldisplay}
-@cindex Display formatting
-@findex display
-
-The @code{@@display} command begins a kind of example, where each line
-of input produces a line of output, and the output is indented.  It is
-thus like the @code{@@example} command except that, in a printed
-manual, @code{@@display} does not select the fixed-width font.  In
-fact, it does not specify the font at all, so that the text appears in
-the same font it would have appeared in without the @code{@@display}
-command.
-
-@display
-This is an example of text written between an @code{@@display} command
-and an @code{@@end display} command.  The @code{@@display} command
-indents the text, but does not fill it.
-@end display
-
-@findex smalldisplay
-Texinfo also provides a command @code{@@smalldisplay}, which is like
-@code{@@display} but uses a smaller font in @code{@@smallbook} format.
-@xref{small}.
-
-The @code{@@table} command (@pxref{table}) does not work inside
-@code{@@display}.  Since @code{@@display} is line-oriented, it doesn't
-make sense to use them together.  If you want to indent a table, try
-@code{@@quotation} (@pxref{quotation}).
-
-
-@node format
-@section @code{@@format} and @code{@@smallformat}
-@findex format
-
-The @code{@@format} command is similar to @code{@@example} except
-that, in the printed manual, @code{@@format} does not select the
-fixed-width font and does not narrow the margins.@refill
-
-@format
-This is an example of text written between an @code{@@format} command
-and an @code{@@end format} command.  As you can see
-from this example,
-the @code{@@format} command does not fill the text.
-@end format
-
-@findex smallformat
-Texinfo also provides a command @code{@@smallformat}, which is like
-@code{@@format} but uses a smaller font in @code{@@smallbook} format.
-@xref{small}.
-
-
-
-@node exdent
-@section @code{@@exdent}: Undoing a Line's Indentation
-@cindex Indentation undoing
-@findex exdent
-
-The @code{@@exdent} command removes any indentation a line might have.
-The command is written at the beginning of a line and applies only to
-the text that follows the command that is on the same line.  Do not use
-braces around the text.  In a printed manual, the text on an
-@code{@@exdent} line is printed in the roman font.@refill
-
-@code{@@exdent} is usually used within examples.  Thus,@refill
-
-@example
-@group
-@@example
-This line follows an @@@@example command.
-@@exdent This line is exdented.
-This line follows the exdented line.
-The @@@@end example comes on the next line.
-@@end group
-@end group
-@end example
-
-@noindent
-produces
-
-@example
-@group
-This line follows an @@example command.
-@exdent This line is exdented.
-This line follows the exdented line.
-The @@end example comes on the next line.
-@end group
-@end example
-
-In practice, the @code{@@exdent} command is rarely used.
-Usually, you un-indent text by ending the example and
-returning the page to its normal width.@refill
-
-
-@node flushleft & flushright
-@section @code{@@flushleft} and @code{@@flushright}
-@findex flushleft
-@findex flushright
-@cindex Ragged right
-@cindex Ragged left
-
-The @code{@@flushleft} and @code{@@flushright} commands line up the
-ends of lines on the left and right margins of a page,
-but do not fill the text.  The commands are written on lines of their
-own, without braces.  The @code{@@flushleft} and @code{@@flushright}
-commands are ended by @code{@@end flushleft} and @code{@@end
-flushright} commands on lines of their own.@refill
-
-@need 1500
-For example,
-
-@example
-@group
-@@flushleft
-This text is
-written flushleft.
-@@end flushleft
-@end group
-@end example
-
-@noindent
-produces
-
-@quotation
-@flushleft
-This text is
-written flushleft.
-@end flushleft
-@end quotation
-
-
-@code{@@flushright} produces the type of indentation often used in the
-return address of letters.  For example,
-
-@example
-@group
-@@flushright
-Here is an example of text written
-flushright.  The @@code@{@@flushright@} command
-right justifies every line but leaves the
-left end ragged.
-@@end flushright
-@end group
-@end example
-
-@noindent
-produces
-
-@flushright
-Here is an example of text written
-flushright.  The @code{@@flushright} command
-right justifies every line but leaves the
-left end ragged.
-@end flushright
-
-
-@node noindent
-@section @code{@@noindent}: Omitting Indentation
-@cindex Omitting indentation
-@cindex Suppressing indentation
-@cindex Indentation, omitting
-@findex noindent
-
-An example or other inclusion can break a paragraph into segments.
-Ordinarily, the formatters indent text that follows an example as a new
-paragraph.  You can prevent this on a case-by-case basis by writing
-@code{@@noindent} at the beginning of a line, preceding the continuation
-text.  You can also disable indentation for all paragraphs globally with
-@code{@@paragraphindent} (@pxref{paragraphindent, Paragraph Indenting}).
-
-It is best to write @code{@@noindent} on a line by itself, since in most
-environments, spaces following the command will not be ignored.  It's ok
-to use it at the beginning of a line, with text following, outside of
-any environment.
-
-@need 1500
-For example:
-
-@example
-@group
-@@example
-This is an example
-@@end example
-
-@@noindent
-This line is not indented.  As you can see, the
-beginning of the line is fully flush left with the line
-that follows after it.  (This whole example is between
-@@code@{@@@@display@} and @@code@{@@@@end display@}.)
-@end group
-@end example
-
-@noindent produces:
-
-@display
-
-@example
-This is an example
-@end example
-
-@noindent
-This line is not indented.  As you can see, the
-beginning of the line is fully flush left with the line
-that follows after it.  (This whole example is between
-@code{@@display} and @code{@@end display}.)
-
-@end display
-
-To adjust the number of blank lines properly in the Info file output,
-remember that the line containing @code{@@noindent} does not generate a
-blank line, and neither does the @code{@@end example} line.
-
-In the Texinfo source file for this manual, each line that says
-`produces' is preceded by @code{@@noindent}.
-
-Do not put braces after an @code{@@noindent} command; they are not
-necessary, since @code{@@noindent} is a command used outside of
-paragraphs (@pxref{Command Syntax}).
-
-
-@node indent
-@section @code{@@indent}: Forcing Indentation
-@cindex Forcing indentation
-@cindex Inserting indentation
-@cindex Indentation, forcing
-@findex indent
-
-@indent
-To complement the @code{@@noindent} command (see the previous
-section), Texinfo provides the @code{@@indent} command that forces a
-paragraph to be indented.  This paragraph, for instance, is indented
-using an @code{@@indent} command.  The first paragraph of a section is
-the most likely place to use @code{@@indent}, to override the normal
-behavior of no indentation there (@pxref{paragraphindent}).
-
-It is best to write @code{@@indent} on a line by itself, since in most
-environments, spaces following the command will not be ignored.  The
-@code{@@indent} line will not generate a blank line in the Info output
-within an environment.
-
-However, it is ok to use it at the beginning of a line, with text
-following, outside of any environment.
-
-Do not put braces after an @code{@@indent} command; they are not
-necessary, since @code{@@indent} is a command used outside of
-paragraphs (@pxref{Command Syntax}).
-
-
-@node cartouche
-@section @code{@@cartouche}: Rounded Rectangles Around Examples
-@findex cartouche
-@cindex Box with rounded corners
-@cindex Rounded rectangles, around examples
-
-In a printed manual, the @code{@@cartouche} command draws a box with
-rounded corners around its contents.  In HTML, a normal rectangle is
-drawn (that's the best HTML can do).  @code{@@cartouche} has no effect
-in Info output.
-
-You can use this command to further highlight an example or quotation.
-For instance, you could write a manual in which one type of example is
-surrounded by a cartouche for emphasis.
-
-For example,
-
-@example
-@@cartouche
-@@example
-% pwd
-/usr/local/share/emacs
-@@end example
-@@end cartouche
-@end example
-
-@noindent
-surrounds the two-line example with a box with rounded corners, in the
-printed manual.
-
-The output from the example looks like this (if you're reading this in
-Info, you'll see the @code{@@cartouche} had no effect):
-
-@cartouche
-@example
-% pwd
-/usr/local/info
-@end example
-@end cartouche
-
-For proper output in HTML, it's necessary to put the
-@code{@@cartouche} around the @code{@@example}, and not the other way
-around.  This limitation of @command{makeinfo} may be removed one day.
-
-@code{@@cartouche} also implies @code{@@group} (@pxref{group}).
-
-@node Lists and Tables
-@chapter Lists and Tables
-@cindex Making lists and tables
-@cindex Lists and tables, making
-@cindex Tables and lists, making
-
-Texinfo has several ways of making lists and tables.  Lists can be
-bulleted or numbered; two-column tables can highlight the items in
-the first column; multi-column tables are also supported.
-
-@menu
-* Introducing Lists::           Texinfo formats lists for you.
-* itemize::                     How to construct a simple list.
-* enumerate::                   How to construct a numbered list.
-* Two-column Tables::           How to construct a two-column table.
-* Multi-column Tables::         How to construct generalized tables.
-@end menu
-
-@node Introducing Lists
-@section Introducing Lists
-
-Texinfo automatically indents the text in lists or tables, and numbers
-an enumerated list.  This last feature is useful if you modify the
-list, since you do not need to renumber it yourself.@refill
-
-Numbered lists and tables begin with the appropriate @@-command at the
-beginning of a line, and end with the corresponding @code{@@end}
-command on a line by itself.  The table and itemized-list commands
-also require that you write formatting information on the same line as
-the beginning @@-command.@refill
-
-Begin an enumerated list, for example, with an @code{@@enumerate}
-command and end the list with an @code{@@end enumerate} command.
-Begin an itemized list with an @code{@@itemize} command, followed on
-the same line by a formatting command such as @code{@@bullet}, and end
-the list with an @code{@@end itemize} command.@refill
-@findex end
-
-Precede each element of a list with an @code{@@item} or @code{@@itemx}
-command.@refill
-
-@sp 1
-@noindent
-Here is an itemized list of the different kinds of table and lists:@refill
-
-@itemize @bullet
-@item
-Itemized lists with and without bullets.
-
-@item
-Enumerated lists, using numbers or letters.
-
-@item
-Two-column tables with highlighting.
-@end itemize
-
-@sp 1
-@noindent
-Here is an enumerated list with the same items:@refill
-
-@enumerate
-@item
-Itemized lists with and without bullets.
-
-@item
-Enumerated lists, using numbers or letters.
-
-@item
-Two-column tables with highlighting.
-@end enumerate
-
-@sp 1
-@noindent
-And here is a two-column table with the same items and their
-@w{@@-commands}:@refill
-
-@table @code
-@item @@itemize
-Itemized lists with and without bullets.
-
-@item @@enumerate
-Enumerated lists, using numbers or letters.
-
-@item @@table
-@itemx @@ftable
-@itemx @@vtable
-Two-column tables, optionally with indexing.
-@end table
-
-
-@node itemize
-@section @code{@@itemize}: Making an Itemized List
-@cindex Itemization
-@findex itemize
-
-The @code{@@itemize} command produces sequences of indented
-paragraphs, with a bullet or other mark inside the left margin
-at the beginning of each paragraph for which such a mark is desired.@refill
-
-@cindex @code{@@w}, for blank items
-Begin an itemized list by writing @code{@@itemize} at the beginning of
-a line.  Follow the command, on the same line, with a character or a
-Texinfo command that generates a mark.  Usually, you will write
-@code{@@bullet} after @code{@@itemize}, but you can use
-@code{@@minus}, or any command or character that results in a single
-character in the Info file.  If you don't want any mark at all, use
-@code{@@w}.  (When you write the mark command such as
-@code{@@bullet} after an @code{@@itemize} command, you may omit the
-@samp{@{@}}.)  If you don't specify a mark command, the default is
-@code{@@bullet}.
-
-Write the text of the indented paragraphs themselves after the
-@code{@@itemize}, up to another line that says @code{@@end
-itemize}.@refill
-
-@findex item
-At the beginning of each paragraph for which a mark in the margin is
-desired, write a line that starts with @code{@@item}.  It is ok to
-have text following the @code{@@item}.
-
-Usually, you should put a blank line before an @code{@@item}.  This
-puts a blank line in the Info file. (@TeX{} inserts the proper
-interline whitespace in either case.)  Except when the entries are
-very brief, these blank lines make the list look better.@refill
-
-Here is an example of the use of @code{@@itemize}, followed by the
-output it produces.  @code{@@bullet} produces an @samp{*} in Info and a
-round dot in @TeX{}.
-
-@example
-@group
-@@itemize @@bullet
-@@item
-Some text for foo.
-
-@@item
-Some text
-for bar.
-@@end itemize
-@end group
-@end example
-
-@noindent
-This produces:
-
-@quotation
-@itemize @bullet
-@item
-Some text for foo.
-
-@item
-Some text
-for bar.
-@end itemize
-@end quotation
-
-Itemized lists may be embedded within other itemized lists.  Here is a
-list marked with dashes embedded in a list marked with bullets:@refill
-
-@example
-@group
-@@itemize @@bullet
-@@item
-First item.
-
-@@itemize @@minus
-@@item
-Inner item.
-
-@@item
-Second inner item.
-@@end itemize
-
-@@item
-Second outer item.
-@@end itemize
-@end group
-@end example
-
-@noindent
-This produces:
-
-@quotation
-@itemize @bullet
-@item
-First item.
-
-@itemize @minus
-@item
-Inner item.
-
-@item
-Second inner item.
-@end itemize
-
-@item
-Second outer item.
-@end itemize
-@end quotation
-
-
-@node enumerate
-@section @code{@@enumerate}: Making a Numbered or Lettered List
-@cindex Enumeration
-@findex enumerate
-
-@code{@@enumerate} is like @code{@@itemize} (@pxref{itemize,,
-@code{@@itemize}}), except that the labels on the items are
-successive integers or letters instead of bullets.
-
-Write the @code{@@enumerate} command at the beginning of a line.  The
-command does not require an argument, but accepts either a number or a
-letter as an option.  Without an argument, @code{@@enumerate} starts the
-list with the number @samp{1}.  With a numeric argument, such as
-@samp{3}, the command starts the list with that number.  With an upper
-or lower case letter, such as @samp{a} or @samp{A}, the command starts
-the list with that letter.
-
-Write the text of the enumerated list in the same way as an itemized
-list: write a line starting with @code{@@item} at the beginning of
-each paragraph that you want enumerated.  It is ok to have text
-following the @code{@@item}.
-
-You should put a blank line between entries in the list.
-This generally makes it easier to read the Info file.
-
-@need 1500
-Here is an example of @code{@@enumerate} without an argument:
-
-@example
-@group
-@@enumerate
-@@item
-Underlying causes.
-
-@@item
-Proximate causes.
-@@end enumerate
-@end group
-@end example
-
-@noindent
-This produces:
-
-@enumerate
-@item
-Underlying causes.
-
-@item
-Proximate causes.
-@end enumerate
-@sp 1
-Here is an example with an argument of @kbd{3}:@refill
-@sp 1
-@example
-@group
-@@enumerate 3
-@@item
-Predisposing causes.
-
-@@item
-Precipitating causes.
-
-@@item
-Perpetuating causes.
-@@end enumerate
-@end group
-@end example
-
-@noindent
-This produces:
-
-@enumerate 3
-@item
-Predisposing causes.
-
-@item
-Precipitating causes.
-
-@item
-Perpetuating causes.
-@end enumerate
-@sp 1
-Here is a brief summary of the alternatives.  The summary is constructed
-using @code{@@enumerate} with an argument of @kbd{a}.@refill
-@sp 1
-@enumerate a
-@item
-@code{@@enumerate}
-
-Without an argument, produce a numbered list, starting with the number
-1.@refill
-
-@item
-@code{@@enumerate @var{positive-integer}}
-
-With a (positive) numeric argument, start a numbered list with that
-number.  You can use this to continue a list that you interrupted with
-other text.@refill
-
-@item
-@code{@@enumerate @var{upper-case-letter}}
-
-With an upper case letter as argument, start a list
-in which each item is marked
-by a letter, beginning with that upper case letter.@refill
-
-@item
-@code{@@enumerate @var{lower-case-letter}}
-
-With a lower case letter as argument, start a list
-in which each item is marked by
-a letter, beginning with that lower case letter.@refill
-@end enumerate
-
-You can also nest enumerated lists, as in an outline.@refill
-
-@node Two-column Tables
-@section Making a Two-column Table
-@cindex Tables, making two-column
-@findex table
-
-@code{@@table} is similar to @code{@@itemize} (@pxref{itemize,,
-@code{@@itemize}}), but allows you to specify a name or heading line for
-each item.  The @code{@@table} command is used to produce two-column
-tables, and is especially useful for glossaries, explanatory
-exhibits, and command-line option summaries.
-
-@menu
-* table::                       How to construct a two-column table.
-* ftable vtable::               Automatic indexing for two-column tables.
-* itemx::                       How to put more entries in the first column.
-@end menu
-
-@node table
-@subsection Using the @code{@@table} Command
-
-@cindex Definition lists, typesetting
-Use the @code{@@table} command to produce two-column tables.  It is
-usually listed for ``definition lists'' of various sorts, where you
-have a list of terms and a brief text with each one.
-
-Write the @code{@@table} command at the beginning of a line, after a
-blank line, and follow it on the same line with an argument that is a
-Texinfo ``indicating'' command such as @code{@@code}, @code{@@samp},
-@code{@@var}, @code{@@option}, or @code{@@kbd} (@pxref{Indicating}).
-
-This command will be applied to the text that goes into the first
-column of each item and thus determines how it will be highlighted.
-For example, @code{@@table @@code} will cause the text in the first
-column to be output as if it @code{@@code} command.
-
-@findex asis
-You may also use the @code{@@asis} command as an argument to
-@code{@@table}.  @code{@@asis} is a command that does nothing; if you
-use this command after @code{@@table}, the first column entries are
-output without added highlighting (``as is'').
-
-The @code{@@table} command works with other commands besides those
-explicitly mentioned here.  However, you can only use commands that
-normally take arguments in braces.  (In this case, however, you use
-the command name without an argument, because the subsequent
-@code{@@item}'s will supply the argument.)
-
-@findex item
-Begin each table entry with an @code{@@item} command at the beginning
-of a line.  Write the first column text on the same line as the
-@code{@@item} command.  Write the second column text on the line
-following the @code{@@item} line and on subsequent lines.  (You do not
-need to type anything for an empty second column entry.)  You may
-write as many lines of supporting text as you wish, even several
-paragraphs.  But only the text on the same line as the @code{@@item}
-will be placed in the first column (including any footnotes).
-
-Normally, you should put a blank line before an @code{@@item} line.
-This puts a blank line in the Info file.  Except when the entries are
-very brief, a blank line looks better.
-
-End the table with a line consisting of @code{@@end table}, followed
-by a blank line.  @TeX{} will always start a new paragraph after the
-table, so the blank line is needed for the Info output to be analogous.
-
-@need 1500
-The following table, for example, highlights the text in the first
-column with an @code{@@samp} command:
-
-@example
-@group
-@@table @@samp
-@@item foo
-This is the text for
-@@samp@{foo@}.
-
-@@item bar
-Text for @@samp@{bar@}.
-@@end table
-@end group
-@end example
-
-@noindent
-This produces:
-
-@table @samp
-@item foo
-This is the text for
-@samp{foo}.
-@item bar
-Text for @samp{bar}.
-@end table
-
-If you want to list two or more named items with a single block of
-text, use the @code{@@itemx} command.  (@xref{itemx,,@code{@@itemx}}.)
-
-
-@node ftable vtable
-@subsection @code{@@ftable} and @code{@@vtable}
-@cindex Tables with indexes
-@cindex Indexing table entries automatically
-@findex ftable
-@findex vtable
-
-The @code{@@ftable} and @code{@@vtable} commands are the same as the
-@code{@@table} command except that @code{@@ftable} automatically enters
-each of the items in the first column of the table into the index of
-functions and @code{@@vtable} automatically enters each of the items in
-the first column of the table into the index of variables.  This
-simplifies the task of creating indices.  Only the items on the same
-line as the @code{@@item} commands are indexed, and they are indexed in
-exactly the form that they appear on that line.  @xref{Indices},
-for more information about indices.@refill
-
-Begin a two-column table using @code{@@ftable} or @code{@@vtable} by
-writing the @@-command at the beginning of a line, followed on the same
-line by an argument that is a Texinfo command such as @code{@@code},
-exactly as you would for an @code{@@table} command; and end the table
-with an @code{@@end ftable} or @code{@@end vtable} command on a line by
-itself.
-
-See the example for @code{@@table} in the previous section.
-
-@node itemx
-@subsection @code{@@itemx}
-@cindex Two named items for @code{@@table}
-@findex itemx
-
-Use the @code{@@itemx} command inside a table when you have two or more
-first column entries for the same item, each of which should appear on a
-line of its own.
-
-Use @code{@@item} for the first entry, and @code{@@itemx} for all
-subsequent entries; @code{@@itemx} must always follow an @code{@@item}
-command, with no blank line intervening.
-
-The @code{@@itemx} command works exactly like @code{@@item} except
-that it does not generate extra vertical space above the first column
-text.  If you have multiple consecutive @code{@@itemx} commands, do
-not insert any blank lines between them.
-
-For example,
-
-@example
-@group
-@@table @@code
-@@item upcase
-@@itemx downcase
-These two functions accept a character or a string as
-argument, and return the corresponding upper case (lower
-case) character or string.
-@@end table
-@end group
-@end example
-
-@noindent
-This produces:
-
-@table @code
-@item upcase
-@itemx downcase
-These two functions accept a character or a string as
-argument, and return the corresponding upper case (lower
-case) character or string.@refill
-@end table
-
-@noindent
-(Note also that this example illustrates multi-line supporting text in
-a two-column table.)@refill
-
-
-@node Multi-column Tables
-@section @code{@@multitable}: Multi-column Tables
-@cindex Tables, making multi-column
-@findex multitable
-
-@code{@@multitable} allows you to construct tables with any number of
-columns, with each column having any width you like.
-
-You define the column widths on the @code{@@multitable} line itself, and
-write each row of the actual table following an @code{@@item} command,
-with columns separated by an @code{@@tab} command.  Finally, @code{@@end
-multitable} completes the table.  Details in the sections below.
-
-@menu
-* Multitable Column Widths::    Defining multitable column widths.
-* Multitable Rows::             Defining multitable rows, with examples.
-@end menu
-
-@node Multitable Column Widths
-@subsection Multitable Column Widths
-@cindex Multitable column widths
-@cindex Column widths, defining for multitables
-@cindex Widths, defining multitable column
-
-You can define the column widths for a multitable in two ways: as
-fractions of the line length; or with a prototype row.  Mixing the two
-methods is not supported.  In either case, the widths are defined
-entirely on the same line as the @code{@@multitable} command.
-
-@enumerate
-@item
-@findex columnfractions
-@cindex Line length, column widths as fraction of
-To specify column widths as fractions of the line length, write
-@code{@@columnfractions} and the decimal numbers (presumably less than
-1; a leading zero is allowed and ignored) after the
-@code{@@multitable} command, as in:
-
-@example
-@@multitable @@columnfractions .33 .33 .33
-@end example
-
-The fractions need not add up exactly to 1.0, as these do not.  This
-allows you to produce tables that do not need the full line length.
-
-@item
-@cindex Prototype row, column widths defined by
-To specify a prototype row, write the longest entry for each column
-enclosed in braces after the @code{@@multitable} command.  For example:
-
-@example
-@@multitable @{some text for column one@} @{for column two@}
-@end example
-
-@noindent
-The first column will then have the width of the typeset `some text for
-column one', and the second column the width of `for column two'.
-
-The prototype entries need not appear in the table itself.
-
-Although we used simple text in this example, the prototype entries can
-contain Texinfo commands; markup commands such as @code{@@code} are
-particularly likely to be useful.
-
-@end enumerate
-
-
-@node Multitable Rows
-@subsection Multitable Rows
-@cindex Multitable rows
-@cindex Rows, of a multitable
-
-@findex item
-@findex tab
-After the @code{@@multitable} command defining the column widths (see
-the previous section), you begin each row in the body of a multitable
-with @code{@@item}, and separate the column entries with @code{@@tab}.
-Line breaks are not special within the table body, and you may break
-input lines in your source file as necessary.
-
-@findex headitem
-@cindex Heading row, in table
-@cindex <thead> HTML tag
-You can also use @code{@@headitem} instead of @code{@@item} to produce
-a @dfn{heading row}.  The @TeX{} output for such a row is in bold, and
-the HTML, XML, and Docbook output uses the @code{<thead>} tag.
-
-Here is a complete example of a multi-column table (the text is from
-@cite{The GNU Emacs Manual}, @pxref{Split Window,, Splitting Windows,
-emacs, The GNU Emacs Manual}):
-
-@example
-@@multitable @@columnfractions .15 .45 .4
-@@headitem Key @@tab Command @@tab Description
-@@item C-x 2
-@@tab @@code@{split-window-vertically@}
-@@tab Split the selected window into two windows,
-with one above the other.
-@@item C-x 3
-@@tab @@code@{split-window-horizontally@}
-@@tab Split the selected window into two windows
-positioned side by side.
-@@item C-Mouse-2
-@@tab
-@@tab In the mode line or scroll bar of a window,
-split that window.
-@@end multitable
-@end example
-
-@noindent produces:
-
-@multitable @columnfractions .15 .45 .4
-@headitem Key @tab Command @tab Description
-@item C-x 2
-@tab @code{split-window-vertically}
-@tab Split the selected window into two windows,
-with one above the other.
-@item C-x 3
-@tab @code{split-window-horizontally}
-@tab Split the selected window into two windows
-positioned side by side.
-@item C-Mouse-2
-@tab
-@tab In the mode line or scroll bar of a window,
-split that window.
-@end multitable
-
-
-@node Special Displays
-@chapter Special Displays
-@cindex Special displays
-
-The commands in this chapter allow you to write text that is specially
-displayed (output format permitting), outside of the normal document
-flow.
-
-One set of such commands is for creating ``floats'', that is, figures,
-tables, and the like, set off from the main text, possibly numbered,
-captioned, and/or referred to from elsewhere in the document.  Images
-are often included in these displays.
-
-Another group of commands is for creating footnotes in Texinfo.
-
-@menu
-* Floats::                      Figures, tables, and the like.
-* Images::                      Including graphics and images.
-* Footnotes::                   Writing footnotes.
-@end menu
-
-
-@node Floats
-@section Floats
-@cindex Floats, in general
-
-A @dfn{float} is a display which is set off from the main text.  It is
-typically labelled as being a ``Figure'', ``Table'', ``Example'', or
-some similar type.
-
-@cindex Floating, not yet implemented
-A float is so-named because, in principle, it can be moved to the
-bottom or top of the current page, or to a following page, in the
-printed output.  (Floating does not make sense in other output
-formats.)  In the present version of Texinfo, however, this floating
-is unfortunately not yet implemented.  Instead, the floating material
-is simply output at the current location, more or less as if it were
-an @code{@@group} (@pxref{group,,@code{@@group}}).
-
-@menu
-* float::                       Producing floating material.
-* caption shortcaption::        Specifying descriptions for floats.
-* listoffloats::                A table of contents for floats.
-@end menu
-
-
-@node float
-@subsection @code{@@float} [@var{type}][,@var{label}]: Floating material
-@findex float
-@cindex Float environment
-
-To produce floating material, enclose the material you want to be
-displayed separate between @code{@@float} and @code{@@end float}
-commands, on lines by themselves.
-
-Floating material uses @code{@@image} to display an already-existing
-graphic (@pxref{Images}), or @code{@@multitable} to display a table
-(@pxref{Multi-column Tables}).  However, the contents of the float can
-be anything.  Here's an example with simple text:
-
-@example
-@@float Figure,fig:ex1
-This is an example float.
-@@end float
-@end example
-
-@noindent And the output:
-
-@float Figure,fig:ex1
-This is an example float.
-@end float
-
-As shown in the example, @code{@@float} takes two arguments (separated
-by a comma), @var{type} and @var{label}.  Both are optional.
-
-@table @var
-@item type
-Specifies the sort of float this is; typically a word such as
-``Figure'', ``Table'', etc.  If not given, and @var{label} is, any
-cross-referencing will simply use a bare number.
-
-@item label
-Specifies a cross-reference label for this float.  If given, this
-float is automatically given a number, and will appear in any
-@code{@@listofloats} output (@pxref{listoffloats}).  Cross-references
-to @var{label} are allowed.
-
-@cindex Floats, making unnumbered
-@cindex Unnumbered float, creating
-On the other hand, if @var{label} is not given, then the float will
-not be numbered and consequently will not appear in the
-@code{@@listoffloats} output or be cross-referenceable.
-@end table
-
-@noindent Normally, you specify both @var{type} and @var{label}, to get a
-labeled and numbered float.
-
-@cindex Floats, numbering of
-@cindex Numbering of floats
-In Texinfo, all floats are numbered the same way: with the chapter
-number (or appendix letter), a period, and the float number, which
-simply counts 1, 2, 3, @dots{}, and is reset at each chapter.  Each
-float type is counted independently.  
-
-Floats within an @code{@@unnumbered} are numbered, or outside of any
-chapter, are simply numbered consecutively from 1.
-
-These numbering conventions are not, at present, changeable.
-
-
-@node caption shortcaption
-@subsection @code{@@caption} & @code{@@shortcaption}
-@findex caption
-@findex shortcaption
-@cindex Captions, for floats
-@cindex Short captions, for lists of floats
-
-You may write an @code{@@caption} anywhere within a @code{@@float}
-environment, to define a caption for the float.  It is not allowed in
-any other context.  @code{@@caption} takes a single argument, enclosed
-in braces.  Here's an example:
-
-@example
-@@float
-An example float, with caption.
-@@caption@{Caption for example float.@}
-@@end float
-@end example
-
-@noindent The output is:
-
-@float
-An example float, with caption.
-@caption{Caption for example float.}
-@end float
-
-@code{@@caption} can appear anywhere within the float; it is not
-processed until the @code{@@end float}.  The caption text is usually a
-sentence or two, but may consist of several paragraphs if necessary.
-
-In the output, the caption always appears below the float; this is not
-currently changeable.  It is preceded by the float type and/or number,
-as specified to the @code{@@float} command (see the previous section).
-
-The @code{@@shortcaption} command likewise may be used only within
-@code{@@float}, and takes a single argument in braces.  The short
-caption text is used instead of the caption text in a list of floats
-(see the next section).  Thus, you can write a long caption for the
-main document, and a short title to appear in the list of floats.  For
-example:
-
-@example
-@@float
-... as above ...
-@@shortcaption@{Text for list of floats.@}
-@@end float
-@end example
-
-The text for @code{@@caption} and @code{@@shortcaption} may not
-contain comments (@code{@@c}), verbatim text (@code{@@verb}),
-environments such as @code{@@example}, or other complex constructs.
-
-
-@node listoffloats
-@subsection @code{@@listoffloats}: Tables of contents for floats
-@findex listoffloats
-@cindex List of floats
-@cindex Floats, list of
-@cindex Table of contents, for floats
-
-You can write a @code{@@listoffloats} command to generate a list of
-floats for a given float type (@pxref{float}), analogous to the
-document's overall table of contents.  Typically, it is written in its
-own @code{@@unnumbered} node to provide a heading and structure,
-rather like @code{@@printindex} (@pxref{Printing Indices & Menus}).
-
-@code{@@listoffloats} takes one optional argument, the float type.
-Here's an example:
-
-@example
-@@node List of Figures
-@@unnumbered List of Figures
-@@listoffloats Figure
-@end example
-
-@noindent And the output from @code{@@listoffloats}:
-
-@display
-@listoffloats Figure
-@end display
-
-Without any argument, @code{@@listoffloats} generates a list of
-floats for which no float type was specified, i.e., no first argument
-to the @code{@@float} command (@pxref{float}).
-
-Each line in the list of floats contains the float type (if any),
-the float number, and the caption, if any---the @code{@@shortcaption}
-argument, if it was specified, else the @code{@@caption} argument.
-In Info, the result is a menu where each float can be selected.  In
-HTML, each line is a link to the float.  In printed output, the page
-number is included.
-
-Unnumbered floats (those without cross-reference labels) are omitted
-from the list of floats.
-
-
-@node Images
-@section Inserting Images
-
-@cindex Images, inserting
-@cindex Pictures, inserting
-@findex image
-
-You can insert an image given in an external file with the
-@code{@@image} command.  Although images can be used anywhere,
-including the middle of a paragraph, we describe them in this chapter
-since they are most often part of a displayed figure or example.
-
-@menu
-* Image Syntax::
-* Image Scaling::
-@end menu
-
-
-@node Image Syntax
-@subsection Image Syntax
-
-Here is the basic synopsis of the @code{@@image} command:
-
-@example
-@@image@{@var{filename}@r{[,} @var{width}@r{[,} @var{height}@r{[,} @var{alttext}@r{[, }@var{extension}@r{]]]]}@}
-@end example
-
-@cindex Formats for images
-@cindex Image formats
-The @var{filename} argument is mandatory, and must not have an
-extension, because the different processors support different formats:
-
-@itemize @bullet
-@item
-@TeX{} reads the file @file{@var{filename}.eps} (Encapsulated PostScript
-format).
-@item
-@pindex pdftex@r{, and images}
-PDF@TeX{} reads @file{@var{filename}.pdf} (Adobe's Portable Document Format).
-@item
-@code{makeinfo} includes @file{@var{filename}.txt} verbatim for
-Info output (more or less as if it was an @code{@@example}).
-@item
-@code{makeinfo} uses the optional fifth argument @var{extension} to
-@code{@@image} for the filename extension, if it is specified.  For example:
-
-@pindex XPM image format
-@example
-@@image@{foo,,,,.xpm@}
-@end example
-
-@noindent
-will cause @code{makeinfo} to look for @file{foo.xpm} before any others.
-
-@end itemize
-
-The @var{width} and @var{height} arguments are described in the next
-section.
-
-For @TeX{} output, if an image is the first thing in a paragraph, for
-example if you want two images side-by-side, you must precede it with
-@code{@@noindent} (@pxref{noindent,,@code{@@noindent}}).  Otherwise it
-will be displayed on a line by itself.  If you want it centered, 
-use @code{@@center} (@pxref{titlefont center sp,,@code{@@titlefont
-@@center @@sp}}).
-
-@cindex Alt attribute for images
-@cindex Images, alternate text for
-When producing html, @code{makeinfo} sets the @dfn{alt attribute} for
-inline images to the optional @var{alttext} (fourth) argument to
-@code{@@image}, if supplied.  If not supplied, @code{makeinfo} uses
-the full file name of the image being displayed.  If you want an empty
-@code{alt} string, use @code{@@-}.  The @var{alttext} is taken as
-Texinfo text, so special characters such as @samp{"} and @samp{<} and
-@samp{&} are escaped in the HTML and XML output.
-
-@cindex GIF images, unsupported due to patents
-@cindex PNG image format
-@cindex JPG image format
-If you do not supply the optional @var{extension} (fifth) argument,
-@code{makeinfo} first tries @file{@var{filename}.png}; if that does
-not exist, it tries @file{@var{filename}.jpg}.  If that does not exist
-either, it complains.  (We cannot support GIF format directly due to
-software patents.)
-
-In Info output, @code{makeinfo} writes a reference to the binary image
-file (trying @var{filename} suffixed with @file{@var{extension}},
-@file{@var{.extension}}, @file{.png}, or @file{.jpg}, in that order)
-if one exists.  It also literally includes the @file{.txt} file if one
-exists.  This way, Info readers which can display images (such as the
-Emacs Info browser, running under X) can do so, whereas Info readers
-which can only use text (such as the standalone Info reader) can
-display the textual version.
-
-The implementation of this is to put the following construct into the
-Info output:
-
-@example
-^@@^H[image src="@var{binaryfile}" text="@var{txtfile}"
-           alt="@var{alttext} ... ^@@^H]
-@end example
-
-@noindent where @samp{^@@} and @samp{^H} stand for the actual null and
-backspace control characters.  If one of the files is not present, the
-corresponding argument is omitted.
-
-The reason for mentioning this here is that older Info browsers (this
-feature was introduced in Texinfo version 4.6) will display the above
-literally, which, although not pretty, should not be harmful.
-
-
-@node Image Scaling
-@subsection Image Scaling
-
-@cindex Images, scaling
-@cindex Scaling images
-@cindex Width of images
-@cindex Height of images
-@cindex Aspect ratio of images
-@cindex Distorting images
-The optional @var{width} and @var{height} arguments to the
-@code{@@image} command (see the previous section) specify the size to
-scale the image to.  They are ignored for Info output.  If neither is
-specified, the image is presented in its natural size (given in the
-file); if only one is specified, the other is scaled proportionately;
-and if both are specified, both are respected, thus possibly distorting
-the original image by changing its aspect ratio.
-
-@cindex Dimensions and image sizes
-The @var{width} and @var{height} may be specified using any valid @TeX{}
-dimension, namely:
-
-@table @asis
-@item pt
-@cindex Points (dimension)
-point (72.27pt = 1in)
-@item pc
-@cindex Picas
-pica (1pc = 12pt)
-@item bp
-@cindex Big points
-big point (72bp = 1in)
-@item in
-@cindex Inches
-inch
-@item cm
-@cindex Centimeters
-centimeter (2.54cm = 1in)
-@item mm
-@cindex Millimeters
-millimeter (10mm = 1cm)
-@item dd
-@cindex Did@^ot points
-did@^ot point (1157dd = 1238pt)
-@item cc
-@cindex Ciceros
-cicero (1cc = 12dd)
-@item sp
-@cindex Scaled points
-scaled point (65536sp = 1pt)
-@end table
-
-@pindex ridt.eps
-For example, the following will scale a file @file{ridt.eps} to one
-inch vertically, with the width scaled proportionately:
-
-@example
-@@image@{ridt,,1in@}
-@end example
-
-@pindex epsf.tex
-For @code{@@image} to work with @TeX{}, the file @file{epsf.tex} must be
-installed somewhere that @TeX{} can find it.  (The standard location is
-@file{@var{texmf}/tex/generic/dvips/epsf.tex}, where @var{texmf} is a
-root of your @TeX{} directory tree.)  This file is included in the
-Texinfo distribution and is also available from
-@uref{ftp://tug.org/tex/epsf.tex}, among other places.
-
-@code{@@image} can be used within a line as well as for displayed
-figures.  Therefore, if you intend it to be displayed, be sure to leave
-a blank line before the command, or the output will run into the
-preceding text.
-
-Image scaling is presently implemented only in @TeX{}, not in HTML or
-any other sort of output.
-
-
-@node Footnotes
-@section Footnotes
-@cindex Footnotes
-@findex footnote
-
-A @dfn{footnote} is for a reference that documents or elucidates the
-primary text.@footnote{A footnote should complement or expand upon
-the primary text, but a reader should not need to read a footnote to
-understand the primary text.  For a thorough discussion of footnotes,
-see @cite{The Chicago Manual of Style}, which is published by the
-University of Chicago Press.}  Footnotes are distracting; use them
-sparingly, if at all.  Standard bibliographical references are better
-placed in a bibliography at the end of a document than in footnotes
-throughout.
-
-@menu
-* Footnote Commands::           How to write a footnote in Texinfo.
-* Footnote Styles::             Controlling how footnotes appear in Info.
-@end menu
-
-
-@node Footnote Commands
-@subsection Footnote Commands
-
-In Texinfo, footnotes are created with the @code{@@footnote} command.
-This command is followed immediately by a left brace, then by the text
-of the footnote, and then by a terminating right brace.  Footnotes may
-be of any length (they will be broken across pages if necessary), but
-are usually short.  The template is:
-
-@example
-ordinary text@@footnote@{@var{text of footnote}@}
-@end example
-
-As shown here, the @code{@@footnote} command should come right after the
-text being footnoted, with no intervening space; otherwise, the footnote
-marker might end up starting a line.
-
-For example, this clause is followed by a sample footnote@footnote{Here
-is the sample footnote.}; in the Texinfo source, it looks like
-this:
-
-@example
-@dots{}a sample footnote@@footnote@{Here is the sample
-footnote.@}; in the Texinfo source@dots{}
-@end example
-
-As you can see, the source includes two punctuation marks next to each
-other; in this case, @samp{.@};} is the sequence.  This is normal (the
-first ends the footnote and the second belongs to the sentence being
-footnoted), so don't worry that it looks odd.
-
-In a printed manual or book, the reference mark for a footnote is a
-small, superscripted number; the text of the footnote appears at the
-bottom of the page, below a horizontal line.
-
-In Info, the reference mark for a footnote is a pair of parentheses
-with the footnote number between them, like this: @samp{(1)}.  The
-reference mark is followed by a cross-reference link to the footnote's
-text.
-
-In the HTML output, footnote references are marked with a small,
-superscripted number which is rendered as a hypertext link to the
-footnote text.
-
-By the way, footnotes in the argument of an @code{@@item} command for a
-@code{@@table} must be on the same line as the @code{@@item}
-(as usual).  @xref{Two-column Tables}.
-
-
-@node Footnote Styles
-@subsection Footnote Styles
-
-Info has two footnote styles, which determine where the text of the
-footnote is located:
-
-@itemize @bullet
-@cindex @samp{@r{End}} node footnote style
-@item
-In the `End' node style, all the footnotes for a single node
-are placed at the end of that node.  The footnotes are separated from
-the rest of the node by a line of dashes with the word
-@samp{Footnotes} within it.  Each footnote begins with an
-@samp{(@var{n})} reference mark.
-
-@need 700
-@noindent
-Here is an example of a single footnote in the end of node style:@refill
-
-@example
-@group
---------- Footnotes ---------
-
-(1)  Here is a sample footnote.
-@end group
-@end example
-
-@cindex @samp{@r{Separate}} footnote style
-@item
-In the `Separate' node style, all the footnotes for a single
-node are placed in an automatically constructed node of
-their own.  In this style, a ``footnote reference'' follows
-each @samp{(@var{n})} reference mark in the body of the
-node.  The footnote reference is actually a cross reference
-which you use to reach the footnote node.
-
-The name of the node with the footnotes is constructed
-by appending @w{@samp{-Footnotes}} to the name of the node
-that contains the footnotes. (Consequently, the footnotes'
-node for the @file{Footnotes} node is
-@w{@file{Footnotes-Footnotes}}!)  The footnotes' node has an
-`Up' node pointer that leads back to its parent node.
-
-@noindent
-Here is how the first footnote in this manual looks after being
-formatted for Info in the separate node style:
-
-@smallexample
-@group
-File: texinfo.info  Node: Overview-Footnotes, Up: Overview
-
-(1) The first syllable of "Texinfo" is pronounced like "speck", not
-"hex". @dots{}
-@end group
-@end smallexample
-@end itemize
-
-Unless your document has long and important footnotes (as in, say,
-Gibbon's @cite{Decline and Fall @dots{}}), we recommend the @samp{end}
-style, as it is simpler for readers to follow.
-
-@findex footnotestyle
-Use the @code{@@footnotestyle} command to specify an Info file's
-footnote style.  Write this command at the beginning of a line followed
-by an argument, either @samp{end} for the end node style or
-@samp{separate} for the separate node style.
-
-@need 700
-For example,
-
-@example
-@@footnotestyle end
-@end example
-@noindent
-or
-@example
-@@footnotestyle separate
-@end example
-
-Write an @code{@@footnotestyle} command before or shortly after the
-end-of-header line at the beginning of a Texinfo file.  (If you
-include the @code{@@footnotestyle} command between the start-of-header
-and end-of-header lines, the region formatting commands will format
-footnotes as specified.)@refill
-
-If you do not specify a footnote style, the formatting commands use
-their default style.  Currently, @code{texinfo-format-buffer} and
-@code{texinfo-format-region} use the `separate' style and
-@code{makeinfo} uses the `end' style.
-
-
-@node Indices
-@chapter Indices
-@cindex Indices
-
-Using Texinfo, you can generate indices without having to sort and
-collate entries manually.  In an index, the entries are listed in
-alphabetical order, together with information on how to find the
-discussion of each entry.  In a printed manual, this information
-consists of page numbers.  In an Info file, this information is a menu
-entry leading to the first node referenced.
-
-Texinfo provides several predefined kinds of index: an index
-for functions, an index for variables, an index for concepts, and so
-on.  You can combine indices or use them for other than their
-canonical purpose.  Lastly, you can define your own new indices.
-
-@xref{Printing Indices & Menus}, for information on how to print
-indices.
-
-@menu
-* Index Entries::               Choose different words for index entries.
-* Predefined Indices::          Use different indices for different kinds
-                                 of entries.
-* Indexing Commands::           How to make an index entry.
-* Combining Indices::           How to combine indices.
-* New Indices::                 How to define your own indices.
-@end menu
-
-
-@node Index Entries
-@section Making Index Entries
-@cindex Index entries, making
-@cindex Entries, making index
-
-When you are making index entries, it is good practice to think of the
-different ways people may look for something.  Different people
-@emph{do not} think of the same words when they look something up.  A
-helpful index will have items indexed under all the different words
-that people may use.  For example, one reader may think it obvious that
-the two-letter names for indices should be listed under ``Indices,
-two-letter names'', since the word ``Index'' is the general concept.
-But another reader may remember the specific concept of two-letter
-names and search for the entry listed as ``Two letter names for
-indices''.  A good index will have both entries and will help both
-readers.@refill
-
-Like typesetting, the construction of an index is a highly skilled,
-professional art, the subtleties of which are not appreciated until you
-need to do it yourself.@refill
-
-@xref{Printing Indices & Menus}, for information about printing an index
-at the end of a book or creating an index menu in an Info file.@refill
-
-
-@node Predefined Indices
-@section Predefined Indices
-
-Texinfo provides six predefined indices.  Here are their nominal
-meanings, abbreviations, and the corresponding index entry commands:
-
-@table @samp
-@item cp
-@cindex @code{cp} (concept) index
-(@code{@@cindex}) concept index, for general concepts.
-@item fn
-@cindex @code{fn} (function) index
-(@code{@@findex}) function index, for function and function-like
-names (such as entry points of libraries).
-@item ky
-@cindex @code{ky} (keystroke) index
-(@code{@@kindex}) keystroke index, for keyboard commands.
-@item pg
-@cindex @code{pg} (program) index
-(@code{@@pindex}) program index, for names of programs.
-@item tp
-@cindex @code{tp} (data type) index
-(@code{@@tindex}) data type index, for type names (such as structures
-defined in header files).
-@item vr
-@cindex @code{vr} (variable) index
-(@code{@@vindex}) variable index, for variable names (such as global
-variables of libraries).
-@end table
-
-@noindent
-Not every manual needs all of these, and most manuals use only two or
-three at most.  The present manual, for example, has two indices: a
-concept index and an @@-command index (that is actually the function
-index but is called a command index in the chapter heading).
-
-You are not required to use the predefined indices strictly for their
-canonical purposes.  For example, suppose you wish to index some C
-preprocessor macros.  You could put them in the function index along
-with actual functions, just by writing @code{@@findex} commands for
-them; then, when you print the ``Function Index'' as an unnumbered
-chapter, you could give it the title `Function and Macro Index' and
-all will be consistent for the reader.
-
-On the other hand, it is best not to stray too far from the meaning of
-the predefined indices.  Otherwise, in the event that your text is
-combined with other text from other manuals, the index entries will
-not match up.  Instead, define your own new index (@pxref{New
-Indices}).
-
-We recommend having a single index in the final document whenever
-possible, however many source indices you use, since then readers have
-only one place to look.  Two or more source indices can be combined
-into one output index using the @code{@@synindex} or
-@code{@@syncodeindex} commands (@pxref{Combining Indices}).
-
-
-@node Indexing Commands
-@section Defining the Entries of an Index
-@cindex Defining indexing entries
-@cindex Index entries
-@cindex Entries for an index
-@cindex Specifying index entries
-@cindex Creating index entries
-
-The data to make an index come from many individual indexing commands
-scattered throughout the Texinfo source file.  Each command says to add
-one entry to a particular index; after formatting, the index will give
-the current page number or node name as the reference.@refill
-
-An index entry consists of an indexing command at the beginning of a
-line followed, on the rest of the line, by the entry.@refill
-
-For example, this section begins with the following five entries for
-the concept index:@refill
-
-@example
-@@cindex Defining indexing entries
-@@cindex Index entries, defining
-@@cindex Entries for an index
-@@cindex Specifying index entries
-@@cindex Creating index entries
-@end example
-
-Each predefined index has its own indexing command---@code{@@cindex}
-for the concept index, @code{@@findex} for the function index, and so
-on, as listed in the previous section.
-
-@cindex Writing index entries
-@cindex Index entry writing
-Concept index entries consist of text.  The best way to write an index
-is to choose entries that are terse yet clear.  If you can do this,
-the index often looks better if the entries are not capitalized, but
-written just as they would appear in the middle of a sentence.
-(Capitalize proper names and acronyms that always call for upper case
-letters.)  This is the case convention we use in most GNU manuals'
-indices.
-
-If you don't see how to make an entry terse yet clear, make it longer
-and clear---not terse and confusing.  If many of the entries are several
-words long, the index may look better if you use a different convention:
-to capitalize the first word of each entry.  But do not capitalize a
-case-sensitive name such as a C or Lisp function name or a shell
-command; that would be a spelling error.
-
-Whichever case convention you use, please use it consistently!
-
-Entries in indices other than the concept index are symbol names in
-programming languages, or program names; these names are usually
-case-sensitive, so use upper and lower case as required for them.
-
-@cindex Index font types
-By default, entries for a concept index are printed in a small roman
-font and entries for the other indices are printed in a small
-@code{@@code} font.  You may change the way part of an entry is
-printed with the usual Texinfo commands, such as @code{@@file} for
-file names (@pxref{Marking Text}), and @code{@@r} for the normal roman
-font (@pxref{Fonts}).
-
-@quotation Caution
-Do not use a colon in an index entry.  In Info, a colon separates the
-menu entry name from the node name, so a colon in the entry itself
-confuses Info.  @xref{Menu Parts}, for more information about the
-structure of a menu entry.
-@end quotation
-
-
-@node Combining Indices
-@section Combining Indices
-@cindex Combining indices
-@cindex Indices, combining them
-
-Sometimes you will want to combine two disparate indices such as
-functions and concepts, perhaps because you have few enough entries
-that a separate index would look silly.
-
-You could put functions into the concept index by writing
-@code{@@cindex} commands for them instead of @code{@@findex} commands,
-and produce a consistent manual by printing the concept index with the
-title `Function and Concept Index' and not printing the `Function
-Index' at all; but this is not a robust procedure.  It works only if
-your document is never included as part of another document that is
-designed to have a separate function index; if your document were to
-be included with such a document, the functions from your document and
-those from the other would not end up together.  Also, to make your
-function names appear in the right font in the concept index, you
-would need to enclose every one of them between the braces of
-@code{@@code}.
-
-@menu
-* syncodeindex::                How to merge two indices, using @code{@@code}
-                                 font for the merged-from index.
-* synindex::                    How to merge two indices, using the
-                                 default font of the merged-to index.
-@end menu
-
-@node syncodeindex
-@subsection @code{@@syncodeindex}
-@findex syncodeindex
-
-When you want to combine functions and concepts into one index, you
-should index the functions with @code{@@findex} and index the concepts
-with @code{@@cindex}, and use the @code{@@syncodeindex} command to
-redirect the function index entries into the concept index.@refill
-
-The @code{@@syncodeindex} command takes two arguments; they are the name
-of the index to redirect, and the name of the index to redirect it to.
-The template looks like this:@refill
-
-@example
-@@syncodeindex @var{from} @var{to}
-@end example
-
-@cindex Predefined names for indices
-@cindex Two letter names for indices
-@cindex Indices, two letter names
-@cindex Names for indices
-For this purpose, the indices are given two-letter names:@refill
-
-@table @samp
-@item cp
-concept index
-@item fn
-function index
-@item vr
-variable index
-@item ky
-key index
-@item pg
-program index
-@item tp
-data type index
-@end table
-
-Write an @code{@@syncodeindex} command before or shortly after the
-end-of-header line at the beginning of a Texinfo file.  For example,
-to merge a function index with a concept index, write the
-following:@refill
-
-@example
-@@syncodeindex fn cp
-@end example
-
-@noindent
-This will cause all entries designated for the function index to merge
-in with the concept index instead.@refill
-
-To merge both a variables index and a function index into a concept
-index, write the following:@refill
-
-@example
-@group
-@@syncodeindex vr cp
-@@syncodeindex fn cp
-@end group
-@end example
-
-@cindex Fonts for indices
-The @code{@@syncodeindex} command puts all the entries from the `from'
-index (the redirected index) into the @code{@@code} font, overriding
-whatever default font is used by the index to which the entries are
-now directed.  This way, if you direct function names from a function
-index into a concept index, all the function names are printed in the
-@code{@@code} font as you would expect.@refill
-
-@node synindex
-@subsection @code{@@synindex}
-@findex synindex
-
-The @code{@@synindex} command is nearly the same as the
-@code{@@syncodeindex} command, except that it does not put the
-`from' index  entries into the @code{@@code} font; rather it puts
-them in the roman font.  Thus, you use @code{@@synindex} when you
-merge a concept index into a function index.@refill
-
-@xref{Printing Indices & Menus}, for information about printing an index
-at the end of a book or creating an index menu in an Info file.@refill
-
-
-@node New Indices
-@section Defining New Indices
-@cindex Defining new indices
-@cindex Indices, defining new
-@cindex New index defining
-@findex defindex
-@findex defcodeindex
-
-In addition to the predefined indices, you may use the
-@code{@@defindex} and @code{@@defcodeindex} commands to define new
-indices.  These commands create new indexing @@-commands with which
-you mark index entries.  The @code{@@defindex} command is used like
-this:
-
-@example
-@@defindex @var{name}
-@end example
-
-The name of an index should be a two letter word, such as @samp{au}.
-For example:
-
-@example
-@@defindex au
-@end example
-
-This defines a new index, called the @samp{au} index.  At the same
-time, it creates a new indexing command, @code{@@auindex}, that you
-can use to make index entries.  Use this new indexing command just as
-you would use a predefined indexing command.
-
-For example, here is a section heading followed by a concept index
-entry and two @samp{au} index entries.
-
-@example
-@@section Cognitive Semantics
-@@cindex kinesthetic image schemas
-@@auindex Johnson, Mark
-@@auindex Lakoff, George
-@end example
-
-@noindent
-(Evidently, @samp{au} serves here as an abbreviation for ``author''.)
-
-In general, Texinfo constructs the new indexing command by
-concatenating the name of the index with @samp{index}; thus, defining
-an @samp{xy} index leads to the automatic creation of an
-@code{@@xyindex} command.
-
-Use the @code{@@printindex} command to print the index, as you do with
-the predefined indices.  For example:
-
-@example
-@group
-@@node Author Index
-@@unnumbered Author Index
-
-@@printindex au
-@end group
-@end example
-
-The @code{@@defcodeindex} is like the @code{@@defindex} command,
-except that, in the printed output, it prints entries in an
-@code{@@code} font by default instead of a roman font.  
-
-You should define new indices before the end-of-header line of a
-Texinfo file, and (of course) before any @code{@@synindex} or
-@code{@@syncodeindex} commands (@pxref{Texinfo File Header}).
-
-
-@node Insertions
-@chapter Special Insertions
-@cindex Inserting special characters and symbols
-@cindex Special insertions
-
-Texinfo provides several commands for inserting characters that have
-special meaning in Texinfo, such as braces, and for other graphic
-elements that do not correspond to simple characters you can type.
-
-@iftex
-These are:
-
-@itemize @bullet
-@item @samp{@@} and braces and commas.
-@item Whitespace within and around a sentence.
-@item Accents.
-@item Dots and bullets.
-@item The @TeX{} logo and the copyright symbol.
-@item The pounds currency symbol.
-@item The minus sign.
-@item Mathematical expressions.
-@item Glyphs for evaluation, macros, errors, etc.
-@item Footnotes.
-@item Images.
-@end itemize
-@end iftex
-
-@menu
-* Atsign Braces Comma::         Inserting @@ and @{@} and ,.
-* Inserting Space::             How to insert the right amount of space
-                                 within a sentence.
-* Inserting Accents::           How to insert accents and special characters.
-* Dots Bullets::                How to insert dots and bullets.
-* TeX and copyright::           How to insert the @TeX{} logo
-                                 and the copyright symbol.
-* euro::                        How to insert the Euro currency symbol.
-* pounds::                      How to insert the pounds currency symbol.
-* minus::                       How to insert a minus sign.
-* math::                        How to format a mathematical expression.
-* Glyphs::                      How to indicate results of evaluation,
-                                 expansion of macros, errors, etc.
-@end menu
-
-
-@node Atsign Braces Comma
-@section Inserting @@ and @{@} and @comma{}
-@cindex Special characters, inserting
-@cindex Commands to insert special characters
-
-@samp{@@} and curly braces are special characters in Texinfo.  To insert
-these characters so they appear in text, you must put an @samp{@@} in
-front of these characters to prevent Texinfo from misinterpreting
-them.
-
-The comma `,' is a special character only in one uncommon context:
-it separates arguments to commands that take multiple arguments.
-
-@menu
-* Inserting an Atsign::
-* Inserting Braces::
-* Inserting a Comma::
-@end menu
-
-
-@node Inserting an Atsign
-@subsection Inserting `@@' with @code{@@@@}
-@findex @@ @r{(literal @samp{@@})}
-@cindex Inserting @@ @r{(literal @samp{@@})}
-
-@code{@@@@} stands for a single @samp{@@} in either printed or Info
-output.
-
-Do not put braces after an @code{@@@@} command.
-
-
-@node Inserting Braces
-@subsection Inserting `@{' and `@}' with @code{@@@{} and @code{@@@}}
-@cindex Braces, inserting
-@findex @{ @r{(literal @samp{@{})}
-@findex @} @r{(literal @samp{@}})}
-
-@code{@@@{} stands for a single @samp{@{} in either printed or Info
-output.
-
-@code{@@@}} stands for a single @samp{@}} in either printed or Info
-output.
-
-Do not put braces after either an @code{@@@{} or an @code{@@@}}
-command.ppp
-
-
-@node Inserting a Comma
-@subsection Inserting `,' with @code{@@comma@{@}}
-@cindex Commas, inserting
-@findex comma
-
-Ordinarily, a comma `,' is a normal character that can be simply typed
-in your input where you need it.
-
-However, Texinfo uses the comma as a special character in one uncommon
-context: some commands, such as @code{@@acronym} (@pxref{acronym}) and
-@code{@@xref} (@pxref{Cross References}), as well as user-defined
-macros (@pxref{Defining Macros}), can take more than one argument.  In
-these cases, the comma character is used to separate arguments.
-
-Since a comma chacter would confuse Texinfo's parsing for these
-commands, you must use the command @samp{@comma{}} instead if you want
-to have an actual comma in the output.  Here are some examples:
-
-@example
-@@acronym@{ABC, A Bizarre @@comma@{@}@}
-@@xref@{Comma,, The @@comma@{@} symbol@}
-@@mymac@{One argument@@comma@{@} containing a comma@}
-@end example
-
-Although @comma{} can be used anywhere, there is no need for it
-anywhere except in this unusual case.
-
-
-@node Inserting Space
-@section Inserting Space
-
-@cindex Inserting space
-@cindex Spacing, inserting
-The following sections describe commands that control spacing of various
-kinds within and after sentences.
-
-@menu
-* Not Ending a Sentence::       Sometimes a . doesn't end a sentence.
-* Ending a Sentence::           Sometimes it does.
-* Multiple Spaces::             Inserting multiple spaces.
-* dmn::                         How to format a dimension.
-@end menu
-
-
-@node Not Ending a Sentence
-@subsection Not Ending a Sentence
-
-@cindex Not ending a sentence
-@cindex Sentence non-ending punctuation
-@cindex Periods, inserting
-Depending on whether a period or exclamation point or question mark is
-inside or at the end of a sentence, less or more space is inserted after
-a period in a typeset manual.  Since it is not always possible
-to determine when a period ends a sentence and when it is used
-in an abbreviation, special commands are needed in some circumstances.
-Usually, Texinfo can guess how to handle periods, so you do not need to
-use the special commands; you just enter a period as you would if you
-were using a typewriter, which means you put two spaces after the
-period, question mark, or exclamation mark that ends a sentence.
-
-@findex <colon> @r{(suppress end-of-sentence space)}
-Use the @code{@@:}@: command after a period, question mark,
-exclamation mark, or colon that should not be followed by extra space.
-For example, use @code{@@:}@: after periods that end abbreviations
-which are not at the ends of sentences.
-
-For example,
-
-@example
-The s.o.p.@@: has three parts @dots{}
-The s.o.p. has three parts @dots{}
-@end example
-
-@noindent
-@ifnottex
-produces
-@end ifnottex
-@iftex
-produces the following.  If you look carefully at this printed output,
-you will see a little extraneous space after @samp{s.o.p.} in the second
-line.
-@end iftex
-
-@quotation
-The s.o.p.@: has three parts @dots{}@*
-The s.o.p. has three parts @dots{}
-@end quotation
-
-@noindent
-(Incidentally, @samp{s.o.p.} is an abbreviation for ``Standard Operating
-Procedure''.)
-
-@code{@@:} has no effect on the Info and HTML output.  In Docbook and
-XML, the previous punctuation character (.?!:) is output as an entity
-instead of as the normal character: @samp{&period; &quest; &excl;
-&colon;}.  This gives further processors a chance to notice and not
-add the usual extra space.
-
-Do not put braces after @code{@@:} (or any non-alphabetic command).
-
-
-@node Ending a Sentence
-@subsection Ending a Sentence
-
-@cindex Ending a Sentence
-@cindex Sentence ending punctuation
-
-@findex .  @r{(end of sentence)}
-@findex ! @r{(end of sentence)}
-@findex ? @r{(end of sentence)}
-Use @code{@@.}@: instead of a period, @code{@@!}@: instead of an
-exclamation point, and @code{@@?}@: instead of a question mark at the end
-of a sentence that ends with a capital letter.  Otherwise, @TeX{}
-will think the letter is an abbreviation and will not insert the correct
-end-of-sentence spacing.  Here is an example:
-
-@example
-Give it to M.I.B. and to M.E.W@@.  Also, give it to R.J.C@@.
-Give it to M.I.B. and to M.E.W.  Also, give it to R.J.C.
-@end example
-
-@noindent
-@ifnottex
-produces
-@end ifnottex
-@iftex
-produces the following.  If you look carefully at this printed output,
-you will see a little more whitespace after the @samp{W} in the first
-line.
-@end iftex
-
-@quotation
-Give it to M.I.B. and to M.E.W@.  Also, give it to R.J.C@.@*
-Give it to M.I.B. and to M.E.W.  Also, give it to R.J.C.
-@end quotation
-
-In the Info file output, @code{@@.}@: is equivalent to a simple
-@samp{.}; likewise for @code{@@!}@: and @code{@@?}@:.
-
-The meanings of @code{@@:} and @code{@@.}@: in Texinfo are designed to
-work well with the Emacs sentence motion commands (@pxref{Sentences,,,
-emacs, The GNU Emacs Manual}).
-
-Do not put braces after any of these commands.
-
-
-@node Multiple Spaces
-@subsection Multiple Spaces
-
-@cindex Multiple spaces
-@cindex Whitespace, inserting
-@cindex Space, inserting horizontal
-@findex <space>
-@findex <tab>
-@findex <newline>
-
-Ordinarily, @TeX{} collapses multiple whitespace characters (space, tab,
-and newline) into a single space.  Info output, on the other hand,
-preserves whitespace as you type it, except for changing a newline into
-a space; this is why it is important to put two spaces at the end of
-sentences in Texinfo documents.
-
-Occasionally, you may want to actually insert several consecutive
-spaces, either for purposes of example (what your program does with
-multiple spaces as input), or merely for purposes of appearance in
-headings or lists.  Texinfo supports three commands:
-@code{@@@kbd{SPACE}}, @code{@@@kbd{TAB}}, and @code{@@@kbd{NL}}, all of
-which insert a single space into the output.  (Here,
-@code{@@@kbd{SPACE}} represents an @samp{@@} character followed by a
-space, i.e., @samp{@@ }, and @kbd{TAB} and @kbd{NL} represent the tab
-character and end-of-line, i.e., when @samp{@@} is the last character on
-a line.)
-
-For example,
-@example
-Spacey@@ @@ @@ @@
-example.
-@end example
-
-@noindent produces
-
-@example
-Spacey@ @ @ @
-example.
-@end example
-
-Other possible uses of @code{@@@kbd{SPACE}} have been subsumed by
-@code{@@multitable} (@pxref{Multi-column Tables}).
-
-Do not follow any of these commands with braces.
-
-To produce a non-breakable space, see @ref{tie, @code{@@tie}}.
-
-
-@node dmn
-@subsection @code{@@dmn}@{@var{dimension}@}: Format a Dimension
-@cindex Thin space between number, dimension
-@cindex Dimension formatting
-@cindex Format a dimension
-@findex dmn
-
-At times, you may want to write @samp{12@dmn{pt}} or
-@samp{8.5@dmn{in}} with little or no space between the number and the
-abbreviation for the dimension.  You can use the @code{@@dmn} command
-to do this.  On seeing the command, @TeX{} inserts just enough space
-for proper typesetting; the Info formatting commands insert no space
-at all, since the Info file does not require it.
-
-To use the @code{@@dmn} command, write the number and then follow it
-immediately, with no intervening space, by @code{@@dmn}, and then by
-the dimension within braces.  For example,
-
-@example
-A4 paper is 8.27@@dmn@{in@} wide.
-@end example
-
-@noindent
-produces
-
-@quotation
-A4 paper is 8.27@dmn{in} wide.
-@end quotation
-
-Not everyone uses this style.  Some people prefer @w{@samp{8.27 in.@@:}}
-or @w{@samp{8.27 inches}} to @samp{8.27@@dmn@{in@}} in the Texinfo file.
-In these cases, however, the formatters may insert a line break between
-the number and the dimension, so use @code{@@w} (@pxref{w}).  Also, if
-you write a period after an abbreviation within a sentence, you should
-write @samp{@@:} after the period to prevent @TeX{} from inserting extra
-whitespace, as shown here.  @xref{Not Ending a Sentence}.
-
-
-@node Inserting Accents
-@section Inserting Accents
-
-@cindex Inserting accents
-@cindex Accents, inserting
-@cindex Floating accents, inserting
-
-Here is a table with the commands Texinfo provides for inserting
-floating accents.  The commands with non-alphabetic names do not take
-braces around their argument (which is taken to be the next character).
-(Exception: @code{@@,} @emph{does} take braces around its argument.)
-This is so as to make the source as convenient to type and read as
-possible, since accented characters are very common in some languages.
-
-To get the true accented characters output in Info, and not just the
-ASCII transliterations, you can use the @option{--enable-encoding}
-option to @command{makeinfo} (@pxref{makeinfo options}).
-
-@findex " @r{(umlaut accent)}
-@cindex Umlaut accent
-@findex ' @r{(umlaut accent)}
-@cindex Acute accent
-@findex = @r{(macron accent)}
-@cindex Macron accent
-@findex ^ @r{(circumflex accent)}
-@cindex Circumflex accent
-@findex ` @r{(grave accent)}
-@cindex Grave accent
-@findex ~ @r{(tilde accent)}
-@cindex Tilde accent
-@findex , @r{(cedilla accent)}
-@cindex Cedilla accent
-@findex dotaccent
-@cindex Dot accent
-@findex H @r{(Hungarian umlaut accent)}
-@cindex Hungarian umlaut accent
-@findex ringaccent
-@cindex Ring accent
-@findex tieaccent
-@cindex Tie-after accent
-@findex u @r{(breve accent)}
-@cindex Breve accent
-@findex ubaraccent
-@cindex Underbar accent
-@findex udotaccent
-@cindex Underdot accent
-@findex v @r{(check accent)}
-@cindex Hacek accent
-@cindex Check accent
-@cindex Caron accent
-@multitable {@@questiondown@{@}} {Output} {hacek/check/caron accent}
-@item Command               @tab Output         @tab What
-@item @t{@@"o}              @tab @"o            @tab umlaut accent
-@item @t{@@'o}              @tab @'o            @tab acute accent
-@item @t{@@,@{c@}}          @tab @,{c}          @tab cedilla accent
-@item @t{@@=o}              @tab @=o            @tab macron/overbar accent
-@item @t{@@^o}              @tab @^o            @tab circumflex accent
-@item @t{@@`o}              @tab @`o            @tab grave accent
-@item @t{@@~o}              @tab @~o            @tab tilde accent
-@item @t{@@dotaccent@{o@}}  @tab @dotaccent{o}  @tab overdot accent
-@item @t{@@H@{o@}}          @tab @H{o}          @tab long Hungarian umlaut
-@item @t{@@ringaccent@{o@}} @tab @ringaccent{o} @tab ring accent
-@item @t{@@tieaccent@{oo@}} @tab @tieaccent{oo} @tab tie-after accent
-@item @t{@@u@{o@}}          @tab @u{o}          @tab breve accent
-@item @t{@@ubaraccent@{o@}} @tab @ubaraccent{o} @tab underbar accent
-@item @t{@@udotaccent@{o@}} @tab @udotaccent{o} @tab underdot accent
-@item @t{@@v@{o@}}          @tab @v{o}          @tab hacek/check/caron accent
-@end multitable
-
-This table lists the Texinfo commands for inserting other characters
-commonly used in languages other than English.
-
-@findex questiondown
-@cindex @questiondown{}
-@findex exclamdown
-@cindex @exclamdown{}
-@findex aa
-@cindex @aa{}
-@findex AA
-@cindex @AA{}
-@findex ae
-@cindex @ae{}
-@findex AE
-@cindex @AE{}
-@findex dotless
-@cindex @dotless{i} (dotless i)
-@cindex @dotless{j} (dotless j)
-@cindex Dotless i, j
-@findex l
-@cindex @l{}
-@findex L
-@cindex @L{}
-@findex o
-@cindex @o{}
-@findex O
-@cindex @O{}
-@findex oe
-@cindex @oe{}
-@findex OE
-@cindex @OE{}
-@cindex Romance ordinals
-@cindex Ordinals, Romance
-@cindex Feminine ordinal
-@findex ordf
-@cindex @ordf{}
-@cindex Masculine ordinal
-@findex ordm
-@cindex @ordm{}
-@findex ss
-@cindex @ss{}
-@cindex Es-zet
-@cindex Sharp S
-@cindex German S
-@multitable {x@@questiondown@{@}} {oe OE} {es-zet or sharp S}
-@item @t{@@exclamdown@{@}}   @tab @exclamdown{}   @tab upside-down !
-@item @t{@@questiondown@{@}} @tab @questiondown{} @tab upside-down ?
-@item @t{@@aa@{@} @@AA@{@}}  @tab @aa{} @AA{}     @tab a,A with circle
-@item @t{@@ae@{@} @@AE@{@}}  @tab @ae{} @AE{}     @tab ae,AE ligatures
-@item @t{@@dotless@{i@}}     @tab @dotless{i}     @tab dotless i
-@item @t{@@dotless@{j@}}     @tab @dotless{j}     @tab dotless j
-@item @t{@@l@{@} @@L@{@}}    @tab @l{} @L{}       @tab suppressed-L,l
-@item @t{@@o@{@} @@O@{@}}    @tab @o{} @O{}       @tab O,o with slash
-@item @t{@@oe@{@} @@OE@{@}}  @tab @oe{} @OE{}     @tab oe,OE ligatures
-@item @t{@@ordf@{@} @@ordm@{@}}  @tab @ordf{} @ordm{}     @tab Spanish ordinals
-@item @t{@@ss@{@}}           @tab @ss{}           @tab es-zet or sharp S
-@end multitable
-
-
-@node Dots Bullets
-@section Inserting Ellipsis and Bullets
-@cindex Dots, inserting
-@cindex Bullets, inserting
-@cindex Ellipsis, inserting
-@cindex Inserting ellipsis
-@cindex Inserting dots
-@cindex Special typesetting commands
-@cindex Typesetting commands for dots, etc.
-
-An @dfn{ellipsis} (a line of dots) is not typeset as a string of
-periods, so a special command is used for ellipsis in Texinfo.  The
-@code{@@bullet} command is special, too.  Each of these commands is
-followed by a pair of braces, @samp{@{@}}, without any whitespace
-between the name of the command and the braces.  (You need to use braces
-with these commands because you can use them next to other text; without
-the braces, the formatters would be confused.  @xref{Command Syntax, ,
-@@-Command Syntax}, for further information.)@refill
-
-@menu
-* dots::                        How to insert dots @dots{}
-* bullet::                      How to insert a bullet.
-@end menu
-
-
-@node dots
-@subsection @code{@@dots}@{@} (@dots{}) and @code{@@enddots}@{@} (@enddots{})
-@findex dots
-@findex enddots
-@cindex Inserting dots
-@cindex Dots, inserting
-
-Use the @code{@@dots@{@}} command to generate an ellipsis, which is
-three dots in a row, appropriately spaced @dots{} like so.  Do
-not simply write three periods in the input file; that would work for
-the Info file output, but would produce the wrong amount of space
-between the periods in the printed manual.
-
-Similarly, the @code{@@enddots@{@}} command generates an
-end-of-sentence ellipsis, which has different spacing afterwards,
-@enddots{}  Look closely to see the difference.
-
-@iftex
-Here is an ellipsis: @dots{}
-Here are three periods in a row: ...
-
-In printed output, the three periods in a row are closer together than
-the dots in the ellipsis.
-@end iftex
-
-
-@node bullet
-@subsection @code{@@bullet}@{@} (@bullet{})
-@findex bullet
-
-Use the @code{@@bullet@{@}} command to generate a large round dot, or
-the closest possible thing to one.  In Info, an asterisk is used.@refill
-
-Here is a bullet: @bullet{}
-
-When you use @code{@@bullet} in @code{@@itemize}, you do not need to
-type the braces, because @code{@@itemize} supplies them.
-(@xref{itemize, , @code{@@itemize}}.)@refill
-
-
-@node TeX and copyright
-@section Inserting @TeX{} and Legal Symbols: @copyright{}, @registeredsymbol{}
-
-The logo `@TeX{}' is typeset in a special fashion and it needs an
-@@-command.  The copyright and registered symbols, `@copyright{}' and
-`@registeredsymbol{}', is also special.  Each of these commands is
-followed by a pair of braces, @samp{@{@}}, without any whitespace
-between the name of the command and the braces.
-
-@menu
-* tex::                         The @TeX{} logos.
-* copyright symbol::            The copyright symbol (c in a circle).
-* registered symbol::           The registered symbol (R in a circle).
-@end menu
-
-
-@node tex
-@subsection @code{@@TeX}@{@} (@TeX{}) and @code{@@LaTeX}@{@} (@LaTeX{})
-@findex TeX
-@findex LaTeX
-
-Use the @code{@@TeX@{@}} command to generate `@TeX{}'.  In a printed
-manual, this is a special logo that is different from three ordinary
-letters.  In Info, it just looks like @samp{TeX}.
-
-Similarly, use the @code{@@LaTeX@{@}} command to generate `@LaTeX{}',
-which is even more special in printed manuals (and different from the
-incorrect @code{La@@TeX@{@}}.  In Info, the result is just
-@samp{LaTeX}.  (@LaTeX{} is another macro package built on top of
-@TeX{}, very loosely analogous to Texinfo in that it emphasizes
-logical structure, but much (much) larger.)
-
-The spelling of these commands are unusual among Texinfo commands in
-that they use both uppercase and lowercase letters.
-
-
-@node copyright symbol
-@subsection @code{@@copyright@{@}} (@copyright{})
-@findex copyright
-
-Use the @code{@@copyright@{@}} command to generate the copyright
-symbol, `@copyright{}'.  Where possible, this is a @samp{c}
-inside a circle; in Info, this is @samp{(C)}.
-
-
-@node registered symbol
-@subsection @code{@@registeredsymbol@{@}} (@registeredsymbol{})
-@findex registeredsymbol
-
-Use the @code{@@registeredsymbol@{@}} command to generate the
-registered symbol, `@registeredsymbol{}'.  Where possible, this is an
-@samp{R} inside a circle; in Info, this is @samp{(R)}.
-
-
-@node euro
-@section @code{@@euro}@{@} (@euro{}): Euro currency symbol
-@findex euro
-
-Use the @code{@@euro@{@}} command to generate `@euro{}'.  Where
-possible, this is the symbol for the Euro currency, invented as part
-of the European economic unification relatively recently.  In plain
-Info, it is the word @samp{Euro }.  (The space is included in the text
-transliteration since typically there would be no space after the
-symbol, so it would be inappropriate to have a space in the source document.)
-
-Texinfo cannot magically synthesize support for the Euro symbol where
-the underlying system (fonts, software, whatever) does not support
-it.  Therefore, in many cases it is preferable to use the word
-``Euro''.  (In banking circles, the abbreviation for the Euro is EUR.)
-
-@cindex ISO 8859-15
-@cindex Latin 9
-In order to get the Euro symbol in encoded Info output, for example,
-it is necessary to specify @code{@@documentencoding ISO-8859-15}.
-(@xref{documentencoding,,@code{@@documentencoding}}.)  The Euro symbol
-is in ISO 8859-15 (aka Latin@tie{}9), and is @emph{not} in the more
-widely-used and supported ISO 8859-1 (Latin@tie{}1).
-
-
-@node pounds
-@section @code{@@pounds}@{@} (@pounds{}): Pounds Sterling
-@findex pounds
-
-Use the @code{@@pounds@{@}} command to generate `@pounds{}'.  Where
-possible, this is the symbol for the currency pounds sterling.  In
-Info, it is a @samp{#}.
-
-
-@node minus
-@section @code{@@minus}@{@} (@minus{}): Inserting a Minus Sign
-@findex minus
-
-@cindex Em dash, compared to minus sign
-@cindex Hyphen, compared to minus
-Use the @code{@@minus@{@}} command to generate a minus sign.  In a
-fixed-width font, this is a single hyphen, but in a proportional font,
-the symbol is the customary length for a minus sign---a little longer
-than a hyphen, shorter than an em-dash:
-
-@display
-@samp{@minus{}} is a minus sign generated with @samp{@@minus@{@}},
-
-`-' is a hyphen generated with the character @samp{-},
-
-`---' is an em-dash for text.
-@end display
-
-@noindent
-In the fixed-width font used by Info, @code{@@minus@{@}} is the same
-as a hyphen.
-
-You should not use @code{@@minus@{@}} inside @code{@@code} or
-@code{@@example} because the width distinction is not made in the
-fixed-width font they use.
-
-When you use @code{@@minus} to specify the mark beginning each entry in
-an itemized list, you do not need to type the braces
-(@pxref{itemize, , @code{@@itemize}}).
-
-
-@node math
-@section @code{@@math}: Inserting Mathematical Expressions
-@findex math
-@cindex Mathematical expressions
-@cindex Formulas, mathematical
-
-You can write a short mathematical expression with the @code{@@math}
-command.  Write the mathematical expression between braces, like this:
-
-@example
-@@math@{(a + b)(a + b) = a^2 + 2ab + b^2@}
-@end example
-
-@iftex
-@noindent This produces the following in @TeX{}:
-
-@display
-@math{(a + b)(a + b) = a^2 + 2ab + b^2}
-@end display
-
-@noindent and the following in other formats:
-@end iftex
-@ifnottex
-@noindent This produces the following in Info and HTML:
-@end ifnottex
-
-@example
-(a + b)(a + b) = a^2 + 2ab + b^2
-@end example
-
-Thus, the @code{@@math} command has no effect on the Info and HTML
-output; @command{makeinfo} just reproduces the input, it does not try
-to interpret the mathematics in any way.
-
-@code{@@math} implies @code{@@tex}.  This not only makes it possible to
-write superscripts and subscripts (as in the above example), but also
-allows you to use any of the plain @TeX{} math control sequences.  It's
-conventional to use @samp{\} instead of @samp{@@} for these commands.
-As in:
-@example
-@@math@{\sin 2\pi \equiv \cos 3\pi@}
-@end example
-
-@iftex
-@noindent which looks like this in @TeX{}:
-@display
-@math{\sin 2\pi \equiv \cos 3\pi}
-@end display
-
-@noindent and
-@end iftex
-@noindent which looks like the input in Info and HTML:
-@example
-\sin 2\pi \equiv \cos 3\pi
-@end example
-
-@findex \ @r{(literal \ in @code{@@math})}
-Since @samp{\} is an escape character inside @code{@@math}, you can use
-@code{@@\} to get a literal backslash (@code{\\} will work in @TeX{},
-but you'll get the literal @samp{\\} in Info).  @code{@@\} is not
-defined outside of @code{@@math}, since a @samp{\} ordinarily produces a
-literal @samp{\}.
-
-
-@cindex Displayed equations
-@cindex Equations, displayed
-For displayed equations, you must at present use @TeX{} directly
-(@pxref{Raw Formatter Commands}).
-
-
-@node Glyphs
-@section Glyphs for Examples
-@cindex Glyphs
-@cindex Examples, glyphs for
-
-In Texinfo, code is often illustrated in examples that are delimited
-by @code{@@example} and @code{@@end example}, or by @code{@@lisp} and
-@code{@@end lisp}.  In such examples, you can indicate the results of
-evaluation or an expansion using @samp{@result{}} or
-@samp{@expansion{}}.  Likewise, there are commands to insert glyphs
-to indicate
-printed output, error messages, equivalence of expressions, and the
-location of point.@refill
-
-The glyph-insertion commands do not need to be used within an example, but
-most often they are.  Every  glyph-insertion command is followed by a pair of
-left- and right-hand braces.@refill
-
-@menu
-* Glyphs Summary::
-* result::                      How to show the result of expression.
-* expansion::                   How to indicate an expansion.
-* Print Glyph::                 How to indicate printed output.
-* Error Glyph::                 How to indicate an error message.
-* Equivalence::                 How to indicate equivalence.
-* Point Glyph::                 How to indicate the location of point.
-@end menu
-
-
-@node Glyphs Summary
-@subsection Glyphs Summary
-
-Here are the different glyph commands:@refill
-
-@table @asis
-@item @result{}
-@code{@@result@{@}} points to the result of an expression.@refill
-
-@item @expansion{}
-@code{@@expansion@{@}} shows the results of a macro expansion.@refill
-
-@item @print{}
-@code{@@print@{@}} indicates printed output.@refill
-
-@item @error{}
-@code{@@error@{@}} indicates that the following text is an error
-message.@refill
-
-@item @equiv{}
-@code{@@equiv@{@}} indicates the exact equivalence of two forms.@refill
-
-@item @point{}
-@code{@@point@{@}} shows the location of point.@refill
-@end table
-
-@menu
-* result::
-* expansion::
-* Print Glyph::
-* Error Glyph::
-* Equivalence::
-* Point Glyph::
-@end menu
-
-
-@node result
-@subsection @code{@@result@{@}} (@result{}): Indicating Evaluation
-@cindex Result of an expression
-@cindex Indicating evaluation
-@cindex Evaluation glyph
-@cindex Value of an expression, indicating
-@findex result
-
-Use the @code{@@result@{@}} command to indicate the result of
-evaluating an expression.@refill
-
-@iftex
-The @code{@@result@{@}} command is displayed as @samp{@result{}} in
-the printed output and as @samp{=>} in other formats.
-@end iftex
-@ifnottex
-The @code{@@result@{@}} command is displayed as @samp{@result{}} in
-Info and HTML and as a true double stemmed arrow in the printed output.
-@end ifnottex
-
-Thus, the following,
-
-@lisp
-(cdr '(1 2 3))
-    @result{} (2 3)
-@end lisp
-
-@noindent
-may be read as ``@code{(cdr '(1 2 3))} evaluates to @code{(2 3)}''.
-
-
-@node expansion
-@subsection @code{@@expansion@{@}} (@expansion{}): Indicating an Expansion
-@cindex Expansion, indicating
-@cindex Macro expansion, indicating
-@findex expansion
-
-When an expression is a macro call, it expands into a new expression.
-You can indicate the result of the expansion with the
-@code{@@expansion@{@}} command.@refill
-
-@iftex
-The @code{@@expansion@{@}} command is displayed as @samp{@expansion{}}
-in the printed output.  and as @samp{==>} in other formats.
-@end iftex
-@ifnottex
-The @code{@@expansion@{@}} command is displayed as @samp{@expansion{}}
-in Info and HTML, and as a long arrow with a flat base in the printed
-output.
-@end ifnottex
-
-@need 700
-For example, the following
-
-@example
-@group
-@@lisp
-(third '(a b c))
-    @@expansion@{@} (car (cdr (cdr '(a b c))))
-    @@result@{@} c
-@@end lisp
-@end group
-@end example
-
-@noindent
-produces
-
-@lisp
-@group
-(third '(a b c))
-    @expansion{} (car (cdr (cdr '(a b c))))
-    @result{} c
-@end group
-@end lisp
-
-@noindent
-which may be read as:
-
-@quotation
-@code{(third '(a b c))} expands to @code{(car (cdr (cdr '(a b c))))};
-the result of evaluating the expression is @code{c}.
-@end quotation
-
-@noindent
-Often, as in this case, an example looks better if the
-@code{@@expansion@{@}} and @code{@@result@{@}} commands are indented.
-
-
-@node Print Glyph
-@subsection @code{@@print@{@}} (@print{}): Indicating Printed Output
-@cindex Printed output, indicating
-@findex print
-
-Sometimes an expression will print output during its execution.  You
-can indicate the printed output with the @code{@@print@{@}} command.@refill
-
-@iftex
-The @code{@@print@{@}} command is displayed as @samp{-|} in Info and
-HTML and as @samp{@print{}} in the printed output.
-@end iftex
-@ifnottex
-The @code{@@print@{@}} command is displayed as @samp{@print{}} in Info
-and HTML and (similarly) as a horizontal dash butting against a
-vertical bar in the printed output.
-@end ifnottex
-
-In the following example, the printed text is indicated with
-@samp{@print{}}, and the value of the expression follows on the
-last line.
-
-@lisp
-@group
-(progn (print 'foo) (print 'bar))
-    @print{} foo
-    @print{} bar
-    @result{} bar
-@end group
-@end lisp
-
-@noindent
-In a Texinfo source file, this example is written as follows:
-
-@lisp
-@group
-@@lisp
-(progn (print 'foo) (print 'bar))
-    @@print@{@} foo
-    @@print@{@} bar
-    @@result@{@} bar
-@@end lisp
-@end group
-@end lisp
-
-
-@node Error Glyph
-@subsection @code{@@error@{@}} (@error{}): Indicating an Error Message
-@cindex Error message, indicating
-@findex error
-
-A piece of code may cause an error when you evaluate it.  You can
-designate the error message with the @code{@@error@{@}} command.@refill
-
-@iftex
-The @code{@@error@{@}} command is displayed as @samp{error-->} in Info
-and HTML and as @samp{@error{}} in the printed output.
-@end iftex
-@ifnottex
-The @code{@@error@{@}} command is displayed as @samp{@error{}} in Info
-and HTML and as the word `error' in a box in the printed output.
-@end ifnottex
-
-@need 700
-Thus,
-
-@example
-@@lisp
-(+ 23 'x)
-@@error@{@} Wrong type argument: integer-or-marker-p, x
-@@end lisp
-@end example
-
-@noindent
-produces
-
-@lisp
-(+ 23 'x)
-@error{} Wrong type argument: integer-or-marker-p, x
-@end lisp
-
-@noindent
-This indicates that the following error message is printed
-when you evaluate the expression:
-
-@lisp
-Wrong type argument: integer-or-marker-p, x
-@end lisp
-
-@samp{@error{}} itself is not part of the error message.
-
-
-@node Equivalence
-@subsection @code{@@equiv@{@}} (@equiv{}): Indicating Equivalence
-@cindex Equivalence, indicating
-@findex equiv
-
-Sometimes two expressions produce identical results.  You can indicate the
-exact equivalence of two forms with the @code{@@equiv@{@}} command.@refill
-
-@iftex
-The @code{@@equiv@{@}} command is displayed as @samp{==} in Info and
-HTML and as @samp{@equiv{}} in the printed output.
-@end iftex
-@ifnottex
-The @code{@@equiv@{@}} command is displayed as @samp{@equiv{}} in Info
-and HTML and as a standard mathematical equivalence sign (three
-parallel horizontal lines) in the printed output.
-@end ifnottex
-
-Thus,
-
-@example
-@@lisp
-(make-sparse-keymap) @@equiv@{@} (list 'keymap)
-@@end lisp
-@end example
-
-@noindent
-produces
-
-@lisp
-(make-sparse-keymap) @equiv{} (list 'keymap)
-@end lisp
-
-@noindent
-This indicates that evaluating @code{(make-sparse-keymap)} produces
-identical results to evaluating @code{(list 'keymap)}.
-
-
-@node Point Glyph
-@subsection @code{@@point@{@}} (@point{}): Indicating Point in a Buffer
-@cindex Point, indicating in a buffer
-@findex point
-
-Sometimes you need to show an example of text in an Emacs buffer.  In
-such examples, the convention is to include the entire contents of the
-buffer in question between two lines of dashes containing the buffer
-name.@refill
-
-You can use the @samp{@@point@{@}} command to show the location of point
-in the text in the buffer.  (The symbol for point, of course, is not
-part of the text in the buffer; it indicates the place @emph{between}
-two characters where point is located.)@refill
-
-@iftex
-The @code{@@point@{@}} command is displayed as @samp{-!-} in Info and
-HTML and as @samp{@point{}} in the printed output.
-@end iftex
-@ifnottex
-The @code{@@point@{@}} command is displayed as @samp{@point{}} in Info
-and HTML and as a small five pointed star in the printed
-output.
-@end ifnottex
-
-The following example shows the contents of buffer @file{foo} before
-and after evaluating a Lisp command to insert the word @code{changed}.@refill
-
-@example
-@group
----------- Buffer: foo ----------
-This is the @point{}contents of foo.
----------- Buffer: foo ----------
-
-@end group
-@end example
-
-@example
-@group
-(insert "changed ")
-    @result{} nil
----------- Buffer: foo ----------
-This is the changed @point{}contents of foo.
----------- Buffer: foo ----------
-
-@end group
-@end example
-
-In a Texinfo source file, the example is written like this:@refill
-
-@example
-@@example
----------- Buffer: foo ----------
-This is the @@point@{@}contents of foo.
----------- Buffer: foo ----------
-
-(insert "changed ")
-    @@result@{@} nil
----------- Buffer: foo ----------
-This is the changed @@point@{@}contents of foo.
----------- Buffer: foo ----------
-@@end example
-@end example
-
-
-@node Breaks
-@chapter Forcing and Preventing Breaks
-@cindex Forcing line and page breaks
-@cindex Making line and page breaks
-@cindex Preventing line and page breaks
-
-@cindex Line breaks
-Usually, a Texinfo file is processed both by @TeX{} and by one of the
-Info formatting commands.  Line, paragraph, or page breaks sometimes
-occur in the `wrong' place in one or other form of output.  You must
-ensure that text looks right both in the printed manual and in the
-Info file.
-
-@cindex White space, excessive
-@cindex Page breaks
-For example, in a printed manual, page breaks may occur awkwardly in
-the middle of an example; to prevent this, you can hold text together
-using a grouping command that keeps the text from being split across
-two pages.  Conversely, you may want to force a page break where none
-would occur normally.  Fortunately, problems like these do not often
-arise.  When they do, use the break, break prevention, or pagination
-commands.
-
-@menu
-* Break Commands::              Summary of break-related commands.
-* Line Breaks::                 Forcing line breaks.
-* - and hyphenation::           Helping @TeX{} with hyphenation points.
-* w::                           Preventing unwanted line breaks in text.
-* tie::                         Inserting an unbreakable but varying space.
-* sp::                          Inserting blank lines.
-* page::                        Forcing the start of a new page.
-* group::                       Preventing unwanted page breaks.
-* need::                        Another way to prevent unwanted page breaks.
-@end menu
-
-
-@node Break Commands
-@section Break Commands
-
-The break commands create or allow line and paragraph breaks:
-
-@table @code
-@item @@*
-Force a line break.
-
-@item @@sp @var{n}
-Skip @var{n} blank lines.
-
-@item @@-
-Insert a discretionary hyphen.
-
-@item @@hyphenation@{@var{hy-phen-a-ted words}@}
-Define hyphen points in @var{hy-phen-a-ted words}.
-@end table
-
-These commands hold text together on a single line:
-
-@table @code
-@item @@w@{@var{text}@}
-Prevent @var{text} from being split and hyphenated across two lines.
-@item @@tie@{@}
-Insert a normal interword space at which a line break may not occur.
-@end table
-@iftex
-@sp 1
-@end iftex
-
-The pagination commands apply only to printed output, since Info
-files do not have pages.
-
-@table @code
-@item @@page
-Start a new page in the printed manual.
-
-@item @@group
-Hold text together that must appear on one printed page.
-
-@item @@need @var{mils}
-Start a new printed page if not enough space on this one.
-@end table
-
-
-@node Line Breaks
-@section @code{@@*} and @code{@@/}: Generate and Allow Line Breaks
-@findex * @r{(force line break)}
-@findex / @r{(allow line break)}
-@cindex Line breaks
-@cindex Breaks in a line
-@cindex Force line break
-@cindex Allow line break
-
-The @code{@@*} command forces a line break in both the printed manual and
-in Info.  The @code{@@/} command allows a line break (printed manual only).
-
-Here is an example with @code{@@*}:
-
-@example
-This line @@* is broken @@*in two places.
-@end example
-
-@noindent produces
-
-@example
-@group
-This line
-is broken
-in two places.
-@end group
-@end example
-
-The @code{@@/} command can be useful within a url
-(@pxref{uref,,@code{@@uref}}), which tend to be long and are otherwise
-unbreakable.  For example:
-
-@example
-The official Texinfo home page is on the GNU web site:
-@@uref@{http://www.gnu.org/@@/software/@@/gnu/@@/texinfo@}.
-@end example
-
-@noindent produces
-
-@display
-The official Texinfo home page is on the GNU web site:
-@uref{http://www.gnu.org/@/software/@/gnu/@/texinfo}.
-@end display
-
-@noindent Without the @code{@@/} commands, @TeX{} would have nowhere to
-break the line.  @code{@@/} has no effect in the online output.
-
-
-@node - and hyphenation
-@section @code{@@-} and @code{@@hyphenation}: Helping @TeX{} Hyphenate
-
-@findex - @r{(discretionary hyphen)}
-@findex hyphenation
-@cindex Hyphenation, helping @TeX{} do
-@cindex Fine-tuning, and hyphenation
-
-Although @TeX{}'s hyphenation algorithm is generally pretty good, it
-does miss useful hyphenation points from time to time.  (Or, far more
-rarely, insert an incorrect hyphenation.)  So, for documents with an
-unusual vocabulary or when fine-tuning for a printed edition, you may
-wish to help @TeX{} out.  Texinfo supports two commands for this:
-
-@table @code
-@item @@-
-Insert a discretionary hyphen, i.e., a place where @TeX{} can (but does
-not have to) hyphenate.  This is especially useful when you notice an
-overfull hbox is due to @TeX{} missing a hyphenation (@pxref{Overfull
-hboxes}).  @TeX{} will not insert any hyphenation points itself into a
-word containing @code{@@-}.
-
-@item @@hyphenation@{@var{hy-phen-a-ted words}@}
-Tell @TeX{} how to hyphenate @var{hy-phen-a-ted words}.  As shown, you
-put a @samp{-} at each hyphenation point.  For example:
-@example
-@@hyphenation@{man-u-script man-u-scripts@}
-@end example
-@noindent @TeX{} only uses the specified hyphenation points when the
-words match exactly, so give all necessary variants.
-@end table
-
-Info output is not hyphenated, so these commands have no effect there.
-
-
-@node w
-@section @code{@@w}@{@var{text}@}: Prevent Line Breaks
-@findex w @r{(prevent line break)}
-@cindex Line breaks, preventing
-
-@code{@@w@{@var{text}@}} outputs @var{text} and prohibits line breaks
-within @var{text}, for both @TeX{} and @command{makeinfo}.
-
-@cindex Non-breakable space, fixed
-@cindex Unbreakable space, fixed
-Thus, you can use @code{@@w} to produce a non-breakable space, fixed at
-the width of a normal interword space:
-
-@example
-@@w@{ @} @@w@{ @} @@w@{ @} indentation.
-@end example
-
-@noindent produces:
-
-@display
-@w{ } @w{ } @w{ } indentation.
-@end display
-
-The space from @code{@@w@{@w{ }@}}, as well as being non-breakable,
-also will not stretch or shrink.  Sometimes that is what you want, for
-instance if you're doing indenting manual.  However, usually you want
-a normal interword space that does stretch and shrink (in the printed
-output); see the @code{@@tie} command in the next section.
-
-@cindex Hyphenation, preventing
-You can also use the @code{@@w} command to prevent @TeX{} from
-automatically hyphenating a long name or phrase that happens to fall
-near the end of a line.  @command{makeinfo} does not ever hyphenate
-words.
-
-@cindex Keyword expansion, preventing
-@cindex Version control keywords, preventing expansion of
-@cindex $Id expansion, preventing
-You can also use @code{@@w} to avoid unwanted keyword expansion in
-source control systems.  For example, to literally write @t{@w{$}Id$}
-in your document, use @code{@@w@{$@}Id$}.
-
-
-@node tie
-@section @code{@@tie@{@}}: Inserting an Unbreakable Space
-@findex tie @r{(unbreakable interword space)}
-@cindex Tied space
-@cindex Non-breakable space, variable
-@cindex Unbreakable space, variable
-
-The @code{@@tie@{@}} command produces a normal interword space at which
-a line break may not occur.  Always write it with following (empty)
-braces, as usual for commands used within a paragraph.  Here's an
-example:
-
-@example
-@@TeX@{@} was written by Donald E.@@tie@{@}Knuth.
-@end example
-
-@noindent produces:
-
-@display
-@TeX{} was written by Donald E.@tie{}Knuth.
-@end display
-
-There are two important differences between @code{@@tie@{@}} and
-@code{@@w@{@w{ }@}}:
-
-@itemize
-@item
-The space produced by @code{@@tie@{@}} will stretch and shrink slightly
-along with the normal interword spaces in the paragraph; the space
-produced by @code{@@w@{@w{ }@}} will not vary.
-
-@item
-@code{@@tie@{@}} allows hyphenation of the surrounding words, while
-@code{@@w@{@w{ }@}} inhibits hyphenation of those words (for @TeX{}nical
-reasons, namely that it produces an @samp{\hbox}).
-
-@end itemize
-
-
-@node sp
-@section @code{@@sp} @var{n}: Insert Blank Lines
-@findex sp @r{(line spacing)}
-@cindex Space, inserting vertical
-@cindex Blank lines
-@cindex Line spacing
-
-A line beginning with and containing only @code{@@sp @var{n}}
-generates @var{n} blank lines of space in both the printed manual and
-the Info file.  @code{@@sp} also forces a paragraph break.  For
-example,
-
-@example
-@@sp 2
-@end example
-
-@noindent
-generates two blank lines.
-
-The @code{@@sp} command is most often used in the title page.@refill
-
-@ignore
-@c node br, page, sp, Breaks
-@comment  node-name,  next,  previous,  up
-@c section @code{@@br}: Generate Paragraph Breaks
-@findex br @r{(paragraph breaks)}
-@cindex Paragraph breaks
-@cindex Breaks in a paragraph
-
-The @code{@@br} command forces a paragraph break.  It inserts a blank
-line.  You can use the command within or at the end of a line.  If
-used within a line, the @code{@@br@{@}} command must be followed by
-left and right braces (as shown here) to mark the end of the
-command.@refill
-
-@need 700
-For example,
-
-@example
-@group
-This line @@br@{@}contains and is ended by paragraph breaks@@br
-and is followed by another line.
-@end group
-@end example
-
-@noindent
-produces
-
-@example
-@group
-This line
-
-contains and is ended by paragraph breaks
-
-and is followed by another line.
-@end group
-@end example
-
-The @code{@@br} command is seldom used.
-@end ignore
-
-
-@node page
-@section @code{@@page}: Start a New Page
-@cindex Page breaks
-@findex page
-
-A line containing only @code{@@page} starts a new page in a printed
-manual.  The command has no effect on Info files since they are not
-paginated.  An @code{@@page} command is often used in the @code{@@titlepage}
-section of a Texinfo file to start the copyright page.
-
-
-@node group
-@comment  node-name,  next,  previous,  up
-@section @code{@@group}: Prevent Page Breaks
-@cindex Group (hold text together vertically)
-@cindex Holding text together vertically
-@cindex Vertically holding text together
-@findex group
-
-The @code{@@group} command (on a line by itself) is used inside an
-@code{@@example} or similar construct to begin an unsplittable vertical
-group, which will appear entirely on one page in the printed output.
-The group is terminated by a line containing only @code{@@end group}.
-These two lines produce no output of their own, and in the Info file
-output they have no effect at all.@refill
-
-@c Once said that these environments
-@c turn off vertical spacing between ``paragraphs''.
-@c Also, quotation used to work, but doesn't in texinfo-2.72
-Although @code{@@group} would make sense conceptually in a wide
-variety of contexts, its current implementation works reliably only
-within @code{@@example} and variants, and within @code{@@display},
-@code{@@format}, @code{@@flushleft} and @code{@@flushright}.
-@xref{Quotations and Examples}.  (What all these commands have in
-common is that each line of input produces a line of output.)  In
-other contexts, @code{@@group} can cause anomalous vertical
-spacing.@refill
-
-@need 750
-This formatting requirement means that you should write:
-
-@example
-@group
-@@example
-@@group
-@dots{}
-@@end group
-@@end example
-@end group
-@end example
-
-@noindent
-with the @code{@@group} and @code{@@end group} commands inside the
-@code{@@example} and @code{@@end example} commands.
-
-The @code{@@group} command is most often used to hold an example
-together on one page.  In this Texinfo manual, more than 100 examples
-contain text that is enclosed between @code{@@group} and @code{@@end
-group}.
-
-If you forget to end a group, you may get strange and unfathomable
-error messages when you run @TeX{}.  This is because @TeX{} keeps
-trying to put the rest of the Texinfo file onto the one page and does
-not start to generate error messages until it has processed
-considerable text.  It is a good rule of thumb to look for a missing
-@code{@@end group} if you get incomprehensible error messages in
-@TeX{}.@refill
-
-@node need
-@comment  node-name,  next,  previous,  up
-@section @code{@@need @var{mils}}: Prevent Page Breaks
-@cindex Need space at page bottom
-@findex need
-
-A line containing only @code{@@need @var{n}} starts
-a new page in a printed manual if fewer than @var{n} mils (thousandths
-of an inch) remain on the current page.  Do not use
-braces around the argument @var{n}.  The @code{@@need} command has no
-effect on Info files since they are not paginated.@refill
-
-@need 800
-This paragraph is preceded by an @code{@@need} command that tells
-@TeX{} to start a new page if fewer than 800 mils (eight-tenths
-inch) remain on the page.  It looks like this:@refill
-
-@example
-@group
-@@need 800
-This paragraph is preceded by @dots{}
-@end group
-@end example
-
-The @code{@@need} command is useful for preventing orphans (single
-lines at the bottoms of printed pages).@refill
-
-
-@node Definition Commands
-@chapter Definition Commands
-@cindex Definition commands
-
-The @code{@@deffn} command and the other @dfn{definition commands}
-enable you to describe functions, variables, macros, commands, user
-options, special forms and other such artifacts in a uniform
-format.@refill
-
-In the Info file, a definition causes the entity
-category---`Function', `Variable', or whatever---to appear at the
-beginning of the first line of the definition, followed by the
-entity's name and arguments.  In the printed manual, the command
-causes @TeX{} to print the entity's name and its arguments on the left
-margin and print the category next to the right margin.  In both
-output formats, the body of the definition is indented.  Also, the
-name of the entity is entered into the appropriate index:
-@code{@@deffn} enters the name into the index of functions,
-@code{@@defvr} enters it into the index of variables, and so
-on (@pxref{Predefined Indices}).
-
-A manual need not and should not contain more than one definition for
-a given name.  An appendix containing a summary should use
-@code{@@table} rather than the definition commands.@refill
-
-@menu
-* Def Cmd Template::            Writing descriptions using definition commands.
-* Def Cmd Continuation Lines::  Continuing the heading over source lines.
-* Optional Arguments::          Handling optional and repeated arguments.
-* deffnx::                      Group two or more `first' lines.
-* Def Cmds in Detail::          Reference for all the definition commands.
-* Def Cmd Conventions::         Conventions for writing definitions.
-* Sample Function Definition::  An example.
-@end menu
-
-
-@node Def Cmd Template
-@section The Template for a Definition
-@cindex Definition template
-@cindex Template for a definition
-
-The @code{@@deffn} command is used for definitions of entities that
-resemble functions.  To write a definition using the @code{@@deffn}
-command, write the @code{@@deffn} command at the beginning of a line
-and follow it on the same line by the category of the entity, the name
-of the entity itself, and its arguments (if any).  Then write the body
-of the definition on succeeding lines.  (You may embed examples in the
-body.)  Finally, end the definition with an @code{@@end deffn} command
-written on a line of its own.
-
-The other definition commands follow the same format: a line with the
-@code{@@def@dots{}} command and whatever arguments are appropriate for
-that command; the body of the definition; and a corresponding
-@code{@@end} line.
-
-The template for a definition looks like this:
-
-@example
-@group
-@@deffn @var{category} @var{name} @var{arguments}@dots{}
-@var{body-of-definition}
-@@end deffn
-@end group
-@end example
-
-@need 700
-@noindent
-For example,
-
-@example
-@group
-@@deffn Command forward-word count
-This command moves point forward @@var@{count@} words
-(or backward if @@var@{count@} is negative). @dots{}
-@@end deffn
-@end group
-@end example
-
-@noindent
-produces
-
-@quotation
-@deffn Command forward-word count
-This function moves point forward @var{count} words
-(or backward if @var{count} is negative). @dots{}
-@end deffn
-@end quotation
-
-Capitalize the category name like a title.  If the name of the
-category contains spaces, as in the phrase `Interactive Command',
-enclose it in braces.  For example:
-
-@example
-@group
-@@deffn @{Interactive Command@} isearch-forward
-@dots{}
-@@end deffn
-@end group
-@end example
-
-@noindent
-Otherwise, the second word will be mistaken for the name of the
-entity.  As a general rule, when any of the arguments in the heading
-line @emph{except} the last one are more than one word, you need to
-enclose them in braces.
-
-Some of the definition commands are more general than others.  The
-@code{@@deffn} command, for example, is the general definition command
-for functions and the like---for entities that may take arguments.
-When you use this command, you specify the category to which the
-entity belongs.  Three predefined, specialized variations
-(@code{@@defun}, @code{@@defmac}, and @code{@@defspec}) specify the
-category for you: ``Function'', ``Macro'', and ``Special Form''
-respectively.  (In Lisp, a special form is an entity much like a
-function.)  Similarly, the general @code{@@defvr} command is
-accompanied by several specialized variations for describing
-particular kinds of variables.
-
-@xref{Sample Function Definition}, for a detailed example of a
-function definition, including the use of @code{@@example} inside the
-definition.
-
-@cindex Macros in definition commands
-Unfortunately, due to implementation difficulties, macros are not expanded
-in @code{@@deffn} and all the other definition commands.
-
-
-@node Def Cmd Continuation Lines
-@section Definition Command Continuation Lines
-@cindex Continuation lines in definition commands
-@cindex Definition command headings, continuing
-@cindex @samp{@@} as continuation in definition commands
-
-The heading line of a definition command can get very long.
-Therefore, Texinfo has a special syntax allowing them to be continued
-over multiple lines of the source file: a lone @samp{@@} at the end of
-each line to be continued.  Here's an example:
-
-@example
-@@defun fn-name @@
-  arg1 arg2 arg3
-This is the basic continued defun.
-@@end defun
-@end example
-
-@noindent produces:
-
-@defun fn-name @
-  arg1 arg2 arg3
-This is the basic continued defun.
-@end defun
-
-@noindent
-As you can see, the continued lines are combined, as if they had been
-typed on one source line.
-
-Although this example only shows a one-line continuation,
-continuations may extend over any number of lines; simply put an
-@code{@@} at the end of each line to be continued.
-
-The @code{@@} character does not have to be the last character on the
-physical line: whitespace is allowed (and ignored) afterwards.
-
-@cindex Whitespace, collapsed around continuations
-@cindex Collapsing whitespace around continuations
-In general, any number of spaces or tabs around the @code{@@}
-continuation character, both on the line with the @code{@@} and on the
-continued line, are collapsed into a single space.  There is one
-exception: the Texinfo processors will not fully collapse whitespace
-around a continuation inside braces.  For example:
-
-@example
-@@deffn @{Category @@
-  Name@} @dots{}
-@end example
-
-@noindent The output (not shown) has excess space between `Category'
-and `Name'.  In this case, simply elide any unwanted whitespace in
-your input, or put the continuation @code{@@} outside braces.
-
-@code{@@} does not (currently) function as a continuation character in
-@emph{any} other context.  Ordinarily, @samp{@@} followed by a
-whitespace character (space, tab, newline) produces a normal interword
-space (@pxref{Multiple Spaces}).
-
-
-@node Optional Arguments
-@section Optional and Repeated Arguments
-@cindex Optional and repeated arguments
-@cindex Repeated and optional arguments
-@cindex Arguments, repeated and optional
-@cindex Syntax, optional & repeated arguments
-@cindex Meta-syntactic chars for arguments
-
-Some entities take optional or repeated arguments, which may be
-specified by a distinctive glyph that uses square brackets and
-ellipses.  For @w{example}, a special form often breaks its argument list
-into separate arguments in more complicated ways than a
-straightforward function.
-
-@c This is consistent with Emacs Lisp Reference manual
-An argument enclosed within square brackets is optional.
-Thus, [@var{optional-arg}] means that @var{optional-arg} is optional.
-An argument followed by an ellipsis is optional
-and may be repeated more than once.
-@c This is consistent with Emacs Lisp Reference manual
-Thus, @var{repeated-args}@samp{@dots{}} stands for zero or more
-arguments.  Parentheses are used when several arguments are grouped
-into additional levels of list structure in Lisp.
-
-Here is the @code{@@defspec} line of an example of an imaginary
-special form:
-
-@quotation
-@defspec foobar (@var{var} [@var{from} @var{to} [@var{inc}]]) @var{body}@dots{}
-@end defspec
-@tex
-\vskip \parskip
-@end tex
-@end quotation
-
-@noindent
-In this example, the arguments @var{from} and @var{to} are optional,
-but must both be present or both absent.  If they are present,
-@var{inc} may optionally be specified as well.  These arguments are
-grouped with the argument @var{var} into a list, to distinguish them
-from @var{body}, which includes all remaining elements of the
-form.@refill
-
-In a Texinfo source file, this @code{@@defspec} line is written like
-this (except it would not be split over two lines, as it is in this
-example).@refill
-
-@example
-@group
-@@defspec foobar (@@var@{var@} [@@var@{from@} @@var@{to@}
-    [@@var@{inc@}]]) @@var@{body@}@@dots@{@}
-@end group
-@end example
-
-@noindent
-The function is listed in the Command and Variable Index under
-@samp{foobar}.@refill
-
-
-@node deffnx
-@section Two or More `First' Lines
-@cindex Two `First' Lines for @code{@@deffn}
-@cindex Grouping two definitions together
-@cindex Definitions grouped together
-@findex deffnx
-
-To create two or more `first' or header lines for a definition, follow
-the first @code{@@deffn} line by a line beginning with @code{@@deffnx}.
-The @code{@@deffnx} command works exactly like @code{@@deffn}
-except that it does not generate extra vertical white space between it
-and the preceding line.@refill
-
-@need 1000
-For example,
-
-@example
-@group
-@@deffn @{Interactive Command@} isearch-forward
-@@deffnx @{Interactive Command@} isearch-backward
-These two search commands are similar except @dots{}
-@@end deffn
-@end group
-@end example
-
-@noindent
-produces
-
-@deffn {Interactive Command} isearch-forward
-@deffnx {Interactive Command} isearch-backward
-These two search commands are similar except @dots{}
-@end deffn
-
-Each definition command has an `x' form: @code{@@defunx},
-@code{@@defvrx}, @code{@@deftypefunx}, etc.
-
-The `x' forms work similarly to @code{@@itemx} (@pxref{itemx}).
-
-
-@node Def Cmds in Detail
-@section The Definition Commands
-
-Texinfo provides more than a dozen definition commands, all of which
-are described in this section.@refill
-
-The definition commands automatically enter the name of the entity in
-the appropriate index: for example, @code{@@deffn}, @code{@@defun},
-and @code{@@defmac} enter function names in the index of functions;
-@code{@@defvr} and @code{@@defvar} enter variable names in the index
-of variables.@refill
-
-Although the examples that follow mostly illustrate Lisp, the commands
-can be used for other programming languages.@refill
-
-@menu
-* Functions Commands::          Commands for functions and similar entities.
-* Variables Commands::          Commands for variables and similar entities.
-* Typed Functions::             Commands for functions in typed languages.
-* Typed Variables::             Commands for variables in typed languages.
-* Data Types::                  The definition command for data types.
-* Abstract Objects::            Commands for object-oriented programming.
-@end menu
-
-@node Functions Commands
-@subsection Functions and Similar Entities
-
-This section describes the commands for describing functions and similar
-entities:@refill
-
-@table @code
-@findex deffn
-@item @@deffn @var{category} @var{name} @var{arguments}@dots{}
-The @code{@@deffn} command is the general definition command for
-functions, interactive commands, and similar entities that may take
-arguments.  You must choose a term to describe the category of entity
-being defined; for example, ``Function'' could be used if the entity is
-a function.  The @code{@@deffn} command is written at the beginning of a
-line and is followed on the same line by the category of entity being
-described, the name of this particular entity, and its arguments, if
-any.  Terminate the definition with @code{@@end deffn} on a line of its
-own.@refill
-
-@need 750
-For example, here is a definition:
-
-@example
-@group
-@@deffn Command forward-char nchars
-Move point forward @@var@{nchars@} characters.
-@@end deffn
-@end group
-@end example
-
-@noindent
-This shows a rather terse definition for a ``command'' named
-@code{forward-char} with one argument, @var{nchars}.
-
-@code{@@deffn} and prints argument names such as @var{nchars} in slanted
-type in the printed output, because we think of these names as
-metasyntactic variables---they stand for the actual argument values.
-Within the text of the description, however, write an argument name
-explicitly with @code{@@var} to refer to the value of the argument.
-In the example above, we used @samp{@@var@{nchars@}} in this way.
-
-In the unusual case when an argument name contains @samp{--}, or
-another character sequence which is treated specially
-(@pxref{Conventions}), use @code{@@var} around the argument.  This
-causes the name to be printed in slanted typewriter, instead of the
-regular slanted font, exactly as input.
-@c except for ?` and !`, but we won't explain that.
-
-The template for @code{@@deffn} is:
-
-@example
-@group
-@@deffn @var{category} @var{name} @var{arguments}@dots{}
-@var{body-of-definition}
-@@end deffn
-@end group
-@end example
-
-@findex defun
-@item @@defun @var{name} @var{arguments}@dots{}
-The @code{@@defun} command is the definition command for functions.
-@code{@@defun} is equivalent to @samp{@@deffn Function @dots{}}.
-Terminate the definition with @code{@@end defun} on a line of its own.
-Thus, the template is:
-
-@example
-@group
-@@defun @var{function-name} @var{arguments}@dots{}
-@var{body-of-definition}
-@@end defun
-@end group
-@end example
-
-@findex defmac
-@item @@defmac @var{name} @var{arguments}@dots{}
-The @code{@@defmac} command is the definition command for macros.
-@code{@@defmac} is equivalent to @samp{@@deffn Macro @dots{}} and
-works like @code{@@defun}.
-
-@findex defspec
-@item @@defspec @var{name} @var{arguments}@dots{}
-The @code{@@defspec} command is the definition command for special
-forms.  (In Lisp, a special form is an entity much like a function,
-@pxref{Special Forms,,, elisp, GNU Emacs Lisp Reference Manual}.)
-@code{@@defspec} is equivalent to @samp{@@deffn @{Special Form@}
-@dots{}} and works like @code{@@defun}.
-@end table
-
-All these commands create entries in the index of functions.
-
-
-@node Variables Commands
-@subsection Variables and Similar Entities
-
-Here are the commands for defining variables and similar
-entities:@refill
-
-@table @code
-@findex defvr
-@item @@defvr @var{category} @var{name}
-The @code{@@defvr} command is a general definition command for
-something like a variable---an entity that records a value.  You must
-choose a term to describe the category of entity being defined; for
-example, ``Variable'' could be used if the entity is a variable.
-Write the @code{@@defvr} command at the beginning of a line and
-follow it on the same line by the category of the entity and the
-name of the entity.
-
-Capitalize the category name like a title.  If the name of the category
-contains spaces, as in the name ``User Option'', enclose it in braces.
-Otherwise, the second word will be mistaken for the name of the entity.
-For example,
-
-@example
-@group
-@@defvr @{User Option@} fill-column
-This buffer-local variable specifies
-the maximum width of filled lines.
-@dots{}
-@@end defvr
-@end group
-@end example
-
-Terminate the definition with @code{@@end defvr} on a line of its
-own.@refill
-
-The template is:
-
-@example
-@group
-@@defvr @var{category} @var{name}
-@var{body-of-definition}
-@@end defvr
-@end group
-@end example
-
-@code{@@defvr} creates an entry in the index of variables for @var{name}.
-
-@findex defvar
-@item @@defvar @var{name}
-The @code{@@defvar} command is the definition command for variables.
-@code{@@defvar} is equivalent to @samp{@@defvr Variable
-@dots{}}.@refill
-
-@need 750
-For example:
-
-@example
-@group
-@@defvar kill-ring
-@dots{}
-@@end defvar
-@end group
-@end example
-
-The template is:
-
-@example
-@group
-@@defvar @var{name}
-@var{body-of-definition}
-@@end defvar
-@end group
-@end example
-
-@code{@@defvar} creates an entry in the index of variables for
-@var{name}.@refill
-
-@findex defopt
-@item @@defopt @var{name}
-@cindex User options, marking
-The @code{@@defopt} command is the definition command for @dfn{user
-options}, i.e., variables intended for users to change according to
-taste; Emacs has many such (@pxref{Variables,,, emacs, The GNU Emacs
-Manual}).  @code{@@defopt} is equivalent to @samp{@@defvr @{User
-Option@} @dots{}} and works like @code{@@defvar}.  It creates an entry
-in the index of variables.
-@end table
-
-
-@node Typed Functions
-@subsection Functions in Typed Languages
-
-The @code{@@deftypefn} command and its variations are for describing
-functions in languages in which you must declare types of variables and
-functions, such as C and C++.
-
-@table @code
-@findex deftypefn
-@item @@deftypefn @var{category} @var{data-type} @var{name} @var{arguments}@dots{}
-The @code{@@deftypefn} command is the general definition command for
-functions and similar entities that may take arguments and that are
-typed.  The @code{@@deftypefn} command is written at the beginning of
-a line and is followed on the same line by the category of entity
-being described, the type of the returned value, the name of this
-particular entity, and its arguments, if any.@refill
-
-@need 800
-@noindent
-For example,
-
-@example
-@group
-@@deftypefn @{Library Function@} int foobar
-  (int @@var@{foo@}, float @@var@{bar@})
-@dots{}
-@@end deftypefn
-@end group
-@end example
-
-@need 1000
-@noindent
-(where the text before the ``@dots{}'', shown above as two lines, would
-actually be a single line in a real Texinfo file) produces the following
-in Info:
-
-@smallexample
-@group
--- Library Function: int foobar (int FOO, float BAR)
-@dots{}
-@end group
-@end smallexample
-@iftex
-
-In a printed manual, it produces:
-
-@quotation
-@deftypefn {Library Function} int foobar (int @var{foo}, float @var{bar})
-@dots{}
-@end deftypefn
-@end quotation
-@end iftex
-
-This means that @code{foobar} is a ``library function'' that returns an
-@code{int}, and its arguments are @var{foo} (an @code{int}) and
-@var{bar} (a @code{float}).@refill
-
-Since in typed languages, the actual names of the arguments are
-typically scattered among data type names and keywords, Texinfo cannot
-find them without help.  You can either (a)@tie{}write everything
-as straight text, and it will be printed in slanted type; (b)@tie{}use
-@code{@@var} for the variable names, which will uppercase the
-variable names in Info and use the slanted typewriter font in printed
-output; (c)@tie{}use @code{@@var} for the variable names and
-@code{@@code} for the type names and keywords, which will be dutifully
-obeyed.
-
-The template for @code{@@deftypefn} is:@refill
-
-@example
-@group
-@@deftypefn @var{category} @var{data-type} @var{name} @var{arguments} @dots{}
-@var{body-of-description}
-@@end deftypefn
-@end group
-@end example
-
-@noindent
-Note that if the @var{category} or @var{data type} is more than one
-word then it must be enclosed in braces to make it a single argument.@refill
-
-If you are describing a procedure in a language that has packages,
-such as Ada, you might consider using @code{@@deftypefn} in a manner
-somewhat contrary to the convention described in the preceding
-paragraphs.  For example:
-
-@example
-@group
-@@deftypefn stacks private push @@
-       (@@var@{s@}:in out stack; @@
-       @@var@{n@}:in integer)
-@dots{}
-@@end deftypefn
-@end group
-@end example
-
-@noindent
-(The @code{@@deftypefn} arguments are shown using continuations
-(@pxref{Def Cmd Continuation Lines}), but could be on a single line in
-a real Texinfo file.)
-
-In this instance, the procedure is classified as belonging to the
-package @code{stacks} rather than classified as a `procedure' and its
-data type is described as @code{private}.  (The name of the procedure
-is @code{push}, and its arguments are @var{s} and @var{n}.)@refill
-
-@code{@@deftypefn} creates an entry in the index of functions for
-@var{name}.
-
-@item @@deftypefun @var{data-type} @var{name} @var{arguments}@dots{}
-@findex deftypefun
-The @code{@@deftypefun} command is the specialized definition command
-for functions in typed languages.  The command is equivalent to
-@samp{@@deftypefn Function @dots{}}.  The template is:
-
-@example
-@group
-@@deftypefun @var{type} @var{name} @var{arguments}@dots{}
-@var{body-of-description}
-@@end deftypefun
-@end group
-@end example
-
-@code{@@deftypefun} creates an entry in the index of functions for
-@var{name}.
-
-@end table
-
-
-@node Typed Variables
-@subsection Variables in Typed Languages
-
-Variables in typed languages are handled in a manner similar to
-functions in typed languages.  @xref{Typed Functions}.  The general
-definition command @code{@@deftypevr} corresponds to
-@code{@@deftypefn} and the specialized definition command
-@code{@@deftypevar} corresponds to @code{@@deftypefun}.@refill
-
-@table @code
-@findex deftypevr
-@item @@deftypevr @var{category} @var{data-type} @var{name}
-The @code{@@deftypevr} command is the general definition command for
-something like a variable in a typed language---an entity that records
-a value.  You must choose a term to describe the category of the
-entity being defined; for example, ``Variable'' could be used if the
-entity is a variable.@refill
-
-The @code{@@deftypevr} command is written at the beginning of a line
-and is followed on the same line by the category of the entity
-being described, the data type, and the name of this particular
-entity.@refill
-
-@need 800
-@noindent
-For example:
-
-@example
-@group
-@@deftypevr @{Global Flag@} int enable
-@dots{}
-@@end deftypevr
-@end group
-@end example
-
-@noindent
-produces the following in Info:
-
-@example
-@group
--- Global Flag: int enable
-@dots{}
-@end group
-@end example
-@iftex
-
-@noindent
-and the following in a printed manual:
-
-@quotation
-@deftypevr {Global Flag} int enable
-@dots{}
-@end deftypevr
-@end quotation
-@end iftex
-
-@need 800
-The template is:
-
-@example
-@@deftypevr @var{category} @var{data-type} @var{name}
-@var{body-of-description}
-@@end deftypevr
-@end example
-
-@findex deftypevar
-@item @@deftypevar @var{data-type} @var{name}
-The @code{@@deftypevar} command is the specialized definition command
-for variables in typed languages.  @code{@@deftypevar} is equivalent
-to @samp{@@deftypevr Variable @dots{}}.  The template is:
-
-@example
-@group
-@@deftypevar @var{data-type} @var{name}
-@var{body-of-description}
-@@end deftypevar
-@end group
-@end example
-@end table
-
-These commands create entries in the index of variables.
-
-@node Data Types
-@subsection Data Types
-
-Here is the command for data types:@refill
-
-@table @code
-@findex deftp
-@item @@deftp @var{category} @var{name} @var{attributes}@dots{}
-The @code{@@deftp} command is the generic definition command for data
-types.  The command is written at the beginning of a line and is
-followed on the same line by the category, by the name of the type
-(which is a word like @code{int} or @code{float}), and then by names of
-attributes of objects of that type.  Thus, you could use this command
-for describing @code{int} or @code{float}, in which case you could use
-@code{data type} as the category.  (A data type is a category of
-certain objects for purposes of deciding which operations can be
-performed on them.)@refill
-
-In Lisp, for example,  @dfn{pair} names a particular data
-type, and an object of that type has two slots called the
-@sc{car} and the @sc{cdr}.  Here is how you would write the first line
-of a definition of @code{pair}.@refill
-
-@example
-@group
-@@deftp @{Data type@} pair car cdr
-@dots{}
-@@end deftp
-@end group
-@end example
-
-@need 950
-The template is:
-
-@example
-@group
-@@deftp @var{category} @var{name-of-type} @var{attributes}@dots{}
-@var{body-of-definition}
-@@end deftp
-@end group
-@end example
-
-@code{@@deftp} creates an entry in the index of data types.
-@end table
-
-
-@node Abstract Objects
-@subsection Object-Oriented Programming
-
-@cindex Object-oriented programming
-
-Here are the commands for formatting descriptions about abstract
-objects, such as are used in object-oriented programming.  A class is
-a defined type of abstract object.  An instance of a class is a
-particular object that has the type of the class.  An instance
-variable is a variable that belongs to the class but for which each
-instance has its own value.
-
-@menu
-* Variables: Object-Oriented Variables.
-* Methods: Object-Oriented Methods.
-@end menu
-
-
-@node Object-Oriented Variables
-@subsubsection Object-Oriented Variables
-
-@cindex Variables, object-oriented
-
-These commands allow you to define different sorts of variables in
-object-oriented programming languages.
-
-@table @code
-@item @@defcv @var{category} @var{class} @var{name}
-@findex defcv
-The @code{@@defcv} command is the general definition command for
-variables associated with classes in object-oriented programming.  The
-@code{@@defcv} command is followed by three arguments: the category of
-thing being defined, the class to which it belongs, and its
-name.  For instance:
-
-@example
-@group
-@@defcv @{Class Option@} Window border-pattern
-@dots{}
-@@end defcv
-@end group
-@end example
-
-@noindent produces:
-@defcv {Class Option} Window border-pattern
-@dots{}
-@end defcv
-
-@code{@@defcv} creates an entry in the index of variables.
-
-@item @@deftypecv @var{category} @var{class} @var{data-type} @var{name}
-@findex deftypecv
-The @code{@@deftypecv} command is the definition command for typed
-class variables in object-oriented programming.  It is analogous to
-@code{@@defcv} with the addition of the @var{data-type} parameter to
-specify the type of the instance variable.  Ordinarily, the data type
-is a programming language construct that should be marked with
-@code{@@code}. For instance:
-
-@example
-@group
-@@deftypecv @{Class Option@} Window @@code@{int@} border-pattern
-@dots{}
-@@end deftypecv
-@end group
-@end example
-
-@noindent produces:
-
-@deftypecv {Class Option} Window @code{int} border-pattern
-@dots{}
-@end deftypecv
-
-@code{@@deftypecv} creates an entry in the index of variables.
-
-@item @@defivar @var{class} @var{name}
-@findex defivar
-The @code{@@defivar} command is the definition command for instance
-variables in object-oriented programming.  @code{@@defivar} is
-equivalent to @samp{@@defcv @{Instance Variable@} @dots{}}.  For
-instance:
-
-@example
-@group
-@@defivar Window border-pattern
-@dots{}
-@@end defivar
-@end group
-@end example
-
-@noindent produces:
-
-@defivar Window border-pattern
-@dots{}
-@end defivar
-
-@code{@@defivar} creates an entry in the index of variables.
-
-@item @@deftypeivar @var{class} @var{data-type} @var{name}
-@findex deftypeivar
-The @code{@@deftypeivar} command is the definition command for typed
-instance variables in object-oriented programming.  It is analogous to
-@code{@@defivar} with the addition of the @var{data-type} parameter to
-specify the type of the instance variable.  Ordinarily, the data type
-is a programming language construct that should be marked with
-@code{@@code}. For instance:
-
-@example
-@group
-@@deftypeivar Window @@code@{int@} border-pattern
-@dots{}
-@@end deftypeivar
-@end group
-@end example
-
-@noindent produces:
-
-@deftypeivar Window @code{int} border-pattern
-@dots{}
-@end deftypeivar
-
-@code{@@deftypeivar} creates an entry in the index of variables.
-
-@end table
-
-@node Object-Oriented Methods
-@subsubsection Object-Oriented Methods
-
-@cindex Methods, object-oriented
-
-These commands allow you to define different sorts of function-like
-entities resembling methods in object-oriented programming languages.
-These entities take arguments, as functions do, but are associated with
-particular classes of objects.
-
-@table @code
-
-@findex defop
-@item @@defop @var{category} @var{class} @var{name} @var{arguments}@dots{}
-The @code{@@defop} command is the general definition command for these
-method-like entities.
-
-For example, some systems have constructs called @dfn{wrappers} that
-are associated with classes as methods are, but that act more like
-macros than like functions.  You could use @code{@@defop Wrapper} to
-describe one of these.@refill
-
-Sometimes it is useful to distinguish methods and @dfn{operations}.
-You can think of an operation as the specification for a method.
-Thus, a window system might specify that all window classes have a
-method named @code{expose}; we would say that this window system
-defines an @code{expose} operation on windows in general.  Typically,
-the operation has a name and also specifies the pattern of arguments;
-all methods that implement the operation must accept the same
-arguments, since applications that use the operation do so without
-knowing which method will implement it.@refill
-
-Often it makes more sense to document operations than methods.  For
-example, window application developers need to know about the
-@code{expose} operation, but need not be concerned with whether a
-given class of windows has its own method to implement this operation.
-To describe this operation, you would write:@refill
-
-@example
-@@defop Operation windows expose
-@end example
-
-The @code{@@defop} command is written at the beginning of a line and
-is followed on the same line by the overall name of the category of
-operation, the name of the class of the operation, the name of the
-operation, and its arguments, if any.@refill
-
-The template is:
-@example
-@group
-@@defop @var{category} @var{class} @var{name} @var{arguments}@dots{}
-@var{body-of-definition}
-@@end defop
-@end group
-@end example
-
-@code{@@defop} creates an entry, such as `@code{expose} on
-@code{windows}', in the index of functions.@refill
-
-@findex deftypeop
-@item @@deftypeop @var{category} @var{class} @var{data-type} @var{name} @var{arguments}@dots{}
-The @code{@@deftypeop} command is the definition command for typed
-operations in object-oriented programming.  It is similar to
-@code{@@defop} with the addition of the @var{data-type} parameter to
-specify the return type of the method.  @code{@@deftypeop} creates an
-entry in the index of functions.
-
-@item @@defmethod @var{class} @var{name} @var{arguments}@dots{}
-@findex defmethod
-The @code{@@defmethod} command is the definition command for methods
-in object-oriented programming.  A method is a kind of function that
-implements an operation for a particular class of objects and its
-subclasses.
-@ignore
-@c ADR: Who cares?!?
-@c KB: Oh, I don't know, I think this info is crucial!
-In the Lisp Machine, methods actually were functions, but
-they were usually defined with @code{defmethod}.
-@end ignore
-
-@code{@@defmethod} is equivalent to @samp{@@defop Method @dots{}}.
-The command is written at the beginning of a line and is followed by
-the name of the class of the method, the name of the method, and its
-arguments, if any.@refill
-
-@noindent
-For example:
-@example
-@group
-@@defmethod @code{bar-class} bar-method argument
-@dots{}
-@@end defmethod
-@end group
-@end example
-
-@noindent
-illustrates the definition for a method called @code{bar-method} of
-the class @code{bar-class}.  The method takes an argument.
-
-@code{@@defmethod} creates an entry in the index of functions.
-
-@item @@deftypemethod @var{class} @var{data-type} @var{name} @var{arguments}@dots{}
-@findex defmethod
-The @code{@@deftypemethod} command is the definition command for methods
-in object-oriented typed languages, such as C++ and Java.  It is similar
-to the @code{@@defmethod} command with the addition of the
-@var{data-type} parameter to specify the return type of the method.
-@code{@@deftypemethod} creates an entry in the index of functions.
-
-@end table
-
-
-@node Def Cmd Conventions
-@section Conventions for Writing Definitions
-@cindex Definition conventions
-@cindex Conventions for writing definitions
-
-When you write a definition using @code{@@deffn}, @code{@@defun}, or
-one of the other definition commands, please take care to use
-arguments that indicate the meaning, as with the @var{count} argument
-to the @code{forward-word} function.  Also, if the name of an argument
-contains the name of a type, such as @var{integer}, take care that the
-argument actually is of that type.@refill
-
-
-@node Sample Function Definition
-@section A Sample Function Definition
-@cindex Function definitions
-@cindex Command definitions
-@cindex Macro definitions
-@cindex Sample function definition
-
-A function definition uses the @code{@@defun} and @code{@@end defun}
-commands.  The name of the function follows immediately after the
-@code{@@defun} command and it is followed, on the same line, by the
-parameter list.@refill
-
-Here is a definition from @ref{Calling Functions,,, elisp, The GNU Emacs
-Lisp Reference Manual}.
-
-@quotation
-@defun apply function &rest arguments
-@code{apply} calls @var{function} with @var{arguments}, just
-like @code{funcall} but with one difference: the last of
-@var{arguments} is a list of arguments to give to
-@var{function}, rather than a single argument.  We also say
-that this list is @dfn{appended} to the other arguments.
-
-@code{apply} returns the result of calling @var{function}.
-As with @code{funcall}, @var{function} must either be a Lisp
-function or a primitive function; special forms and macros
-do not make sense in @code{apply}.
-
-@example
-(setq f 'list)
-    @result{} list
-(apply f 'x 'y 'z)
-@error{} Wrong type argument: listp, z
-(apply '+ 1 2 '(3 4))
-    @result{} 10
-(apply '+ '(1 2 3 4))
-    @result{} 10
-
-(apply 'append '((a b c) nil (x y z) nil))
-    @result{} (a b c x y z)
-@end example
-
-An interesting example of using @code{apply} is found in the description
-of @code{mapcar}.@refill
-@end defun
-@end quotation
-
-@need 1200
-In the Texinfo source file, this example looks like this:
-
-@example
-@group
-@@defun apply function &rest arguments
-@@code@{apply@} calls @@var@{function@} with
-@@var@{arguments@}, just like @@code@{funcall@} but with one
-difference: the last of @@var@{arguments@} is a list of
-arguments to give to @@var@{function@}, rather than a single
-argument.  We also say that this list is @@dfn@{appended@}
-to the other arguments.
-@end group
-
-@group
-@@code@{apply@} returns the result of calling
-@@var@{function@}.  As with @@code@{funcall@},
-@@var@{function@} must either be a Lisp function or a
-primitive function; special forms and macros do not make
-sense in @@code@{apply@}.
-@end group
-
-@group
-@@example
-(setq f 'list)
-    @@result@{@} list
-(apply f 'x 'y 'z)
-@@error@{@} Wrong type argument: listp, z
-(apply '+ 1 2 '(3 4))
-    @@result@{@} 10
-(apply '+ '(1 2 3 4))
-    @@result@{@} 10
-
-(apply 'append '((a b c) nil (x y z) nil))
-    @@result@{@} (a b c x y z)
-@@end example
-@end group
-
-@group
-An interesting example of using @@code@{apply@} is found
-in the description of @@code@{mapcar@}.
-@@end defun
-@end group
-@end example
-
-@noindent
-In this manual, this function is listed in the Command and Variable
-Index under @code{apply}.@refill
-
-Ordinary variables and user options are described using a format like
-that for functions except that variables do not take arguments.
-
-
-@node Conditionals
-@chapter Conditionally Visible Text
-@cindex Conditionally visible text
-@cindex Text, conditionally visible
-@cindex Visibility of conditional text
-@cindex If text conditionally visible
-
-The @dfn{conditional commands} allow you to use different text for
-different output formats, or for general conditions that you define.
-For example, you can use them to specify different text for the
-printed manual and the Info output.
-
-The conditional commands comprise the following categories.
-
-@itemize @bullet
-@item
-Commands specific to an output format (Info, @TeX{}, HTML, @dots{}).
-
-@item
-Commands specific to any output format @emph{other} than a given
-one (not Info, not @TeX{}, @dots{}).
-
-@item
-`Raw' formatter text for any output format, passed straight
-through with no interpretation of @@-commands.
-
-@item
-Format-independent variable substitutions, and testing if a variable
-is set or clear.
-
-@end itemize
-
-@menu
-* Conditional Commands::        Text for a given format.
-* Conditional Not Commands::    Text for any format other than a given one.
-* Raw Formatter Commands::      Using raw formatter commands.
-* set clear value::             Variable tests and substitutions.
-* Conditional Nesting::         Using conditionals inside conditionals.
-@end menu
-
-
-@node Conditional Commands
-@section Conditional Commands
-
-Texinfo has an @code{@@if@var{format}} environment for each output
-format, to allow conditional inclusion of text for a particular output
-format.
-
-@findex ifinfo
-@code{@@ifinfo} begins segments of text that should be ignored by
-@TeX{} when it typesets the printed manual, and by @command{makeinfo}
-when not producing Info output.  The segment of text appears only in
-the Info file and, for historical compatibility, the plain text
-output.
-
-@findex ifdocbook
-@findex ifhtml
-@findex ifplaintext
-@findex iftex
-@findex ifxml
-The environments for the other formats are analogous:
-
-@table @code
-@item @@ifdocbook @dots{} @@end ifdocbook
-Text to appear only in the Docbook output.
-
-@item @@ifhtml @dots{} @@end ifhtml
-Text to appear only in the HTML output.
-
-@item @@ifplaintext @dots{} @@end ifplaintext
-Text to appear only in the plain text output.
-
-@item @@iftex @dots{} @@end iftex
-Text to appear only in the printed manual.
-
-@item @@ifxml @dots{} @@end ifxml
-Text to appear only in the XML output.
-@end table
-
-The @code{@@if@dots{}} and @code{@@end if@dots{}} commands must appear
-on lines by themselves in your source file.
-
-Here is an example showing all these conditionals:
-
-@example
-@@iftex
-This text will appear only in the printed manual.
-@@end iftex
-@@ifinfo
-However, this text will appear only in Info and plain text.
-@@end ifinfo
-@@ifhtml
-And this text will only appear in HTML.
-@@end ifhtml
-@@ifplaintext
-Whereas this text will only appear in plain text.
-@@end ifplaintext
-@@ifxml
-Notwithstanding that this will only appear in XML.
-@@end ifxml
-@@ifdocbook
-Nevertheless, this will only appear in Docbook.
-@@end ifdocbook
-@end example
-
-@noindent
-The preceding example produces the following line:
-
-@iftex
-This text will appear only in the printed manual.
-@end iftex
-@ifinfo
-However, this text will appear only in Info and plain text.
-@end ifinfo
-@ifhtml
-And this text will only appear in HTML.
-@end ifhtml
-@ifplaintext
-Whereas this text will only appear in plain text.
-@end ifplaintext
-@ifxml
-Notwithstanding that this will only appear in XML.
-@end ifxml
-@ifdocbook
-Nevertheless, this will only appear in Docbook.
-@end ifdocbook
-
-@noindent
-Notice that you only see one of the input lines, depending on which
-version of the manual you are reading.
-
-
-@node Conditional Not Commands
-@section Conditional Not Commands
-@findex ifnotdocbook
-@findex ifnothtml
-@findex ifnotinfo
-@findex ifnotplaintext
-@findex ifnottex
-@findex ifnotxml
-
-You can specify text to be included in any output format @emph{other}
-than a given one with the @code{@@ifnot@dots{}} environments:
-
-@example
-@@ifnotdocbook @dots{} @@end ifnotdocbook
-@@ifnothtml @dots{} @@end ifnothtml
-@@ifnotinfo @dots{} @@end ifnotinfo
-@@ifnotplaintext @dots{} @@end ifnotplaintext
-@@ifnottex @dots{} @@end ifnottex
-@@ifnotxml @dots{} @@end ifnotxml
-@end example
-
-@noindent
-The @code{@@ifnot@dots{}} command and the @code{@@end} command must
-appear on lines by themselves in your actual source file.
-
-If the output file is being made in the given format, the
-region is @emph{ignored}.  Otherwise, it is included.
-
-There is one exception (for historical compatibility):
-@code{@@ifnotinfo} text is omitted for both Info and plain text
-output, not just Info.  To specify text which appears only in Info and
-not in plain text, use @code{@@ifnotplaintext}, like this:
-
-@example
-@@ifinfo
-@@ifnotplaintext
-This will be in Info, but not plain text.
-@@end ifnotplaintext
-@@end ifinfo
-@end example
-
-The regions delimited by these commands are ordinary Texinfo source as
-with @code{@@iftex}, not raw formatter source as with @code{@@tex}
-(@pxref{Raw Formatter Commands}).
-
-
-@node Raw Formatter Commands
-@section Raw Formatter Commands
-@cindex Raw formatter commands
-@cindex @TeX{} commands, using ordinary
-@cindex Ordinary @TeX{} commands, using
-@cindex Commands using raw @TeX{}
-@cindex Docbook, including raw
-@cindex HTML, including raw
-@cindex XML, including raw
-@cindex Plain @TeX{}
-
-Inside a region delineated by @code{@@iftex} and @code{@@end iftex},
-you can embed some raw @TeX{} commands.  The Texinfo processors will
-ignore such a region unless @TeX{} output is being produced.  You can
-write the @TeX{} commands as you would write them in a normal @TeX{}
-file, except that you must replace the @samp{\} used by @TeX{} with an
-@samp{@@}.  For example, in the @code{@@titlepage} section of a
-Texinfo file, you can use the @TeX{} command @code{@@vskip} to format
-the copyright page.  (The @code{@@titlepage} command causes Info to
-ignore the region automatically, as it does with the @code{@@iftex}
-command.)
-
-However, most features of plain @TeX{} will not work within
-@code{@@iftex}, as they are overridden by Texinfo features.  The
-purpose of @code{@@iftex} is to provide conditional processing for the
-Texinfo source, not provide access to underlying formatting features.
-
-@findex tex
-You can enter plain @TeX{} completely, and use @samp{\} in the @TeX{}
-commands, by delineating a region with the @code{@@tex} and @code{@@end
-tex} commands.  All plain @TeX{} commands and category codes are
-restored within an @code{@@tex} region.  The sole exception is that the
-@code{@@} character still introduces a command, so that @code{@@end tex}
-can be recognized properly.  As with @code{@@iftex}, Texinfo
-processors will ignore such a region unless @TeX{} output is being produced.
-
-@findex \gdef @r{within @code{@@tex}}
-In complex cases, you may wish to define new @TeX{} macros within
-@code{@@tex}.  You must use @code{\gdef} to do this, not @code{\def},
-because @code{@@tex} regions are processed in a @TeX{} group.
-
-@cindex Mathematical expressions
-As an example, here is a mathematical expression written in plain @TeX{}:
-
-@example
-@@tex
-$$ \chi^2 = \sum_@{i=1@}^N
-         \left (y_i - (a + b x_i)
-         \over \sigma_i\right)^2 $$
-@@end tex
-@end example
-
-@noindent
-The output of this example will appear only in a printed manual.  If
-you are reading this in Info, you will not see the equation that appears
-in the printed manual.
-@iftex
-In a printed manual, the above expression looks like
-this:
-@end iftex
-
-@tex
-$$ \chi^2 = \sum_{i=1}^N
-         \left(y_i - (a + b x_i)
-         \over \sigma_i\right)^2 $$
-@end tex
-
-@findex ifhtml
-@findex html
-Analogously, you can use @code{@@ifhtml @dots{} @@end ifhtml} to delimit
-a region to be included in HTML output only, and @code{@@html @dots{}
-@@end html} for a region of raw HTML.
-
-@findex ifxml
-@findex xml
-Likewise, you can use @code{@@ifxml @dots{} @@end ifxml} to delimit
-a region to be included in XML output only, and @code{@@xml @dots{}
-@@end xml} for a region of raw XML.
-
-@findex ifdocbook
-@findex docbook
-Again likewise, you can use @code{@@ifdocbook @dots{} @@end ifdocbook}
-to delimit a region to be included in Docbook output only, and
-@code{@@docbook @dots{} @@end docbook} for a region of raw Docbook.
-
-In all cases, the exception to the raw processing is that @code{@@} is
-still an escape character, so the @code{@@end} command can be
-recognized.
-
-
-@node set clear value
-@section @code{@@set}, @code{@@clear}, and @code{@@value}
-
-You can direct the Texinfo formatting commands to format or ignore parts
-of a Texinfo file with the @code{@@set}, @code{@@clear}, @code{@@ifset},
-and @code{@@ifclear} commands.
-
-Here are brief descriptions of these commands, see the following
-sections for more details:
-
-@table @code
-@item @@set @var{flag} [@var{value}]
-Set the variable @var{flag}, to the optional @var{value} if specifed.
-
-@item @@clear @var{flag}
-Undefine the variable @var{flag}, whether or not it was previously defined.
-
-@item @@ifset @var{flag}
-If @var{flag} is set, text through the next @code{@@end ifset} command
-is formatted.  If @var{flag} is clear, text through the following
-@code{@@end ifset} command is ignored.
-
-@item @@ifclear @var{flag}
-If @var{flag} is set, text through the next @code{@@end ifclear} command
-is ignored.  If @var{flag} is clear, text through the following
-@code{@@end ifclear} command is formatted.
-@end table
-
-@menu
-* set value::                   Expand a flag variable to a string.
-* ifset ifclear::               Format a region if a flag is set.
-* value Example::               An easy way to update edition information.
-@end menu
-
-
-@node set value
-@subsection @code{@@set} and @code{@@value}
-@findex value
-
-You use the @code{@@set} command to specify a value for a flag, which
-is later expanded by the @code{@@value} command.
-
-A @dfn{flag} (aka @dfn{variable}) is an identifier.  It is best to use
-only letters and numerals in a flag name, not @samp{-} or
-@samp{_}---they will work in some contexts, but not all, due to
-limitations in @TeX{}.
-
-The value is the remainder of the input line, and can contain anything.
-
-Write the @code{@@set} command like this:
-
-@example
-@@set foo This is a string.
-@end example
-
-@noindent
-This sets the value of the flag @code{foo} to ``This is a string.''.
-
-The Texinfo formatters then replace an @code{@@value@{@var{flag}@}}
-command with the string to which @var{flag} is set.  Thus, when
-@code{foo} is set as shown above, the Texinfo formatters convert this:
-
-@example
-@group
-@@value@{foo@}
-@exdent @r{to this:}
-This is a string.
-@end group
-@end example
-
-You can write an @code{@@value} command within a paragraph; but you
-must write an @code{@@set} command on a line of its own.
-
-If you write the @code{@@set} command like this:
-
-@example
-@@set foo
-@end example
-
-@noindent
-without specifying a string, the value of @code{foo} is the empty string.
-
-If you clear a previously set flag with @code{@@clear @var{flag}}, a
-subsequent @code{@@value@{flag@}} command will report an error.
-
-For example, if you set @code{foo} as follows:
-
-@example
-@@set howmuch very, very, very
-@end example
-
-@noindent
-then the formatters transform
-
-@example
-@group
-It is a @@value@{howmuch@} wet day.
-@exdent @r{into}
-It is a very, very, very wet day.
-@end group
-@end example
-
-If you write
-
-@example
-@@clear howmuch
-@end example
-
-@noindent
-then the formatters transform
-
-@example
-@group
-It is a @@value@{howmuch@} wet day.
-@exdent @r{into}
-It is a @{No value for "howmuch"@} wet day.
-@end group
-@end example
-
-
-@node ifset ifclear
-@subsection @code{@@ifset} and @code{@@ifclear}
-
-@findex ifset
-When a @var{flag} is set, the Texinfo formatting commands format text
-between subsequent pairs of @code{@@ifset @var{flag}} and @code{@@end
-ifset} commands.  When the @var{flag} is cleared, the Texinfo formatting
-commands do @emph{not} format the text.  @code{@@ifclear} operates
-analogously.
-
-Write the conditionally formatted text between @code{@@ifset @var{flag}}
-and @code{@@end ifset} commands, like this:
-
-@example
-@group
-@@ifset @var{flag}
-@var{conditional-text}
-@@end ifset
-@end group
-@end example
-
-For example, you can create one document that has two variants, such as
-a manual for a `large' and `small' model:
-
-@cindex Shrubbery
-@example
-You can use this machine to dig up shrubs
-without hurting them.
-
-@@set large
-
-@@ifset large
-It can also dig up fully grown trees.
-@@end ifset
-
-Remember to replant promptly @dots{}
-@end example
-
-@noindent
-In the example, the formatting commands will format the text between
-@code{@@ifset large} and @code{@@end ifset} because the @code{large}
-flag is set.
-
-When @var{flag} is cleared, the Texinfo formatting commands do
-@emph{not} format the text between @code{@@ifset @var{flag}} and
-@code{@@end ifset}; that text is ignored and does not appear in either
-printed or Info output.
-
-For example, if you clear the flag of the preceding example by writing
-an @code{@@clear large} command after the @code{@@set large} command
-(but before the conditional text), then the Texinfo formatting commands
-ignore the text between the @code{@@ifset large} and @code{@@end ifset}
-commands.  In the formatted output, that text does not appear; in both
-printed and Info output, you see only the lines that say, ``You can use
-this machine to dig up shrubs without hurting them.  Remember to replant
-promptly @dots{}''.
-
-@findex ifclear
-If a flag is cleared with an @code{@@clear @var{flag}} command, then
-the formatting commands format text between subsequent pairs of
-@code{@@ifclear} and @code{@@end ifclear} commands.  But if the flag
-is set with @code{@@set @var{flag}}, then the formatting commands do
-@emph{not} format text between an @code{@@ifclear} and an @code{@@end
-ifclear} command; rather, they ignore that text.  An @code{@@ifclear}
-command looks like this:
-
-@example
-@@ifclear @var{flag}
-@end example
-
-
-@node value Example
-@subsection @code{@@value} Example
-
-You can use the @code{@@value} command to minimize the number of
-places you need to change when you record an update to a manual.
-@xref{GNU Sample Texts}, for the full text of an example of using this
-to work with Automake distributions.
-
-This example is adapted from @ref{Top,, Overview, make, The GNU Make
-Manual}.
-
-@enumerate
-@item
-Set the flags:
-
-@example
-@group
-@@set EDITION 0.35 Beta
-@@set VERSION 3.63 Beta
-@@set UPDATED 14 August 1992
-@@set UPDATE-MONTH August 1992
-@end group
-@end example
-
-@item
-Write text for the @code{@@copying} section (@pxref{copying}):
-
-@example
-@group
-@@copying
-This is Edition @@value@{EDITION@},
-last updated @@value@{UPDATED@},
-of @@cite@{The GNU Make Manual@},
-for @@code@{make@}, version @@value@{VERSION@}.
-
-Copyright @dots{}
-
-Permission is granted @dots{}
-@@end copying
-@end group
-@end example
-
-@item
-Write text for the title page, for people reading the printed manual:
-
-@example
-@group
-@@titlepage
-@@title GNU Make
-@@subtitle A Program for Directing Recompilation
-@@subtitle Edition @@value@{EDITION@}, @dots{}
-@@subtitle @@value@{UPDATE-MONTH@}
-@@page
-@@insertcopying
-@dots{}
-@@end titlepage
-@end group
-@end example
-
-@noindent
-(On a printed cover, a date listing the month and the year looks less
-fussy than a date listing the day as well as the month and year.)
-
-@item
-Write text for the Top node, for people reading the Info file:
-
-@example
-@group
-@@ifnottex
-@@node Top
-@@top Make
-
-@@insertcopying
-@dots{}
-@@end ifnottex
-@end group
-@end example
-
-After you format the manual, the @code{@@value} constructs have been
-expanded, so the output contains text like this:
-
-@example
-@group
-This is Edition 0.35 Beta, last updated 14 August 1992,
-of `The GNU Make Manual', for `make', Version 3.63 Beta.
-@end group
-@end example
-@end enumerate
-
-When you update the manual, you change only the values of the flags; you
-do not need to edit the three sections.
-
-
-@node Conditional Nesting
-@section Conditional Nesting
-@cindex Conditionals, nested
-@cindex Nesting conditionals
-
-Conditionals can be nested; however, the details are a little tricky.
-The difficulty comes with failing conditionals, such as
-@code{@@ifhtml} when HTML is not being produced, where the included
-text is to be ignored.  However, it is not to be @emph{completely}
-ignored, since it is useful to have one @code{@@ifset} inside another,
-for example---that is a way to include text only if two conditions are
-met.  Here's an example:
-
-@example
-@@ifset somevar
-@@ifset anothervar
-Both somevar and anothervar are set.
-@@end ifset
-@@ifclear anothervar
-Somevar is set, anothervar is not.
-@@end ifclear
-@@end ifset
-@end example
-
-Technically, Texinfo requires that for a failing conditional, the
-ignored text must be properly nested with respect to that failing
-conditional.  Unfortunately, it's not always feasible to check that
-@emph{all} conditionals are properly nested, because then the
-processors could have to fully interpret the ignored text, which
-defeats the purpose of the command.  Here's an example illustrating
-these rules:
-
-@example
-@@ifset a
-@@ifset b
-@@ifclear ok  - ok, ignored
-@@end junky   - ok, ignored
-@@end ifset
-@@c WRONG - missing @@end ifset.
-@end example
-
-Finally, as mentioned above, all conditional commands must be on lines
-by themselves, with no text (even spaces) before or after.  Otherwise,
-the processors cannot reliably determine which commands to consider
-for nesting purposes.
-
-
-@node Internationalization
-@chapter Internationalization
-
-@cindex Internationalization
-Texinfo has some support for writing in languages other than English,
-although this area still needs considerable work.
-
-For a list of the various accented and special characters Texinfo
-supports, see @ref{Inserting Accents}.
-
-@menu
-* documentlanguage::            Declaring the current language.
-* documentencoding::            Declaring the input encoding.
-@end menu
-
-
-@node documentlanguage
-@section @code{@@documentlanguage @var{cc}}: Set the Document Language
-
-@findex documentlanguage
-@cindex Language, declaring
-@cindex Document language, declaring
-
-The @code{@@documentlanguage} command declares the current document
-language.  Write it on a line by itself, with a two-letter ISO-639
-language code following (list is included below).  If you have a
-multilingual document, the intent is to be able to use this command
-multiple times, to declare each language change.  If the command is not
-used at all, the default is @code{en} for English.
-
-@cindex @file{txi-@var{cc}.tex}
-At present, this command is ignored in Info and HTML output.  For
-@TeX{}, it causes the file @file{txi-@var{cc}.tex} to be read (if it
-exists).  Such a file appropriately redefines the various English words
-used in @TeX{} output, such as `Chapter', `See', and so on.
-
-@cindex Hyphenation patterns, language-dependent
-It would be good if this command also changed @TeX{}'s ideas of the
-current hyphenation patterns (via the @TeX{} primitive
-@code{\language}), but this is unfortunately not currently implemented.
-
-@cindex ISO 639 codes
-@cindex Language codes
-Hereare the valid language codes, from ISO-639.
-
-@multitable @columnfractions .07 .26 .07 .26 .07 .26
-@item
-@code{aa} @tab Afar @tab
-@code{ab} @tab Abkhazian @tab
-@code{af} @tab Afrikaans
-@item
-@code{am} @tab Amharic @tab
-@code{ar} @tab Arabic @tab
-@code{as} @tab Assamese
-@item
-@code{ay} @tab Aymara @tab
-@code{az} @tab Azerbaijani @tab
-@code{ba} @tab Bashkir
-@item
-@code{be} @tab Byelorussian @tab
-@code{bg} @tab Bulgarian @tab
-@code{bh} @tab Bihari
-@item
-@code{bi} @tab Bislama @tab
-@code{bn} @tab Bengali; Bangla @tab
-@code{bo} @tab Tibetan
-@item
-@code{br} @tab Breton @tab
-@code{ca} @tab Catalan @tab
-@code{co} @tab Corsican
-@item
-@code{cs} @tab Czech @tab
-@code{cy} @tab Welsh @tab
-@code{da} @tab Danish
-@item
-@code{de} @tab German @tab
-@code{dz} @tab Bhutani @tab
-@code{el} @tab Greek
-@item
-@code{en} @tab English @tab
-@code{eo} @tab Esperanto @tab
-@code{es} @tab Spanish
-@item
-@code{et} @tab Estonian @tab
-@code{eu} @tab Basque @tab
-@code{fa} @tab Persian
-@item
-@code{fi} @tab Finnish @tab
-@code{fj} @tab Fiji @tab
-@code{fo} @tab Faroese
-@item
-@code{fr} @tab French @tab
-@code{fy} @tab Frisian @tab
-@code{ga} @tab Irish
-@item
-@code{gd} @tab Scots Gaelic @tab
-@code{gl} @tab Galician @tab
-@code{gn} @tab Guarani
-@item
-@code{gu} @tab Gujarati @tab
-@code{ha} @tab Hausa @tab
-@code{he} @tab Hebrew
-@item
-@code{hi} @tab Hindi @tab
-@code{hr} @tab Croatian @tab
-@code{hu} @tab Hungarian
-@item
-@code{hy} @tab Armenian @tab
-@code{ia} @tab Interlingua @tab
-@code{id} @tab Indonesian
-@item
-@code{ie} @tab Interlingue @tab
-@code{ik} @tab Inupiak @tab
-@code{is} @tab Icelandic
-@item
-@code{it} @tab Italian @tab
-@code{iu} @tab Inuktitut @tab
-@code{ja} @tab Japanese
-@item
-@code{jw} @tab Javanese @tab
-@code{ka} @tab Georgian @tab
-@code{kk} @tab Kazakh
-@item
-@code{kl} @tab Greenlandic @tab
-@code{km} @tab Cambodian @tab
-@code{kn} @tab Kannada
-@item
-@code{ks} @tab Kashmiri @tab
-@code{ko} @tab Korean @tab
-@code{ku} @tab Kurdish
-@item
-@code{ky} @tab Kirghiz @tab
-@code{la} @tab Latin @tab
-@code{ln} @tab Lingala
-@item
-@code{lt} @tab Lithuanian @tab
-@code{lo} @tab Laothian @tab
-@code{lv} @tab Latvian, Lettish
-@item
-@code{mg} @tab Malagasy @tab
-@code{mi} @tab Maori @tab
-@code{mk} @tab Macedonian
-@item
-@code{ml} @tab Malayalam @tab
-@code{mn} @tab Mongolian @tab
-@code{mo} @tab Moldavian
-@item
-@code{mr} @tab Marathi @tab
-@code{ms} @tab Malay @tab
-@code{mt} @tab Maltese
-@item
-@code{my} @tab Burmese @tab
-@code{na} @tab Nauru @tab
-@code{ne} @tab Nepali
-@item
-@code{nl} @tab Dutch @tab
-@code{no} @tab Norwegian @tab
-@code{oc} @tab Occitan
-@item
-@code{om} @tab (Afan) Oromo @tab
-@code{or} @tab Oriya @tab
-@code{pa} @tab Punjabi
-@item
-@code{pl} @tab Polish @tab
-@code{ps} @tab Pashto, Pushto @tab
-@code{pt} @tab Portuguese
-@item
-@code{qu} @tab Quechua @tab
-@code{rm} @tab Rhaeto-Romance @tab
-@code{rn} @tab Kirundi
-@item
-@code{ro} @tab Romanian @tab
-@code{ru} @tab Russian @tab
-@code{rw} @tab Kinyarwanda
-@item
-@code{sa} @tab Sanskrit @tab
-@code{sd} @tab Sindhi @tab
-@code{sg} @tab Sangro
-@item
-@code{sh} @tab Serbo-Croatian @tab
-@code{si} @tab Sinhalese @tab
-@code{sk} @tab Slovak
-@item
-@code{sl} @tab Slovenian @tab
-@code{sm} @tab Samoan @tab
-@code{sn} @tab Shona
-@item
-@code{so} @tab Somali @tab
-@code{sq} @tab Albanian @tab
-@code{sr} @tab Serbian
-@item
-@code{ss} @tab Siswati @tab
-@code{st} @tab Sesotho @tab
-@code{su} @tab Sundanese
-@item
-@code{sv} @tab Swedish @tab
-@code{sw} @tab Swahili @tab
-@code{ta} @tab Tamil
-@item
-@code{te} @tab Telugu @tab
-@code{tg} @tab Tajik @tab
-@code{th} @tab Thai
-@item
-@code{ti} @tab Tigrinya @tab
-@code{tk} @tab Turkmen @tab
-@code{tl} @tab Tagalog
-@item
-@code{tn} @tab Setswana @tab
-@code{to} @tab Tonga @tab
-@code{tr} @tab Turkish
-@item
-@code{ts} @tab Tsonga @tab
-@code{tt} @tab Tatar @tab
-@code{tw} @tab Twi
-@item
-@code{ug} @tab Uighur @tab
-@code{uk} @tab Ukrainian @tab
-@code{ur} @tab Urdu
-@item
-@code{uz} @tab Uzbek @tab
-@code{vi} @tab Vietnamese @tab
-@code{vo} @tab Volapuk
-@item
-@code{wo} @tab Wolof @tab
-@code{xh} @tab Xhosa @tab
-@code{yi} @tab Yiddish
-@item
-@code{yo} @tab Yoruba @tab
-@code{za} @tab Zhuang @tab
-@code{zh} @tab Chinese
-@item
-@code{zu} @tab Zulu
-@end multitable
-
-
-@node documentencoding
-@section @code{@@documentencoding @var{enc}}: Set Input Encoding
-
-@findex documentencoding
-@cindex Encoding, declaring
-@cindex Input encoding, declaring
-@cindex Character set, declaring
-@cindex Document input encoding
-
-The @code{@@documentencoding} command declares the input document
-encoding.  Write it on a line by itself, with a valid encoding
-specification following.
-
-At present, Texinfo supports only these encodings:
-
-@table @code
-@item US-ASCII
-This has no particular effect, but it's included for completeness.
-
-@itemx ISO-8859-1
-@itemx ISO-8859-15
-@item ISO-8859-2
-These specify the standard encodings for Western European (the first
-two) and Eastern European languages (the third), respectively.  ISO
-8859-15 replaces some little-used characters from 8859-1 (e.g.,
-precomposed fractions) with more commonly needed ones, such as the
-Euro symbol.
-
-A full description of the encodings is beyond our scope here;
-one useful reference is @uref{http://czyborra.com/charsets/iso8859.html}.
-@end table
-
-Specifying an encoding @var{enc} has the following effects:
-
-@opindex --enable-encoding
-@cindex Local Variables: section, for encoding
-@cindex Info output, and encoding
-In Info output, if the option @option{--enable-encoding} is given
-to @command{makeinfo}, a so-called `Local Variables' section
-(@pxref{File Variables,,,emacs,The GNU Emacs Manual}) is output
-including @var{enc}.  This allows Info readers to set the encoding
-appropriately.
-
-@example
-Local Variables:
-coding: @var{enc}
-End:
-@end example
-
-@cindex HTML output, and encodings
-@cindex @code{http-equiv}, and charset specification
-@cindex @code{<meta>} HTML tag, and charset specification
-In HTML output, a @samp{<meta>} tag is output, in the @samp{<head>}
-section of the HTML, that specifies @var{enc}.  Web servers and
-browsers cooperate to use this information so the correct encoding is
-used to display the page, if supported by the system.
-
-@example
-<meta http-equiv="Content-Type" content="text/html;
-     charset=@var{enc}">
-@end example
-
-In all other cases, it is recognized but ignored.
-
-
-@node Defining New Texinfo Commands
-@chapter Defining New Texinfo Commands
-@cindex Macros
-@cindex Defining new Texinfo commands
-@cindex New Texinfo commands, defining
-@cindex Texinfo commands, defining new
-@cindex User-defined Texinfo commands
-
-Texinfo provides several ways to define new commands:
-
-@itemize @bullet
-@item
-A Texinfo @dfn{macro} allows you to define a new Texinfo command as any
-sequence of text and/or existing commands (including other macros).  The
-macro can have any number of @dfn{parameters}---text you supply each
-time you use the macro.
-
-Incidentally, these macros have nothing to do with the @code{@@defmac}
-command, which is for documenting macros in the subject of the manual
-(@pxref{Def Cmd Template}).
-
-@item
-@samp{@@alias} is a convenient way to define a new name for an existing
-command.
-
-@item
-@samp{@@definfoenclose} allows you to define new commands with
-customized output in the Info file.
-
-@end itemize
-
-@menu
-* Defining Macros::             Defining and undefining new commands.
-* Invoking Macros::             Using a macro, once you've defined it.
-* Macro Details::               Limitations of Texinfo macros.
-* alias::                       Command aliases.
-* definfoenclose::              Customized highlighting.
-@end menu
-
-
-@node Defining Macros
-@section Defining Macros
-@cindex Defining macros
-@cindex Macro definitions
-
-@findex macro
-You use the Texinfo @code{@@macro} command to define a macro, like this:
-
-@example
-@@macro @var{macroname}@{@var{param1}, @var{param2}, @dots{}@}
-@var{text} @dots{} \@var{param1}\ @dots{}
-@@end macro
-@end example
-
-The @dfn{parameters} @var{param1}, @var{param2}, @dots{} correspond to
-arguments supplied when the macro is subsequently used in the document
-(described in the next section).
-
-@cindex Macro names, valid characters in
-@cindex Names of macros, valid characters of
-For a macro to work consistently with @TeX{}, @var{macroname} must
-consist entirely of letters: no digits, hyphens, underscores, or other
-special characters.  So, we recommend using only letters.  However,
-@command{makeinfo} will accept anything except @samp{@{@}_^=};
-@samp{_} and @samp{^} are excluded so that macros can be called in
-@code{@@math} mode without a following space
-(@pxref{math,,@code{@@math}}).
-
-If a macro needs no parameters, you can define it either with an empty
-list (@samp{@@macro foo @{@}}) or with no braces at all (@samp{@@macro
-foo}).
-
-@cindex Body of a macro
-@cindex Mutually recursive macros
-@cindex Recursion, mutual
-The definition or @dfn{body} of the macro can contain most Texinfo
-commands, including previously-defined macros.  Not-yet-defined macro
-invocations are not allowed; thus, it is not possible to have mutually
-recursive Texinfo macros.  Also, a macro definition that defines another
-macro does not work in @TeX{} due to limitations in the design of
-@code{@@macro}.
-
-@cindex Parameters to macros
-In the macro body, instances of a parameter name surrounded by
-backslashes, as in @samp{\@var{param1}\} in the example above, are
-replaced by the corresponding argument from the macro invocation.  You
-can use parameter names any number of times in the body, including zero.
-
-@cindex Backslash in macros
-To get a single @samp{\} in the macro expansion, use @samp{\\}.  Any
-other use of @samp{\} in the body yields a warning.
-
-@cindex Spaces in macros
-@cindex Whitespace in macros
-The newlines after the @code{@@macro} line and before the @code{@@end
-macro} line are ignored, that is, not included in the macro body.  All
-other whitespace is treated according to the usual Texinfo rules.
-
-@cindex Recursive macro invocations
-@findex rmacro
-To allow a macro to be used recursively, that is, in an argument to a
-call to itself, you must define it with @samp{@@rmacro}, like this:
-
-@example
-@@rmacro rmac @{arg@}
-a\arg\b
-@@end rmacro
-@dots{}
-@@rmac@{1@@rmac@{text@}2@}
-@end example
-
-This produces the output `a1atextb2b'.  With @samp{@@macro} instead of
-@samp{@@rmacro}, an error message is given.
-
-@findex unmacro
-@cindex Macros, undefining
-@cindex Undefining macros
-You can undefine a macro @var{foo} with @code{@@unmacro @var{foo}}.
-It is not an error to undefine a macro that is already undefined.
-For example:
-
-@example
-@@unmacro foo
-@end example
-
-
-@node Invoking Macros
-@section Invoking Macros
-@cindex Invoking macros
-@cindex Expanding macros
-@cindex Running macros
-@cindex Macro invocation
-
-After a macro is defined (see the previous section), you can use
-(@dfn{invoke}) it in your document like this:
-
-@example
-@@@var{macroname} @{@var{arg1}, @var{arg2}, @dots{}@}
-@end example
-
-@noindent and the result will be just as if you typed the body of
-@var{macroname} at that spot.  For example:
-
-@example
-@@macro foo @{p, q@}
-Together: \p\ & \q\.
-@@end macro
-@@foo@{a, b@}
-@end example
-
-@noindent produces:
-
-@display
-Together: a & b.
-@end display
-
-@cindex Backslash, and macros
-Thus, the arguments and parameters are separated by commas and delimited
-by braces; any whitespace after (but not before) a comma is ignored.
-The braces are required in the invocation (but not the definition), even
-when the macro takes no arguments, consistent with all other Texinfo
-commands.  For example:
-
-@example
-@@macro argless @{@}
-No arguments here.
-@@end macro
-@@argless@{@}
-@end example
-
-@noindent produces:
-
-@display
-No arguments here.
-@end display
-
-@cindex Comma, in macro arguments
-@cindex Braces, in macro arguments
-To insert a comma, brace, or backslash in an argument, prepend a
-backslash, as in
-
-@example
-@@@var{macname} @{\\\@{\@}\,@}
-@end example
-
-@noindent
-which will pass the (almost certainly error-producing) argument
-@samp{\@{@},} to @var{macname}.  However, commas in parameters, even
-if escaped by a backslash, might cause trouble in @TeX{}.
-
-If the macro is defined to take a single argument, and is invoked
-without any braces, the entire rest of the line after the macro name is
-supplied as the argument.  For example:
-
-@example
-@@macro bar @{p@}
-Twice: \p\ & \p\.
-@@end macro
-@@bar aah
-@end example
-
-@noindent produces:
-
-@c Sorry for cheating, but let's not require macros to process the manual.
-@display
-Twice: aah & aah.
-@end display
-
-If the macro is defined to take a single argument, and is invoked with
-braces, the braced text is passed as the argument, regardless of
-commas.  For example:
-
-@example
-@@macro bar @{p@}
-Twice: \p\ & \p\.
-@@end macro
-@@bar@{a,b@}
-@end example
-
-@noindent produces:
-
-@display
-Twice: a,b & a,b.
-@end display
-
-
-@node Macro Details
-@section Macro Details and Caveats
-@cindex Macro details
-@cindex Details of macro usage
-@cindex Caveats for macro usage
-
-Due to unavoidable limitations, certain macro-related constructs cause
-problems with @TeX{}.  If you get macro-related errors when producing
-the printed version of a manual, try expanding the macros with
-@command{makeinfo} by invoking @command{texi2dvi} with the @samp{-E}
-option (@pxref{Format with texi2dvi}).
-
-@itemize @bullet
-@item
-As mentioned earlier, macro names must consist entirely of letters.
-
-@item
-It is not advisable to redefine any @TeX{} primitive, plain, or
-Texinfo command name as a macro. Unfortunately this is a very large
-set of names, and the possible resulting errors are unpredictable.
-
-@item
-All macros are expanded inside at least one @TeX{} group.  This means
-that @code{@@set} and other such commands have no effect inside a
-macro.
-
-@item
-Commas in macro arguments, even if escaped by a backslash, don't
-always work.
-
-@item
-Macro arguments cannot cross lines.
-
-@item
-It is (usually) best to avoid comments inside macro definitions, but
-see the next item.
-
-@item
-Macros containing a command which must be on a line by itself, such as
-a conditional, cannot be invoked in the middle of a line.  In general,
-the interaction of newlines in the macro definitions and invocations
-depends on the precise commands and context.  You may be able to work
-around some problems with judicious use of @code{@@c}.  Suppose you
-define a macro that is always intended to be used on a line by itself:
-
-@example
-@@macro linemac
-@@cindex whatever
-@@c
-@@end macro
-...
-foo
-@@linemac
-bar
-@end example
-
-Without the @code{@@c}, there will be an unwanted blank line between
-the @samp{@@cindex whatever} and the @samp{bar} (one newline comes
-from the macro definition, one from after the invocation), causing a
-paragraph break.
-
-On the other hand, you wouldn't want the @code{@@c} if the macro was
-sometimes invoked in the middle of a line (the text after the
-invocation would be treated as a comment).
-
-@item
-In general, you can't arbitrarily substitute a macro call for Texinfo
-command arguments, even when the text is the same.  It might work with
-some commands, it fails with others.  Best not to do it at all.  For
-instance, this fails:
-
-@example
-@@macro offmacro
-off
-@@end macro
-@@headings @@offmacro
-@end example
-
-@noindent
-You would expect this to be equivalent to @code{@@headings off}, but
-for @TeX{}nical reasons, it fails with a mysterious error message
-(@code{Paragraph ended before @@headings was complete}).
-
-@item
-Macros cannot define macros in the natural way.  To do this, you must
-use conditionals and raw @TeX{}.  For example:
-
-@example
-@@ifnottex
-@@macro ctor @{name, arg@}
-@@macro \name\
-something involving \arg\ somehow
-@@end macro
-@@end macro
-@@end ifnottex
-@@tex
-\gdef\ctor#1@{\ctorx#1,@}
-\gdef\ctorx#1,#2,@{\def#1@{something involving #2 somehow@}@}
-@@end tex
-@end example
-
-@end itemize
-
-The @command{makeinfo} implementation also has limitations:
-
-@itemize
-@item
-@code{@@verbatim} and macros do not mix; for instance, you can't start
-a verbatim block inside a macro and end it outside.
-(@xref{verbatim}.)  Starting any environment inside a macro and ending
-it outside may or may not work, for that matter.
-
-@item
-Macros that completely define macros are ok, but it's not possible to
-have incorrectly nested macro definitions.  That is, @code{@@macro}
-and @code{@@end macro} (likewise for @code{@@rmacro}) must be
-correctly paired.  For example, you cannot start a macro definition
-within a macro, and then end the nested definition outside the macro.
-
-@item
-@code{@@rmacro} is a kludge.
-
-@end itemize
-
-One more limitation is common to both implementations: white space is
-ignored at the beginnings of lines.
-
-Future major revisions of Texinfo may ease some of these limitations
-(by introducing a new macro syntax).
-
-
-@node alias
-@section @samp{@@alias @var{new}=@var{existing}}
-@cindex Aliases, command
-@cindex Command aliases
-@findex alias
-
-The @samp{@@alias} command defines a new command to be just like an
-existing one.  This is useful for defining additional markup names, thus
-preserving semantic information in the input even though the output
-result may be the same.
-
-Write the @samp{@@alias} command on a line by itself, followed by the
-new command name, an equals sign, and the existing command name.
-Whitespace around the equals sign is ignored.  Thus:
-@example
-@@alias @var{new} = @var{existing}
-@end example
-
-For example, if your document contains citations for both books and
-some other media (movies, for example), you might like to define a
-macro @code{@@moviecite@{@}} that does the same thing as an ordinary
-@code{@@cite@{@}} but conveys the extra semantic information as well.
-You'd do this as follows:
-
-@example
-@@alias moviecite = cite
-@end example
-
-Macros do not always have the same effect as aliases, due to vagaries
-of argument parsing.  Also, aliases are much simpler to define than
-macros.  So the command is not redundant.  (It was also heavily used
-in the Jargon File!)
-
-Aliases must not be recursive, directly or indirectly.
-
-It is not advisable to redefine any @TeX{} primitive, plain, or
-Texinfo command name as an alias.  Unfortunately this is a very large
-set of names, and the possible resulting errors are completely random.
-
-
-@node definfoenclose
-@section @samp{definfoenclose}: Customized Highlighting
-@cindex Highlighting, customized
-@cindex Customized highlighting
-@findex definfoenclose
-
-A @code{@@definfoenclose} command may be used to define a highlighting
-command for Info, but not for @TeX{}.  A command defined using
-@code{@@definfoenclose} marks text by enclosing it in strings that
-precede and follow the text.  You can use this to get closer control of
-your Info output.
-
-Presumably, if you define a command with @code{@@definfoenclose} for Info,
-you will create a corresponding command for @TeX{}, either in
-@file{texinfo.tex}, @file{texinfo.cnf}, or within an @samp{@@iftex} in
-your document.
-
-Write a @code{@@definfoenclose} command on a line and follow it with
-three arguments separated by commas.  The first argument to
-@code{@@definfoenclose} is the @@-command name (without the @code{@@});
-the second argument is the Info start delimiter string; and the third
-argument is the Info end delimiter string.  The latter two arguments
-enclose the highlighted text in the Info file.  A delimiter string may
-contain spaces.  Neither the start nor end delimiter is required.  If
-you do not want a start delimiter but do want an end delimiter, you must
-follow the command name with two commas in a row; otherwise, the Info
-formatting commands will naturally misinterpret the end delimiter string
-you intended as the start delimiter string.
-
-If you do a @code{@@definfoenclose} on the name of a pre-defined macro
-(such as @code{@@emph}, @code{@@strong}, @code{@@t}, or @code{@@i}), the
-enclosure definition will override the built-in definition.
-
-An enclosure command defined this way takes one argument in braces; this
-is intended for new markup commands (@pxref{Marking Text}).
-
-@findex phoo
-For example, you can write:
-
-@example
-@@definfoenclose phoo,//,\\
-@end example
-
-@noindent
-near the beginning of a Texinfo file to define @code{@@phoo} as an Info
-formatting command that inserts `//' before and `\\' after the argument
-to @code{@@phoo}.  You can then write @code{@@phoo@{bar@}} wherever you
-want `//bar\\' highlighted in Info.
-
-Also, for @TeX{} formatting, you could write
-
-@example
-@@iftex
-@@global@@let@@phoo=@@i
-@@end iftex
-@end example
-
-@noindent
-to define @code{@@phoo} as a command that causes @TeX{} to typeset the
-argument to @code{@@phoo} in italics.
-
-Each definition applies to its own formatter: one for @TeX{}, the other
-for @code{texinfo-format-buffer} or @code{texinfo-format-region}.  The
-@code{@@definfoenclose} command need not be within @samp{@@ifinfo}, but
-the raw @TeX{} commands do need to be in @samp{@@iftex}.
-
-@findex headword
-Here is another example: write
-
-@example
-@@definfoenclose headword, , :
-@end example
-
-@noindent
-near the beginning of the file, to define @code{@@headword} as an Info
-formatting command that inserts nothing before and a colon after the
-argument to @code{@@headword}.
-
-@samp{@@definfoenclose} definitions must not be recursive, directly or
-indirectly.
-
-
-@node Hardcopy
-@chapter Formatting and Printing Hardcopy
-@cindex Format and print hardcopy
-@cindex Printing hardcopy
-@cindex Hardcopy, printing it
-@cindex Making a printed manual
-@cindex Sorting indices
-@cindex Indices, sorting
-@cindex @TeX{} index sorting
-@pindex texindex
-
-There are three major shell commands for making a printed manual from a
-Texinfo file: one for converting the Texinfo file into a file that will be
-printed, a second for sorting indices, and a third for printing the
-formatted document.  When you use the shell commands, you can either
-work directly in the operating system shell or work within a shell
-inside GNU Emacs.
-
-If you are using GNU Emacs, you can use commands provided by Texinfo
-mode instead of shell commands.  In addition to the three commands to
-format a file, sort the indices, and print the result, Texinfo mode
-offers key bindings for commands to recenter the output buffer, show the
-print queue, and delete a job from the print queue.
-
-@menu
-* Use TeX::                     Use @TeX{} to format for hardcopy.
-* Format with tex/texindex::    How to format with explicit shell commands.
-* Format with texi2dvi::        A simpler way to format.
-* Print with lpr::              How to print.
-* Within Emacs::                How to format and print from an Emacs shell.
-* Texinfo Mode Printing::       How to format and print in Texinfo mode.
-* Compile-Command::             How to print using Emacs's compile command.
-* Requirements Summary::        @TeX{} formatting requirements summary.
-* Preparing for TeX::           What to do before you use @TeX{}.
-* Overfull hboxes::             What are and what to do with overfull hboxes.
-* smallbook::                   How to print small format books and manuals.
-* A4 Paper::                    How to print on A4 or A5 paper.
-* pagesizes::                   How to print with customized page sizes.
-* Cropmarks and Magnification:: How to print marks to indicate the size
-                                 of pages and how to print scaled up output.
-* PDF Output::                  Portable Document Format output.
-* Obtaining TeX::               How to Obtain @TeX{}.
-@end menu
-
-@node Use TeX
-@section Use @TeX{}
-
-The typesetting program called @TeX{} is used for formatting a Texinfo
-file.  @TeX{} is a very powerful typesetting program and, if used correctly,
-does an exceptionally good job.  (@xref{Obtaining TeX, , How to Obtain
-@TeX{}}, for information on how to obtain @TeX{}.)
-
-The standalone @code{makeinfo} program and Emacs functions
-@code{texinfo-format-region} and @code{texinfo-format-buffer} commands
-read the very same @@-commands in the Texinfo file as does @TeX{}, but
-process them differently to make an Info file (@pxref{Creating an Info
-File}).
-
-
-@node Format with tex/texindex
-@section Format with @code{tex} and @code{texindex}
-@cindex Shell formatting with @code{tex} and @code{texindex}
-@cindex Formatting with @code{tex} and @code{texindex}
-@cindex DVI file
-
-You can format the Texinfo file with the shell command @code{tex}
-followed by the name of the Texinfo file.  For example:
-
-@example
-tex foo.texi
-@end example
-
-@noindent @TeX{} will produce a @dfn{DVI file} as well as several auxiliary
-files containing information for indices, cross references, etc.  The
-DVI file (for @dfn{DeVice Independent} file) can be printed on virtually
-any device (see the following sections).
-
-@pindex texindex
-The @code{tex} formatting command itself does not sort the indices; it
-writes an output file of unsorted index data.  To generate a printed
-index after running the @command{tex} command, you first need a sorted
-index to work from.  The @command{texindex} command sorts indices.
-(The source file @file{texindex.c} comes as part of the standard
-Texinfo distribution, among other places.)  (@command{texi2dvi} runs
-@command{tex} and @command{texindex} as necessary.)
-
-@cindex Names of index files
-@cindex Index file names
-The @code{tex} formatting command outputs unsorted index files under
-names that obey a standard convention: the name of your main input file
-with any @samp{.tex} (or similar, @pxref{tex invocation,,, web2c,
-Web2c}) extension removed, followed by the two letter names of indices.
-For example, the raw index output files for the input file
-@file{foo.texinfo} would be @file{foo.cp}, @file{foo.vr}, @file{foo.fn},
-@file{foo.tp}, @file{foo.pg} and @file{foo.ky}.  Those are exactly the
-arguments to give to @code{texindex}.
-
-@need 1000
-@cindex Wildcards
-@cindex Globbing
-Instead of specifying all the unsorted index file names explicitly, you
-can use @samp{??} as shell wildcards and give the command in this
-form:
-
-@example
-texindex foo.??
-@end example
-
-@noindent
-This command will run @code{texindex} on all the unsorted index files,
-including any that you have defined yourself using @code{@@defindex}
-or @code{@@defcodeindex}.  (You may execute @samp{texindex foo.??}
-even if there are similarly named files with two letter extensions
-that are not index files, such as @samp{foo.el}.  The @code{texindex}
-command reports but otherwise ignores such files.)
-
-For each file specified, @code{texindex} generates a sorted index file
-whose name is made by appending @samp{s} to the input file name.  The
-@code{@@printindex} command looks for a file with that name
-(@pxref{Printing Indices & Menus}).  @code{texindex} does not alter the
-raw index output file.
-
-After you have sorted the indices, you need to rerun @code{tex} on the
-Texinfo file.  This regenerates the DVI file, this time with
-up-to-date index entries.
-
-Finally, you may need to run @code{tex} one more time, to get the page
-numbers in the cross-references correct.
-
-To summarize, this is a five step process:
-
-@enumerate
-@item
-Run @code{tex} on your Texinfo file.  This generates a DVI file (with
-undefined cross-references and no indices), and the raw index files
-(with two letter extensions).
-
-@item
-Run @code{texindex} on the raw index files.  This creates the
-corresponding sorted index files (with three letter extensions).
-
-@item
-Run @code{tex} again on your Texinfo file.  This regenerates the DVI
-file, this time with indices and defined cross-references, but with page
-numbers for the cross-references from last time, generally incorrect.
-
-@item
-Sort the indices again, with @code{texindex}.
-
-@item
-Run @code{tex} one last time.  This time the correct page numbers are
-written for the cross-references.
-@end enumerate
-
-@pindex texi2dvi
-Alternatively, it's a one-step process: run @code{texi2dvi}
-(@pxref{Format with texi2dvi}).
-
-You need not run @code{texindex} each time after you run @code{tex}.  If
-you do not, on the next run, the @code{tex} formatting command will use
-whatever sorted index files happen to exist from the previous use of
-@code{texindex}.  This is usually ok while you are debugging.
-
-@cindex Auxiliary files, avoiding
-@findex novalidate
-@cindex Pointer validation, suppressing
-@cindex Chapters, formatting one at a time
-Sometimes you may wish to print a document while you know it is
-incomplete, or to print just one chapter of a document.  In that case,
-the usual auxiliary files that @TeX{} creates and warnings @TeX{} gives
-when cross-references are not satisfied are just nuisances.  You can
-avoid them with the @code{@@novalidate} command, which you must give
-@emph{before} the @code{@@setfilename} command
-(@pxref{setfilename,,@code{@@setfilename}}).  Thus, the beginning of
-your file would look approximately like this:
-
-@example
-\input texinfo
-@@novalidate
-@@setfilename myfile.info
-@dots{}
-@end example
-
-@noindent @code{@@novalidate} also turns off validation in
-@code{makeinfo}, just like its @code{--no-validate} option
-(@pxref{Pointer Validation}).
-
-
-@node Format with texi2dvi
-@section Format with @code{texi2dvi}
-@pindex texi2dvi @r{(shell script)}
-
-The @code{texi2dvi} command automatically runs both @TeX{} and
-@command{texindex} as many times as necessary to produce a DVI file
-with sorted indices and all cross-references resolved.  It is
-therefore simpler than manually executing the
-@code{tex}---@code{texindex}---@code{tex}---@code{tex} sequence
-described in the previous section.
-
-To run @code{texi2dvi} on an input file @file{foo.texi}, do this (where
-@samp{prompt$ } is your shell prompt):
-
-@example
-prompt$ @kbd{texi2dvi foo.texi}
-@end example
-
-As shown in this example, the input filenames to @code{texi2dvi} must
-include any extension (@samp{.texi}, @samp{.texinfo}, etc.).  Under
-MS-DOS and perhaps in other circumstances, you may need to run @samp{sh
-texi2dvi foo.texi} instead of relying on the operating system to invoke
-the shell on the @samp{texi2dvi} script.
-
-Perhaps the most useful option to @code{texi2dvi} is
-@samp{--command=@var{cmd}}.  This inserts @var{cmd} on a line by itself
-after the @code{@@setfilename} in a temporary copy of the input file
-before running @TeX{}.  With this, you can specify different printing
-formats, such as @code{@@smallbook} (@pxref{smallbook}),
-@code{@@afourpaper} (@pxref{A4 Paper}), or @code{@@pagesizes}
-(@pxref{pagesizes}), without actually changing the document source.
-(You can also do this on a site-wide basis with @file{texinfo.cnf};
-@pxref{Preparing for TeX,,Preparing for @TeX{}}).
-
-With the @option{--pdf} option, @command{texi2dvi} produces PDF output
-instead of DVI (@pxref{PDF Output}), by running @command{pdftex}
-instead of @command{tex}.  Alternatively, the command
-@command{texi2pdf} is an abbreviation for running @samp{texi2dvi --pdf}.
-
-@cindex @LaTeX{}, processing with @command{texi2dvi}
-@command{texi2dvi} can also be used to process @LaTeX{} files; simply
-run @samp{texi2dvi filename.ext}.
-
-@command{texi2dvi} will use @command{etex} (or @command{pdfetex}) if
-they are available; these extended versions of @TeX{} are not
-required, and the DVI (or PDF) output is identical, but they simplify
-the @TeX{} programming in some cases, and provide additional tracing
-information when debugging @file{texinfo.tex}.
-
-For a list of other options, run @samp{texi2dvi --help}.
-
-
-@node Print with lpr
-@section Shell Print Using @code{lpr -d}
-@pindex lpr @r{(DVI print command)}
-
-The precise command to print a DVI file depends on your system
-installation.  Two common ones are @samp{dvips foo.dvi -o} and @samp{lpr
--d foo.dvi}.
-
-For example, the following commands will (perhaps) suffice to sort the
-indices, format, and print the @cite{Bison Manual}:
-
-@example
-@group
-tex bison.texinfo
-texindex bison.??
-tex bison.texinfo
-lpr -d bison.dvi
-@end group
-@end example
-
-@noindent
-(Remember that the shell commands may be different at your site; but
-these are commonly used versions.)
-
-Using the @code{texi2dvi} shell script (see the previous section):
-
-@example
-@group
-texi2dvi bison.texinfo
-lpr -d bison.dvi
-# or perhaps dvips bison.dvi -o
-@end group
-@end example
-
-@cindex Shell printing, on MS-DOS/MS-Windows
-@cindex Printing DVI files, on MS-DOS/MS-Windows
-@pindex lpr@r{-d, replacements on MS-DOS/MS-Windows}
-@code{lpr} is a standard program on Unix systems, but it is usually
-absent on MS-DOS/MS-Windows.  Some network packages come with a
-program named @code{lpr}, but these are usually limited to sending files
-to a print server over the network, and generally don't support the
-@samp{-d} option.  If you are unfortunate enough to work on one of these
-systems, you have several alternative ways of printing DVI files:
-
-@itemize @bullet{}
-@item Find and install a Unix-like @code{lpr} program, or its clone.
-If you can do that, you will be able to print DVI files just like
-described above.
-
-@item Send the DVI files to a network printer queue for DVI files.
-Some network printers have special queues for printing DVI files.  You
-should be able to set up your network software to send files to that
-queue.  In some cases, the version of @code{lpr} which comes with your
-network software will have a special option to send a file to specific
-queues, like this:
-
-@example
-lpr -Qdvi -hprint.server.domain bison.dvi
-@end example
-
-@item Convert the DVI file to a Postscript or PCL file and send it to your
-local printer.  @xref{Invoking Dvips,,, dvips, Dvips}, and the man
-pages for @code{dvilj}, for detailed description of these tools.  Once
-the DVI file is converted to the format your local printer understands
-directly, just send it to the appropriate port, usually @samp{PRN}.
-@end itemize
-
-
-@node Within Emacs
-@section From an Emacs Shell
-@cindex Print, format from Emacs shell
-@cindex Format, print from Emacs shell
-@cindex Shell, format, print from
-@cindex Emacs shell, format, print from
-@cindex GNU Emacs shell, format, print from
-
-You can give formatting and printing commands from a shell within GNU
-Emacs.  To create a shell within Emacs, type @kbd{M-x shell}.  In this
-shell, you can format and print the document.  @xref{Hardcopy, , Format
-and Print Hardcopy}, for details.
-
-You can switch to and from the shell buffer while @code{tex} is
-running and do other editing.  If you are formatting a long document
-on a slow machine, this can be very convenient.@refill
-
-You can also use @code{texi2dvi} from an Emacs shell.  For example,
-here is how to use @code{texi2dvi} to format and print @cite{Using and
-Porting GNU CC} from a shell within Emacs:
-
-@example
-@group
-texi2dvi gcc.texinfo
-lpr -d gcc.dvi
-@end group
-@end example
-
-See the next section for more information about formatting
-and printing in Texinfo mode.
-
-
-@node Texinfo Mode Printing
-@section Formatting and Printing in Texinfo Mode
-@cindex Region printing in Texinfo mode
-@cindex Format and print in Texinfo mode
-@cindex Print and format in Texinfo mode
-
-Texinfo mode provides several predefined key commands for @TeX{}
-formatting and printing.  These include commands for sorting indices,
-looking at the printer queue, killing the formatting job, and
-recentering the display of the buffer in which the operations
-occur.@refill
-
-@table @kbd
-@item C-c C-t C-b
-@itemx M-x texinfo-tex-buffer
-Run @code{texi2dvi} on the current buffer.@refill
-
-@item C-c C-t C-r
-@itemx M-x texinfo-tex-region
-Run @TeX{} on the current region.@refill
-
-@item C-c C-t C-i
-@itemx M-x texinfo-texindex
-Sort the indices of a Texinfo file formatted with
-@code{texinfo-tex-region}.@refill
-
-@item C-c C-t C-p
-@itemx M-x texinfo-tex-print
-Print a DVI file that was made with @code{texinfo-tex-region} or
-@code{texinfo-tex-buffer}.@refill
-
-@item C-c C-t C-q
-@itemx M-x tex-show-print-queue
-Show the print queue.@refill
-
-@item C-c C-t C-d
-@itemx M-x texinfo-delete-from-print-queue
-Delete a job from the print queue; you will be prompted for the job
-number shown by a preceding @kbd{C-c C-t C-q} command
-(@code{texinfo-show-tex-print-queue}).@refill
-
-@item C-c C-t C-k
-@itemx M-x tex-kill-job
-Kill the currently running @TeX{} job started by either
-@code{texinfo-tex-region} or @code{texinfo-tex-buffer}, or any other
-process running in the Texinfo shell buffer.@refill
-
-@item C-c C-t C-x
-@itemx M-x texinfo-quit-job
-Quit a @TeX{} formatting job that has stopped because of an error by
-sending an @key{x} to it.  When you do this, @TeX{} preserves a record
-of what it did in a @file{.log} file.@refill
-
-@item C-c C-t C-l
-@itemx M-x tex-recenter-output-buffer
-Redisplay the shell buffer in which the @TeX{} printing and formatting
-commands are run to show its most recent output.@refill
-@end table
-
-@need 1000
-Thus, the usual sequence of commands for formatting a buffer is as
-follows (with comments to the right):@refill
-
-@example
-@group
-C-c C-t C-b             @r{Run @code{texi2dvi} on the buffer.}
-C-c C-t C-p             @r{Print the DVI file.}
-C-c C-t C-q             @r{Display the printer queue.}
-@end group
-@end example
-
-The Texinfo mode @TeX{} formatting commands start a subshell in Emacs
-called the @file{*tex-shell*}.  The @code{texinfo-tex-command},
-@code{texinfo-texindex-command}, and @code{tex-dvi-print-command}
-commands are all run in this shell.
-
-You can watch the commands operate in the @samp{*tex-shell*} buffer,
-and you can switch to and from and use the @samp{*tex-shell*} buffer
-as you would any other shell buffer.@refill
-
-@need 1500
-The formatting and print commands depend on the values of several variables.
-The default values are:@refill
-
-@example
-@group
-    @r{Variable}                              @r{Default value}
-
-texinfo-texi2dvi-command                  "texi2dvi"
-texinfo-tex-command                       "tex"
-texinfo-texindex-command                  "texindex"
-texinfo-delete-from-print-queue-command   "lprm"
-texinfo-tex-trailer                       "@@bye"
-tex-start-of-header                       "%**start"
-tex-end-of-header                         "%**end"
-tex-dvi-print-command                     "lpr -d"
-tex-show-queue-command                    "lpq"
-@end group
-@end example
-
-You can change the values of these variables with the @kbd{M-x
-set-variable} command (@pxref{Examining, , Examining and Setting
-Variables, emacs, The GNU Emacs Manual}), or with your @file{.emacs}
-initialization file (@pxref{Init File, , , emacs, The GNU Emacs
-Manual}).
-
-@cindex Customize Emacs package (@t{Development/Docs/Texinfo})
-Beginning with version 20, GNU Emacs offers a user-friendly interface,
-called @dfn{Customize}, for changing values of user-definable variables.
-@xref{Easy Customization, , Easy Customization Interface, emacs, The GNU
-Emacs Manual}, for more details about this.  The Texinfo variables can
-be found in the @samp{Development/Docs/Texinfo} group, once you invoke
-the @kbd{M-x customize} command.
-
-
-@node Compile-Command
-@section Using the Local Variables List
-@cindex Local variables
-@cindex Compile command for formatting
-@cindex Format with the compile command
-
-Yet another way to apply the @TeX{} formatting command to a Texinfo file
-is to put that command in a @dfn{local variables list} at the end of the
-Texinfo file.  You can then specify the @code{tex} or @code{texi2dvi}
-commands as a @code{compile-command} and have Emacs run it by typing
-@kbd{M-x compile}.  This creates a special shell called the
-@file{*compilation*} buffer in which Emacs runs the compile command.
-For example, at the end of the @file{gdb.texinfo} file, after the
-@code{@@bye}, you could put the following:@refill
-
-@example
-@group
-Local Variables:
-compile-command: "texi2dvi gdb.texinfo"
-End:
-@end group
-@end example
-
-@noindent
-This technique is most often used by programmers who also compile programs
-this way; see @ref{Compilation, , , emacs, The GNU Emacs Manual}.@refill
-
-
-@node Requirements Summary
-@section @TeX{} Formatting Requirements Summary
-@cindex Requirements for formatting
-@cindex Minimal requirements for formatting
-@cindex Formatting requirements
-
-Every Texinfo file that is to be input to @TeX{} must begin with a
-@code{\input} command and must contain an @code{@@setfilename} command:
-
-@example
-\input texinfo
-@@setfilename @var{arg-not-used-by-@TeX{}}
-@end example
-
-@noindent
-The first command instructs @TeX{} to load the macros it needs to
-process a Texinfo file and the second command opens auxiliary files.
-
-Every Texinfo file must end with a line that terminates @TeX{}'s
-processing and forces out unfinished pages:
-
-@example
-@@bye
-@end example
-
-Strictly speaking, these lines are all a Texinfo file needs to be
-processed successfully by @TeX{}.
-
-Usually, however, the beginning includes an @code{@@settitle} command to
-define the title of the printed manual, an @code{@@setchapternewpage}
-command, a title page, a copyright page, and permissions.  Besides an
-@code{@@bye}, the end of a file usually includes indices and a table of
-contents.  (And of course most manuals contain a body of text as well.)
-
-For more information, see:
-
-@itemize @bullet
-@item @ref{settitle, , @code{@@settitle}}.
-@item @ref{setchapternewpage, , @code{@@setchapternewpage}}.
-@item @ref{Headings, ,Page Headings}.
-@item @ref{Titlepage & Copyright Page}.
-@item @ref{Printing Indices & Menus}.
-@item @ref{Contents}.
-@end itemize
-
-
-@node Preparing for TeX
-@section Preparing for @TeX{}
-@cindex Preparing for @TeX{}
-@cindex @TeX{} input initialization
-@cindex @b{.profile} initialization file
-@cindex @b{.cshrc} initialization file
-@cindex Initialization file for @TeX{} input
-
-@TeX{} needs to know where to find the @file{texinfo.tex} file that the
-@samp{\input texinfo} command on the first line reads.  The
-@file{texinfo.tex} file tells @TeX{} how to handle @@-commands; it is
-included in all standard GNU distributions.  The latest version is
-always available from the Texinfo source repository:
-@smalldisplay
-@uref{http://savannah.gnu.org/cgi-bin/viewcvs/texinfo/texinfo/doc/texinfo.tex?rev=HEAD}
-@end smalldisplay
-
-@pindex texinfo.tex@r{, installing}
-
-Usually, the installer has put the @file{texinfo.tex} file in the
-default directory that contains @TeX{} macros when GNU Texinfo, Emacs or
-other GNU software is installed.  In this case, @TeX{} will find the
-file and you do not need to do anything special.  If this has not been
-done, you can put @file{texinfo.tex} in the current directory when you
-run @TeX{}, and @TeX{} will find it there.
-
-@pindex epsf.tex@r{, installing}
-Also, you should install @file{epsf.tex}, if it is not already installed
-from another distribution.  More details are at the end of the description
-of the @code{@@image} command (@pxref{Images}).
-
-@pindex pdfcolor.tex@r{, installing}
-Likewise for @file{pdfcolor.tex}, if it is not already installed and you
-use pdftex.
-
-@pindex texinfo.cnf @r{installation}
-@cindex Customizing of @TeX{} for Texinfo
-@cindex Site-wide Texinfo configuration file
-Optionally, you may create an additional @file{texinfo.cnf}, and install
-it as well.  This file is read by @TeX{} when the @code{@@setfilename}
-command is executed (@pxref{setfilename,, @code{@@setfilename}}).  You can put any
-commands you like there, according to local site-wide conventions.  They
-will be read by @TeX{} when processing any Texinfo document.  For
-example, if @file{texinfo.cnf} contains the line @samp{@@afourpaper}
-(@pxref{A4 Paper}), then all Texinfo documents will be processed with
-that page size in effect.  If you have nothing to put in
-@file{texinfo.cnf}, you do not need to create it.
-
-@cindex Environment variable @code{TEXINPUTS}
-@vindex TEXINPUTS
-If neither of the above locations for these system files suffice for
-you, you can specify the directories explicitly.  For
-@file{texinfo.tex}, you can do this by writing the complete path for the
-file after the @code{\input} command.  Another way, that works for both
-@file{texinfo.tex} and @file{texinfo.cnf} (and any other file @TeX{}
-might read), is to set the @code{TEXINPUTS} environment variable in your
-@file{.cshrc} or @file{.profile} file.
-
-Which you use of @file{.cshrc} or @file{.profile} depends on
-whether you use a Bourne shell-compatible (@code{sh}, @code{bash},
-@code{ksh}, @dots{}) or C shell-compatible (@code{csh}, @code{tcsh})
-command interpreter.  The latter read the @file{.cshrc} file for
-initialization information, and the former read @file{.profile}.
-
-In a @file{.cshrc} file, you could use the following @code{csh} command
-sequence:
-
-@example
-setenv TEXINPUTS .:/home/me/mylib:
-@end example
-
-@need 1000
-In a @file{.profile} file, you could use the following @code{sh} command
-sequence:
-
-@example
-@group
-TEXINPUTS=.:/home/me/mylib:
-export TEXINPUTS
-@end group
-@end example
-
-On MS-DOS/MS-Windows, you would say it like this@footnote{Note the use
-of the @samp{;} character, instead of @samp{:}, as directory separator
-on these systems.}:
-
-@example
-@group
-set TEXINPUTS=.;d:/home/me/mylib;c:
-@end group
-@end example
-
-@noindent
-It is customary for DOS/Windows users to put such commands in the
-@file{autoexec.bat} file, or in the Windows Registry.
-
-@noindent
-These settings would cause @TeX{} to look for @file{\input} file first
-in the current directory, indicated by the @samp{.}, then in a
-hypothetical user @samp{me}'s @file{mylib} directory, and finally in
-the system directories.  (A leading, trailing, or doubled @samp{:}
-indicates searching the system directories at that point.)
-
-@cindex Dumping a .fmt file
-@cindex Format file, dumping
-Finally, you may wish to dump a @file{.fmt} file (@pxref{Memory dumps,,,
-web2c, Web2c}) so that @TeX{} can load Texinfo faster.  (The
-disadvantage is that then updating @file{texinfo.tex} requires
-redumping.)  You can do this by running this command, assuming
-@file{epsf.tex} is findable by @TeX{}:
-
-@example
-initex texinfo @@dump
-@end example
-
-(@code{dump} is a @TeX{} primitive.)  Then, move @file{texinfo.fmt} to
-wherever your @code{.fmt} files are found; typically, this will be in the
-subdirectory @file{web2c} of your @TeX{} installation.
-
-
-@node Overfull hboxes
-@section Overfull ``hboxes''
-@cindex Overfull @samp{hboxes}
-@cindex @samp{hboxes}, overfull
-@cindex Final output
-
-@TeX{} is sometimes unable to typeset a line without extending it into
-the right margin.  This can occur when @TeX{} comes upon what it
-interprets as a long word that it cannot hyphenate, such as an
-electronic mail network address or a very long title.  When this
-happens, @TeX{} prints an error message like this:
-
-@example
-Overfull @@hbox (20.76302pt too wide)
-@end example
-
-@findex hbox
-@noindent
-(In @TeX{}, lines are in ``horizontal boxes'', hence the term, ``hbox''.
-@samp{@@hbox} is a @TeX{} primitive not needed in the Texinfo language.)
-
-@TeX{} also provides the line number in the Texinfo source file and
-the text of the offending line, which is marked at all the places that
-@TeX{} considered hyphenation.
-@xref{Debugging with TeX, , Catching Errors with @TeX{} Formatting},
-for more information about typesetting errors.
-
-If the Texinfo file has an overfull hbox, you can rewrite the sentence
-so the overfull hbox does not occur, or you can decide to leave it.  A
-small excursion into the right margin often does not matter and may not
-even be noticeable.
-
-If you have many overfull boxes and/or an antipathy to rewriting, you
-can coerce @TeX{} into greatly increasing the allowable interword
-spacing, thus (if you're lucky) avoiding many of the bad line breaks,
-like this:
-
-@findex \emergencystretch
-@example
-@@tex
-\global\emergencystretch = .9\hsize
-@@end tex
-@end example
-
-@noindent
-(You should adjust the fraction as needed.)  This huge value for
-@code{\emergencystretch} cannot be the default, since then the typeset
-output would generally be of noticeably lower quality; the default
-is @samp{.15\hsize}.  @code{\hsize} is the @TeX{} dimension
-containing the current line width.
-
-@cindex Black rectangle in hardcopy
-@cindex Rectangle, black in hardcopy
-@cindex Box, ugly black in hardcopy
-@cindex Ugly black rectangles in hardcopy
-For what overfull boxes you have, however, @TeX{} will print a large,
-ugly, black rectangle beside the line that contains the overfull hbox
-unless told otherwise.  This is so you will notice the location of the
-problem if you are correcting a draft.
-
-@findex finalout
-To prevent such a monstrosity from marring your final printout, write
-the following in the beginning of the Texinfo file on a line of its own,
-before the @code{@@titlepage} command:
-
-@example
-@@finalout
-@end example
-
-
-@node smallbook
-@section Printing ``Small'' Books
-@findex smallbook
-@cindex Small book size
-@cindex Book, printing small
-@cindex Page sizes for books
-@cindex Size of printed book
-
-By default, @TeX{} typesets pages for printing in an 8.5 by 11 inch
-format.  However, you can direct @TeX{} to typeset a document in a 7 by
-9.25 inch format that is suitable for bound books by inserting the
-following command on a line by itself at the beginning of the Texinfo
-file, before the title page:@refill
-
-@example
-@@smallbook
-@end example
-
-@noindent
-(Since many books are about 7 by 9.25 inches, this command might better
-have been called the @code{@@regularbooksize} command, but it came to be
-called the @code{@@smallbook} command by comparison to the 8.5 by 11
-inch format.)
-
-If you write the @code{@@smallbook} command between the
-start-of-header and end-of-header lines, the Texinfo mode @TeX{}
-region formatting command, @code{texinfo-tex-region}, will format the
-region in ``small'' book size (@pxref{Start of Header}).@refill
-
-@xref{small}, for information about
-commands that make it easier to produce examples for a smaller manual.
-
-@xref{Format with texi2dvi}, and @ref{Preparing for TeX,,Preparing for
-@TeX{}}, for other ways to format with @code{@@smallbook} that do not
-require changing the source file.
-
-
-@node A4 Paper
-@section Printing on A4 Paper
-@cindex A4 paper, printing on
-@cindex A5 paper, printing on
-@cindex Paper size, A4
-@cindex European A4 paper
-@findex afourpaper
-
-You can tell @TeX{} to format a document for printing on European size
-A4 paper (or A5) with the @code{@@afourpaper} (or @code{@@afivepaper})
-command.  Write the command on a line by itself near the beginning of
-the Texinfo file, before the title page.  For example, this is how you
-would write the header for this manual:
-
-@example
-@group
-\input texinfo    @@c -*-texinfo-*-
-@@c %**start of header
-@@setfilename texinfo
-@@settitle Texinfo
-@@afourpaper
-@@c %**end of header
-@end group
-@end example
-
-@xref{Format with texi2dvi}, and @ref{Preparing for TeX,,Preparing for
-@TeX{}}, for other ways to format for different paper sizes that do not
-require changing the source file.
-
-@findex afourlatex
-@findex afourwide
-You may or may not prefer the formatting that results from the command
-@code{@@afourlatex}.  There's also @code{@@afourwide} for A4 paper in
-wide format.
-
-@node pagesizes
-@section @code{@@pagesizes} [@var{width}][, @var{height}]: Custom Page Sizes
-@findex pagesizes
-@cindex Custom page sizes
-@cindex Page sizes, customized
-@cindex Text width and height
-@cindex Width of text area
-@cindex Height of text area
-@cindex Depth of text area
-
-You can explicitly specify the height and (optionally) width of the main
-text area on the page with the @code{@@pagesizes} command.  Write this
-on a line by itself near the beginning of the Texinfo file, before the
-title page.  The height comes first, then the width if desired,
-separated by a comma.  Examples:
-
-@example
-@@pagesizes 200mm,150mm  @c for b5 paper
-@end example
-@noindent and
-@example
-@@pagesizes 11.5in      @c for legal paper
-@end example
-
-@cindex B5 paper, printing on
-@cindex Legal paper, printing on
-This would be reasonable for printing on B5-size paper.  To emphasize,
-this command specifies the size of the @emph{text area}, not the size of
-the paper (which is 250@dmn{mm} by 177@dmn{mm} for B5, 14@dmn{in} by
-8.5@dmn{in} for legal).
-
-@cindex Margins on page, not controllable
-To make more elaborate changes, such as changing any of the page
-margins, you must define a new command in @file{texinfo.tex} (or
-@file{texinfo.cnf}, @pxref{Preparing for TeX,,Preparing for @TeX{}}).
-
-@xref{Format with texi2dvi}, and @ref{Preparing for TeX,,Preparing for
-@TeX{}}, for other ways to specify @code{@@pagesizes} that do not
-require changing the source file.
-
-@code{@@pagesizes} is ignored by @code{makeinfo}.
-
-
-@node Cropmarks and Magnification
-@section Cropmarks and Magnification
-@findex cropmarks
-@cindex Cropmarks for printing
-@cindex Printing cropmarks
-You can (attempt to) direct @TeX{} to print cropmarks at the corners of
-pages with the @code{@@cropmarks} command.  Write the @code{@@cropmarks}
-command on a line by itself between @code{@@iftex} and @code{@@end
-iftex} lines near the beginning of the Texinfo file, before the title
-page, like this:@refill
-
-@example
-@group
-@@iftex
-@@cropmarks
-@@end iftex
-@end group
-@end example
-
-This command is mainly for printers that typeset several pages on one
-sheet of film; but you can attempt to use it to mark the corners of a
-book set to 7 by 9.25 inches with the @code{@@smallbook} command.
-(Printers will not produce cropmarks for regular sized output that is
-printed on regular sized paper.)  Since different printing machines work
-in different ways, you should explore the use of this command with a
-spirit of adventure.  You may have to redefine the command in
-@file{texinfo.tex}.
-
-@findex \mag @r{(raw @TeX{} magnification)}
-@cindex Magnified printing
-@cindex Larger or smaller pages
-You can attempt to direct @TeX{} to typeset pages larger or smaller than
-usual with the @code{\mag} @TeX{} command.  Everything that is typeset
-is scaled proportionally larger or smaller.  (@code{\mag} stands for
-``magnification''.)  This is @emph{not} a Texinfo @@-command, but is a
-plain @TeX{} command that is prefixed with a backslash.  You have to
-write this command between @code{@@tex} and @code{@@end tex}
-(@pxref{Raw Formatter Commands}).
-
-Follow the @code{\mag} command with an @samp{=} and then a number that
-is 1000 times the magnification you desire.  For example, to print pages
-at 1.2 normal size, write the following near the beginning of the
-Texinfo file, before the title page:
-
-@example
-@group
-@@tex
-\mag=1200
-@@end tex
-@end group
-@end example
-
-With some printing technologies, you can print normal-sized copies that
-look better than usual by giving a larger-than-normal master to your
-print shop.  They do the reduction, thus effectively increasing the
-resolution.
-
-Depending on your system, DVI files prepared with a
-nonstandard-@code{\mag} may not print or may print only with certain
-magnifications.  Be prepared to experiment.
-
-
-@node PDF Output
-@section PDF Output
-@cindex PDF output
-
-@pindex pdftex
-The simplest way to generate PDF output from Texinfo source is to run
-the convenience script @command{texi2pdf}; this simply executes the
-@command{texi2dvi} script with the @option{--pdf} option
-(@pxref{Format with texi2dvi}).  If for some reason you want to
-process by hand, simply run the @command{pdftex} program instead of
-plain @command{tex}.  That is, run @samp{pdftex foo.texi} instead of
-@samp{tex foo.texi}.
-
-@dfn{PDF} stands for `Portable Document Format'. It was invented by
-Adobe Systems some years ago for document interchange, based on their
-PostScript language.  Related links:
-
-@itemize
-@item
-GNU GV, a @uref{http://www.foolabs.com/xpdf/, Ghostscript-based PDF
-reader}.  (It can also preview PostScript documents.)
-
-@item
-A freely available standalone @uref{http://www.foolabs.com/xpdf/,
-PDF reader} for the X window system.
-
-@item
-@uref{http://partners.adobe.com/asn/acrobat/sdk/public/docs/, PDF definition}.
-
-@end itemize
-
-At present, Texinfo does not provide
-@samp{@@ifpdf} or @samp{@@pdf} commands as for the other output
-formats, since PDF documents contain many internal links that would be
-hard or impossible to get right at the Texinfo source level.
-
-PDF files require special software to be displayed, unlike the plain
-ASCII formats (Info, HTML) that Texinfo supports.  They also tend to
-be much larger than the DVI files output by @TeX{} by default.
-Nevertheless, a PDF file does define an actual typeset document in a
-self-contained file, so it has its place.
-
-
-@node Obtaining TeX
-@section How to Obtain @TeX{}
-@cindex Obtaining @TeX{}
-@cindex @TeX{}, how to obtain
-
-@c !!! Here is information about obtaining TeX.  Update it whenever.
-@c !!! Also consider updating TeX.README on ftp.gnu.org.
-@c     Updated by RJC on 1 March 1995, conversation with MacKay.
-@c     Updated by kb@cs.umb.edu on 29 July 1996.
-@c     Updated by kb@cs.umb.edu on 25 April 1997.
-@c     Updated by kb@cs.umb.edu on 27 February 1998.
-@TeX{} is freely redistributable.  You can obtain @TeX{} for Unix
-systems via anonymous ftp or on physical media.  The core material
-consists of the Web2c @TeX{} distribution (@uref{http://tug.org/web2c}).
-
-Instructions for retrieval by anonymous ftp and information on other
-available distributions:
-@uref{http://tug.org/unixtex.ftp}.
-
-The Free Software Foundation provides a core distribution on its Source
-Code CD-ROM suitable for printing Texinfo manuals.  To order it, contact:
-
-@display
-@group
-Free Software Foundation, Inc.
-59 Temple Place Suite 330
-Boston, MA @ @ 02111-1307
-USA
-Telephone: @w{+1-617-542-5942}
-Fax: (including Japan) @w{+1-617-542-2652}
-Free Dial Fax (in Japan):
-@w{ } @w{ } @w{ } 0031-13-2473 (KDD)
-@w{ } @w{ } @w{ } 0066-3382-0158 (IDC)
-Electronic mail: @code{gnu@@gnu.org}
-@end group
-@end display
-
-Many other @TeX{} distributions are available; see
-@uref{http://tug.org/}.
-
-
-@node Creating and Installing Info Files
-@chapter Creating and Installing Info Files
-
-This chapter describes how to create and install Info files.  @xref{Info
-Files}, for general information about the file format itself.
-
-@menu
-* Creating an Info File::
-* Installing an Info File::
-@end menu
-
-
-@node Creating an Info File
-@section Creating an Info File
-@cindex Creating an Info file
-@cindex Info, creating an online file
-@cindex Formatting a file for Info
-
-@code{makeinfo} is a program that converts a Texinfo file into an Info
-file, HTML file, or plain text.  @code{texinfo-format-region} and
-@code{texinfo-format-buffer} are GNU Emacs functions that convert
-Texinfo to Info.
-
-For information on installing the Info file in the Info system,
-@pxref{Installing an Info File}.
-
-@menu
-* makeinfo advantages::         @code{makeinfo} provides better error checking.
-* Invoking makeinfo::           How to run @code{makeinfo} from a shell.
-* makeinfo options::            Specify fill-column and other options.
-* Pointer Validation::          How to check that pointers point somewhere.
-* makeinfo in Emacs::           How to run @code{makeinfo} from Emacs.
-* texinfo-format commands::     Two Info formatting commands written
-                                 in Emacs Lisp are an alternative
-                                 to @code{makeinfo}.
-* Batch Formatting::            How to format for Info in Emacs Batch mode.
-* Tag and Split Files::         How tagged and split files help Info
-                                 to run better.
-@end menu
-
-
-@node makeinfo advantages
-@subsection @code{makeinfo} Preferred
-
-The @code{makeinfo} utility creates an Info file from a Texinfo source
-file more quickly than either of the Emacs formatting commands and
-provides better error messages.  We recommend it.  @code{makeinfo} is a
-C program that is independent of Emacs.  You do not need to run Emacs to
-use @code{makeinfo}, which means you can use @code{makeinfo} on machines
-that are too small to run Emacs.  You can run @code{makeinfo} in any one
-of three ways: from an operating system shell, from a shell inside
-Emacs, or by typing the @kbd{C-c C-m C-r} or the @kbd{C-c C-m C-b}
-command in Texinfo mode in Emacs.
-
-The @code{texinfo-format-region} and the @code{texinfo-format-buffer}
-commands are useful if you cannot run @code{makeinfo}.  Also, in some
-circumstances, they format short regions or buffers more quickly than
-@code{makeinfo}.
-
-
-@node Invoking makeinfo
-@subsection Running @code{makeinfo} from a Shell
-@pindex makeinfo
-
-To create an Info file from a Texinfo file, invoke @command{makeinfo}
-followed by the name of the Texinfo file.  Thus, to create the Info
-file for Bison, type the following to the shell:
-
-@example
-makeinfo bison.texinfo
-@end example
-
-(You can run a shell inside Emacs by typing @kbd{M-x shell}.)
-
-@command{makeinfo} has many options to control its actions and output;
-see the next section.
-
-
-@node makeinfo options
-@subsection Options for @code{makeinfo}
-@cindex @code{makeinfo} options
-@cindex Options for @code{makeinfo}
-
-The @command{makeinfo} program accepts many options.  Perhaps the most
-commonly needed are those that change the output format.  By default,
-@command{makeinfo} outputs Info files.
-
-Each command line option is a word preceded by @samp{--} or a letter
-preceded by @samp{-}.  You can use abbreviations for the long option
-names as long as they are unique.
-
-For example, you could use the following shell command to create an Info
-file for @file{bison.texinfo} in which each line is filled to only 68
-columns:
-
-@example
-makeinfo --fill-column=68 bison.texinfo
-@end example
-
-You can write two or more options in sequence, like this:@refill
-
-@example
-makeinfo --no-split --fill-column=70 @dots{}
-@end example
-
-@noindent
-This would keep the Info file together as one possibly very long
-file and would also set the fill column to 70.
-
-The options are:
-
-@table @code
-
-@item -D @var{var}
-@opindex -D @var{var}
-Cause the variable @var{var} to be defined.  This is equivalent to
-@code{@@set @var{var}} in the Texinfo file (@pxref{set clear value}).
-
-@item --commands-in-node-names
-@opindex --commands-in-node-names
-Allow @code{@@}-commands in node names.  This is not recommended, as it
-can probably never be implemented in @TeX{}.  It also makes
-@code{makeinfo} much slower.  Also, this option is ignored when
-@samp{--no-validate} is used.  @xref{Pointer Validation}, for more
-details.
-
-@item --css-include=@var{file}
-@opindex --css-include
-Include the contents of @var{file}, which should contain cascading
-style sheets specifications, in the @samp{<style>} block of the HTML
-output.  @xref{HTML CSS}.  If @var{file} is @samp{-}, read standard
-input.
-
-@item --docbook
-@opindex --docbook
-Generate Docbook output rather than Info.
-
-@item --enable-encoding
-@opindex --enable-encoding
-Output accented and special characters in Info or plain text output
-based on @samp{@@documentencoding}.
-@xref{documentencoding,,@code{documentencoding}}, and @ref{Inserting Accents}.
-
-@item --error-limit=@var{limit}
-@itemx -e @var{limit}
-@opindex --error-limit=@var{limit}
-@opindex -e @var{limit}
-Set the maximum number of errors that @code{makeinfo} will report
-before exiting (on the assumption that continuing would be useless);
-default 100.
-
-@item --fill-column=@var{width}
-@itemx -f @var{width}
-@opindex --fill-column=@var{width}
-@opindex -f @var{width}
-Specify the maximum number of columns in a line; this is the right-hand
-edge of a line.  Paragraphs that are filled will be filled to this
-width.  (Filling is the process of breaking up and connecting lines so
-that lines are the same length as or shorter than the number specified
-as the fill column.  Lines are broken between words.) The default value
-is 72.  Ignored with @samp{--html}.
-
-@item --footnote-style=@var{style}
-@itemx -s @var{style}
-@opindex --footnote-style=@var{style}
-@opindex -s @var{style}
-Set the footnote style to @var{style}, either @samp{end} for the end
-node style (the default) or @samp{separate} for the separate node style.
-The value set by this option overrides the value set in a Texinfo file
-by an @code{@@footnotestyle} command (@pxref{Footnotes}).  When the
-footnote style is @samp{separate}, @code{makeinfo} makes a new node
-containing the footnotes found in the current node.  When the footnote
-style is @samp{end}, @code{makeinfo} places the footnote references at
-the end of the current node.  Ignored with @samp{--html}.
-
-@item --force
-@itemx -F
-@opindex --force
-@opindex -F
-Ordinarily, if the input file has errors, the output files are not
-created.  With this option, they are preserved.
-
-@item --help
-@itemx -h
-@opindex --help
-@opindex -h
-Print a usage message listing all available options, then exit successfully.
-
-@item --html
-@opindex --html
-Generate HTML output rather than Info.  @xref{Generating HTML}.  By
-default, the HTML output is split into one output file per Texinfo
-source node, and the split output is written into a subdirectory with
-the name of the top-level info file.
-
-@item -I @var{dir}
-@opindex -I @var{dir}
-Append @var{dir} to the directory search list for finding files that
-are included using the @code{@@include} command.  By default,
-@code{makeinfo} searches only the current directory.  If @var{dir} is
-not given, the current directory @file{.} is appended.  Note that
-@var{dir} can actually be a list of several directories separated by the
-usual path separator character (@samp{:} on Unix, @samp{;} on
-MS-DOS/MS-Windows).
-
-@item --ifdocbook
-@opindex --ifdocbook
-@itemx --ifhtml
-@opindex --ifhtml
-@itemx --ifinfo
-@opindex --ifinfo
-@itemx --ifplaintext
-@opindex --ifplaintext
-@itemx --iftex
-@opindex --iftex
-@itemx --ifxml
-@opindex --ifxml
-For the specified format, process @samp{@@if@var{format}} and
-@samp{@@@var{format}} commands even if not generating the given output
-format.  For instance, if @option{--iftex} is specified, then
-@samp{@@iftex} and @samp{@@tex} blocks will be read.  
-
-@item --macro-expand=@var{file}
-@itemx -E @var{file}
-@opindex --macro-expand=@var{file}
-@opindex -E @var{file}
-Output the Texinfo source with all the macros expanded to the named
-file.  Normally, the results of macro expansion are used internally by
-@code{makeinfo} and then discarded.  This option is used by
-@command{texi2dvi}.
-
-@item --no-headers
-@item --plaintext
-@opindex --no-headers
-@opindex --plaintext
-@cindex Plain text output
-@cindex ASCII text output
-@cindex Generating plain text files
-@cindex @file{INSTALL} file, generating
-@cindex Node separators, omitting
-@cindex Menus, omitting
-Do not include menus or node separator lines in the output, and
-implicitly @option{--enable-encoding} (see above).  This results in a
-simple plain text file that you can (for example) send in email
-without complications, or include in a distribution (as in an
-@file{INSTALL} file).
-
-@cindex Navigation links, omitting
-For HTML output, likewise omit menus.  And if @samp{--no-split} is also
-specified, do not include a navigation links at the top of each node
-(these are never included in the default case of split output).
-@xref{Generating HTML}.
-
-In both cases, ignore @code{@@setfilename} and write to standard
-output by default---can be overridden with @option{-o}.
-
-@item --no-ifdocbook
-@opindex --no-ifdocbook
-@itemx --no-ifhtml
-@opindex --no-ifhtml
-@itemx --no-ifinfo
-@opindex --no-ifinfo
-@itemx --no-ifplaintext
-@opindex --no-ifplaintext
-@itemx --no-iftex
-@opindex --no-iftex
-@itemx --no-ifxml
-@opindex --no-ifxml
-Do not process @samp{@@if@var{format}} and @samp{@@@var{format}}
-commands, and do process @samp{@@ifnot@var{format}}, even if
-generating the given format.  For instance, if @option{--no-ifhtml} is
-specified, then @samp{@@ifhtml} and @samp{@@html} blocks will not be
-read, and @samp{@@ifnothtml} blocks will be.
-
-@item --no-number-footnotes
-@opindex --no-number-footnotes
-Suppress automatic footnote numbering.  By default, @code{makeinfo}
-numbers each footnote sequentially in a single node, resetting the
-current footnote number to 1 at the start of each node.
-
-@item --no-number-sections
-@opindex --no-number-sections
-Do not output chapter, section, and appendix numbers.
-You need to specify this if your manual is not hierarchically-structured.
-
-@item --no-split
-@opindex --no-split
-@cindex Splitting of output files
-@cindex Output file splitting
-Suppress the splitting stage of @code{makeinfo}.  By default, large
-output files (where the size is greater than 70k bytes) are split into
-smaller subfiles.  For Info output, each one is approximately 50k bytes.
-For HTML output, each file contains one node (@pxref{Generating HTML}).
-
-@item --no-pointer-validate
-@itemx --no-validate
-@opindex --no-pointer-validate
-@opindex --no-validate
-@cindex Pointer validation, suppressing
-Suppress the pointer-validation phase of @code{makeinfo}---a dangerous
-thing to do.  This can also be done with the @code{@@novalidate}
-command (@pxref{Use TeX,,Use @TeX{}}).  Normally, after a Texinfo file
-is processed, some consistency checks are made to ensure that cross
-references can be resolved, etc.  @xref{Pointer Validation}.
-
-@item --no-warn
-@opindex --no-warn
-Suppress warning messages (but @emph{not} error messages).
-
-@item --number-sections
-@opindex --number-sections
-Output chapter, section, and appendix numbers as in printed manuals.
-This is the default.  It works only with hierarchically-structured
-manuals.
-
-@item --output=@var{file}
-@itemx -o @var{file}
-@opindex --output=@var{file}
-@opindex -o @var{file}
-Specify that the output should be directed to @var{file} and not to the
-file name specified in the @code{@@setfilename} command found in the
-Texinfo source (@pxref{setfilename}).  If @var{file} is @samp{-}, output
-goes to standard output and @samp{--no-split} is implied.  For split
-HTML output, @var{file} is the name for the directory into which all
-HTML nodes are written (@pxref{Generating HTML}).
-
-@item -P @var{dir}
-@opindex -P @var{dir}
-Prepend @var{dir} to the directory search list for @code{@@include}.
-If @var{dir} is not given, the current directory @file{.} is prepended.
-See @samp{-I} for more details.
-
-@item --paragraph-indent=@var{indent}
-@itemx -p @var{indent}
-@opindex --paragraph-indent=@var{indent}
-@opindex -p @var{indent}
-Set the paragraph indentation style to @var{indent}.  The value set by
-this option overrides the value set in a Texinfo file by an
-@code{@@paragraphindent} command (@pxref{paragraphindent}).  The value
-of @var{indent} is interpreted as follows:
-
-@table @asis
-@item @samp{asis}
-Preserve any existing indentation at the starts of paragraphs.
-
-@item @samp{0} or @samp{none}
-Delete any existing indentation.
-
-@item @var{num}
-Indent each paragraph by @var{num} spaces.
-@end table
-
-@item --reference-limit=@var{limit}
-@itemx -r @var{limit}
-@opindex --reference-limit=@var{limit}
-@opindex -r @var{limit}
-Set the value of the number of references to a node that
-@code{makeinfo} will make without reporting a warning.  If a node has more
-than this number of references in it, @code{makeinfo} will make the
-references but also report a warning.  The default is 1000.
-
-@item --split-size=@var{num}
-@opindex --split-size=@var{num}
-Keep Info files to at most @var{num} characters; default is 300,000.
-
-@item -U @var{var}
-Cause @var{var} to be undefined.  This is equivalent to
-@code{@@clear @var{var}} in the Texinfo file (@pxref{set clear value}).
-
-@item --verbose
-@opindex --verbose
-Cause @code{makeinfo} to display messages saying what it is doing.
-Normally, @code{makeinfo} only outputs messages if there are errors or
-warnings.
-
-@item --version
-@itemx -V
-@opindex --version
-@opindex -V
-Print the version number, then exit successfully.
-
-@item --xml
-@opindex --xml
-Generate XML output rather than Info.
-
-@end table
-
-@vindex TEXINFO_OUTPUT_FORMAT
-@cindex Environment variable @code{TEXINFO_OUTPUT_FORMAT}
-@command{makeinfo} also reads the environment variable
-@env{TEXINFO_OUTPUT_FORMAT} to determine the output format, if not
-overridden by a command line option.  The possible values are:
-
-@example
-docbook  html  info  plaintext  xml
-@end example
-
-If not set, Info output is the default.
-
-
-@node Pointer Validation
-@subsection Pointer Validation
-@cindex Pointer validation with @code{makeinfo}
-@cindex Validation of pointers
-
-If you do not suppress pointer validation with the @samp{--no-validate}
-option or the @code{@@novalidate} command in the source file (@pxref{Use
-TeX,,Use @TeX{}}), @code{makeinfo} will check the validity of the final
-Info file.  Mostly, this means ensuring that nodes you have referenced
-really exist.  Here is a complete list of what is checked:
-
-@enumerate
-@item
-If a `Next', `Previous', or `Up' node reference is a reference to a
-node in the current file and is not an external reference such as to
-@file{(dir)}, then the referenced node must exist.@refill
-
-@item
-In every node, if the `Previous' node is different from the `Up' node,
-then the node pointed to by the `Previous' field must have a `Next'
-field which points back to this node.@refill
-
-@item
-Every node except the `Top' node must have an `Up' pointer.@refill
-
-@item
-The node referenced by an `Up' pointer must itself reference the current
-node through a menu item, unless the node referenced by `Up'
-has the form `(@var{file})'.
-
-@item
-If the `Next' reference of a node is not the same as the `Next' reference
-of the `Up' reference, then the node referenced by the `Next' pointer
-must have a `Previous' pointer that points back to the current node.
-This rule allows the last node in a section to point to the first node
-of the next chapter.@refill
-
-@item
-Every node except `Top' should be referenced by at least one other node,
-either via the `Previous' or `Next' links, or via a menu or a
-cross-reference.@refill
-@end enumerate
-
-@cindex @@-commands in @@node, limited support
-Some Texinfo documents might fail during the validation phase because
-they use commands like @code{@@value} and @code{@@definfoenclose} in
-node definitions and cross-references inconsistently.  (Your best bet
-is to avoid using @@-commands in node names.)  Consider the
-following example:
-
-@example
-@group
-@@set nodename Node 1
-
-@@node @@value@{nodename@}, Node 2, Top, Top
-
-This is node 1.
-
-@@node Node 2, , Node 1, Top
-
-This is node 2.
-@end group
-@end example
-
-@noindent
-Here, the node ``Node 1'' was referenced both verbatim and through
-@code{@@value}.
-
-By default, @code{makeinfo} fails such cases, because node names are not
-fully expanded until they are written to the output file.  You should
-always try to reference nodes consistently; e.g., in the above example,
-the second @code{@@node} line should have also used @code{@@value}.
-However, if, for some reason, you @emph{must} reference node names
-inconsistently, and @code{makeinfo} fails to validate the file, you can
-use the @samp{--commands-in-node-names} option to force @code{makeinfo}
-to perform the expensive expansion of all node names it finds in the
-document.  This might considerably slow down the program, though;
-twofold increase in conversion time was measured for large documents
-such as the Jargon file.
-
-@cindex @@value in @@node lines
-The support for @code{@@}-commands in @code{@@node} directives is not
-general enough to be freely used.  For example, if the example above
-redefined @code{nodename} somewhere in the document, @code{makeinfo}
-will fail to convert it, even if invoked with the
-@samp{--commands-in-node-names} option.
-
-@samp{--commands-in-node-names} has no effect if the @samp{--no-validate}
-option is given.
-
-
-@node makeinfo in Emacs
-@subsection Running @code{makeinfo} Within Emacs
-@cindex Running @code{makeinfo} in Emacs
-@cindex @code{makeinfo} inside Emacs
-@cindex Shell, running @code{makeinfo} in
-
-You can run @code{makeinfo} in GNU Emacs Texinfo mode by using either the
-@code{makeinfo-region} or the @code{makeinfo-buffer} commands.  In
-Texinfo mode, the commands are bound to @kbd{C-c C-m C-r} and @kbd{C-c
-C-m C-b} by default.@refill
-
-@table @kbd
-@item C-c C-m C-r
-@itemx M-x makeinfo-region
-Format the current region for Info.@refill
-@findex makeinfo-region
-
-@item C-c C-m C-b
-@itemx M-x makeinfo-buffer
-Format the current buffer for Info.@refill
-@findex makeinfo-buffer
-@end table
-
-When you invoke @code{makeinfo-region} the output goes to a temporary
-buffer.  When you invoke @code{makeinfo-buffer} output goes to the
-file set with @code{@@setfilename} (@pxref{setfilename}).
-
-The Emacs @code{makeinfo-region} and @code{makeinfo-buffer} commands
-run the @code{makeinfo} program in a temporary shell buffer.  If
-@code{makeinfo} finds any errors, Emacs displays the error messages in
-the temporary buffer.@refill
-
-@cindex Errors, parsing
-@cindex Parsing errors
-@findex next-error
-You can parse the error messages by typing @kbd{C-x `}
-(@code{next-error}).  This causes Emacs to go to and position the
-cursor on the line in the Texinfo source that @code{makeinfo} thinks
-caused the error.  @xref{Compilation, , Running @code{make} or
-Compilers Generally, emacs, The GNU Emacs Manual}, for more
-information about using the @code{next-error} command.@refill
-
-In addition, you can kill the shell in which the @code{makeinfo}
-command is running or make the shell buffer display its most recent
-output.@refill
-
-@table @kbd
-@item C-c C-m C-k
-@itemx M-x makeinfo-kill-job
-@findex makeinfo-kill-job
-Kill the current running @code{makeinfo} job
-(from @code{makeinfo-region} or @code{makeinfo-buffer}).@refill
-
-@item C-c C-m C-l
-@itemx M-x makeinfo-recenter-output-buffer
-@findex makeinfo-recenter-output-buffer
-Redisplay the @code{makeinfo} shell buffer to display its most recent
-output.@refill
-@end table
-
-@noindent
-(Note that the parallel commands for killing and recentering a @TeX{}
-job are @kbd{C-c C-t C-k} and @kbd{C-c C-t C-l}.  @xref{Texinfo Mode
-Printing}.)@refill
-
-You can specify options for @code{makeinfo} by setting the
-@code{makeinfo-options} variable with either the @kbd{M-x
-customize} or the @kbd{M-x set-variable} command, or by setting the
-variable in your @file{.emacs} initialization file.
-
-For example, you could write the following in your @file{.emacs} file:@refill
-
-@example
-@group
-(setq makeinfo-options
-     "--paragraph-indent=0 --no-split
-      --fill-column=70 --verbose")
-@end group
-@end example
-
-@noindent
-@c If you write these three cross references using xref, you see
-@c three references to the same named manual, which looks strange.
-@iftex
-For more information, see @ref{makeinfo options, , Options for
-@code{makeinfo}}, as well as ``Easy Customization Interface,'' ``Examining
-and Setting Variables,'' and ``Init File'' in @cite{The GNU Emacs
-Manual}.
-@end iftex
-@ifnottex
-For more information, see@*
-@ref{Easy Customization, , Easy Customization Interface, emacs, The GNU Emacs Manual},@*
-@ref{Examining, , Examining and Setting Variables, emacs, The GNU Emacs Manual},@*
-@ref{Init File, , , emacs, The GNU Emacs Manual}, and@*
-@ref{makeinfo options, , Options for @code{makeinfo}}.
-@end ifnottex
-
-@node texinfo-format commands
-@subsection The @code{texinfo-format@dots{}} Commands
-
-In GNU Emacs in Texinfo mode, you can format part or all of a Texinfo
-file with the @code{texinfo-format-region} command.  This formats the
-current region and displays the formatted text in a temporary buffer
-called @samp{*Info Region*}.@refill
-
-Similarly, you can format a buffer with the
-@code{texinfo-format-buffer} command.  This command creates a new
-buffer and generates the Info file in it.  Typing @kbd{C-x C-s} will
-save the Info file under the name specified by the
-@code{@@setfilename} line which must be near the beginning of the
-Texinfo file.@refill
-
-@table @kbd
-@item C-c C-e C-r
-@itemx @code{texinfo-format-region}
-@findex texinfo-format-region
-Format the current region for Info.
-
-@item C-c C-e C-b
-@itemx @code{texinfo-format-buffer}
-@findex texinfo-format-buffer
-Format the current buffer for Info.
-@end table
-
-The @code{texinfo-format-region} and @code{texinfo-format-buffer}
-commands provide you with some error checking, and other functions can
-provide you with further help in finding formatting errors.  These
-procedures are described in an appendix; see @ref{Catching Mistakes}.
-However, the @code{makeinfo} program is often faster and
-provides better error checking (@pxref{makeinfo in Emacs}).@refill
-
-@node Batch Formatting
-@comment  node-name,  next,  previous,  up
-@subsection Batch Formatting
-@cindex Batch formatting for Info
-@cindex Info batch formatting
-
-You can format Texinfo files for Info using @code{batch-texinfo-format}
-and Emacs Batch mode.  You can run Emacs in Batch mode from any shell,
-including a shell inside of Emacs.  (@xref{Command Arguments,,,
-emacs, The GNU Emacs Manual}.)
-
-Here is a shell command to format all the files that end in
-@file{.texinfo} in the current directory:
-
-@example
-emacs -batch -funcall batch-texinfo-format *.texinfo
-@end example
-
-@noindent
-Emacs processes all the files listed on the command line, even if an
-error occurs while attempting to format some of them.@refill
-
-Run @code{batch-texinfo-format} only with Emacs in Batch mode as shown;
-it is not interactive.  It kills the Batch mode Emacs on completion.@refill
-
-@code{batch-texinfo-format} is convenient if you lack @code{makeinfo}
-and want to format several Texinfo files at once.  When you use Batch
-mode, you create a new Emacs process.  This frees your current Emacs, so
-you can continue working in it.  (When you run
-@code{texinfo-format-region} or @code{texinfo-format-buffer}, you cannot
-use that Emacs for anything else until the command finishes.)@refill
-
-@node Tag and Split Files
-@comment  node-name,  next,  previous,  up
-@subsection Tag Files and Split Files
-@cindex Making a tag table automatically
-@cindex Tag table, making automatically
-
-If a Texinfo file has more than 30,000 bytes,
-@code{texinfo-format-buffer} automatically creates a tag table
-for its Info file;  @code{makeinfo} always creates a tag table.  With
-a @dfn{tag table}, Info can jump to new nodes more quickly than it can
-otherwise.@refill
-
-@cindex Indirect subfiles
-In addition, if the Texinfo file contains more than about 300,000
-bytes, @code{texinfo-format-buffer} and @code{makeinfo} split the
-large Info file into shorter @dfn{indirect} subfiles of about 300,000
-bytes each.  Big files are split into smaller files so that Emacs does
-not need to make a large buffer to hold the whole of a large Info
-file; instead, Emacs allocates just enough memory for the small, split-off
-file that is needed at the time.  This way, Emacs avoids wasting
-memory when you run Info.  (Before splitting was implemented, Info
-files were always kept short and @dfn{include files} were designed as
-a way to create a single, large printed manual out of the smaller Info
-files.  @xref{Include Files}, for more information.  Include files are
-still used for very large documents, such as @cite{The Emacs Lisp
-Reference Manual}, in which each chapter is a separate file.)@refill
-
-When a file is split, Info itself makes use of a shortened version of
-the original file that contains just the tag table and references to
-the files that were split off.  The split-off files are called
-@dfn{indirect} files.@refill
-
-The split-off files have names that are created by appending @w{@samp{-1}},
-@w{@samp{-2}}, @w{@samp{-3}} and so on to the file name specified by the
-@code{@@setfilename} command.  The shortened version of the original file
-continues to have the name specified by @code{@@setfilename}.@refill
-
-At one stage in writing this document, for example, the Info file was saved
-as the file @file{test-texinfo} and that file looked like this:@refill
-
-@example
-@group
-Info file: test-texinfo,    -*-Text-*-
-produced by texinfo-format-buffer
-from file: new-texinfo-manual.texinfo
-
-^_
-Indirect:
-test-texinfo-1: 102
-test-texinfo-2: 50422
-@end group
-@group
-test-texinfo-3: 101300
-^_^L
-Tag table:
-(Indirect)
-Node: overview^?104
-Node: info file^?1271
-@end group
-@group
-Node: printed manual^?4853
-Node: conventions^?6855
-@dots{}
-@end group
-@end example
-
-@noindent
-(But @file{test-texinfo} had far more nodes than are shown here.)  Each of
-the split-off, indirect files, @file{test-texinfo-1},
-@file{test-texinfo-2}, and @file{test-texinfo-3}, is listed in this file
-after the line that says @samp{Indirect:}.  The tag table is listed after
-the line that says @samp{Tag table:}. @refill
-
-In the list of indirect files, the number following the file name
-records the cumulative number of bytes in the preceding indirect files,
-not counting the file list itself, the tag table, or the permissions
-text in each file.  In the tag table, the number following the node name
-records the location of the beginning of the node, in bytes from the
-beginning of the (unsplit) output.
-
-If you are using @code{texinfo-format-buffer} to create Info files,
-you may want to run the @code{Info-validate} command.  (The
-@code{makeinfo} command does such a good job on its own, you do not
-need @code{Info-validate}.)  However, you cannot run the @kbd{M-x
-Info-validate} node-checking command on indirect files.  For
-information on how to prevent files from being split and how to
-validate the structure of the nodes, see @ref{Using Info-validate}.
-
-
-@node Installing an Info File
-@section Installing an Info File
-@cindex Installing an Info file
-@cindex Info file installation
-@cindex @file{dir} directory for Info installation
-
-Info files are usually kept in the @file{info} directory.  You can read
-Info files using the standalone Info program or the Info reader built
-into Emacs.  (@inforef{Top, info, info}, for an introduction to Info.)
-
-@menu
-* Directory File::              The top level menu for all Info files.
-* New Info File::               Listing a new Info file.
-* Other Info Directories::      How to specify Info files that are
-                                 located in other directories.
-* Installing Dir Entries::      How to specify what menu entry to add
-                                 to the Info directory.
-* Invoking install-info::       @code{install-info} options.
-@end menu
-
-
-@node Directory File
-@subsection The Directory File @file{dir}
-
-For Info to work, the @file{info} directory must contain a file that
-serves as a top level directory for the Info system.  By convention,
-this file is called @file{dir}.  (You can find the location of this file
-within Emacs by typing @kbd{C-h i} to enter Info and then typing
-@kbd{C-x C-f} to see the pathname to the @file{info} directory.)
-
-The @file{dir} file is itself an Info file.  It contains the top level
-menu for all the Info files in the system.  The menu looks like
-this:@refill
-
-@example
-@group
-* Menu:
-* Info:    (info).     Documentation browsing system.
-* Emacs:   (emacs).    The extensible, self-documenting
-                      text editor.
-* Texinfo: (texinfo).  With one source file, make
-                      either a printed manual using
-                      @@TeX@{@} or an Info file.
-@dots{}
-@end group
-@end example
-
-Each of these menu entries points to the `Top' node of the Info file
-that is named in parentheses.  (The menu entry does not need to
-specify the `Top' node, since Info goes to the `Top' node if no node
-name is mentioned.  @xref{Other Info Files, , Nodes in Other Info
-Files}.)@refill
-
-Thus, the @samp{Info} entry points to the `Top' node of the
-@file{info} file and the @samp{Emacs} entry points to the `Top' node
-of the @file{emacs} file.@refill
-
-In each of the Info files, the `Up' pointer of the `Top' node refers
-back to the @code{dir} file.  For example, the line for the `Top'
-node of the Emacs manual looks like this in Info:@refill
-
-@example
-File: emacs  Node: Top, Up: (DIR), Next: Distrib
-@end example
-
-@noindent
-In this case, the @file{dir} file name is written in upper case
-letters---it can be written in either upper or lower case.  This is not
-true in general, it is a special case for @file{dir}.
-
-
-@node New Info File
-@subsection Listing a New Info File
-@cindex Adding a new Info file
-@cindex Listing a new Info file
-@cindex New Info file, listing it in @file{dir} file
-@cindex Info file, listing a new
-@cindex @file{dir} file listing
-
-To add a new Info file to your system, you must write a menu entry to
-add to the menu in the @file{dir} file in the @file{info} directory.
-For example, if you were adding documentation for GDB, you would write
-the following new entry:@refill
-
-@example
-* GDB: (gdb).           The source-level C debugger.
-@end example
-
-@noindent
-The first part of the menu entry is the menu entry name, followed by a
-colon.  The second part is the name of the Info file, in parentheses,
-followed by a period.  The third part is the description.
-
-The name of an Info file often has a @file{.info} extension.  Thus, the
-Info file for GDB might be called either @file{gdb} or @file{gdb.info}.
-The Info reader programs automatically try the file name both with and
-without @file{.info}@footnote{On MS-DOS/MS-Windows systems, Info will
-try the @file{.inf} extension as well.}; so it is better to avoid
-clutter and not to write @samp{.info} explicitly in the menu entry.  For
-example, the GDB menu entry should use just @samp{gdb} for the file
-name, not @samp{gdb.info}.
-
-
-@node Other Info Directories
-@subsection Info Files in Other Directories
-@cindex Installing Info in another directory
-@cindex Info installed in another directory
-@cindex Another Info directory
-@cindex @file{dir} files and Info directories
-
-If an Info file is not in the @file{info} directory, there are three
-ways to specify its location:@refill
-
-@enumerate
-@item
-Write the pathname in the @file{dir} file as the second part of the menu.
-
-@item
-If you are using Emacs, list the name of the file in a second @file{dir}
-file, in its directory; and then add the name of that directory to the
-@code{Info-directory-list} variable in your personal or site
-initialization file.
-
-This variable tells Emacs where to look for @file{dir} files (the files
-must be named @file{dir}).  Emacs merges the files named @file{dir} from
-each of the listed directories.  (In Emacs version 18, you can set the
-@code{Info-directory} variable to the name of only one
-directory.)@refill
-
-@item
-Specify the Info directory name in the @code{INFOPATH} environment
-variable in your @file{.profile} or @file{.cshrc} initialization file.
-(Only you and others who set this environment variable will be able to
-find Info files whose location is specified this way.)
-@end enumerate
-
-For example, to reach a test file in the @file{/home/bob/info}
-directory, you could add an entry like this to the menu in the
-standard @file{dir} file:@refill
-
-@example
-* Test: (/home/bob/info/info-test).  Bob's own test file.
-@end example
-
-@noindent
-In this case, the absolute file name of the @file{info-test} file is
-written as the second part of the menu entry.@refill
-
-Alternatively, you could write the following in your @file{.emacs} file:
-
-@vindex Info-directory-list
-@example
-@group
-(require 'info)
-(setq Info-directory-list
- (cons (expand-file-name "/home/bob/info")
-       Info-directory-list))
-@end group
-@end example
-
-This tells Emacs to merge the system @file{dir} file with the @file{dir}
-file in @file{/home/bob/info}.  Thus, Info will list the
-@file{/home/bob/info/info-test} file as a menu entry in the
-@file{/home/bob/info/dir} file.  Emacs does the merging only when
-@kbd{M-x info} is first run, so if you want to set
-@code{Info-directory-list} in an Emacs session where you've already run
-@code{info}, you must @code{(setq Info-dir-contents nil)} to force Emacs
-to recompose the @file{dir} file.
-
-@vindex INFOPATH
-@cindex Environment variable @code{INFOPATH}
-Finally, you can tell Info where to look by setting the @code{INFOPATH}
-environment variable in your shell startup file, such as @file{.cshrc},
-@file{.profile} or @file{autoexec.bat}.  If you use a Bourne-compatible
-shell such as @code{sh} or @code{bash} for your shell command
-interpreter, you set the @code{INFOPATH} environment variable in the
-@file{.profile} initialization file; but if you use @code{csh} or
-@code{tcsh}, you set the variable in the @file{.cshrc} initialization
-file.  On MS-DOS/MS-Windows systems, you must set @code{INFOPATH} in
-your @file{autoexec.bat} file or in the Registry.  Each type of shell
-uses a different syntax.
-
-@itemize @bullet
-@item
-In a @file{.cshrc} file, you could set the @code{INFOPATH}
-variable as follows:@refill
-
-@smallexample
-setenv INFOPATH .:~/info:/usr/local/emacs/info
-@end smallexample
-
-@item
-In a @file{.profile} file, you would achieve the same effect by
-writing:@refill
-
-@smallexample
-INFOPATH=.:$HOME/info:/usr/local/emacs/info
-export INFOPATH
-@end smallexample
-
-@item
-@pindex autoexec.bat
-In a @file{autoexec.bat} file, you write this command@footnote{Note the
-use of @samp{;} as the directory separator, and a different syntax for
-using values of other environment variables.}:
-
-@smallexample
-set INFOPATH=.;%HOME%/info;c:/usr/local/emacs/info
-@end smallexample
-@end itemize
-
-@noindent
-The @samp{.} indicates the current directory as usual.  Emacs uses the
-@code{INFOPATH} environment variable to initialize the value of Emacs's
-own @code{Info-directory-list} variable.  The stand-alone Info reader
-merges any files named @file{dir} in any directory listed in the
-@env{INFOPATH} variable into a single menu presented to you in the node
-called @samp{(dir)Top}.
-
-@cindex Colon, last in @env{INFOPATH}
-However you set @env{INFOPATH}, if its last character is a
-colon@footnote{On MS-DOS/MS-Windows systems, use semi-colon instead.}, this
-is replaced by the default (compiled-in) path.  This gives you a way to
-augment the default path with new directories without having to list all
-the standard places.  For example (using @code{sh} syntax):
-
-@example
-INFOPATH=/local/info:
-export INFOPATH
-@end example
-
-@noindent
-will search @file{/local/info} first, then the standard directories.
-Leading or doubled colons are not treated specially.
-
-@cindex @file{dir} file, creating your own
-When you create your own @file{dir} file for use with
-@code{Info-directory-list} or @env{INFOPATH}, it's easiest to start by
-copying an existing @file{dir} file and replace all the text after the
-@samp{* Menu:} with your desired entries.  That way, the punctuation and
-special CTRL-_ characters that Info needs will be present.
-
-
-@node Installing Dir Entries
-@subsection Installing Info Directory Files
-
-When you install an Info file onto your system, you can use the program
-@code{install-info} to update the Info directory file @file{dir}.
-Normally the makefile for the package runs @code{install-info}, just
-after copying the Info file into its proper installed location.
-
-@findex dircategory
-@findex direntry
-In order for the Info file to work with @code{install-info}, you include
-the commands @code{@@dircategory} and
-@code{@@direntry}@dots{}@code{@@end direntry} in the Texinfo source
-file.  Use @code{@@direntry} to specify the menu entries to add to the
-Info directory file, and use @code{@@dircategory} to specify which part
-of the Info directory to put it in.  Here is how these commands are used
-in this manual:
-
-@smallexample
-@@dircategory Texinfo documentation system
-@@direntry
-* Texinfo: (texinfo).           The GNU documentation format.
-* install-info: (texinfo)Invoking install-info. @dots{}
-@dots{}
-@@end direntry
-@end smallexample
-
-Here's what this produces in the Info file:
-
-@smallexample
-INFO-DIR-SECTION Texinfo documentation system
-START-INFO-DIR-ENTRY
-* Texinfo: (texinfo).           The GNU documentation format.
-* install-info: (texinfo)Invoking install-info. @dots{}
-@dots{}
-END-INFO-DIR-ENTRY
-@end smallexample
-
-@noindent
-The @code{install-info} program sees these lines in the Info file, and
-that is how it knows what to do.
-
-Always use the @code{@@direntry} and @code{@@dircategory} commands near
-the beginning of the Texinfo input, before the first @code{@@node}
-command.  If you use them later on in the input, @code{install-info}
-will not notice them.
-
-If you use @code{@@dircategory} more than once in the Texinfo source,
-each usage specifies the `current' category; any subsequent
-@code{@@direntry} commands will add to that category.
-
-@cindex Free Software Directory
-@cindex Dir categories, choosing
-@cindex Categories, choosing
-When choosing a category name for the @code{@@dircategory} command, we
-recommend consulting the @uref{http://www.gnu.org/directory,
-Free Software Directory}.  If your program is not listed there,
-or listed incorrectly or incompletely, please report the situation to
-the directory maintainers (@email{bug-directory@@gnu.org}) so that the
-category names can be kept in sync.
-
-Here are a few examples (see the @file{util/dir-example} file in the
-Texinfo distribution for large sample @code{dir} file):
-
-@display
-Emacs
-Localization
-Printing
-Software development
-Software libraries
-Text creation and manipulation
-@end display
-
-@cindex Invoking nodes, including in dir file
-Each `Invoking' node for every program installed should have a
-corresponding @code{@@direntry}.  This lets users easily find the
-documentation for the different programs they can run, as with the
-traditional @command{man} system.
-
-
-@node Invoking install-info
-@subsection Invoking @command{install-info}
-@pindex install-info
-
-@code{install-info} inserts menu entries from an Info file into the
-top-level @file{dir} file in the Info system (see the previous sections
-for an explanation of how the @file{dir} file works).  It's most often
-run as part of software installation, or when constructing a @file{dir} file
-for all manuals on a system.  Synopsis:
-
-@example
-install-info [@var{option}]@dots{} [@var{info-file} [@var{dir-file}]]
-@end example
-
-If @var{info-file} or @var{dir-file} are not specified, the options
-(described below) that define them must be.  There are no compile-time
-defaults, and standard input is never used.  @code{install-info} can
-read only one Info file and write only one @file{dir} file per invocation.
-
-@cindex @file{dir}, created by @code{install-info}
-If @var{dir-file} (however specified) does not exist,
-@code{install-info} creates it if possible (with no entries).
-
-@cindex Compressed files, reading
-@cindex Dir files, compressed
-If any input file is compressed with @code{gzip} (@pxref{Invoking
-gzip,,,gzip, Gzip}), @code{install-info} automatically uncompresses it
-for reading.  And if @var{dir-file} is compressed, @code{install-info}
-also automatically leaves it compressed after writing any changes.
-If @var{dir-file} itself does not exist, @code{install-info} tries to
-open @file{@var{dir-file}.gz}.
-
-Options:
-
-@table @code
-@item --delete
-@opindex --delete
-Delete the entries in @var{info-file} from @var{dir-file}.  The file
-name in the entry in @var{dir-file} must be @var{info-file} (except for
-an optional @samp{.info} in either one).  Don't insert any new entries.
-
-@item --dir-file=@var{name}
-@itemx -d @var{name}
-@opindex --dir-file=@var{name}
-@opindex -d @var{name}
-Specify file name of the Info directory file.  This is equivalent to
-using the @var{dir-file} argument.
-
-@item --entry=@var{text}
-@itemx -e @var{text}
-@opindex --entry=@var{text}
-@opindex -e @var{text}
-Insert @var{text} as an Info directory entry; @var{text} should have the
-form of an Info menu item line plus zero or more extra lines starting
-with whitespace.  If you specify more than one entry, they are all
-added.  If you don't specify any entries, they are determined from
-information in the Info file itself.
-
-@item --help
-@itemx -h
-@opindex --help
-@opindex -h
-Display a usage message listing basic usage and all available options,
-then exit successfully.
-
-@item --info-file=@var{file}
-@itemx -i @var{file}
-@opindex --info-file=@var{file}
-@opindex -i @var{file}
-Specify Info file to install in the directory.
-Equivalent to using the @var{info-file} argument.
-
-@item --info-dir=@var{dir}
-@itemx -D @var{dir}
-@opindex --info-dir=@var{dir}
-@opindex -D @var{dir}
-Specify the directory where the directory file @file{dir} resides.
-Equivalent to @samp{--dir-file=@var{dir}/dir}.
-
-@item --item=@var{text}
-@opindex --item=@var{text}
-Same as @samp{--entry=@var{text}}.  An Info directory entry is actually
-a menu item.
-
-@item --quiet
-@opindex --quiet
-Suppress warnings.
-
-@item --remove
-@itemx -r
-@opindex --remove
-@opindex -r
-Same as @samp{--delete}.
-
-@item --section=@var{sec}
-@itemx -s @var{sec}
-@opindex --section=@var{sec}
-@opindex -s @var{sec}
-Put this file's entries in section @var{sec} of the directory.  If you
-specify more than one section, all the entries are added in each of the
-sections.  If you don't specify any sections, they are determined from
-information in the Info file itself.
-
-@item --version
-@itemx -V
-@opindex --version
-@opindex -V
-@cindex Version number, for install-info
-Display version information and exit successfully.
-
-@end table
-
-
-@node Generating HTML
-@chapter Generating HTML
-@cindex HTML output
-
-@command{makeinfo} generates Info output by default, but given the
-@option{--html} option, it will generate HTML, for web browsers and
-other programs.  This chapter gives some details on such HTML output.
-
-
-@command{makeinfo} can also write in XML and Docbook format, but we do
-not as yet describe these further.  @xref{Output Formats}, for a brief
-overview of all the output formats.
-
-@menu
-* HTML Translation::       Details of the HTML output.
-* HTML Splitting::         How HTML output is split.
-* HTML CSS::               Influencing HTML output with Cascading Style Sheets.
-* HTML Xref::              Cross-references in HTML output.
-@end menu
-
-
-@node HTML Translation
-@section HTML Translation
-
-@command{makeinfo} will include segments of Texinfo source between
-@code{@@ifhtml} and @code{@@end ifhtml} in the HTML output (but not
-any of the other conditionals, by default).  Source between
-@code{@@html} and @code{@@end html} is passed without change to the
-output (i.e., suppressing the normal escaping of input @samp{<},
-@samp{>} and @samp{&} characters which have special significance in
-HTML).  @xref{Conditional Commands}.
-
-@opindex --footnote-style@r{, ignored in HTML output}
-The @option{--footnote-style} option is currently ignored for HTML output;
-footnotes are always linked to the end of the output file.
-
-@cindex Navigation bar, in HTML output
-By default, a navigation bar is inserted at the start of each node,
-analogous to Info output.  The @samp{--no-headers} option suppresses
-this if used with @samp{--no-split}.  Header @code{<link>} elements in
-split output can support info-like navigation with browsers like Lynx
-and @w{Emacs W3} which implement this HTML@tie{}1.0 feature.
-
-@cindex HTML output, browser compatibility of
-The HTML generated is mostly standard (i.e., HTML@tie{}2.0, RFC-1866).
-One exception is that HTML@tie{}3.2 tables are generated from the
-@code{@@multitable} command, but tagged to degrade as well as possible
-in browsers without table support.  The HTML@tie{}4 @samp{lang}
-attribute on the @samp{<html>} attribute is also used.  (Please report
-output from an error-free run of @code{makeinfo} which has browser
-portability problems as a bug.)
-
-
-@node HTML Splitting
-@section HTML Splitting
-@cindex Split HTML output
-@cindex HTML output, split
-
-When splitting output (which is the default), @command{makeinfo}
-writes HTML output into (generally) one output file per Texinfo source
-@code{@@node}.
-
-The output file name is the node name with special characters replaced
-by @samp{-}'s, so it can work as a filename.  In the unusual case of
-two different nodes having the same name after this treatment, they
-are written consecutively to the same file, with HTML anchors so each
-can be referred to separately.  If @command{makeinfo} is run on a
-system which does not distinguish case in filenames, nodes which are
-the same except for case will also be folded into the same output
-file.
-
-When splitting, the HTML output files are written into a subdirectory,
-with the name chosen as follows:
-@enumerate
-@item 
-@command{makeinfo} first tries the subdirectory with the base name
-from @code{@@setfilename} (that is, any extension is removed).  For
-example, HTML output for @code{@@setfilename gcc.info} would be
-written into a subdirectory named @samp{gcc}.
-
-@item
-If that directory cannot be created for any reason, then
-@command{makeinfo} tries appending @samp{.html} to the directory name.
-For example, output for @code{@@setfilename texinfo} would be written
-to @samp{texinfo.html}.
-
-@item
-If the @samp{@var{name}.html} directory can't be
-created either, @code{makeinfo} gives up.
-
-@end enumerate
-
-@noindent In any case, the top-level output file within the directory
-is always named @samp{index.html}.
-
-Monolithic output (@code{--no-split}) is named according to
-@code{@@setfilename} (with any @samp{.info} extension is replaced with
-@samp{.html}) or @code{--output} (the argument is used literally).
-
-
-@node HTML CSS
-@section HTML CSS
-@cindex HTML, and CSS
-@cindex CSS, and HTML output
-@cindex Cascading Style Sheets, and HTML output
-
-Cascading Style Sheets (CSS for short) is an Internet standard for
-influencing the display of HTML documents: see
-@uref{http://www.w3.org/Style/CSS/}.
-
-By default, @command{makeinfo} includes a few simple CSS commands to
-better implement the appearance of some of the environments.  Here 
-are two of them, as an example:
-
-@example
-pre.display @{ font-family:inherit @}
-pre.smalldisplay @{ font-family:inherit; font-size:smaller @}
-@end example
-
-A full explanation of CSS is (far) beyond this manual; please see the
-reference above.  In brief, however, this specification tells the web
-browser to use a `smaller' font size for @code{@@smalldisplay} text,
-and to use the `inherited' font (generally a regular roman typeface)
-for both @code{@@smalldisplay} and @code{@@display}.  By default, the
-HTML @samp{<pre>} command uses a monospaced font.
-
-You can influence the CSS in the HTML output with the
-@option{--css-include=@var{file}} option to @command{makeinfo}.  This
-includes the contents @var{file} in the HTML output, as you might
-expect.  However, the details are somewhat tricky, as described in the
-following, to provide maximum flexibility.
-
-@cindex @@import specifications, in CSS files
-The CSS file may begin with so-called @samp{@@import} directives,
-which link to external CSS specifications for browsers to use when
-interpreting the document.  Again, a full description is beyond our
-scope here, but we'll describe how they work syntactically, so we can
-explain how @command{makeinfo} handles them.
-
-@cindex Comments, in CSS files
-There can be more than one @samp{@@import}, but they have to come
-first in the file, with only whitespace and comments interspersed, no
-normal definitions.  (Technical exception: an @samp{@@charset}
-directive may precede the @samp{@@import}'s.  This does not alter
-@command{makeinfo}'s behavior, it just copies the @samp{@@charset} if
-present.)  Comments in CSS files are delimited by @samp{/* ... */}, as
-in C.  An @samp{@@import} directive must be in one of these two forms:
-
-@example
-@@import url(http://example.org/foo.css);
-@@import "http://example.net/bar.css";
-@end example
-
-As far as @command{makeinfo} is concerned, the crucial characters are
-the @samp{@@} at the beginning and the semicolon terminating the
-directive.  When reading the CSS file, it simply copies any such
-@samp{@@}-directive into the output, as follows:
-
-@itemize
-@item If @var{file} contains only normal CSS declarations, it is
-included after @command{makeinfo}'s default CSS, thus overriding it.
-
-@item If @var{file} begins with @samp{@@import} specifications (see
-below), then the @samp{import}'s are included first (they have to come
-first, according to the standard), and then @command{makeinfo}'s
-default CSS is included.  If you need to override @command{makeinfo}'s
-defaults from an @samp{@@import}, you can do so with the @samp{!@:
-important} CSS construct, as in:
-@example
-pre.smallexample @{ font-size: inherit ! important @}
-@end example
-
-@item If @var{file} contains both @samp{@@import} and inline CSS
-specifications, the @samp{@@import}'s are included first, then
-@command{makeinfo}'s defaults, and lastly the inline CSS from
-@var{file}.
-
-@item Any @@-directive other than @samp{@@import} and @samp{@@charset}
-is treated as a CSS declaration, meaning @command{makeinfo} includes
-its default CSS and then the rest of the file.
-
-@end itemize
-
-If the CSS file is malformed or erroneous, @command{makeinfo}'s output
-is unspecified.  @command{makeinfo} does not try to interpret the
-meaning of the CSS file in any way; it just looks for the special
-@samp{@@} and @samp{;} characters and blindly copies the text into the
-output.  Comments in the CSS file may or may not be included in the
-output.
-
-
-@node HTML Xref
-@section HTML Cross-references
-@cindex HTML cross-references
-@cindex Cross-references, in HTML output
-
-Cross-references between Texinfo manuals in HTML format amount, in the
-end, to a standard HTML @code{<a>} link, but the details are
-unfortunately complex.  This section describes the algorithm used in
-detail, so that Texinfo can cooperate with other programs, such as
-@command{texi2html}, by writing mutually compatible HTML files.
-
-This algorithm may or may not be used for links @emph{within} HTML
-output for a Texinfo file.  Since no issues of compatibility arise in
-such cases, we do not need to specify this.
-
-We try to support references to such ``external'' manuals in both
-monolithic and split forms.  A @dfn{monolithic} (mono) manual is
-entirely contained in one file, and a @dfn{split} manual has a file
-for each node.  (@xref{HTML Splitting}.)
-
-@cindex Dumas, Patrice
-Acknowledgement: this algorithm was primarily devised by Patrice Dumas
-in 2003--04.
-
-@menu
-* Link Basics:       HTML Xref Link Basics.
-* Node Expansion:    HTML Xref Node Name Expansion.
-* Command Expansion: HTML Xref Command Expansion.
-* 8-bit Expansion:   HTML Xref 8-bit Character Expansion.
-* Mismatch:          HTML Xref Mismatch.
-@end menu
-
-
-@node HTML Xref Link Basics
-@subsection HTML Cross-reference Link Basics
-@cindex HTML cross-reference link basics
-
-For our purposes, an HTML link consists of four components: a host
-name, a directory part, a file part, and a target part.  We
-always assume the @code{http} protocol.  For example:
-
-@example
-http://@var{host}/@var{dir}/@var{file}.html#@var{target}
-@end example
-
-The information to construct a link comes from the node name and
-manual name in the cross-reference command in the Texinfo source
-(@pxref{Cross References}), and from @dfn{external information}, which
-is currently simply hardwired.  In the future, it may come from an
-external data file.
-
-We now consider each part in turn.
-
-The @var{host} is hardwired to be the local host.  This could either
-be the literal string @samp{localhost}, or, according to the rules for
-HTML links, the @samp{http://localhost/} could be omitted entirely.
-
-The @var{dir} and @var{file} parts are more complicated, and depend on
-the relative split/mono nature of both the manual being processed and
-the manual that the cross-reference refers to.  The underlying idea is
-that there is one directory for Texinfo manuals in HTML, and each
-manual is either available as a monolithic file @file{manual.html}, or a
-split subdirectory @file{manual/*.html}.  Here are the cases:
-
-@itemize @bullet
-@item
-If the present manual is split, and the referent manual is also split,
-the directory is @samp{../@var{referent/}} and the file is the
-expanded node name (described later).
-
-@item
-If the present manual is split, and the referent manual is mono, the
-directory is @samp{../} and the file is @file{@var{referent}.html}.
-
-@item
-If the present manual is mono, and the referent manual is split, the
-directory is @file{@var{referent}/} and the file is the expanded node
-name.
-
-@item
-If the present manual is mono, and the referent manual is also mono,
-the directory is @file{./} (or just the empty string), and the file is
-@file{@var{referent}.html}.
-
-@end itemize
-
-One exception: the algorithm for node name expansion prefixes the
-string @samp{g_t} when the node name begins with a non-letter.  This
-kludge (due to XHTML rules) is not necessary for filenames, and is
-therefore omitted.
-
-Any directory part in the filename argument of the source
-cross-reference command is ignored.  Thus, @code{@@xref@{,,,../foo@}}
-and @code{@@xref@{,,,foo@}} both use @samp{foo} as the manual name.
-This is because any such attempted hardwiring of the directory is very
-unlikely to be useful for both Info and HTML output.
-
-Finally, the @var{target} part is always the expanded node name.
-
-Whether the present manual is split or mono is determined by user
-option; @command{makeinfo} defaults to split, with the
-@option{--no-split} option overriding this.
-
-Whether the referent manual is split or mono is another bit of the
-external information.  For now, @command{makeinfo} simply assumes the
-referent manual is the same as the present manual.
-
-There can be a mismatch between the format of the referent manual that
-the generating software assumes, and the format it's actually present
-in.  @xref{HTML Xref Mismatch}.
-
-
-@node HTML Xref Node Name Expansion
-@subsection HTML Cross-reference Node Name Expansion
-@cindex HTML cross-reference node name expansion
-@cindex node name expansion, in HTML cross-references
-@cindex expansion, of node names in HTML cross-references
-
-As mentioned in the previous section, the key part of the HTML
-cross-reference algorithm is the conversion of node names in the
-Texinfo source into strings suitable for XHTML identifiers and
-filenames.  The restrictions are similar for each: plain ASCII
-letters, numbers, and the @samp{-} and @samp{_} characters are all
-that can be used.  (Although HTML anchors can contain most characters,
-XHTML is more restrictive.)
-
-Cross-references in Texinfo can actually refer either to nodes or
-anchors (@pxref{anchor}), but anchors are treated identically to nodes
-in this context, so we'll continue to say ``node'' names for
-simplicity.
-
-(@@-commands and 8-bit characters are not presently handled by
-@command{makeinfo} for HTML cross-references.  See the next section.)
-
-A special exception: the Top node (@pxref{The Top Node}) is always
-mapped to the file @file{index.html}, to match web server software.
-However, the HTML @emph{target} is @samp{Top}.  Thus (in the split case):
-
-@example
-@@xref@{Top, Introduction,, emacs, The GNU Emacs Manual@}.
-@result{} <a href="emacs/index.html#Top">
-@end example
-
-@enumerate
-@item
-The standard ASCII letters (a-z and A-Z) are not modified.  All other
-characters are changed as specified below.
-
-@item
-The standard ASCII numbers (0-9) are not modified except when a number
-is the first character of the node name.  In that case, see below.
-
-@item
-Multiple consecutive space, tab and newline characters are transformed
-into just one space.  (It's not possible to have newlines in node
-names with the current implementation, but we specify it anyway, just
-in case.)
-
-@item
-Leading and trailing spaces are removed.
-
-@item
-After the above has been applied, each remaining space character is
-converted into a @samp{-} character.
-
-@item
-Other ASCII 7-bit characters are transformed into @samp{_00@var{xx}},
-where @var{xx} is the ASCII character code in (lowercase) hexadecimal.
-This includes @samp{_}, which is mapped to @samp{_005f}.
-
-@item
-If the node name does not begin with a letter, the literal string
-@samp{g_t} is prefixed to the result.  (Due to the rules above, that
-string can never occur otherwise; it is an arbitrary choice, standing
-for ``GNU Texinfo''.)  This is necessary because XHTML requires that
-identifiers begin with a letter.
-
-@end enumerate
-
-For example:
-
-@example
-@@node A  node --- with _'%
-@result{} A-node-_002d_002d_002d-with-_005f_0027_0025
-@end example
-
-Notice in particular:
-
-@itemize @bullet
-@item @samp{_} @result{} @samp{_005f}
-@item @samp{-} @result{} @samp{_002d}
-@item @samp{A  node} @result{} @samp{A-node}
-@end itemize
-
-On case-folding computer systems, nodes differing only by case will be
-mapped to the same file.  
-
-In particular, as mentioned above, Top always maps to the file
-@file{index.html}.  Thus, on a case-folding system, Top and a node
-named `Index' will both be written to @file{index.html}.
-
-Fortunately, the targets serve to distinguish these cases, since HTML
-target names are always case-sensitive, independent of operating
-system.
-
-
-@node HTML Xref Command Expansion
-@subsection HTML Cross-reference Command Expansion
-@cindex HTML cross-reference command expansion
-
-In standard Texinfo, node names may not contain @@-commands.
-@command{makeinfo} has an option @option{--commands-in-node-names}
-which partially supports it (@pxref{Invoking makeinfo}), but it is not
-robust and not recommended.
-
-Thus, @command{makeinfo} also does not fully implement this part of
-the HTML cross-reference algorithm, but it is documented here for the
-sake of completeness.
-
-First, comments are removed.
-
-Next, any @code{@@value} commands (@pxref{set value}) and macro invocations
-(@pxref{Invoking Macros}) are fully expanded.
-
-Then, for the following commands, the command name and braces are removed,
-the text of the argument is recursively transformed:
-@example
-@@asis @@b @@cite @@code @@command @@dfn @@dmn @@dotless
-@@emph @@env @@file @@indicateurl @@kbd @@key
-@@samp @@sc @@slanted @@strong @@t @@var @@w
-@end example
-
-@noindent For @code{@@sc}, any letters are capitalized.
-
-The following commands are replaced by constant text, as shown.  If
-any of these commands have non-empty arguments, as in
-@code{@@TeX@{bad@}}, it is an error, and the result is unspecified.
-`(space)' means a space character, `(nothing)' means the empty string,
-etc.  The notation `U+@var{xxxx}' means Unicode code point @var{xxxx}.
-There are further transformations of many of these expansions for the
-final file or target name, such as space characters to @samp{-}, etc.,
-according to the other rules.
-
-@multitable @columnfractions .3 .5
-@item @code{@@(newline)}        @tab (space)
-@item @code{@@(space)}          @tab (space)
-@item @code{@@(tab)}            @tab (space)
-@item @code{@@!}                @tab @samp{!}
-@item @code{@@*}                @tab (space)
-@item @code{@@-}                @tab (nothing)
-@item @code{@@.}                @tab @samp{.}
-@item @code{@@:}                @tab (nothing)
-@item @code{@@?}                @tab @samp{?}
-@item @code{@@@@}               @tab @samp{@@}
-@item @code{@@@{}               @tab @samp{@{}
-@item @code{@@@}}               @tab @samp{@}}
-@item @code{@@LaTeX}            @tab @samp{LaTeX}
-@item @code{@@TeX}              @tab @samp{TeX}
-@item @code{@@bullet}           @tab U+2022
-@item @code{@@comma}            @tab @samp{,}
-@item @code{@@copyright}        @tab U+00A9
-@item @code{@@dots}             @tab U+2026
-@item @code{@@enddots}          @tab @samp{...}
-@item @code{@@equiv}            @tab U+2261
-@item @code{@@error}            @tab @samp{error-->}
-@item @code{@@euro}             @tab U+20AC
-@item @code{@@exclamdown}       @tab U+00A1
-@item @code{@@expansion}        @tab U+2192
-@item @code{@@minus}            @tab U+2212
-@item @code{@@ordf}             @tab U+00AA
-@item @code{@@ordm}             @tab U+00BA
-@item @code{@@point}            @tab U+2217
-@item @code{@@pounds}           @tab U+00A3
-@item @code{@@print}            @tab @samp{-|}
-@item @code{@@questiondown}     @tab U+00BF
-@item @code{@@registeredsymbol} @tab U+00AE
-@item @code{@@result}           @tab U+21D2
-@item @code{@@tie}              @tab (space)
-@end multitable
-
-An @code{@@acronym} or @code{@@abbr} command is replaced by the first
-argument, followed by the second argument in parentheses, if present.
-@xref{acronym}.
-
-An @code{@@email} command is replaced by the @var{text} argument if
-present, else the address.  @xref{email}.
-
-An @code{@@image} command is replaced by the filename (first)
-argument.  @xref{Images}.
-
-A @code{@@verb} command is replaced by its transformed argument.
-@xref{verb}.
-
-Any other command is an error, and the result is unspecified.
-
-
-@node HTML Xref 8-bit Character Expansion
-@subsection HTML Cross-reference 8-bit Character Expansion
-@cindex HTML cross-reference 8-bit character expansion
-@cindex 8-bit characters, in HTML cross-references
-@cindex Expansion of 8-bit characters in HTML cross-references
-
-Usually, characters other than plain 7-bit ASCII are transformed into
-the corresponding Unicode code point(s) in Normalization Form C, which
-uses precomposed characters where available.  (This is the
-normalization form recommended by the W3C and other bodies.)  This
-holds when that code point is 0xffff or less, as it almost always is.
-
-These will then be further transformed by the rules above into the
-string @samp{_@var{xxxx}}, where @var{xxxx} is the code point in hex.
-
-For example, combining this rule and the previous section:
-
-@example
-@@node @@b@{A@} @@TeX@{@} @@u@{B@} @@point@{@}@@enddots@{@}
-@result{} A-TeX-B_0306-_2605_002e_002e_002e
-@end example
-
-Notice: 1)@tie{}@code{@@enddots} expands to three periods which in
-turn expands to three @samp{_002e}'s; 2)@tie{}@code{@@u@{B@}} is a `B'
-with a breve accent, which does not exist as a pre-accented Unicode
-character, therefore expands to @samp{B_0306} (B with combining
-breve).
-
-When the Unicode code point is above 0xffff, the transformation is
-@samp{__@var{xxxxxx}}, that is, two leading underscores followed by
-six hex digits.  Since Unicode has declared that their highest code
-point is 0x10ffff, this is sufficient.  (We felt it was better to
-define this extra escape than to always use six hex digits, since the
-first two would nearly always be zeros.)
-
-For the definition of Unicode Normalization Form C, see Unicode report
-UAX#15, @uref{http://www.unicode.org/reports/tr15/}.  Many related
-documents and implementations are available elsewhere on the web.
-
-
-@node HTML Xref Mismatch
-@subsection HTML Cross-reference Mismatch
-@cindex HTML cross-reference mismatch
-@cindex Mismatched HTML cross-reference source and target
-
-As mentioned earlier (@pxref{HTML Xref Link Basics}), the generating
-software has to guess whether a given manual being cross-referenced is
-available in split or monolithic form---and, inevitably, it might
-guess wrong.  However, it is possible when the referent manual itself
-is generated, it is possible to handle at least some mismatches.
-
-In the case where we assume the referent is split, but it is actually
-available in mono, the only recourse would be to generate a
-@file{manual/} subdirectory full of HTML files which redirect back to
-the monolithic @file{manual.html}.  Since this is essentially the same
-as a split manual in the first place, it's not very appealing.
-
-On the other hand, in the case where we assume the referent is mono,
-but it is actually available in split, it is possible to use
-JavaScript to redirect from the putatively monolithic
-@file{manual.html} to the different @file{manual/node.html} files.
-Here's an example:
-
-@example
-function redirect() @{
-  switch (location.hash) @{
-    case "#Node1":
-      location.replace("manual/Node1.html#Node1"); break;
-    case "#Node2" :
-      location.replace("manual/Node2.html#Node2"); break;
-    @dots{}
-    default:;
-  @}
-@}
-@end example
-
-Then, in the @code{<body>} tag of @file{manual.html}:
-
-@example
-<body onLoad="redirect();">
-@end example
-
-Once again, this is something the software which generated the
-@emph{referent} manual has to do in advance, it's not something the
-software generating the actual cross-reference in the present manual
-can control.
-
-Ultimately, we hope to allow for an external configuration file to
-control which manuals are available from where, and how.
-
-
-@ignore
--- not yet --
-
-external information
---------------------
-
-The information for the reference is searched in the file
-`htmlxref.cnf' present in the following directories:
-<srcdir>/.texinfo/, ~/.texinfo/,  SYSCONFDIR/texinfo/,
-DATADIR/texinfo/
-The first match should be used.
-
-The file is line-oriented, with the following format:
-  <manualname> <whitespace> <keyword> <whitespace> <urlprefix>
-with <keyword> being "mono" or "split". Thus
-texinfo split http://www.gnu.org/software/texinfo/manual/texinfo/html_node/
-texinfo mono http://www.gnu.org/software/texinfo/manual/texinfo/texinfo.html
-
-If the keyword is 'split', that is the target is split, the urlprefix gives 
-the directory and host name.
-If the keyword is 'mono', that is the target is mono, the urlprefix gives 
-directory, host and file name.
-
-'#' followed by a space begins comments. '#' followed by another character
-cannot begin comments as there are # in urls.
-
-@end ignore
-
-
-@node Command List
-@appendix @@-Command List
-@cindex Alphabetical @@-command list
-@cindex List of  @@-commands
-@cindex @@-command list
-@cindex Reference to @@-commands
-
-Here is an alphabetical list of the @@-commands in Texinfo.  Square
-brackets, @t{[}@w{ }@t{]}, indicate optional arguments; an ellipsis,
-@samp{@dots{}}, indicates repeated text.
-
-More specifics on the general syntax of different @@-commands are
-given in the section below.
-
-@menu
-* Command Syntax::    General syntax for varieties of @@-commands.
-@end menu
-
-@sp 1
-@table @code
-@item @@@var{whitespace}
-An @code{@@} followed by a space, tab, or newline produces a normal,
-stretchable, interword space.  @xref{Multiple Spaces}.
-
-@item @@!
-Generate an exclamation point that really does end a sentence (usually
-after an end-of-sentence capital letter).  @xref{Ending a Sentence}.
-
-@item @@"
-@itemx @@'
-Generate an umlaut or acute accent, respectively, over the next
-character, as in @"o and @'o.  @xref{Inserting Accents}.
-
-@item @@*
-Force a line break.  @xref{Line Breaks}.
-
-@item @@,@{@var{c}@}
-Generate a cedilla accent under @var{c}, as in @,{c}.  @xref{Inserting
-Accents}.
-
-@item @@-
-Insert a discretionary hyphenation point.  @xref{- and hyphenation}.
-
-@item @@.
-Produce a period that really does end a sentence (usually after an
-end-of-sentence capital letter).  @xref{Ending a Sentence}.
-
-@item @@/
-Produces no output, but allows a line break.  @xref{Line Breaks}.
-
-@item @@:
-Indicate to @TeX{} that an immediately preceding period, question
-mark, exclamation mark, or colon does not end a sentence.  Prevent
-@TeX{} from inserting extra whitespace as it does at the end of a
-sentence.  The command has no effect on the Info file output.
-@xref{Not Ending a Sentence}.
-
-@item @@=
-Generate a macron (bar) accent over the next character, as in @=o.
-@xref{Inserting Accents}.
-
-@item @@?
-Generate a question mark that really does end a sentence (usually after
-an end-of-sentence capital letter).  @xref{Ending a Sentence}.
-
-@item @@@@
-Stands for an at sign, @samp{@@}.
-@xref{Atsign Braces Comma, , Inserting @@ and @{@} and @comma{}}.
-
-@item @@\
-Stands for a backslash (@samp{\}) inside @code{@@math}.
-@xref{math,,@code{math}}.
-
-@item @@^
-@itemx @@`
-Generate a circumflex (hat) or grave accent, respectively, over the next
-character, as in @^o and @`e.
-@xref{Inserting Accents}.
-
-@item @@@{
-Stands for a left brace, @samp{@{}.
-@xref{Atsign Braces Comma, , Inserting @@ and @{@} and @comma{}}.
-
-@item @@@}
-Stands for a right-hand brace, @samp{@}}.@*
-@xref{Atsign Braces Comma, , Inserting @@ and @{@} and @comma{}}.
-
-@item @@~
-Generate a tilde accent over the next character, as in @~N.
-@xref{Inserting Accents}.
-
-@item @@AA@{@}
-@itemx @@aa@{@}
-Generate the uppercase and lowercase Scandinavian A-ring letters,
-respectively: @AA{}, @aa{}.  @xref{Inserting Accents}.
-
-@item @@abbr@{@var{abbreviation}@}
-Tag @var{abbreviation} as an abbreviation, such as `Comput.'.
-@xref{abbr,, @code{abbr}}.
-
-@item @@acronym@{@var{acronym}@}
-Tag @var{acronym} as an acronym, such as `NASA'.
-@xref{acronym,, @code{acronym}}.
-
-@item @@AE@{@}
-@itemx @@ae@{@}
-Generate the uppercase and lowercase AE ligatures, respectively:
-@AE{}, @ae{}.  @xref{Inserting Accents}.
-
-@itemx @@afivepaper
-Change page dimensions for the A5 paper size.  @xref{A4 Paper}.
-
-@item @@afourlatex
-@itemx @@afourpaper
-@itemx @@afourwide
-Change page dimensions for the A4 paper size.  @xref{A4 Paper}.
-
-@item @@alias @var{new}=@var{existing}
-Make the command @samp{@@@var{new}} an alias for the existing command
-@samp{@@@var{existing}}.  @xref{alias}.
-
-@item @@anchor@{@var{name}@}
-Define @var{name} as the current location for use as a cross-reference
-target.  @xref{anchor,, @code{@@anchor}}.
-
-@item @@appendix @var{title}
-Begin an appendix.  The title appears in the table
-of contents of a printed manual.  In Info, the title is
-underlined with asterisks.  @xref{unnumbered & appendix, , The
-@code{@@unnumbered} and @code{@@appendix} Commands}.@refill
-
-@item @@appendixsec @var{title}
-@itemx @@appendixsection @var{title}
-Begin an appendix section within an appendix.  The section title appears
-in the table of contents of a printed manual.  In Info, the title is
-underlined with equal signs.  @code{@@appendixsection} is a longer
-spelling of the @code{@@appendixsec} command.  @xref{unnumberedsec
-appendixsec heading, , Section Commands}.@refill
-
-@item @@appendixsubsec @var{title}
-Begin an appendix subsection within an appendix.  The title appears
-in the table of contents of a printed manual.  In Info, the title is
-underlined with hyphens.  @xref{unnumberedsubsec appendixsubsec
-subheading, , Subsection Commands}.@refill
-
-@item @@appendixsubsubsec @var{title}
-Begin an appendix subsubsection within an appendix subsection.  The
-title appears in the table of contents of a printed manual.  In Info,
-the title is underlined with periods.  @xref{subsubsection,, The
-`subsub' Commands}.@refill
-
-@item @@asis
-Used following @code{@@table}, @code{@@ftable}, and @code{@@vtable} to
-print the table's first column without highlighting (``as is'').
-@xref{Two-column Tables, , Making a Two-column Table}.@refill
-
-@item @@author @var{author}
-Typeset @var{author} flushleft and underline it.  @xref{title
-subtitle author, , The @code{@@title} and @code{@@author}
-Commands}.@refill
-
-@item @@b@{@var{text}@}
-Print @var{text} in @b{bold} font.  No effect in Info.  @xref{Fonts}.@refill
-
-@ignore
-@item @@br
-Force a paragraph break.  If used within a line, follow @code{@@br}
-with braces.  @xref{br, , @code{@@br}}.@refill
-@end ignore
-
-@item @@bullet@{@}
-Generate a large round dot, or the closest possible
-thing to one.  @xref{bullet, , @code{@@bullet}}.@refill
-
-@item @@bye
-Stop formatting a file.  The formatters do not see the contents of a
-file following an @code{@@bye} command.  @xref{Ending a File}.@refill
-
-@item @@c @var{comment}
-Begin a comment in Texinfo.  The rest of the line does not appear in
-either the Info file or the printed manual.  A synonym for
-@code{@@comment}.  @xref{Comments}.
-
-@item @@caption
-Define the full caption for a @code{@@float}.  @xref{caption shortcaption}.
-
-@item @@cartouche
-Highlight an example or quotation by drawing a box with rounded
-corners around it.  Pair with @code{@@end cartouche}.  No effect in
-Info.  @xref{cartouche, , Drawing Cartouches Around Examples}.)@refill
-
-@item @@center @var{line-of-text}
-Center the line of text following the command.
-@xref{titlefont center sp, , @code{@@center}}.@refill
-
-@item @@centerchap @var{line-of-text}
-Like @code{@@chapter}, but centers the chapter title.  @xref{chapter,,
-@code{@@chapter}}.
-
-@item @@chapheading @var{title}
-Print a chapter-like heading in the text, but not in the table of
-contents of a printed manual.  In Info, the title is underlined with
-asterisks.  @xref{majorheading & chapheading, , @code{@@majorheading}
-and @code{@@chapheading}}.@refill
-
-@item @@chapter @var{title}
-Begin a chapter.  The chapter title appears in the table of
-contents of a printed manual.  In Info, the title is underlined with
-asterisks.  @xref{chapter, , @code{@@chapter}}.@refill
-
-@item @@cindex @var{entry}
-Add @var{entry} to the index of concepts.  @xref{Index Entries, ,
-Defining the Entries of an Index}.@refill
-
-@item @@cite@{@var{reference}@}
-Highlight the name of a book or other reference that lacks a
-companion Info file.  @xref{cite, , @code{@@cite}}.@refill
-
-@item @@clear @var{flag}
-Unset @var{flag}, preventing the Texinfo formatting commands from
-formatting text between subsequent pairs of @code{@@ifset @var{flag}}
-and @code{@@end ifset} commands, and preventing
-@code{@@value@{@var{flag}@}} from expanding to the value to which
-@var{flag} is set.
-@xref{set clear value, , @code{@@set} @code{@@clear} @code{@@value}}.@refill
-
-@item @@code@{@var{sample-code}@}
-Highlight text that is an expression, a syntactically complete token
-of a program, or a program name.  @xref{code, , @code{@@code}}.@refill
-
-@item @@comma@{@}
-Insert a comma `,' character; only needed when a literal comma would
-be taken as an argument separator.  @xref{Inserting a Comma}.
-
-@item @@command@{@var{command-name}@}
-Indicate a command name, such as @command{ls}.
-@xref{command,, @code{@@command}}.
-
-@item @@comment @var{comment}
-Begin a comment in Texinfo.  The rest of the line does not appear in
-either the Info file or the printed manual.  A synonym for @code{@@c}.
-@xref{Comments}.
-
-@item @@contents
-Print a complete table of contents.  Has no effect in Info, which uses
-menus instead.  @xref{Contents, , Generating a Table of
-Contents}.@refill
-
-@item @@copyright@{@}
-Generate the copyright symbol @copyright{}.  @xref{copyright symbol,,
-@code{@@copyright@{@}}}.
-
-@ignore
-@item @@ctrl@{@var{ctrl-char}@}
-Describe an @sc{ascii} control character.  Insert actual control character
-into Info file.  @xref{ctrl, , @code{@@ctrl}}.@refill
-@end ignore
-
-@item @@defcodeindex @var{index-name}
-Define a new index and its indexing command.  Print entries in an
-@code{@@code} font.  @xref{New Indices, , Defining New
-Indices}.@refill
-
-@item @@defcv @var{category} @var{class} @var{name}
-@itemx @@defcvx @var{category} @var{class} @var{name}
-Format a description for a variable associated with a class in
-object-oriented programming.  Takes three arguments: the category of
-thing being defined, the class to which it belongs, and its name.
-@xref{Definition Commands}, and @ref{deffnx,, Def Cmds in Detail}.
-
-@item @@deffn @var{category} @var{name} @var{arguments}@dots{}
-@itemx @@deffnx @var{category} @var{name} @var{arguments}@dots{}
-Format a description for a function, interactive command, or similar
-entity that may take arguments.  @code{@@deffn} takes as arguments the
-category of entity being described, the name of this particular
-entity, and its arguments, if any.  @xref{Definition Commands}.@refill
-
-@item @@defindex @var{index-name}
-Define a new index and its indexing command.  Print entries in a roman
-font.  @xref{New Indices, , Defining New Indices}.@refill
-
-@item @@definfoenclose @var{newcmd}, @var{before}, @var{after},
-Create new @@-command @var{newcmd} for Info that marks text by enclosing
-it in strings that precede and follow the text.  @xref{definfoenclose}.
-
-@item @@defivar @var{class} @var{instance-variable-name}
-@itemx @@defivarx @var{class} @var{instance-variable-name}
-This command formats a description for an instance variable in
-object-oriented programming.  The command is equivalent to @samp{@@defcv
-@{Instance Variable@} @dots{}}.  @xref{Definition Commands}, and
-@ref{deffnx,, Def Cmds in Detail}.
-
-@item @@defmac @var{macroname} @var{arguments}@dots{}
-@itemx @@defmacx @var{macroname} @var{arguments}@dots{}
-Format a description for a macro.  The command is equivalent to
-@samp{@@deffn Macro @dots{}}.  @xref{Definition Commands}, and
-@ref{deffnx,, Def Cmds in Detail}.
-
-@item @@defmethod @var{class} @var{method-name} @var{arguments}@dots{}
-@itemx @@defmethodx @var{class} @var{method-name} @var{arguments}@dots{}
-Format a description for a method in object-oriented programming.  The
-command is equivalent to @samp{@@defop Method @dots{}}.  Takes as
-arguments the name of the class of the method, the name of the
-method, and its arguments, if any.  @xref{Definition Commands}, and
-@ref{deffnx,, Def Cmds in Detail}.
-
-@item @@defop @var{category} @var{class} @var{name} @var{arguments}@dots{}
-@itemx @@defopx @var{category} @var{class} @var{name} @var{arguments}@dots{}
-Format a description for an operation in object-oriented programming.
-@code{@@defop} takes as arguments the overall name of the category of
-operation, the name of the class of the operation, the name of the
-operation, and its arguments, if any.  @xref{Definition
-Commands}, and @ref{Abstract Objects}.
-
-@item @@defopt @var{option-name}
-@itemx @@defoptx @var{option-name}
-Format a description for a user option.  The command is equivalent to
-@samp{@@defvr @{User Option@} @dots{}}.  @xref{Definition Commands}, and
-@ref{deffnx,, Def Cmds in Detail}.
-
-@item @@defspec @var{special-form-name} @var{arguments}@dots{}
-@itemx @@defspecx @var{special-form-name} @var{arguments}@dots{}
-Format a description for a special form.  The command is equivalent to
-@samp{@@deffn @{Special Form@} @dots{}}.  @xref{Definition Commands},
-and @ref{deffnx,, Def Cmds in Detail}.
-
-@item @@deftp @var{category} @var{name-of-type} @var{attributes}@dots{}
-@itemx @@deftpx @var{category} @var{name-of-type} @var{attributes}@dots{}
-Format a description for a data type.  @code{@@deftp} takes as arguments
-the category, the name of the type (which is a word like @samp{int} or
-@samp{float}), and then the names of attributes of objects of that type.
-@xref{Definition Commands}, and @ref{Data Types}.
-
-@item @@deftypecv @var{category} @var{class} @var{data-type} @var{name}
-@itemx @@deftypecvx @var{category} @var{class} @var{data-type} @var{name}
-Format a description for a typed class variable in object-oriented programming.
-@xref{Definition Commands}, and @ref{Abstract Objects}.
-
-@item @@deftypefn @var{classification} @var{data-type} @var{name} @var{arguments}@dots{}
-@itemx @@deftypefnx @var{classification} @var{data-type} @var{name} @var{arguments}@dots{}
-Format a description for a function or similar entity that may take
-arguments and that is typed.  @code{@@deftypefn} takes as arguments the
-classification of entity being described, the type, the name of the
-entity, and its arguments, if any.  @xref{Definition Commands}, and
-@ref{deffnx,, Def Cmds in Detail}.
-
-@item @@deftypefun @var{data-type} @var{function-name} @var{arguments}@dots{}
-@itemx @@deftypefunx @var{data-type} @var{function-name} @var{arguments}@dots{}
-Format a description for a function in a typed language.
-The command is equivalent to @samp{@@deftypefn Function @dots{}}.
-@xref{Definition Commands}, and @ref{deffnx,, Def Cmds in Detail}.
-
-@item @@deftypeivar @var{class} @var{data-type} @var{variable-name}
-@itemx @@deftypeivarx @var{class} @var{data-type} @var{variable-name}
-Format a description for a typed instance variable in object-oriented
-programming. @xref{Definition Commands}, and @ref{Abstract Objects}.
-
-@item @@deftypemethod @var{class} @var{data-type} @var{method-name} @var{arguments}@dots{}
-@itemx @@deftypemethodx @var{class} @var{data-type} @var{method-name} @var{arguments}@dots{}
-Format a description for a typed method in object-oriented programming.
-@xref{Definition Commands}, and @ref{deffnx,, Def Cmds in Detail}.
-
-@item @@deftypeop @var{category} @var{class} @var{data-type} @var{name} @var{arguments}@dots{}
-@itemx @@deftypeopx @var{category} @var{class} @var{data-type} @var{name} @var{arguments}@dots{}
-Format a description for a typed operation in object-oriented programming.
-@xref{Definition Commands}, and @ref{Abstract Objects}.
-
-@item @@deftypevar @var{data-type} @var{variable-name}
-@itemx @@deftypevarx @var{data-type} @var{variable-name}
-Format a description for a variable in a typed language.  The command is
-equivalent to @samp{@@deftypevr Variable @dots{}}.  @xref{Definition
-Commands}, and @ref{deffnx,, Def Cmds in Detail}.
-
-@item @@deftypevr @var{classification} @var{data-type} @var{name}
-@itemx @@deftypevrx @var{classification} @var{data-type} @var{name}
-Format a description for something like a variable in a typed
-language---an entity that records a value.  Takes as arguments the
-classification of entity being described, the type, and the name of the
-entity.  @xref{Definition Commands}, and @ref{deffnx,, Def Cmds in
-Detail}.
-
-@item @@defun @var{function-name} @var{arguments}@dots{}
-@itemx @@defunx @var{function-name} @var{arguments}@dots{}
-Format a description for functions.  The command is equivalent to
-@samp{@@deffn Function @dots{}}.  @xref{Definition Commands}, and
-@ref{deffnx,, Def Cmds in Detail}.
-
-@item @@defvar @var{variable-name}
-@itemx @@defvarx @var{variable-name}
-Format a description for variables.  The command is equivalent to
-@samp{@@defvr Variable @dots{}}.  @xref{Definition Commands}, and
-@ref{deffnx,, Def Cmds in Detail}.
-
-@item @@defvr @var{category} @var{name}
-@itemx @@defvrx @var{category} @var{name}
-Format a description for any kind of variable.  @code{@@defvr} takes
-as arguments the category of the entity and the name of the entity.
-@xref{Definition Commands},
-and @ref{deffnx,, Def Cmds in Detail}.
-
-@item @@detailmenu
-Avoid @code{makeinfo} confusion stemming from the detailed node listing
-in a master menu.  @xref{Master Menu Parts}.
-
-@item @@dfn@{@var{term}@}
-Highlight the introductory or defining use of a term.
-@xref{dfn, , @code{@@dfn}}.@refill
-
-@item @@dircategory @var{dirpart}
-Specify a part of the Info directory menu where this file's entry should
-go.  @xref{Installing Dir Entries}.
-
-@item @@direntry
-Begin the Info directory menu entry for this file.  Pair with
-@code{@@end direntry}.  @xref{Installing Dir Entries}.
-
-@item @@display
-Begin a kind of example.  Like @code{@@example} (indent text, do not
-fill), but do not select a new font.  Pair with @code{@@end display}.
-@xref{display, , @code{@@display}}.
-
-@item @@dmn@{@var{dimension}@}
-Format a unit of measure, as in 12@dmn{pt}.  Causes @TeX{} to insert a
-thin space before @var{dimension}.  No effect in Info.
-@xref{dmn, , @code{@@dmn}}.
-
-@item @@docbook
-Enter Docbook completely.  Pair with @code{@@end docbook}.  @xref{Raw
-Formatter Commands}.
-
-@item @@documentdescription
-Set the document description text, included in the HTML output.  Pair
-with @code{@@end documentdescription}.  @xref{documentdescription,,
-@code{@@documentdescription}}.
-
-@item @@documentencoding @var{enc}
-Declare the input encoding to be @var{enc}.
-@xref{documentencoding,, @code{@@documentencoding}}.
-
-@item @@documentlanguage @var{CC}
-Declare the document language as the two-character ISO-639 abbreviation
-@var{CC}.  @xref{documentlanguage,, @code{@@documentlanguage}}.
-
-@item @@dotaccent@{@var{c}@}
-Generate a dot accent over the character @var{c}, as in @dotaccent{o}.
-@xref{Inserting Accents}.
-
-@item @@dots@{@}
-Insert an ellipsis: @samp{@dots{}}.
-@xref{dots, , @code{@@dots}}.@refill
-
-@item @@email@{@var{address}[, @var{displayed-text}]@}
-Indicate an electronic mail address.
-@xref{email, , @code{@@email}}.
-
-@item @@emph@{@var{text}@}
-Highlight @var{text}; text is displayed in @emph{italics} in printed
-output, and surrounded by asterisks in Info.  @xref{Emphasis, ,
-Emphasizing Text}.
-
-@item @@end @var{environment}
-Ends @var{environment}, as in @samp{@@end example}.  @xref{Formatting
-Commands,,@@-commands}.
-
-@item @@env@{@var{environment-variable}@}
-Indicate an environment variable name, such as @env{PATH}.
-@xref{env,, @code{@@env}}.
-
-@item @@enddots@{@}
-Generate an end-of-sentence of ellipsis, like this @enddots{}
-@xref{dots,,@code{@@dots@{@}}}.
-
-@item @@enumerate [@var{number-or-letter}]
-Begin a numbered list, using @code{@@item} for each entry.
-Optionally, start list with @var{number-or-letter}.  Pair with
-@code{@@end enumerate}.  @xref{enumerate, ,
-@code{@@enumerate}}.@refill
-
-@item @@equiv@{@}
-Indicate to the reader the exact equivalence of two forms with a
-glyph: @samp{@equiv{}}.  @xref{Equivalence}.@refill
-
-@item @@euro@{@}
-Generate the Euro currency sign.
-@xref{euro,,@code{@@euro@{@}}}.
-
-@item @@error@{@}
-Indicate to the reader with a glyph that the following text is
-an error message: @samp{@error{}}.  @xref{Error Glyph}.@refill
-
-@item  @@evenfooting [@var{left}] @@| [@var{center}] @@| [@var{right}]
-@itemx @@evenheading [@var{left}] @@| [@var{center}] @@| [@var{right}]
-Specify page footings resp.@: headings for even-numbered (left-hand)
-pages.  @xref{Custom Headings, ,
-How to Make Your Own Headings}.@refill
-
-@item @@everyfooting [@var{left}] @@| [@var{center}] @@| [@var{right}]
-@itemx @@everyheading [@var{left}] @@| [@var{center}] @@| [@var{right}]
-Specify page footings resp.@: headings for every page.  Not relevant to
-Info.  @xref{Custom Headings, , How to Make Your Own Headings}.@refill
-
-@item @@example
-Begin an example.  Indent text, do not fill, and select fixed-width font.
-Pair with @code{@@end example}.  @xref{example, ,
-@code{@@example}}.@refill
-
-@item @@exampleindent @var{indent}
-Indent example-like environments by @var{indent} number of spaces
-(perhaps 0).  @xref{exampleindent,, Paragraph Indenting}.
-
-@item @@exclamdown@{@}
-Produce an upside-down exclamation point.  @xref{Inserting Accents}.
-
-@item @@exdent @var{line-of-text}
-Remove any indentation a line might have.  @xref{exdent, ,
-Undoing the Indentation of a Line}.@refill
-
-@item @@expansion@{@}
-Indicate the result of a macro expansion to the reader with a special
-glyph: @samp{@expansion{}}.
-@xref{expansion, , @expansion{} Indicating an Expansion}.@refill
-
-@item @@file@{@var{filename}@}
-Highlight the name of a file, buffer, node, or directory.  @xref{file, ,
-@code{@@file}}.@refill
-
-@item @@finalout
-Prevent @TeX{} from printing large black warning rectangles beside
-over-wide lines.  @xref{Overfull hboxes}.@refill
-
-@item @@findex @var{entry}
-Add @var{entry} to the index of functions.  @xref{Index Entries, ,
-Defining the Entries of an Index}.@refill
-
-@item @@float
-Environment to define floating material.  Pair with @code{@@end float}.
-@xref{Floats}.
-
-@item @@flushleft
-@itemx @@flushright
-Left justify every line but leave the right end ragged.
-Leave font as is.  Pair with @code{@@end flushleft}.
-@code{@@flushright} analogous.
-@xref{flushleft & flushright, , @code{@@flushleft} and
-@code{@@flushright}}.@refill
-
-@item @@footnote@{@var{text-of-footnote}@}
-Enter a footnote.  Footnote text is printed at the bottom of the page
-by @TeX{}; Info may format in either `End' node or `Separate' node style.
-@xref{Footnotes}.@refill
-
-@item @@footnotestyle @var{style}
-Specify an Info file's footnote style, either @samp{end} for the end
-node style or @samp{separate} for the separate node style.
-@xref{Footnotes}.@refill
-
-@item @@format
-Begin a kind of example.  Like @code{@@display}, but do not narrow the
-margins.  Pair with @code{@@end format}.  @xref{example,,
-@code{@@example}}.
-
-@item @@ftable @var{formatting-command}
-Begin a two-column table, using @code{@@item} for each entry.
-Automatically enter each of the items in the first column into the
-index of functions.  Pair with @code{@@end ftable}.  The same as
-@code{@@table}, except for indexing.  @xref{ftable vtable, ,
-@code{@@ftable} and @code{@@vtable}}.@refill
-
-@item @@group
-Hold text together that must appear on one printed page.  Pair with
-@code{@@end group}.  Not relevant to Info.  @xref{group, ,
-@code{@@group}}.@refill
-
-@item @@H@{@var{c}@}
-Generate the long Hungarian umlaut accent over @var{c}, as in @H{o}.
-
-@item @@heading @var{title}
-Print an unnumbered section-like heading in the text, but not in the
-table of contents of a printed manual.  In Info, the title is
-underlined with equal signs.  @xref{unnumberedsec appendixsec heading,
-, Section Commands}.@refill
-
-@item @@headings @var{on-off-single-double}
-Turn page headings on or off, and/or specify single-sided or double-sided
-page headings for printing.  @xref{headings on off, , The
-@code{@@headings} Command}.
-
-@item @@html
-Enter HTML completely.  Pair with @code{@@end html}.  @xref{Raw
-Formatter Commands}.
-
-@item @@hyphenation@{@var{hy-phen-a-ted words}@}
-Explicitly define hyphenation points.  @xref{- and hyphenation,,
-@code{@@-} and @code{@@hyphenation}}.
-
-@item @@i@{@var{text}@}
-Print @var{text} in @i{italic} font.  No effect in Info.  @xref{Fonts}.
-
-@item @@ifclear @var{flag}
-If @var{flag} is cleared, the Texinfo formatting commands format text
-between @code{@@ifclear @var{flag}} and the following @code{@@end
-ifclear} command.
-@xref{set clear value, , @code{@@set} @code{@@clear} @code{@@value}}.@refill
-
-@item @@ifdocbook
-@itemx @@ifhtml
-@itemx @@ifinfo
-Begin text that will appear only in the given output format.
-@code{@@ifinfo} output appears in both Info and (for historical
-compatibility) plain text output.  Pair with @code{@@end ifdocbook}
-resp.@: @code{@@end ifhtml} resp.@: @code{@@end ifinfo}.
-@xref{Conditionals}.
-
-@item @@ifnotdocbook
-@itemx @@ifnothtml
-@itemx @@ifnotinfo
-@itemx @@ifnotplaintext
-@itemx @@ifnottex
-@itemx @@ifnotxml
-Begin a stretch of text that will be ignored in one output format but
-not the others.  The text appears in the formats not specified:
-@code{@@ifnothtml} text is omitted from html output, etc.  The exception
-is @code{@@ifnotinfo} text, which is omitted from plain text output as
-well as Info output.  Pair with the corresponding @code{@@end
-ifnot@var{format}}.  @xref{Conditionals}.
-
-@item @@ifplaintext
-Begin text that will appear only in the plain text output.
-Pair with @code{@@end ifplaintext}.  @xref{Conditionals}.
-
-@item @@ifset @var{flag}
-If @var{flag} is set, the Texinfo formatting commands format text
-between @code{@@ifset @var{flag}} and the following @code{@@end ifset}
-command.
-@xref{set clear value, , @code{@@set} @code{@@clear} @code{@@value}}.@refill
-
-@item @@iftex
-Begin text that will not appear in the Info file or other output, but
-will be processed only by @TeX{}.  Pair with @code{@@end iftex}.
-@xref{Conditionals, , Conditionally Visible Text}.@refill
-
-@item @@ifxml
-Begin text that will appear only in the XML output.  Pair with
-@code{@@end ifxml}.  @xref{Conditionals}.
-
-@item @@ignore
-Begin text that will not appear in any output.  Pair with @code{@@end
-ignore}.  @xref{Comments, , Comments and Ignored Text}.
-
-@item @@image@{@var{filename}, [@var{width}], [@var{height}], [@var{alt}], [@var{ext}]@}
-Include graphics image in external @var{filename} scaled to the given
-@var{width} and/or @var{height}, using @var{alt} text and looking for
-@samp{@var{filename}.@var{ext}} in HTML.  @xref{Images}.
-
-@item @@include @var{filename}
-Incorporate the contents of the file @var{filename} into the Info file
-or printed document.  @xref{Include Files}.@refill
-
-@item @@indicateurl@{@var{indicateurl}@}
-Indicate text that is a uniform resource locator for the World Wide
-Web.  @xref{indicateurl, , @code{@@indicateurl}}.
-
-@item @@inforef@{@var{node-name}, [@var{entry-name}], @var{info-file-name}@}
-Make a cross reference to an Info file for which there is no printed
-manual.  @xref{inforef, , Cross references using
-@code{@@inforef}}.@refill
-
-@item \input @var{macro-definitions-file}
-Use the specified macro definitions file.  This command is used only
-in the first line of a Texinfo file to cause @TeX{} to make use of the
-@file{texinfo} macro definitions file.  The backslash in @code{\input}
-is used instead of an @code{@@} because @TeX{} does not
-recognize @code{@@} until after it has read the definitions file.
-@xref{Texinfo File Header}.
-
-@item @@item
-Indicate the beginning of a marked paragraph for @code{@@itemize} and
-@code{@@enumerate}; indicate the beginning of the text of a first column
-entry for @code{@@table}, @code{@@ftable}, and @code{@@vtable}.
-@xref{Lists and Tables}.@refill
-
-@item @@itemize  @var{mark-generating-character-or-command}
-Produce a sequence of indented paragraphs, with a mark inside the left
-margin at the beginning of each paragraph.  Pair with @code{@@end
-itemize}.  @xref{itemize, , @code{@@itemize}}.@refill
-
-@item @@itemx
-Like @code{@@item} but do not generate extra vertical space above the
-item text.  @xref{itemx, , @code{@@itemx}}.@refill
-
-@item @@kbd@{@var{keyboard-characters}@}
-Indicate text that is characters of input to be typed by
-users.  @xref{kbd, , @code{@@kbd}}.@refill
-
-@item @@kbdinputstyle @var{style}
-Specify when @code{@@kbd} should use a font distinct from @code{@@code}.
-@xref{kbd, , @code{@@kbd}}.@refill
-
-@item @@key@{@var{key-name}@}
-Indicate a name for a key on a keyboard.
-@xref{key, , @code{@@key}}.@refill
-
-@item @@kindex @var{entry}
-Add @var{entry} to the index of keys.
-@xref{Index Entries, , Defining the Entries of an Index}.@refill
-
-@item @@L@{@}
-@itemx @@l@{@}
-Generate the uppercase and lowercase Polish suppressed-L letters,
-respectively: @L{}, @l{}.
-
-@item @@LaTeX@{@}
-Insert the logo @LaTeX{}.  @xref{tex, , @TeX{} and @LaTeX{}}.
-
-@item @@lisp
-Begin an example of Lisp code.  Indent text, do not fill, and select
-fixed-width font.  Pair with @code{@@end lisp}.  @xref{lisp, , @code{@@lisp}}.
-
-@item @@listoffloats
-Produce a table-of-contents-like listing of @code{@@float}s.
-@xref{listoffloats}.
-
-@item @@lowersections
-Change subsequent chapters to sections, sections to subsections, and so
-on. @xref{Raise/lower sections, , @code{@@raisesections} and
-@code{@@lowersections}}.@refill
-
-@item @@macro @var{macroname} @{@var{params}@}
-Define a new Texinfo command @code{@@@var{macroname}@{@var{params}@}}.
-Only supported by @code{makeinfo} and @code{texi2dvi}.  @xref{Defining
-Macros}.
-
-@item @@majorheading @var{title}
-Print a chapter-like heading in the text, but not in the table of
-contents of a printed manual.  Generate more vertical whitespace before
-the heading than the @code{@@chapheading} command.  @xref{majorheading &
-chapheading, , @code{@@majorheading} and @code{@@chapheading}}.@refill
-
-@item @@math@{@var{mathematical-expression}@}
-Format a mathematical expression.
-@xref{math, , @code{@@math}: Inserting Mathematical Expressions}.
-
-@item @@menu
-Mark the beginning of a menu of nodes in Info.  No effect in a printed
-manual.  Pair with @code{@@end menu}.  @xref{Menus}.@refill
-
-@item @@minus@{@}
-Generate a minus sign, `@minus{}'.  @xref{minus, , @code{@@minus}}.@refill
-
-@item @@multitable @var{column-width-spec}
-Begin a multi-column table.  Pair with @code{@@end multitable}.
-@xref{Multitable Column Widths}.
-
-@item @@need @var{n}
-Start a new page in a printed manual if fewer than @var{n} mils
-(thousandths of an inch) remain on the current page.  @xref{need, ,
-@code{@@need}}.@refill
-
-@item @@node @var{name}, @var{next}, @var{previous}, @var{up}
-Define the beginning of a new node in Info, and serve as a locator for
-references for @TeX{}.  @xref{node, , @code{@@node}}.@refill
-
-@item @@noindent
-Prevent text from being indented as if it were a new paragraph.
-@xref{noindent, , @code{@@noindent}}.@refill
-
-@item @@novalidate
-Suppress validation of node references, omit creation of auxiliary files
-with @TeX{}.  Use before @code{@@setfilename}.  @xref{Pointer Validation}.
-
-@item @@O@{@}
-@itemx @@o@{@}
-Generate the uppercase and lowercase O-with-slash letters, respectively:
-@O{}, @o{}.
-
-@item  @@oddfooting [@var{left}] @@| [@var{center}] @@| [@var{right}]
-@itemx @@oddheading [@var{left}] @@| [@var{center}] @@| [@var{right}]
-Specify page footings resp.@: headings for odd-numbered (right-hand)
-pages.  @xref{Custom Headings, ,
-How to Make Your Own Headings}.@refill
-
-@item @@OE@{@}
-@itemx @@oe@{@}
-Generate the uppercase and lowercase OE ligatures, respectively:
-@OE{}, @oe{}.  @xref{Inserting Accents}.
-
-@item @@option@{@var{option-name}@}
-Indicate a command-line option, such as @option{-l} or @option{--help}.
-@xref{option,, @code{@@option}}.
-
-@item @@page
-Start a new page in a printed manual.  No effect in Info.
-@xref{page, , @code{@@page}}.@refill
-
-@item @@pagesizes [@var{width}][, @var{height}]
-Change page dimensions.  @xref{pagesizes}.
-
-@item @@paragraphindent @var{indent}
-Indent paragraphs by @var{indent} number of spaces (perhaps 0); preserve
-source file indentation if @var{indent} is @code{asis}.
-@xref{paragraphindent,, Paragraph Indenting}.
-
-@item @@pindex @var{entry}
-Add @var{entry} to the index of programs.  @xref{Index Entries, , Defining
-the Entries of an Index}.@refill
-
-@item @@point@{@}
-Indicate the position of point in a buffer to the reader with a
-glyph: @samp{@point{}}.  @xref{Point Glyph, , Indicating
-Point in a Buffer}.@refill
-
-@item @@pounds@{@}
-Generate the pounds sterling currency sign.
-@xref{pounds,,@code{@@pounds@{@}}}.
-
-@item @@print@{@}
-Indicate printed output to the reader with a glyph:
-@samp{@print{}}.  @xref{Print Glyph}.@refill
-
-@item @@printindex @var{index-name}
-Print an alphabetized two-column index in a printed manual or generate
-an alphabetized menu of index entries for Info.  @xref{Printing
-Indices & Menus}.@refill
-
-@item @@pxref@{@var{node-name}, [@var{entry}], [@var{topic-or-title}], [@var{info-file}], [@var{manual}]@}
-Make a reference that starts with a lower case `see' in a printed
-manual.  Use within parentheses only.  Do not follow command with a
-punctuation mark---the Info formatting commands automatically insert
-terminating punctuation as needed.  Only the first argument is mandatory.
-@xref{pxref, , @code{@@pxref}}.@refill
-
-@item @@questiondown@{@}
-Generate an upside-down question mark.  @xref{Inserting Accents}.
-
-@item @@quotation
-Narrow the margins to indicate text that is quoted from another real
-or imaginary work.  Takes optional argument of prefix text.  Pair with
-@code{@@end quotation}.  @xref{quotation, ,
-@code{@@quotation}}.@refill
-
-@item @@r@{@var{text}@}
-Print @var{text} in @r{roman} font.  No effect in Info.
-@xref{Fonts}.@refill
-
-@item @@raisesections
-Change subsequent sections to chapters, subsections to sections, and so
-on.  @xref{Raise/lower sections, , @code{@@raisesections} and
-@code{@@lowersections}}.@refill
-
-@item @@ref@{@var{node-name}, [@var{entry}], [@var{topic-or-title}], [@var{info-file}], [@var{manual}]@}
-Make a reference.  In a printed manual, the reference does not start
-with a `See'.  Follow command with a punctuation mark.  Only the first
-argument is mandatory.  @xref{ref, , @code{@@ref}}.@refill
-
-@item @@refill
-This command used to refill and indent the paragraph after all the
-other processing has been done.  It is no longer needed, since all
-formatters now automatically refill as needed, but you may still see
-it in the source to some manuals, as it does no harm.
-
-@item @@registeredsymbol@{@}
-Generate the legal symbol @registeredsymbol{}.  @xref{registered
-symbol,, @code{@@registeredsymbol@{@}}}.
-
-@item @@result@{@}
-Indicate the result of an expression to the reader with a special
-glyph: @samp{@result{}}.  @xref{result, , @code{@@result}}.@refill
-
-@item @@ringaccent@{@var{c}@}
-Generate a ring accent over the next character, as in @ringaccent{o}.
-@xref{Inserting Accents}.
-
-@item @@samp@{@var{text}@}
-Highlight @var{text} that is a literal example of a sequence of
-characters.  Used for single characters, for statements, and often for
-entire shell commands.  @xref{samp, , @code{@@samp}}.@refill
-
-@item @@sansserif@{@var{text}@}
-Print @var{text} in a @sansserif{sans serif} font if possible.  No
-effect in Info.  @xref{Fonts}.
-
-@item @@sc@{@var{text}@}
-Set @var{text} in a printed output in @sc{the small caps font} and
-set text in the Info file in uppercase letters.
-@xref{Smallcaps}.@refill
-
-@item @@section @var{title}
-Begin a section within a chapter.  In a printed manual, the section
-title is numbered and appears in the table of contents.  In Info, the
-title is underlined with equal signs.  @xref{section, ,
-@code{@@section}}.@refill
-
-@item @@set @var{flag} [@var{string}]
-Make @var{flag} active, causing the Texinfo formatting commands to
-format text between subsequent pairs of @code{@@ifset @var{flag}} and
-@code{@@end ifset} commands.  Optionally, set value of @var{flag} to
-@var{string}.
-@xref{set clear value, , @code{@@set} @code{@@clear} @code{@@value}}.
-
-@item @@setchapternewpage @var{on-off-odd}
-Specify whether chapters start on new pages, and if so, whether on
-odd-numbered (right-hand) new pages.  @xref{setchapternewpage, ,
-@code{@@setchapternewpage}}.
-
-@item @@setcontentsaftertitlepage
-Put the table of contents after the @samp{@@end titlepage} even if the
-@code{@@contents} command is not there.  @xref{Contents}.
-
-@item @@setfilename @var{info-file-name}
-Provide a name to be used by the Info file.  This command is essential
-for @TeX{} formatting as well, even though it produces no output.
-@xref{setfilename, , @code{@@setfilename}}.
-
-@item @@setshortcontentsaftertitlepage
-Place the short table of contents after the @samp{@@end titlepage}
-command even if the @code{@@shortcontents} command is not there.
-@xref{Contents}.
-
-@item @@settitle @var{title}
-Provide a title for page headers in a printed manual, and the default
-document description for HTML @samp{<head>}.
-@xref{settitle, , @code{@@settitle}}.@refill
-
-@item @@shortcaption
-Define the short caption for a @code{@@float}.  @xref{caption shortcaption}.
-
-@item @@shortcontents
-Print a short table of contents.  Not relevant to Info, which uses
-menus rather than tables of contents.  A synonym for
-@code{@@summarycontents}.  @xref{Contents, , Generating a Table of
-Contents}.@refill
-
-@item @@shorttitlepage @var{title}
-Generate a minimal title page.  @xref{titlepage,,@code{@@titlepage}}.
-
-@item @@slanted@{@var{text}@}
-Print @var{text} in a @slanted{slanted} font if possible.  No effect
-in Info.  @xref{Fonts}.
-
-@item @@smallbook
-Cause @TeX{} to produce a printed manual in a 7 by 9.25 inch format
-rather than the regular 8.5 by 11 inch format.  @xref{smallbook, ,
-Printing Small Books}.  Also, see @ref{small}.
-
-@item @@smalldisplay
-Begin a kind of example.  Like @code{@@smallexample} (narrow margins, no
-filling), but do not select the fixed-width font.  Pair with @code{@@end
-smalldisplay}.  @xref{small}.
-
-@item @@smallexample
-Indent text to indicate an example.  Do not fill, select fixed-width
-font, narrow the margins.  In printed manuals, print text in a smaller
-font than with @code{@@example}.  Pair with @code{@@end smallexample}.
-@xref{small}.
-
-@item @@smallformat
-Begin a kind of example.  Like @code{@@smalldisplay}, but do not narrow
-the margins.  Pair with @code{@@end smallformat}.  @xref{small}.
-
-@item @@smalllisp
-Begin an example of Lisp code.  Same as @code{@@smallexample}.  Pair
-with @code{@@end smalllisp}.  @xref{small}.
-
-@item @@sp @var{n}
-Skip @var{n} blank lines.  @xref{sp, , @code{@@sp}}.@refill
-
-@item @@ss@{@}
-Generate the German sharp-S es-zet letter, @ss{}.  @xref{Inserting Accents}.
-
-@item @@strong @{@var{text}@}
-Emphasize @var{text} by typesetting it in a @strong{bold} font for the
-printed manual and by surrounding it with asterisks for Info.
-@xref{emph & strong, , Emphasizing Text}.@refill
-
-@item @@subheading @var{title}
-Print an unnumbered subsection-like heading in the text, but not in
-the table of contents of a printed manual.  In Info, the title is
-underlined with hyphens.  @xref{unnumberedsubsec appendixsubsec
-subheading, , @code{@@unnumberedsubsec} @code{@@appendixsubsec}
-@code{@@subheading}}.@refill
-
-@item @@subsection @var{title}
-Begin a subsection within a section.  In a printed manual, the
-subsection title is numbered and appears in the table of contents.  In
-Info, the title is underlined with hyphens.  @xref{subsection, ,
-@code{@@subsection}}.@refill
-
-@item @@subsubheading @var{title}
-Print an unnumbered subsubsection-like heading in the text, but not in
-the table of contents of a printed manual.  In Info, the title is
-underlined with periods.  @xref{subsubsection, , The `subsub'
-Commands}.@refill
-
-@item @@subsubsection @var{title}
-Begin a subsubsection within a subsection.  In a printed manual,
-the subsubsection title is numbered and appears in the table of
-contents.  In Info, the title is underlined with periods.
-@xref{subsubsection, , The `subsub' Commands}.@refill
-
-@item @@subtitle @var{title}
-In a printed manual, set a subtitle in a normal sized font flush to
-the right-hand side of the page.  Not relevant to Info, which does not
-have title pages.  @xref{title subtitle author, , @code{@@title}
-@code{@@subtitle} and @code{@@author} Commands}.@refill
-
-@item @@summarycontents
-Print a short table of contents.  Not relevant to Info, which uses
-menus rather than tables of contents.  A synonym for
-@code{@@shortcontents}.  @xref{Contents, , Generating a Table of
-Contents}.@refill
-
-@item @@syncodeindex @var{from-index} @var{into-index}
-Merge the index named in the first argument into the index named in
-the second argument, printing the entries from the first index in
-@code{@@code} font.  @xref{Combining Indices}.@refill
-
-@item @@synindex @var{from-index} @var{into-index}
-Merge the index named in the first argument into the index named in
-the second argument.  Do not change the font of @var{from-index}
-entries.  @xref{Combining Indices}.@refill
-
-@item @@t@{@var{text}@}
-Print @var{text} in a @t{fixed-width}, typewriter-like font.
-No effect in Info.  @xref{Fonts}.@refill
-
-@item @@tab
-Separate columns in a multitable.  @xref{Multitable Rows}.
-
-@item @@table @var{formatting-command}
-Begin a two-column table, using @code{@@item} for each entry.  Write
-each first column entry on the same line as @code{@@item}.  First
-column entries are printed in the font resulting from
-@var{formatting-command}.  Pair with @code{@@end table}.
-@xref{Two-column Tables, , Making a Two-column Table}.
-Also see @ref{ftable vtable, , @code{@@ftable} and @code{@@vtable}},
-and @ref{itemx, , @code{@@itemx}}.@refill
-
-@item @@TeX@{@}
-Insert the logo @TeX{}.  @xref{tex, , @TeX{} and @LaTeX{}}.
-
-@item @@tex
-Enter @TeX{} completely.  Pair with @code{@@end tex}.  @xref{Raw
-Formatter Commands}.
-
-@item @@thischapter
-@itemx @@thischaptername
-@itemx @@thisfile
-@itemx @@thispage
-@itemx @@thistitle
-Only allowed in a heading or footing.  Stands for the number and name of
-the current chapter (in the format `Chapter 1: Title'), the chapter name
-only, the filename, the current page number, and the title of the
-document, respectively.  @xref{Custom Headings, , How to Make Your Own
-Headings}.@refill
-
-@item @@tie@{@}
-Generate a normal interword space at which a line break is not allowed.
-@xref{tie,, @code{@@tie@{@}}}.
-
-@item @@tieaccent@{@var{cc}@}
-Generate a tie-after accent over the next two characters @var{cc}, as in
-`@tieaccent{oo}'.  @xref{Inserting Accents}.
-
-@item @@tindex @var{entry}
-Add @var{entry} to the index of data types.  @xref{Index Entries, ,
-Defining the Entries of an Index}.@refill
-
-@item @@title @var{title}
-In a printed manual, set a title flush to the left-hand side of the
-page in a larger than normal font and underline it with a black rule.
-Not relevant to Info, which does not have title pages.  @xref{title
-subtitle author, , The @code{@@title} @code{@@subtitle} and
-@code{@@author} Commands}.@refill
-
-@item @@titlefont@{@var{text}@}
-In a printed manual, print @var{text} in a larger than normal font.
-Not relevant to Info, which does not have title pages.
-@xref{titlefont center sp, , The @code{@@titlefont} @code{@@center}
-and @code{@@sp} Commands}.@refill
-
-@item @@titlepage
-Indicate to Texinfo the beginning of the title page.  Write command on
-a line of its own.  Pair with @code{@@end titlepage}.  Nothing between
-@code{@@titlepage} and @code{@@end titlepage} appears in Info.
-@xref{titlepage, , @code{@@titlepage}}.@refill
-
-@item @@today@{@}
-Insert the current date, in `1 Jan 1900' style.  @xref{Custom
-Headings, , How to Make Your Own Headings}.@refill
-
-@item @@top @var{title}
-In a Texinfo file to be formatted with @code{makeinfo}, identify the
-topmost @code{@@node} in the file, which must be written on the line
-immediately preceding the @code{@@top} command.  Used for
-@code{makeinfo}'s node pointer insertion feature.  The title is
-underlined with asterisks.  Both the @code{@@node} line and the @code{@@top}
-line normally should be enclosed by @code{@@ifnottex} and @code{@@end
-ifnottex}.  In @TeX{} and @code{texinfo-format-buffer}, the @code{@@top}
-command is merely a synonym for @code{@@unnumbered}.  @xref{makeinfo
-Pointer Creation, , Creating Pointers with @code{makeinfo}}.
-
-@item @@u@{@var{c}@}
-@itemx @@ubaraccent@{@var{c}@}
-@itemx @@udotaccent@{@var{c}@}
-Generate a breve, underbar, or underdot accent, respectively, over or
-under the character @var{c}, as in @u{o}, @ubaraccent{o},
-@udotaccent{o}.  @xref{Inserting Accents}.
-
-@item @@unnumbered @var{title}
-In a printed manual, begin a chapter that appears without chapter
-numbers of any kind.  The title appears in the table of contents of a
-printed manual.  In Info, the title is underlined with asterisks.
-@xref{unnumbered & appendix, , @code{@@unnumbered} and
-@code{@@appendix}}.@refill
-
-@item @@unnumberedsec @var{title}
-In a printed manual, begin a section that appears without section
-numbers of any kind.  The title appears in the table of contents of a
-printed manual.  In Info, the title is underlined with equal signs.
-@xref{unnumberedsec appendixsec heading, , Section Commands}.@refill
-
-@item @@unnumberedsubsec @var{title}
-In a printed manual, begin an unnumbered subsection within a
-chapter.  The title appears in the table of contents of a printed
-manual.  In Info, the title is underlined with hyphens.
-@xref{unnumberedsubsec appendixsubsec subheading, ,
-@code{@@unnumberedsubsec} @code{@@appendixsubsec}
-@code{@@subheading}}.@refill
-
-@item @@unnumberedsubsubsec @var{title}
-In a printed manual, begin an unnumbered subsubsection within a
-chapter.  The title appears in the table of contents of a printed
-manual.  In Info, the title is underlined with periods.
-@xref{subsubsection, , The `subsub' Commands}.@refill
-
-@item @@uref@{@var{url}[, @var{displayed-text}][, @var{replacement}@}
-@itemx @@url@{@var{url}[, @var{displayed-text}][, @var{replacement}@}
-Define a cross reference to an external uniform resource locator for the
-World Wide Web.  @xref{uref, , @code{@@uref}}.
-
-@item @@v@{@var{c}@}
-Generate check accent over the character @var{c}, as in @v{o}.
-@xref{Inserting Accents}.
-
-@item @@value@{@var{flag}@}
-Replace @var{flag} with the value to which it is set by @code{@@set
-@var{flag}}.
-@xref{set clear value, , @code{@@set} @code{@@clear} @code{@@value}}.@refill
-
-@item @@var@{@var{metasyntactic-variable}@}
-Highlight a metasyntactic variable, which is something that stands for
-another piece of text.  @xref{var, , Indicating Metasyntactic
-Variables}.@refill
-
-@item @@verb@{@var{delim} @var{literal} @var{delim}@}
-Output @var{literal}, delimited by the single character @var{delim},
-exactly as is (in the fixed-width font), including any whitespace or
-Texinfo special characters.  @xref{verb,,@code{verb}}.
-
-@item @@verbatim
-Output the text of the environment exactly as is (in the fixed-width
-font).  Pair with @code{@@end verbatim}.  @xref{verbatim,,@code{verbatim}}.
-
-@item @@verbatiminclude @var{filename}
-Output the contents of @var{filename} exactly as is (in the fixed-width font).
-@xref{verbatiminclude,,@code{verbatiminclude}}.
-
-@item @@vindex @var{entry}
-Add @var{entry} to the index of variables.  @xref{Index Entries, ,
-Defining the Entries of an Index}.@refill
-
-@item @@vskip @var{amount}
-In a printed manual, insert whitespace so as to push text on the
-remainder of the page towards the bottom of the page.  Used in
-formatting the copyright page with the argument @samp{0pt plus
-1filll}.  (Note spelling of @samp{filll}.)  @code{@@vskip} may be used
-only in contexts ignored for Info.  @xref{Copyright}.
-
-@item @@vtable @var{formatting-command}
-Begin a two-column table, using @code{@@item} for each entry.
-Automatically enter each of the items in the first column into the
-index of variables.  Pair with @code{@@end vtable}.  The same as
-@code{@@table}, except for indexing.  @xref{ftable vtable, ,
-@code{@@ftable} and @code{@@vtable}}.@refill
-
-@item @@w@{@var{text}@}
-Prevent @var{text} from being split across two lines.
-@xref{w, , @code{@@w}}.@refill
-
-@item @@xml
-Enter XML completely.  Pair with @code{@@end xml}.  @xref{Raw
-Formatter Commands}.
-
-@item @@xref@{@var{node-name}, [@var{entry}], [@var{topic-or-title}], [@var{info-file}], [@var{manual}]@}
-Make a reference that starts with `See' in a printed manual.  Follow
-command with a punctuation mark.  Only the first argument is
-mandatory.  @xref{xref, , @code{@@xref}}.@refill
-@end table
-
-
-@node Command Syntax
-@section @@-Command Syntax
-@cindex @@-command syntax
-@cindex Syntax, of @@-commands
-@cindex Command syntax
-
-The character @samp{@@} is used to start special Texinfo commands.
-(It has the same meaning that @samp{\} has in plain @TeX{}.)  Texinfo
-has four types of @@-command:@refill
-
-@table @asis
-@item 1. Non-alphabetic commands.
-These commands consist of an @@ followed by a punctuation mark or other
-character that is not part of the alphabet.  Non-alphabetic commands are
-almost always part of the text within a paragraph, and never take any
-argument.  The two characters (@@ and the other one) are complete in
-themselves; none is followed by braces.  The non-alphabetic commands
-are: @code{@@.}, @code{@@:}, @code{@@*}, @code{@@@kbd{SPACE}},
-@code{@@@kbd{TAB}}, @code{@@@kbd{NL}}, @code{@@@@}, @code{@@@{}, and
-@code{@@@}}.@refill
-
-@item 2. Alphabetic commands that do not require arguments.
-These commands start with @@ followed by a word followed by left- and
-right-hand braces.  These commands insert special symbols in the
-document; they do not require arguments.  For example,
-@code{@@dots@{@}} @result{} @samp{@dots{}}, @code{@@equiv@{@}}
-@result{} @samp{@equiv{}}, @code{@@TeX@{@}} @result{} `@TeX{}',
-and @code{@@bullet@{@}} @result{} @samp{@bullet{}}.@refill
-
-@item 3. Alphabetic commands that require arguments within braces.
-These commands start with @@ followed by a letter or a word, followed by an
-argument within braces.  For example, the command @code{@@dfn} indicates
-the introductory or defining use of a term; it is used as follows: @samp{In
-Texinfo, @@@@-commands are @@dfn@{mark-up@} commands.}@refill
-
-@item 4. Alphabetic commands that occupy an entire line.
-These commands occupy an entire line.  The line starts with @@,
-followed by the name of the command (a word); for example, @code{@@center}
-or @code{@@cindex}.  If no argument is needed, the word is followed by
-the end of the line.  If there is an argument, it is separated from
-the command name by a space.  Braces are not used.@refill
-@end table
-
-@cindex Braces and argument syntax
-Thus, the alphabetic commands fall into classes that have
-different argument syntaxes.  You cannot tell to which class a command
-belongs by the appearance of its name, but you can tell by the
-command's meaning: if the command stands for a glyph, it is in
-class 2 and does not require an argument; if it makes sense to use the
-command together with other text as part of a paragraph, the command
-is in class 3 and must be followed by an argument in braces;
-otherwise, it is in class 4 and uses the rest of the line as its
-argument.@refill
-
-The purpose of having a different syntax for commands of classes 3 and
-4 is to make Texinfo files easier to read, and also to help the GNU
-Emacs paragraph and filling commands work properly.  There is only one
-exception to this rule: the command @code{@@refill}, which is always
-used at the end of a paragraph immediately following the final period
-or other punctuation character.  @code{@@refill} takes no argument and
-does @emph{not} require braces.  @code{@@refill} never confuses the
-Emacs paragraph commands because it cannot appear at the beginning of
-a line.  It is also no longer needed, since all formatters now refill
-paragraphs automatically.
-
-
-@node Tips
-@appendix Tips and Hints
-
-Here are some tips for writing Texinfo documentation:@refill
-
-@cindex Tips
-@cindex Usage tips
-@cindex Hints
-@itemize @bullet
-@item
-Write in the present tense, not in the past or the future.
-
-@item
-Write actively!  For example, write ``We recommend that @dots{}'' rather
-than ``It is recommended that @dots{}''.
-
-@item
-Use 70 or 72 as your fill column.  Longer lines are hard to read.
-
-@item
-Include a copyright notice and copying permissions.
-@end itemize
-
-@subsubheading Index, Index, Index!
-
-Write many index entries, in different ways.
-Readers like indices; they are helpful and convenient.
-
-Although it is easiest to write index entries as you write the body of
-the text, some people prefer to write entries afterwards.  In either
-case, write an entry before the paragraph to which it applies.  This
-way, an index entry points to the first page of a paragraph that is
-split across pages.
-
-Here are more hints we have found valuable:
-
-@itemize @bullet
-@item
-Write each index entry differently, so each entry refers to a different
-place in the document.
-
-@item
-Write index entries only where a topic is discussed significantly.  For
-example, it is not useful to index ``debugging information'' in a
-chapter on reporting bugs.  Someone who wants to know about debugging
-information will certainly not find it in that chapter.
-
-@item
-Consistently capitalize the first word of every concept index entry,
-or else consistently use lower case.  Terse entries often call for
-lower case; longer entries for capitalization.  Whichever case
-convention you use, please use one or the other consistently!  Mixing
-the two styles looks bad.
-
-@item
-Always capitalize or use upper case for those words in an index for
-which this is proper, such as names of countries or acronyms.  Always
-use the appropriate case for case-sensitive names, such as those in C or
-Lisp.
-
-@item
-Write the indexing commands that refer to a whole section immediately
-after the section command, and write the indexing commands that refer to
-a paragraph before that paragraph.
-
-In the example that follows, a blank line comes after the index
-entry for ``Leaping'':
-
-@example
-@group
-@@section The Dog and the Fox
-@@cindex Jumping, in general
-@@cindex Leaping
-
-@@cindex Dog, lazy, jumped over
-@@cindex Lazy dog jumped over
-@@cindex Fox, jumps over dog
-@@cindex Quick fox jumps over dog
-The quick brown fox jumps over the lazy dog.
-@end group
-@end example
-
-@noindent
-(Note that the example shows entries for the same concept that are
-written in different ways---@samp{Lazy dog}, and @samp{Dog, lazy}---so
-readers can look up the concept in different ways.)
-@end itemize
-
-@subsubheading Blank Lines
-
-@itemize @bullet
-@item
-Insert a blank line between a sectioning command and the first following
-sentence or paragraph, or between the indexing commands associated with
-the sectioning command and the first following sentence or paragraph, as
-shown in the tip on indexing.  Otherwise, a formatter may fold title and
-paragraph together.
-
-@item
-Always insert a blank line before an @code{@@table} command and after an
-@code{@@end table} command; but never insert a blank line after an
-@code{@@table} command or before an @code{@@end table} command.
-
-@need 1000
-For example,
-
-@example
-@group
-Types of fox:
-
-@@table @@samp
-@@item Quick
-Jump over lazy dogs.
-@end group
-
-@group
-@@item Brown
-Also jump over lazy dogs.
-@@end table
-
-@end group
-@group
-@@noindent
-On the other hand, @dots{}
-@end group
-@end example
-
-Insert blank lines before and after @code{@@itemize} @dots{} @code{@@end
-itemize} and @code{@@enumerate} @dots{} @code{@@end enumerate} in the
-same way.
-@end itemize
-
-@subsubheading Complete Phrases
-
-Complete phrases are easier to read than @dots{}
-
-@itemize @bullet
-@item
-Write entries in an itemized list as complete sentences; or at least, as
-complete phrases.  Incomplete expressions @dots{} awkward @dots{} like
-this.
-
-@item
-Write the prefatory sentence or phrase for a multi-item list or table as
-a complete expression.  Do not write ``You can set:''; instead, write
-``You can set these variables:''.  The former expression sounds cut off.
-@end itemize
-
-@subsubheading Editions, Dates and Versions
-
-Include edition numbers, version numbers, and dates in the
-@code{@@copying} text (for people reading the Texinfo file, and for the
-legal copyright in the output files).  Then use @code{@@insertcopying}
-in the @code{@@titlepage} section (for people reading the printed
-output) and the Top node (for people reading the online output).
-
-It is easiest to do this using @code{@@set} and @code{@@value}.
-@xref{value Example, , @code{@@value} Example}, and @ref{GNU Sample Texts}.
-
-
-@subsubheading Definition Commands
-
-Definition commands are @code{@@deffn}, @code{@@defun},
-@code{@@defmac}, and the like, and enable you to write descriptions in
-a uniform format.@refill
-
-@itemize @bullet
-@item
-Write just one definition command for each entity you define with a
-definition command.  The automatic indexing feature creates an index
-entry that leads the reader to the definition.
-
-@item
-Use @code{@@table} @dots{} @code{@@end table} in an appendix that
-contains a summary of functions, not @code{@@deffn} or other definition
-commands.
-@end itemize
-
-@subsubheading Capitalization
-
-@itemize @bullet
-@item
-Capitalize ``Texinfo''; it is a name.  Do not write the @samp{x} or
-@samp{i} in upper case.
-
-@item
-Capitalize ``Info''; it is a name.
-
-@item
-Write @TeX{} using the @code{@@TeX@{@}} command.  Note the uppercase
-@samp{T} and @samp{X}.  This command causes the formatters to
-typeset the name according to the wishes of Donald Knuth, who wrote
-@TeX{}.
-@end itemize
-
-@subsubheading Spaces
-
-Do not use spaces to format a Texinfo file, except inside of
-@code{@@example} @dots{} @code{@@end example} and other literal
-environments and commands.
-
-@need 700
-For example, @TeX{} fills the following:
-
-@example
-@group
-   @@kbd@{C-x v@}
-   @@kbd@{M-x vc-next-action@}
-      Perform the next logical operation
-      on the version-controlled file
-      corresponding to the current buffer.
-@end group
-@end example
-
-@need 950
-@noindent
-so it looks like this:
-
-@iftex
-@quotation
-   @kbd{C-x v}
-   @kbd{M-x vc-next-action}
-      Perform the next logical operation on the version-controlled file
-      corresponding to the current buffer.
-@end quotation
-@end iftex
-@ifnottex
-@quotation
-`C-x v' `M-x vc-next-action' Perform the next logical operation on the
-version-controlled file corresponding to the current buffer.
-@end quotation
-@end ifnottex
-
-@noindent
-In this case, the text should be formatted with
-@code{@@table}, @code{@@item}, and @code{@@itemx}, to create a table.
-
-
-@subsubheading @@code, @@samp, @@var, and @samp{---}
-
-@itemize @bullet
-@item
-Use @code{@@code} around Lisp symbols, including command names.
-For example,
-
-@example
-The main function is @@code@{vc-next-action@}, @dots{}
-@end example
-
-@item
-Avoid putting letters such as @samp{s} immediately after an
-@samp{@@code}.  Such letters look bad.
-
-@item
-Use @code{@@var} around meta-variables.  Do not write angle brackets
-around them.
-
-@item
-Use three hyphens in a row, @samp{---}, to indicate a long dash.  @TeX{}
-typesets these as a long dash and the Info formatters reduce three
-hyphens to two.
-@end itemize
-
-@subsubheading Periods Outside of Quotes
-
-Place periods and other punctuation marks @emph{outside} of quotations,
-unless the punctuation is part of the quotation.  This practice goes
-against publishing conventions in the United States, but enables the
-reader to distinguish between the contents of the quotation and the
-whole passage.
-
-For example, you should write the following sentence with the period
-outside the end quotation marks:
-
-@example
-Evidently, @samp{au} is an abbreviation for ``author''.
-@end example
-
-@noindent
-since @samp{au} does @emph{not} serve as an  abbreviation for
-@samp{author.} (with a period following the word).
-
-@subsubheading Introducing New Terms
-
-@itemize @bullet
-@item
-Introduce new terms so that a reader who does not know them can
-understand them from context; or write a definition for the term.
-
-For example, in the following, the terms ``check in'', ``register'' and
-``delta'' are all appearing for the first time; the example sentence should be
-rewritten so they are understandable.
-
-@quotation
-The major function assists you in checking in a file to your
-version control system and registering successive sets of changes to
-it as deltas.
-@end quotation
-
-@item
-Use the @code{@@dfn} command around a word being introduced, to indicate
-that the reader should not expect to know the meaning already, and
-should expect to learn the meaning from this passage.
-@end itemize
-
-@subsubheading @@pxref
-
-@c !!! maybe include this in the tips on pxref
-@ignore
-By the way, it is okay to use pxref with something else in front of
-it within the parens, as long as the pxref is followed by the close
-paren, and the material inside the parens is not part of a larger
-sentence.  Also, you can use xref inside parens as part of a complete
-sentence so long as you terminate the cross reference with punctuation.
-@end ignore
-Absolutely never use @code{@@pxref} except in the special context for
-which it is designed: inside parentheses, with the closing parenthesis
-following immediately after the closing brace.  One formatter
-automatically inserts closing punctuation and the other does not.  This
-means that the output looks right both in printed output and in an Info
-file, but only when the command is used inside parentheses.
-
-@subsubheading Invoking from a Shell
-
-You can invoke programs such as Emacs, GCC, and @code{gawk} from a
-shell.  The documentation for each program should contain a section that
-describes this.  Unfortunately, if the node names and titles for these
-sections are all different, they are difficult for users to find.
-
-So, there is a convention to name such sections with a phrase beginning
-with the word `Invoking', as in `Invoking Emacs'; this way, users can
-find the section easily.
-
-
-@subsubheading ANSI C Syntax
-
-When you use @code{@@example} to describe a C function's calling
-conventions, use the ANSI C syntax, like this:@refill
-
-@example
-void dld_init (char *@@var@{path@});
-@end example
-
-@noindent
-And in the subsequent discussion, refer to the argument values by
-writing the same argument names, again highlighted with
-@code{@@var}.@refill
-
-@need 800
-Avoid the obsolete style that looks like this:@refill
-
-@example
-#include <dld.h>
-
-dld_init (path)
-char *path;
-@end example
-
-Also, it is best to avoid writing @code{#include} above the
-declaration just to indicate that the function is declared in a
-header file.  The practice may give the misimpression that the
-@code{#include} belongs near the declaration of the function.  Either
-state explicitly which header file holds the declaration or, better
-yet, name the header file used for a group of functions at the
-beginning of the section that describes the functions.@refill
-
-@subsubheading Bad Examples
-
-Here are several examples of bad writing to avoid:
-
-In this example, say, `` @dots{} you must @code{@@dfn}@{check
-in@} the new version.''  That flows better.
-
-@quotation
-When you are done editing the file, you must perform a
-@code{@@dfn}@{check in@}.
-@end quotation
-
-In the following example, say, ``@dots{} makes a unified interface such as VC
-mode possible.''
-
-@quotation
-SCCS, RCS and other version-control systems all perform similar
-functions in broadly similar ways (it is this resemblance which makes
-a unified control mode like this possible).
-@end quotation
-
-And in this example, you should specify what `it' refers to:
-
-@quotation
-If you are working with other people, it assists in coordinating
-everyone's changes so they do not step on each other.
-@end quotation
-
-@subsubheading And Finally @dots{}
-
-@itemize @bullet
-@item
-Pronounce @TeX{} as if the @samp{X} were a Greek `chi', as the last
-sound in the name `Bach'.  But pronounce Texinfo as in `speck':
-``teckinfo''.
-
-@item
-Write notes for yourself at the very end of a Texinfo file after the
-@code{@@bye}.  None of the formatters process text after the
-@code{@@bye}; it is as if the text were within @code{@@ignore} @dots{}
-@code{@@end ignore}.
-@end itemize
-
-
-@node Sample Texinfo Files
-@appendix Sample Texinfo Files
-@cindex Sample Texinfo files
-
-The first example is from the first chapter (@pxref{Short Sample}),
-given here in its entirety, without commentary.  The second
-includes the full texts to be used in GNU manuals.
-
-@menu
-* Short Sample Texinfo File::
-* GNU Sample Texts::
-* Verbatim Copying License::
-* All-permissive Copying License::
-@end menu
-
-
-@node Short Sample Texinfo File
-@section Short Sample
-@cindex Sample Texinfo file, no comments
-
-Here is a complete, short sample Texinfo file, without any commentary.
-You can see this file, with comments, in the first chapter.  @xref{Short
-Sample}.
-
-In a nutshell: The @command{makeinfo} program transforms a Texinfo
-source file such as this into an Info file or HTML; and @TeX{} typesets
-it for a printed manual.
-
-
-@sp 1
-@example
-\input texinfo   @@c -*-texinfo-*-
-@@c %**start of header
-@@setfilename sample.info
-@@settitle Sample Manual 1.0
-@@c %**end of header
-
-@@copying
-This is a short example of a complete Texinfo file.
-
-Copyright (C) 2004 Free Software Foundation, Inc.
-@@end copying
-
-@@titlepage
-@@title Sample Title
-@@page
-@@vskip 0pt plus 1filll
-@@insertcopying
-@@end titlepage
-
-@@c Output the table of the contents at the beginning.
-@@contents
-
-@@ifnottex
-@@node Top
-@@top GNU Sample
-
-@@insertcopying
-@@end ifnottex
-
-@@menu
-* First Chapter::    The first chapter is the
-                      only chapter in this sample.
-* Index::            Complete index.
-@@end menu
-
-
-@@node First Chapter
-@@chapter First Chapter
-
-@@cindex chapter, first
-
-This is the first chapter.
-@@cindex index entry, another
-
-Here is a numbered list.
-
-@@enumerate
-@@item
-This is the first item.
-
-@@item
-This is the second item.
-@@end enumerate
-
-
-@@node Index
-@@unnumbered Index
-
-@@printindex cp
-
-@@bye
-@end example
-
-
-@node GNU Sample Texts
-@section GNU Sample Texts
-
-@cindex GNU sample texts
-@cindex Sample texts, GNU
-@cindex Full texts, GNU
-
-Following is a sample Texinfo document with the full texts that should
-be used in GNU manuals.
-
-As well as the legal texts, it also serves as a practical example of how
-many elements in a GNU system can affect the manual.  If you're not
-familiar with all these different elements, don't worry.  They're not
-required and a perfectly good manual can be written without them.
-They're included here nonetheless because many manuals do (or could)
-benefit from them.
-
-@xref{Short Sample}, for a minimal example of a Texinfo file.
-@xref{Beginning a File}, for a full explanation of that minimal
-example.
-
-Here are some notes on the example:
-
-@itemize @bullet
-@item
-@cindex $Id
-@cindex CVS $Id
-@cindex RCS $Id
-@cindex Documentation identification
-@cindex Identification of documentation
-The @samp{$Id:} comment is for the CVS (@pxref{Top,, Overview, cvs,
-Concurrent Versions System}) or RCS (see rcsintro(1)) version control
-systems, which expand it into a string such as:
-@example
-$Id: texinfo.txi,v 1.128 2004/12/29 15:06:41 karl Exp $
-@end example
-(This is useful in all sources that use version control, not just manuals.)
-You may wish to include the @samp{$Id:} comment in the @code{@@copying}
-text, if you want a completely unambiguous reference to the
-documentation version.
-
-If you want to literally write @t{@w{$}Id$}, use @code{@@w}:
-@code{@@w@{$@}Id$}.
-
-@item
-@pindex automake@r{, and version info}
-@vindex UPDATED @r{Automake variable}
-@vindex VERSION @r{Automake variable}
-@pindex time-stamp.el
-The @file{version.texi} in the @code{@@include} command is maintained
-automatically by Automake (@pxref{Top,, Introduction, automake, GNU
-Automake}).  It sets the @samp{VERSION} and @samp{UPDATED} values used
-elsewhere.  If your distribution doesn't use Automake, but you do use
-Emacs, you may find the time-stamp.el package helpful (@pxref{Time
-Stamps,,,emacs,The GNU Emacs Manual}).
-
-@item
-The @code{@@syncodeindex} command reflects the recommendation to use
-only one index where possible, to make it easier for readers to look up
-index entries.
-
-@item
-The @code{@@dircategory} is for constructing the Info directory.
-@xref{Installing Dir Entries}, which includes a variety of recommended
-category names.
-
-@item
-The `Invoking' node is a GNU standard to help users find the basic
-information about command-line usage of a given program.  @xref{Manual
-Structure Details,,,standards, GNU Coding Standards}.
-
-@item
-@cindex GNU Free Documentation License, including entire
-@cindex Free Documentation License, including entire
-It is best to include the entire GNU Free Documentation License in a GNU
-manual, unless the manual is only a few pages long.  Of course this
-sample is even shorter than that, but it includes the FDL anyway in
-order to show one conventional way to do so.  The @file{fdl.texi} file
-is available on the GNU machines and in the Texinfo and other GNU
-source distributions.
-
-The FDL provides for omitting itself under certain conditions, but in
-that case the sample texts given here have to be modified.  @xref{GNU
-Free Documentation License}.
-
-@item
-If your manual has invariant sections (again, see the license itself for
-details), then don't forget to change the text here accordingly.
-
-@item
-For documents that express your personal views, feelings or experiences,
-it is more appropriate to use a license permitting only verbatim
-copying, rather than the FDL.  @xref{Verbatim Copying License}.
-
-@end itemize
-
-Here is the sample document:
-
-@verbatim
-\input texinfo   @c -*-texinfo-*-
-@comment $Id: texinfo.txi,v 1.128 2004/12/29 15:06:41 karl Exp $
-@comment %**start of header
-@setfilename sample.info
-@include version.texi
-@settitle GNU Sample @value{VERSION}
-@syncodeindex pg cp
-@comment %**end of header
-@copying
-This manual is for GNU Sample
-(version @value{VERSION}, @value{UPDATED}),
-which is an example in the Texinfo documentation.
-
-Copyright @copyright{} 2004 Free Software Foundation, Inc.
-
-@quotation
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
-and with the Back-Cover Texts as in (a) below.  A copy of the
-license is included in the section entitled ``GNU Free Documentation
-License.''
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-@end quotation
-@end copying
-
-@dircategory Texinfo documentation system
-@direntry
-* sample: (sample)Invoking sample.
-@end direntry
-
-@titlepage
-@title GNU Sample
-@subtitle for version @value{VERSION}, @value{UPDATED}
-@author A.U. Thor (@email{bug-texinfo@@gnu.org})
-@page
-@vskip 0pt plus 1filll
-@insertcopying
-@end titlepage
-
-@contents
-
-@ifnottex
-@node Top
-@top GNU Sample
-
-@insertcopying
-@end ifnottex
-
-@menu
-* Invoking sample::
-* Copying This Manual::
-* Index::
-@end menu
-
-
-@node Invoking sample
-@chapter Invoking sample
-
-@pindex sample
-@cindex invoking @command{sample}
-
-This is a sample manual.  There is no sample program to
-invoke, but if there was, you could see its basic usage
-and command line options here.
-
-
-@node Copying This Manual
-@appendix Copying This Manual
-
-@menu
-* GNU Free Documentation License::  License for copying this manual.
-@end menu
-
-@include fdl.texi
-
-
-@node Index
-@unnumbered Index
-
-@printindex cp
-
-@bye
-@end verbatim
-
-
-@node Verbatim Copying License
-@section Verbatim Copying License
-
-@cindex Verbatim copying license
-@cindex License for verbatim copying
-
-For software manuals and other documentation, it is important to use a
-license permitting free redistribution and updating, so that when a free
-program is changed, the documentation can be updated as well.
-
-On the other hand, for documents that express your personal views,
-feelings or experiences, it is more appropriate to use a license
-permitting only verbatim copying.
-
-Here is sample text for such a license permitting verbatim copying only.
-This is just the license text itself.  For a complete sample document,
-see the previous sections.
-
-@verbatim
-@copying
-This document is a sample for allowing verbatim copying only.
-
-Copyright @copyright{} 2004 Free Software Foundation, Inc.
-
-@quotation
-Permission is granted to make and distribute verbatim copies
-of this entire document without royalty provided the
-copyright notice and this permission notice are preserved.
-@end quotation
-@end copying
-@end verbatim
-
-
-@node All-permissive Copying License
-@section All-permissive Copying License
-
-@cindex All-permissive copying license
-@cindex License for all-permissive copying
-
-For software manuals and other documentation, it is important to use a
-license permitting free redistribution and updating, so that when a free
-program is changed, the documentation can be updated as well.
-
-On the other hand, for small supporting files, short manuals (under 300
-lines long) and rough documentation (README files, INSTALL files, etc.),
-the full FDL would be overkill.  They can use a simple all-permissive
-license.
-
-Here is sample text for such an all-permissive license.  This is just
-the license text itself.  For a complete sample document, see the
-previous sections.
-
-@example
-Copyright @copyright{} 2004 Free Software Foundation, Inc.
-
-Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.
-@end example
-
-
-@node Include Files
-@appendix Include Files
-@cindex Include files
-
-When @TeX{} or an Info formatting command sees an @code{@@include}
-command in a Texinfo file, it processes the contents of the file named
-by the command and incorporates them into the DVI or Info file being
-created.  Index entries from the included file are incorporated into
-the indices of the output file.
-
-Include files let you keep a single large document as a collection of
-conveniently small parts.
-
-@menu
-* Using Include Files::         How to use the @code{@@include} command.
-* texinfo-multiple-files-update::  How to create and update nodes and
-                                     menus when using included files.
-* Include Files Requirements::  @code{texinfo-multiple-files-update} needs.
-* Sample Include File::         A sample outer file with included files
-                                     within it; and a sample included file.
-* Include Files Evolution::     How use of the @code{@@include} command
-                                     has changed over time.
-@end menu
-
-@node Using Include Files
-@section How to Use Include Files
-@findex include
-
-To include another file within a Texinfo file, write the
-@code{@@include} command at the beginning of a line and follow it on
-the same line by the name of a file to be included.  For example:
-
-@example
-@@include buffers.texi
-@end example
-
-The name of the file is taken literally, with a single exception:
-@code{@@value@{@var{var}@}} references are expanded.  This makes it
-possible to reliably include files in other directories in a
-distribution.  @xref{verbatiminclude,,@code{@@verbatiminclude}}, for
-an example.
-
-An included file should simply be a segment of text that you expect to
-be included as is into the overall or @dfn{outer} Texinfo file; it
-should not contain the standard beginning and end parts of a Texinfo
-file.  In particular, you should not start an included file with a
-line saying @samp{\input texinfo}; if you do, that phrase is inserted
-into the output file as is.  Likewise, you should not end an included
-file with an @code{@@bye} command; nothing after @code{@@bye} is
-formatted.
-
-In the past, you were required to write an @code{@@setfilename} line at the
-beginning of an included file, but no longer.  Now, it does not matter
-whether you write such a line.  If an @code{@@setfilename} line exists
-in an included file, it is ignored.@refill
-
-Conventionally, an included file begins with an @code{@@node} line that
-is followed by an @code{@@chapter} line.  Each included file is one
-chapter.  This makes it easy to use the regular node and menu creating
-and updating commands to create the node pointers and menus within the
-included file.  However, the simple Emacs node and menu creating and
-updating commands do not work with multiple Texinfo files.  Thus you
-cannot use these commands to fill in the `Next', `Previous', and `Up'
-pointers of the @code{@@node} line that begins the included file.  Also,
-you cannot use the regular commands to create a master menu for the
-whole file.  Either you must insert the menus and the `Next',
-`Previous', and `Up' pointers by hand, or you must use the GNU Emacs
-Texinfo mode command, @code{texinfo-multiple-files-update}, that is
-designed for @code{@@include} files.@refill
-
-When an included file does not have any node lines in it, the
-multiple files update command does not try to create a menu entry
-for it.  Consequently, you can include any file, such as a
-version or an update file without node lines, not just files that
-are chapters.  Small includable files like this are created by
-Automake (@pxref{GNU Sample Texts}).
-
-
-@node texinfo-multiple-files-update
-@section @code{texinfo-multiple-files-update}
-@findex texinfo-multiple-files-update
-
-GNU Emacs Texinfo mode provides the @code{texinfo-multiple-files-update}
-command.  This command creates or updates `Next', `Previous', and `Up'
-pointers of included files as well as those in the outer or overall
-Texinfo file, and it creates or updates a main menu in the outer file.
-Depending whether you call it with optional arguments, the command
-updates only the pointers in the first @code{@@node} line of the
-included files or all of them:@refill
-
-@table @kbd
-@item M-x texinfo-multiple-files-update
-Called without any arguments:@refill
-
-@itemize @minus
-@item
-Create or update the `Next', `Previous', and `Up' pointers of the
-first @code{@@node} line in each file included in an outer or overall
-Texinfo file.@refill
-
-@item
-Create or update the `Top' level node pointers of the outer or
-overall file.@refill
-
-@item
-Create or update a main menu in the outer file.@refill
-@end itemize
-
-@item C-u M-x texinfo-multiple-files-update
-Called with @kbd{C-u} as a prefix argument:
-
-@itemize @minus{}
-@item
-Create or update pointers in the first @code{@@node} line in each
-included file.
-
-@item
-Create or update the `Top' level node pointers of the outer file.
-
-@item
-Create and insert a master menu in the outer file.  The master menu
-is made from all the menus in all the included files.@refill
-@end itemize
-
-@item C-u 8 M-x texinfo-multiple-files-update
-Called with a numeric prefix argument, such as @kbd{C-u 8}:
-
-@itemize @minus
-@item
-Create or update @strong{all} the `Next', `Previous', and `Up' pointers
-of all the included files.@refill
-
-@item
-Create or update @strong{all} the menus of all the included
-files.@refill
-
-@item
-Create or update the `Top' level node pointers of the outer or
-overall file.@refill
-
-@item
-And then create a master menu in the outer file.  This is similar to
-invoking @code{texinfo-master-menu} with an argument when you are
-working with just one file.@refill
-@end itemize
-@end table
-
-Note the use of the prefix argument in interactive use: with a regular
-prefix argument, just @w{@kbd{C-u}}, the
-@code{texinfo-multiple-files-update} command inserts a master menu;
-with a numeric prefix argument, such as @kbd{C-u 8}, the command
-updates @strong{every} pointer and menu in @strong{all} the files and then inserts a
-master menu.@refill
-
-
-@node Include Files Requirements
-@section Include Files Requirements
-@cindex Include files requirements
-@cindex Requirements for include files
-
-If you plan to use the @code{texinfo-multiple-files-update} command,
-the outer Texinfo file that lists included files within it should
-contain nothing but the beginning and end parts of a Texinfo file, and
-a number of @code{@@include} commands listing the included files.  It
-should not even include indices, which should be listed in an included
-file of their own.@refill
-
-Moreover, each of the included files must contain exactly one highest
-level node (conventionally, @code{@@chapter} or equivalent),
-and this node must be the first node in the included file.
-Furthermore, each of these highest level nodes in each included file
-must be at the same hierarchical level in the file structure.
-Usually, each is an @code{@@chapter}, an @code{@@appendix}, or an
-@code{@@unnumbered} node.  Thus, normally, each included file contains
-one, and only one, chapter or equivalent-level node.@refill
-
-The outer file should contain only @emph{one} node, the `Top' node.  It
-should @emph{not} contain any nodes besides the single `Top' node.  The
-@code{texinfo-multiple-files-update} command will not process
-them.@refill
-
-
-@node Sample Include File
-@section Sample File with @code{@@include}
-@cindex Sample @code{@@include} file
-@cindex Include file sample
-@cindex @code{@@include} file sample
-
-Here is an example of an outer Texinfo file with @code{@@include} files
-within it before running @code{texinfo-multiple-files-update}, which
-would insert a main or master menu:
-
-@example
-@group
-\input texinfo @@c -*-texinfo-*-
-@c %**start of header
-@@setfilename include-example.info
-@@settitle Include Example
-@c %**end of header
-@end group
-
-... @xref{Sample Texinfo Files}, for
-examples of the rest of the frontmatter ...
-
-@group
-@@ifnottex
-@@node Top
-@@top Include Example
-@@end ifnottex
-@end group
-
-@group
-@@include foo.texinfo
-@@include bar.texinfo
-@@include concept-index.texinfo
-@@bye
-@end group
-@end example
-
-An included file, such as @file{foo.texinfo}, might look like this:
-
-@example
-@group
-@@node First
-@@chapter First Chapter
-
-Contents of first chapter @dots{}
-@end group
-@end example
-
-The full contents of @file{concept-index.texinfo} might be as simple as this:
-
-@example
-@group
-@@node Concept Index
-@@unnumbered Concept Index
-
-@@printindex cp
-@end group
-@end example
-
-The outer Texinfo source file for @cite{The GNU Emacs Lisp Reference
-Manual} is named @file{elisp.texi}.  This outer file contains a master
-menu with 417 entries and a list of 41 @code{@@include}
-files.
-
-
-@node Include Files Evolution
-@section Evolution of Include Files
-
-When Info was first created, it was customary to create many small
-Info files on one subject.  Each Info file was formatted from its own
-Texinfo source file.  This custom meant that Emacs did not need to
-make a large buffer to hold the whole of a large Info file when
-someone wanted information; instead, Emacs allocated just enough
-memory for the small Info file that contained the particular
-information sought.  This way, Emacs could avoid wasting memory.@refill
-
-References from one file to another were made by referring to the file
-name as well as the node name. (@xref{Other Info Files, , Referring to
-Other Info Files}.  Also, see @ref{Four and Five Arguments, ,
-@code{@@xref} with Four and Five Arguments}.)@refill
-
-Include files were designed primarily as a way to create a single,
-large printed manual out of several smaller Info files.  In a printed
-manual, all the references were within the same document, so @TeX{}
-could automatically determine the references' page numbers.  The Info
-formatting commands used include files only for creating joint
-indices; each of the individual Texinfo files had to be formatted for
-Info individually.  (Each, therefore, required its own
-@code{@@setfilename} line.)@refill
-
-However, because large Info files are now split automatically, it is
-no longer necessary to keep them small.@refill
-
-Nowadays, multiple Texinfo files are used mostly for large documents,
-such as @cite{The GNU Emacs Lisp Reference Manual}, and for projects
-in which several different people write different sections of a
-document simultaneously.@refill
-
-In addition, the Info formatting commands have been extended to work
-with the @code{@@include} command so as to create a single large Info
-file that is split into smaller files if necessary.  This means that
-you can write menus and cross references without naming the different
-Texinfo files.@refill
-
-
-@node Headings
-@appendix Page Headings
-@cindex Headings
-@cindex Footings
-@cindex Page numbering
-@cindex Page headings
-@cindex Formatting headings and footings
-
-Most printed manuals contain headings along the top of every page
-except the title and copyright pages.  Some manuals also contain
-footings.  (Headings and footings have no meaning to Info, which is
-not paginated.)@refill
-
-@menu
-* Headings Introduced::         Conventions for using page headings.
-* Heading Format::              Standard page heading formats.
-* Heading Choice::              How to specify the type of page heading.
-* Custom Headings::             How to create your own headings and footings.
-@end menu
-
-@node Headings Introduced
-@section Headings Introduced
-
-Texinfo provides standard page heading formats for manuals that are
-printed on one side of each sheet of paper and for manuals that are
-printed on both sides of the paper.  Typically, you will use these
-formats, but you can specify your own format if you wish.@refill
-
-In addition, you can specify whether chapters should begin on a new
-page, or merely continue the same page as the previous chapter; and if
-chapters begin on new pages, you can specify whether they must be
-odd-numbered pages.@refill
-
-By convention, a book is printed on both sides of each sheet of paper.
-When you open a book, the right-hand page is odd-numbered, and
-chapters begin on right-hand pages---a preceding left-hand page is
-left blank if necessary.  Reports, however, are often printed on just
-one side of paper, and chapters begin on a fresh page immediately
-following the end of the preceding chapter.  In short or informal
-reports, chapters often do not begin on a new page at all, but are
-separated from the preceding text by a small amount of whitespace.@refill
-
-The @code{@@setchapternewpage} command controls whether chapters begin
-on new pages, and whether one of the standard heading formats is used.
-In addition, Texinfo has several heading and footing commands that you
-can use to generate your own heading and footing formats.@refill
-
-In Texinfo, headings and footings are single lines at the tops and
-bottoms of pages; you cannot create multiline headings or footings.
-Each header or footer line is divided into three parts: a left part, a
-middle part, and a right part.  Any part, or a whole line, may be left
-blank.  Text for the left part of a header or footer line is set
-flushleft; text for the middle part is centered; and, text for the
-right part is set flushright.@refill
-
-@node Heading Format
-@comment  node-name,  next,  previous,  up
-@section Standard Heading Formats
-
-Texinfo provides two standard heading formats, one for manuals printed
-on one side of each sheet of paper, and the other for manuals printed
-on both sides of the paper.
-
-By default, nothing is specified for the footing of a Texinfo file,
-so the footing remains blank.@refill
-
-The standard format for single-sided printing consists of a header
-line in which the left-hand part contains the name of the chapter, the
-central part is blank, and the right-hand part contains the page
-number.@refill
-
-@need 950
-A single-sided page looks like this:
-
-@example
-@group
-  _______________________
- |                       |
- | chapter   page number |
- |                       |
- | Start of text ...     |
- | ...                   |
- |                       |
-@end group
-@end example
-
-The standard format for two-sided printing depends on whether the page
-number is even or odd.  By convention, even-numbered pages are on the
-left- and odd-numbered pages are on the right.  (@TeX{} will adjust the
-widths of the left- and right-hand margins.  Usually, widths are
-correct, but during double-sided printing, it is wise to check that
-pages will bind properly---sometimes a printer will produce output in
-which the even-numbered pages have a larger right-hand margin than the
-odd-numbered pages.)@refill
-
-In the standard double-sided format, the left part of the left-hand
-(even-numbered) page contains the page number, the central part is
-blank, and the right part contains the title (specified by the
-@code{@@settitle} command).  The left part of the right-hand
-(odd-numbered) page contains the name of the chapter, the central part
-is blank, and the right part contains the page number.@refill
-
-@need 750
-Two pages, side by side as in an open book, look like this:@refill
-
-@example
-@group
-  _______________________     _______________________
- |                       |   |                       |
- | page number     title |   | chapter   page number |
- |                       |   |                       |
- | Start of text ...     |   | More  text ...        |
- | ...                   |   | ...                   |
- |                       |   |                       |
-@end group
-@end example
-
-@noindent
-The chapter name is preceded by the word ``Chapter'', the chapter number
-and a colon.  This makes it easier to keep track of where you are in the
-manual.@refill
-
-@node Heading Choice
-@comment  node-name,  next,  previous,  up
-@section Specifying the Type of Heading
-
-@TeX{} does not begin to generate page headings for a standard Texinfo
-file until it reaches the @code{@@end titlepage} command.  Thus, the
-title and copyright pages are not numbered.  The @code{@@end
-titlepage} command causes @TeX{} to begin to generate page headings
-according to a standard format specified by the
-@code{@@setchapternewpage} command that precedes the
-@code{@@titlepage} section.@refill
-
-@need 1000
-There are four possibilities:@refill
-
-@table @asis
-@item No @code{@@setchapternewpage} command
-Cause @TeX{} to specify the single-sided heading format, with chapters
-on new pages. This is the same as @code{@@setchapternewpage on}.@refill
-
-@item @code{@@setchapternewpage on}
-Specify the single-sided heading format, with chapters on new pages.@refill
-
-@item @code{@@setchapternewpage off}
-Cause @TeX{} to start a new chapter on the same page as the last page of
-the preceding chapter, after skipping some vertical whitespace.  Also
-cause @TeX{} to typeset for single-sided printing.  (You can override
-the headers format with the @code{@@headings double} command; see
-@ref{headings on off, , The @code{@@headings} Command}.)@refill
-
-@item @code{@@setchapternewpage odd}
-Specify the double-sided heading format, with chapters on new pages.@refill
-@end table
-
-@noindent
-Texinfo lacks an @code{@@setchapternewpage even} command.@refill
-
-@node Custom Headings
-@comment  node-name,  next,  previous,  up
-@section How to Make Your Own Headings
-
-You can use the standard headings provided with Texinfo or specify
-your own.  By default, Texinfo has no footers, so if you specify them,
-the available page size for the main text will be slightly reduced.
-
-Texinfo provides six commands for specifying headings and
-footings:
-@itemize @bullet
-@item
-@code{@@everyheading} @code{@@everyfooting} generate page headers and
-footers that are the same for both even- and odd-numbered pages.
-@item
-@code{@@evenheading} and @code{@@evenfooting} command generate headers
-and footers for even-numbered (left-hand) pages.
-@item
-@code{@@oddheading} and @code{@@oddfooting} generate headers and footers
-for odd-numbered (right-hand) pages.
-@end itemize
-
-Write custom heading specifications in the Texinfo file immediately
-after the @code{@@end titlepage} command.
-You must cancel the predefined heading commands with the
-@code{@@headings off} command before defining your own
-specifications.@refill
-
-@need 1000
-Here is how to tell @TeX{} to place the chapter name at the left, the
-page number in the center, and the date at the right of every header
-for both even- and odd-numbered pages:@refill
-
-@example
-@group
-@@headings off
-@@everyheading @@thischapter @@| @@thispage @@| @@today@{@}
-@end group
-@end example
-
-@noindent
-You need to divide the left part from the central part and the central
-part from the right part by inserting @samp{@@|} between parts.
-Otherwise, the specification command will not be able to tell where
-the text for one part ends and the next part begins.@refill
-
-Each part can contain text or @@-commands.  The text
-is printed as if the part were within an ordinary paragraph in the
-body of the page.  The @@-commands replace
-themselves with the page number, date, chapter name, or
-whatever.@refill
-
-@need 950
-Here are the six heading and footing commands:@refill
-
-@findex everyheading
-@findex everyfooting
-@table @code
-@item @@everyheading @var{left} @@| @var{center} @@| @var{right}
-@itemx @@everyfooting @var{left} @@| @var{center} @@| @var{right}
-
-The `every' commands specify the format for both even- and odd-numbered
-pages.  These commands are for documents that are printed on one side
-of each sheet of paper, or for documents in which you want symmetrical
-headers or footers.@refill
-
-@findex evenheading
-@findex evenfooting
-@findex oddheading
-@findex oddfooting
-@item @@evenheading @var{left} @@| @var{center} @@| @var{right}
-@itemx @@oddheading  @var{left} @@| @var{center} @@| @var{right}
-@itemx @@evenfooting @var{left} @@| @var{center} @@| @var{right}
-@itemx @@oddfooting  @var{left} @@| @var{center} @@| @var{right}
-
-The `even' and `odd' commands specify the format for even-numbered
-pages and odd-numbered pages.  These commands are for books and
-manuals that are printed on both sides of each sheet of paper.
-@end table
-
-Use the @samp{@@this@dots{}} series of @@-commands to
-provide the names of chapters
-and sections and the page number.  You can use the
-@samp{@@this@dots{}} commands in the left, center, or right portions
-of headers and footers, or anywhere else in a Texinfo file so long as
-they are between @code{@@iftex} and @code{@@end iftex} commands.@refill
-
-@need 1000
-Here are the @samp{@@this@dots{}} commands:@refill
-
-@table @code
-@findex thispage
-@item @@thispage
-Expands to the current page number.@refill
-@c !!! Karl Berry says that `thissection' can fail on page breaks.
-@ignore
-@item @@thissection
-Expands to the name of the current section.@refill
-@end ignore
-
-@findex thischaptername
-@item @@thischaptername
-Expands to the name of the current chapter.@refill
-
-@findex thischapter
-@item @@thischapter
-Expands to the number and name of the current
-chapter, in the format `Chapter 1: Title'.@refill
-
-@findex thistitle
-@item @@thistitle
-Expands to the name of the document, as specified by the
-@code{@@settitle} command.@refill
-
-@findex thisfile
-@item @@thisfile
-For @code{@@include} files only: expands to the name of the current
-@code{@@include} file.  If the current Texinfo source file is not an
-@code{@@include} file, this command has no effect.  This command does
-@emph{not} provide the name of the current Texinfo source file unless
-it is an @code{@@include} file.  (@xref{Include Files}, for more
-information about @code{@@include} files.)@refill
-@end table
-
-@noindent
-You can also use the @code{@@today@{@}} command, which expands to the
-current date, in `1 Jan 1900' format.@refill
-@findex today
-
-Other @@-commands and text are printed in a header or footer just as
-if they were in the body of a page.  It is useful to incorporate text,
-particularly when you are writing drafts:@refill
-
-@example
-@group
-@@headings off
-@@everyheading @@emph@{Draft!@} @@| @@thispage @@| @@thischapter
-@@everyfooting @@| @@| Version: 0.27: @@today@{@}
-@end group
-@end example
-
-Beware of overlong titles: they may overlap another part of the
-header or footer and blot it out.@refill
-
-
-@node Catching Mistakes
-@appendix Formatting Mistakes
-@cindex Structure, catching mistakes in
-@cindex Nodes, catching mistakes
-@cindex Catching mistakes
-@cindex Correcting mistakes
-@cindex Mistakes, catching
-@cindex Problems, catching
-@cindex Debugging the Texinfo structure
-
-Besides mistakes in the content of your documentation, there are two
-kinds of mistake you can make with Texinfo: you can make mistakes with
-@@-commands, and you can make mistakes with the structure of the nodes
-and chapters.
-
-Emacs has two tools for catching the @@-command mistakes and two for
-catching structuring mistakes.@refill
-
-For finding problems with @@-commands, you can run @TeX{} or a region
-formatting command on the region that has a problem; indeed, you can
-run these commands on each region as you write it.@refill
-
-For finding problems with the structure of nodes and chapters, you can use
-@kbd{C-c C-s} (@code{texinfo-show-structure}) and the related @code{occur}
-command and you can use the @kbd{M-x Info-validate} command.@refill
-
-@menu
-* makeinfo Preferred::          @code{makeinfo} finds errors.
-* Debugging with Info::         How to catch errors with Info formatting.
-* Debugging with TeX::          How to catch errors with @TeX{} formatting.
-* Using texinfo-show-structure::  How to use @code{texinfo-show-structure}.
-* Using occur::                 How to list all lines containing a pattern.
-* Running Info-Validate::       How to find badly referenced nodes.
-@end menu
-
-
-@node makeinfo Preferred
-@section @code{makeinfo} Find Errors
-
-The @code{makeinfo} program does an excellent job of catching errors
-and reporting them---far better than @code{texinfo-format-region} or
-@code{texinfo-format-buffer}.  In addition, the various functions for
-automatically creating and updating node pointers and menus remove
-many opportunities for human error.@refill
-
-If you can, use the updating commands to create and insert pointers
-and menus.  These prevent many errors.  Then use @code{makeinfo} (or
-its Texinfo mode manifestations, @code{makeinfo-region} and
-@code{makeinfo-buffer}) to format your file and check for other
-errors.  This is the best way to work with Texinfo.  But if you
-cannot use @code{makeinfo}, or your problem is very puzzling, then you
-may want to use the tools described in this appendix.@refill
-
-@node Debugging with Info
-@comment  node-name,  next,  previous,  up
-@section Catching Errors with Info Formatting
-@cindex Catching errors with Info formatting
-@cindex Debugging with Info formatting
-
-After you have written part of a Texinfo file, you can use the
-@code{texinfo-format-region} or the @code{makeinfo-region} command to
-see whether the region formats properly.@refill
-
-Most likely, however, you are reading this section because for some
-reason you cannot use the @code{makeinfo-region} command; therefore, the
-rest of this section presumes that you are using
-@code{texinfo-format-region}.@refill
-
-If you have made a mistake with an @@-command,
-@code{texinfo-format-region} will stop processing at or after the
-error and display an error message.  To see where in the buffer the
-error occurred, switch to the @samp{*Info Region*} buffer; the cursor
-will be in a position that is after the location of the error.  Also,
-the text will not be formatted after the place where the error
-occurred (or more precisely, where it was detected).@refill
-
-For example, if you accidentally end a menu with the command @code{@@end
-menus} with an `s' on the end, instead of with @code{@@end menu}, you
-will see an error message that says:@refill
-
-@example
-@@end menus is not handled by texinfo
-@end example
-
-@noindent
-The cursor will stop at the point in the buffer where the error
-occurs, or not long after it.  The buffer will look like this:@refill
-
-@example
-@group
----------- Buffer: *Info Region* ----------
-* Menu:
-
-* Using texinfo-show-structure::  How to use
-                                 `texinfo-show-structure'
-                                 to catch mistakes.
-* Running Info-Validate::         How to check for
-                                 unreferenced nodes.
-@@end menus
-@point{}
----------- Buffer: *Info Region* ----------
-@end group
-@end example
-
-The @code{texinfo-format-region} command sometimes provides slightly
-odd error messages.  For example, the following cross reference fails to format:@refill
-
-@example
-(@@xref@{Catching Mistakes, for more info.)
-@end example
-
-@noindent
-In this case, @code{texinfo-format-region} detects the missing closing
-brace but displays a message that says @samp{Unbalanced parentheses}
-rather than @samp{Unbalanced braces}.  This is because the formatting
-command looks for mismatches between braces as if they were
-parentheses.@refill
-
-Sometimes @code{texinfo-format-region} fails to detect mistakes.  For
-example, in the following, the closing brace is swapped with the
-closing parenthesis:@refill
-
-@example
-(@@xref@{Catching Mistakes), for more info.@}
-@end example
-
-@noindent
-Formatting produces:
-@example
-(*Note for more info.: Catching Mistakes)
-@end example
-
-The only way for you to detect this error is to realize that the
-reference should have looked like this:@refill
-
-@example
-(*Note Catching Mistakes::, for more info.)
-@end example
-
-Incidentally, if you are reading this node in Info and type @kbd{f
-@key{RET}} (@code{Info-follow-reference}), you will generate an error
-message that says:
-
-@example
-No such node: "Catching Mistakes) The only way @dots{}
-@end example
-
-@noindent
-This is because Info perceives the example of the error as the first
-cross reference in this node and if you type a @key{RET} immediately
-after typing the Info @kbd{f} command, Info will attempt to go to the
-referenced node.  If you type @kbd{f catch @key{TAB} @key{RET}}, Info
-will complete the node name of the correctly written example and take
-you to the `Catching Mistakes' node.  (If you try this, you can return
-from the `Catching Mistakes' node by typing @kbd{l}
-(@code{Info-last}).)
-
-@c !!! section on using Elisp debugger ignored.
-@ignore
-Sometimes @code{texinfo-format-region} will stop long after the
-original error; this is because it does not discover the problem until
-then.  In this case, you will need to backtrack.@refill
-
-@c menu
-@c * Using the Emacs Lisp Debugger::  How to use the Emacs Lisp debugger.
-@c end menu
-
-@c node Using the Emacs Lisp Debugger
-@c appendixsubsec Using the Emacs Lisp Debugger
-@c index Using the Emacs Lisp debugger
-@c index Emacs Lisp debugger
-@c index Debugger, using the Emacs Lisp
-
-If an error is especially elusive, you can turn on the Emacs Lisp
-debugger and look at the backtrace; this tells you where in the
-@code{texinfo-format-region} function the problem occurred.  You can
-turn on the debugger with the command:@refill
-
-@example
-M-x set-variable @key{RET} debug-on-error @key{RET} t @key{RET}
-@end example
-
-@noindent
-and turn it off with
-
-@example
-M-x set-variable @key{RET} debug-on-error @key{RET} nil @key{RET}
-@end example
-
-Often, when you are using the debugger, it is easier to follow what is
-going on if you use the Emacs Lisp files that are not byte-compiled.
-The byte-compiled sources send octal numbers to the debugger that may
-look mysterious.  To use the uncompiled source files, load
-@file{texinfmt.el} and @file{texinfo.el} with the @kbd{M-x load-file}
-command.@refill
-
-The debugger will not catch an error if @code{texinfo-format-region}
-does not detect one.  In the example shown above,
-@code{texinfo-format-region} did not find the error when the whole
-list was formatted, but only when part of the list was formatted.
-When @code{texinfo-format-region} did not find an error, the debugger
-did not find one either. @refill
-
-However, when @code{texinfo-format-region} did report an error, it
-invoked the debugger.  This is the backtrace it produced:@refill
-
-@example
----------- Buffer: *Backtrace* ----------
-Signalling: (search-failed "[@},]")
- re-search-forward("[@},]")
- (while ...)
- (let ...)
- texinfo-format-parse-args()
- (let ...)
- texinfo-format-xref()
- funcall(texinfo-format-xref)
- (if ...)
- (let ...)
- (if ...)
- (while ...)
- texinfo-format-scan()
- (save-excursion ...)
- (let ...)
- texinfo-format-region(103370 103631)
-* call-interactively(texinfo-format-region)
----------- Buffer: *Backtrace* ----------
-@end example
-
-The backtrace is read from the bottom up.
-@code{texinfo-format-region} was called interactively; and it, in
-turn, called various functions, including @code{texinfo-format-scan},
-@code{texinfo-format-xref} and @code{texinfo-format-parse-args}.
-Inside the function @code{texinfo-format-parse-args}, the function
-@code{re-search-forward} was called; it was this function that could
-not find the missing right-hand brace.@refill
-
-@xref{Lisp Debug, , Debugging Emacs Lisp, emacs, The GNU Emacs
-Manual}, for more information.@refill
-@end ignore
-
-@node Debugging with TeX
-@comment  node-name,  next,  previous,  up
-@section Catching Errors with @TeX{} Formatting
-@cindex Catching errors with @TeX{} formatting
-@cindex Debugging with @TeX{} formatting
-
-You can also catch mistakes when you format a file with @TeX{}.@refill
-
-Usually, you will want to do this after you have run
-@code{texinfo-format-buffer} (or, better, @code{makeinfo-buffer}) on
-the same file, because @code{texinfo-format-buffer} sometimes displays
-error messages that make more sense than @TeX{}.  (@xref{Debugging
-with Info}, for more information.)@refill
-
-For example, @TeX{} was run on a Texinfo file, part of which is shown
-here:@refill
-
-@example
----------- Buffer: texinfo.texi ----------
-name of the Texinfo file as an extension.  The
-@@samp@{??@} are `wildcards' that cause the shell to
-substitute all the raw index files.  (@@xref@{sorting
-indices, for more information about sorting
-indices.)@@refill
----------- Buffer: texinfo.texi ----------
-@end example
-
-@noindent
-(The cross reference lacks a closing brace.)
-@TeX{} produced the following output, after which it stopped:@refill
-
-@example
----------- Buffer: *tex-shell* ----------
-Runaway argument?
-@{sorting indices, for more information about sorting
-indices.) @@refill @@ETC.
-! Paragraph ended before @@xref was complete.
-<to be read again>
-                  @@par
-l.27
-
-?
----------- Buffer: *tex-shell* ----------
-@end example
-
-In this case, @TeX{} produced an accurate and
-understandable error message:
-
-@example
-Paragraph ended before @@xref was complete.
-@end example
-
-@noindent
-@samp{@@par} is an internal @TeX{} command of no relevance to Texinfo.
-@samp{l.27} means that @TeX{} detected the problem on line 27 of the
-Texinfo file.  The @samp{?} is the prompt @TeX{} uses in this
-circumstance.@refill
-
-Unfortunately, @TeX{} is not always so helpful, and sometimes you must
-truly be a Sherlock Holmes to discover what went wrong.@refill
-
-In any case, if you run into a problem like this, you can do one of three
-things.@refill
-
-@enumerate
-@item
-You can tell @TeX{} to continue running and ignore just this error by
-typing @key{RET} at the @samp{?} prompt.@refill
-
-@item
-You can tell @TeX{} to continue running and to ignore all errors as best
-it can by typing @kbd{r @key{RET}} at the @samp{?} prompt.@refill
-
-This is often the best thing to do.  However, beware: the one error
-may produce a cascade of additional error messages as its consequences
-are felt through the rest of the file.  To stop @TeX{} when it is
-producing such an avalanche of error messages, type @kbd{C-c} (or
-@kbd{C-c C-c}, if you are running a shell inside Emacs).
-
-@item
-You can tell @TeX{} to stop this run by typing @kbd{x @key{RET}}
-at the @samp{?} prompt.@refill
-@end enumerate
-
-If you are running @TeX{} inside Emacs, you need to switch to the shell
-buffer and line at which @TeX{} offers the @samp{?} prompt.
-
-Sometimes @TeX{} will format a file without producing error messages even
-though there is a problem.  This usually occurs if a command is not ended
-but @TeX{} is able to continue processing anyhow.  For example, if you fail
-to end an itemized list with the @code{@@end itemize} command, @TeX{} will
-write a DVI file that you can print out.  The only error message that
-@TeX{} will give you is the somewhat mysterious comment that@refill
-
-@example
-(@@end occurred inside a group at level 1)
-@end example
-
-@noindent
-However, if you print the DVI file, you will find that the text
-of the file that follows the itemized list is entirely indented as if
-it were part of the last item in the itemized list.  The error message
-is the way @TeX{} says that it expected to find an @code{@@end}
-command somewhere in the file; but that it could not determine where
-it was needed.@refill
-
-Another source of notoriously hard-to-find errors is a missing
-@code{@@end group} command.  If you ever are stumped by
-incomprehensible errors, look for a missing @code{@@end group} command
-first.@refill
-
-If the Texinfo file lacks header lines,
-@TeX{} may stop in the
-beginning of its run and display output that looks like the following.
-The @samp{*} indicates that @TeX{} is waiting for input.@refill
-
-@example
-This is TeX, Version 3.14159 (Web2c 7.0)
-(test.texinfo [1])
-*
-@end example
-
-@noindent
-In this case, simply type @kbd{\end @key{RET}} after the asterisk.  Then
-write the header lines in the Texinfo file and run the @TeX{} command
-again. (Note the use of the backslash, @samp{\}.  @TeX{} uses @samp{\}
-instead of @samp{@@}; and in this circumstance, you are working
-directly with @TeX{}, not with Texinfo.)@refill
-
-@node Using texinfo-show-structure
-@comment  node-name,  next,  previous,  up
-@section Using @code{texinfo-show-structure}
-@cindex Showing the structure of a file
-@findex texinfo-show-structure
-
-It is not always easy to keep track of the nodes, chapters, sections, and
-subsections of a Texinfo file.  This is especially true if you are revising
-or adding to a Texinfo file that someone else has written.@refill
-
-In GNU Emacs, in Texinfo mode, the @code{texinfo-show-structure}
-command lists all the lines that begin with the @@-commands that
-specify the structure: @code{@@chapter}, @code{@@section},
-@code{@@appendix}, and so on.  With an argument (@w{@kbd{C-u}}
-as prefix argument, if interactive),
-the command also shows the @code{@@node} lines.  The
-@code{texinfo-show-structure} command is bound to @kbd{C-c C-s} in
-Texinfo mode, by default.@refill
-
-The lines are displayed in a buffer called the @samp{*Occur*} buffer,
-indented by hierarchical level.  For example, here is a part of what was
-produced by running @code{texinfo-show-structure} on this manual:@refill
-
-@example
-@group
-Lines matching "^@@\\(chapter \\|sect\\|subs\\|subh\\|
-unnum\\|major\\|chapheading \\|heading \\|appendix\\)"
-in buffer texinfo.texi.
-@dots{}
-4177:@@chapter Nodes
-4198:    @@heading Two Paths
-4231:    @@section Node and Menu Illustration
-4337:    @@section The @@code@{@@@@node@} Command
-4393:        @@subheading Choosing Node and Pointer Names
-4417:        @@subsection How to Write an @@code@{@@@@node@} Line
-4469:        @@subsection @@code@{@@@@node@} Line Tips
-@dots{}
-@end group
-@end example
-
-This says that lines 4337, 4393, and 4417 of @file{texinfo.texi} begin
-with the @code{@@section}, @code{@@subheading}, and @code{@@subsection}
-commands respectively.  If you move your cursor into the @samp{*Occur*}
-window, you can position the cursor over one of the lines and use the
-@kbd{C-c C-c} command (@code{occur-mode-goto-occurrence}), to jump to
-the corresponding spot in the Texinfo file.  @xref{Other Repeating
-Search, , Using Occur, emacs, The GNU Emacs Manual}, for more
-information about @code{occur-mode-goto-occurrence}.@refill
-
-The first line in the @samp{*Occur*} window describes the @dfn{regular
-expression} specified by @var{texinfo-heading-pattern}.  This regular
-expression is the pattern that @code{texinfo-show-structure} looks for.
-@xref{Regexps, , Using Regular Expressions, emacs, The GNU Emacs Manual},
-for more information.@refill
-
-When you invoke the @code{texinfo-show-structure} command, Emacs will
-display the structure of the whole buffer.  If you want to see the
-structure of just a part of the buffer, of one chapter, for example,
-use the @kbd{C-x n n} (@code{narrow-to-region}) command to mark the
-region.  (@xref{Narrowing, , , emacs, The GNU Emacs Manual}.)  This is
-how the example used above was generated.  (To see the whole buffer
-again, use @kbd{C-x n w} (@code{widen}).)@refill
-
-If you call @code{texinfo-show-structure} with a prefix argument by
-typing @w{@kbd{C-u C-c C-s}}, it will list lines beginning with
-@code{@@node} as well as the lines beginning with the @@-sign commands
-for @code{@@chapter}, @code{@@section}, and the like.@refill
-
-You can remind yourself of the structure of a Texinfo file by looking at
-the list in the @samp{*Occur*} window; and if you have mis-named a node
-or left out a section, you can correct the mistake.@refill
-
-@node Using occur
-@comment  node-name,  next,  previous,  up
-@section Using @code{occur}
-@cindex Occurrences, listing with @code{@@occur}
-@findex occur
-
-Sometimes the @code{texinfo-show-structure} command produces too much
-information.  Perhaps you want to remind yourself of the overall structure
-of a Texinfo file, and are overwhelmed by the detailed list produced by
-@code{texinfo-show-structure}.  In this case, you can use the @code{occur}
-command directly.  To do this, type@refill
-
-@example
-@kbd{M-x occur}
-@end example
-
-@noindent
-and then, when prompted, type a @dfn{regexp}, a regular expression for
-the pattern you want to match.  (@xref{Regexps, , Regular Expressions,
-emacs, The GNU Emacs Manual}.)  The @code{occur} command works from
-the current location of the cursor in the buffer to the end of the
-buffer.  If you want to run @code{occur} on the whole buffer, place
-the cursor at the beginning of the buffer.@refill
-
-For example, to see all the lines that contain the word
-@samp{@@chapter} in them, just type @samp{@@chapter}.  This will
-produce a list of the chapters.  It will also list all the sentences
-with @samp{@@chapter} in the middle of the line.@refill
-
-If you want to see only those lines that start with the word
-@samp{@@chapter}, type @samp{^@@chapter} when prompted by
-@code{occur}.  If you want to see all the lines that end with a word
-or phrase, end the last word with a @samp{$}; for example,
-@samp{catching mistakes$}.  This can be helpful when you want to see
-all the nodes that are part of the same chapter or section and
-therefore have the same `Up' pointer.@refill
-
-@xref{Other Repeating Search, , Using Occur, emacs , The GNU Emacs Manual},
-for more information.@refill
-
-@node Running Info-Validate
-@comment  node-name,  next,  previous,  up
-@section Finding Badly Referenced Nodes
-@findex Info-validate
-@cindex Nodes, checking for badly referenced
-@cindex Checking for badly referenced nodes
-@cindex Looking for badly referenced nodes
-@cindex Finding badly referenced nodes
-@cindex Badly referenced nodes
-
-You can use the @code{Info-validate} command to check whether any of
-the `Next', `Previous', `Up' or other node pointers fail to point to a
-node.  This command checks that every node pointer points to an
-existing node.  The @code{Info-validate} command works only on Info
-files, not on Texinfo files.@refill
-
-The @code{makeinfo} program validates pointers automatically, so you
-do not need to use the @code{Info-validate} command if you are using
-@code{makeinfo}.  You only may need to use @code{Info-validate} if you
-are unable to run @code{makeinfo} and instead must create an Info file
-using @code{texinfo-format-region} or @code{texinfo-format-buffer}, or
-if you write an Info file from scratch.@refill
-
-@menu
-* Using Info-validate::         How to run @code{Info-validate}.
-* Unsplit::                     How to create an unsplit file.
-* Tagifying::                   How to tagify a file.
-* Splitting::                   How to split a file manually.
-@end menu
-
-@node Using Info-validate
-@subsection Running @code{Info-validate}
-@cindex Running @code{Info-validate}
-@cindex Info validating a large file
-@cindex Validating a large file
-
-To use @code{Info-validate}, visit the Info file you wish to check and
-type:@refill
-
-@example
-M-x Info-validate
-@end example
-
-@noindent
-Note that the @code{Info-validate} command requires an upper case
-`I'.  You may also need to create a tag table before running
-@code{Info-validate}.  @xref{Tagifying}.
-
-If your file is valid, you will receive a message that says ``File appears
-valid''.  However, if you have a pointer that does not point to a node,
-error messages will be displayed in a buffer called @samp{*problems in
-info file*}.@refill
-
-For example, @code{Info-validate} was run on a test file that contained
-only the first node of this manual.  One of the messages said:@refill
-
-@example
-In node "Overview", invalid Next: Texinfo Mode
-@end example
-
-@noindent
-This meant that the node called @samp{Overview} had a `Next' pointer that
-did not point to anything (which was true in this case, since the test file
-had only one node in it).@refill
-
-Now suppose we add a node named @samp{Texinfo Mode} to our test case
-but we do not specify a `Previous' for this node.  Then we will get
-the following error message:@refill
-
-@example
-In node "Texinfo Mode", should have Previous: Overview
-@end example
-
-@noindent
-This is because every `Next' pointer should be matched by a
-`Previous' (in the node where the `Next' points) which points back.@refill
-
-@code{Info-validate} also checks that all menu entries and cross references
-point to actual nodes.@refill
-
-@code{Info-validate} requires a tag table and does not work with files
-that have been split.  (The @code{texinfo-format-buffer} command
-automatically splits large files.)  In order to use @code{Info-validate}
-on a large file, you must run @code{texinfo-format-buffer} with an
-argument so that it does not split the Info file; and you must create a
-tag table for the unsplit file.
-
-@node Unsplit
-@comment  node-name,  next,  previous,  up
-@subsection Creating an Unsplit File
-@cindex Creating an unsplit file
-@cindex Unsplit file creation
-
-You can run @code{Info-validate} only on a single Info file that has a
-tag table.  The command will not work on the indirect subfiles that
-are generated when a master file is split.  If you have a large file
-(longer than 300,000 bytes or so), you need to run the
-@code{texinfo-format-buffer} or @code{makeinfo-buffer} command in such
-a way that it does not create indirect subfiles.  You will also need
-to create a tag table for the Info file.  After you have done this,
-you can run @code{Info-validate} and look for badly referenced
-nodes.@refill
-
-The first step is to create an unsplit Info file.  To prevent
-@code{texinfo-format-buffer} from splitting a Texinfo file into
-smaller Info files, give a prefix to the @kbd{M-x
-texinfo-format-buffer} command:@refill
-
-@example
-C-u M-x texinfo-format-buffer
-@end example
-
-@noindent
-or else
-
-@example
-C-u C-c C-e C-b
-@end example
-
-@noindent
-When you do this, Texinfo will not split the file and will not create
-a tag table for it. @refill
-@cindex Making a tag table manually
-@cindex Tag table, making manually
-
-@node Tagifying
-@subsection Tagifying a File
-
-After creating an unsplit Info file, you must create a tag table for
-it.  Visit the Info file you wish to tagify and type:@refill
-
-@example
-M-x Info-tagify
-@end example
-
-@noindent
-(Note the upper case @samp{I} in @code{Info-tagify}.)  This creates an
-Info file with a tag table that you can validate.@refill
-
-The third step is to validate the Info file:@refill
-
-@example
-M-x Info-validate
-@end example
-
-@noindent
-(Note the upper case @samp{I} in @code{Info-validate}.)
-In brief, the steps are:@refill
-
-@example
-@group
-C-u M-x texinfo-format-buffer
-M-x Info-tagify
-M-x Info-validate
-@end group
-@end example
-
-After you have validated the node structure, you can rerun
-@code{texinfo-format-buffer} in the normal way so it will construct a
-tag table and split the file automatically, or you can make the tag
-table and split the file manually.@refill
-
-@node Splitting
-@comment  node-name,  next,  previous,  up
-@subsection Splitting a File Manually
-@cindex Splitting an Info file manually
-@cindex Info file, splitting manually
-
-You should split a large file or else let the
-@code{texinfo-format-buffer} or @code{makeinfo-buffer} command do it
-for you automatically.  (Generally you will let one of the formatting
-commands do this job for you.  @xref{Creating an Info File}.)@refill
-
-The split-off files are called the indirect subfiles.@refill
-
-Info files are split to save memory.  With smaller files, Emacs does not
-have make such a large buffer to hold the information.@refill
-
-If an Info file has more than 30 nodes, you should also make a tag
-table for it. @xref{Using Info-validate}, for information
-about creating a tag table.  (Again, tag tables are usually created
-automatically by the formatting command; you only need to create a tag
-table yourself if you are doing the job manually.  Most likely, you
-will do this for a large, unsplit file on which you have run
-@code{Info-validate}.)@refill
-
-@c Info-split is autoloaded in `loaddefs.el' in Emacs 18.51
-@ignore
-Before running @code{Info-split}, you need to load the @code{info} library
-into Emacs by giving the command @kbd{M-x load-library @key{RET} info
-@key{RET}}.
-@end ignore
-
-Visit the Info file you wish to tagify and split and type the two
-commands:@refill
-
-@example
-M-x Info-tagify
-M-x Info-split
-@end example
-
-@noindent
-(Note that the @samp{I} in @samp{Info} is upper case.)@refill
-
-When you use the @code{Info-split} command, the buffer is modified into a
-(small) Info file which lists the indirect subfiles.  This file should be
-saved in place of the original visited file.  The indirect subfiles are
-written in the same directory the original file is in, with names generated
-by appending @samp{-} and a number to the original file name.@refill
-
-The primary file still functions as an Info file, but it contains just
-the tag table and a directory of subfiles.@refill
-
-
-@ignore
-The simple description in the command summary seems sufficient to me
-these days, so ignore this appendix.  --karl, 13mar04.
-
-@node Refilling Paragraphs
-@appendix Refilling Paragraphs
-@cindex Refilling paragraphs
-@cindex Filling paragraphs
-@cindex Paragraphs, filling
-@findex refill
-
-The @code{@@refill} command refills and, optionally, indents the first
-line of a paragraph.@footnote{Perhaps the command should have been
-called the @code{@@refillandindent} command, but @code{@@refill} is
-shorter and the name was chosen before indenting was possible.} The
-@code{@@refill} command is no longer important, but we describe it here
-because you once needed it.  You will see it in many old Texinfo
-files.@refill
-
-Without refilling, paragraphs containing long @@-constructs may look
-bad after formatting because the formatter removes @@-commands and
-shortens some lines more than others.  In the past, neither the
-@code{texinfo-format-region} command nor the
-@code{texinfo-format-buffer} command refilled paragraphs
-automatically.  The @code{@@refill} command had to be written at the
-end of every paragraph to cause these formatters to fill them.  (Both
-@TeX{} and @code{makeinfo} have always refilled paragraphs
-automatically.)  Now, all the Info formatters automatically fill and
-indent those paragraphs that need to be filled and indented.@refill
-
-The @code{@@refill} command causes @code{texinfo-format-region} and
-@code{texinfo-format-buffer} to refill a paragraph in the Info file
-@emph{after} all the other processing has been done.  For this reason,
-you can not use @code{@@refill} with a paragraph containing either
-@code{@@*} or @code{@@w@{ @dots{} @}} since the refilling action will
-override those two commands.@refill
-
-The @code{texinfo-format-region} and @code{texinfo-format-buffer}
-commands now automatically append @code{@@refill} to the end of each
-paragraph that should be filled.  They do not append @code{@@refill} to
-the ends of paragraphs that contain @code{@@*} or @w{@code{@@w@{ @dots{}@}}}
-and therefore do not refill or indent them.@refill
-
-@end ignore
-
-
-@c These are no longer ``new'', and the explanations
-@c are all given elsewhere anyway, I think.  --karl, 25apr97.
-@c So ignore the entire appendix.
-@ignore
-@c node New Features, Command and Variable Index, Obtaining TeX, Top
-@c appendix Second Edition Features
-
-@tex
-% Widen the space for the first column so three control-character
-% strings fit in the first column.  Switched back to default .8in
-% value at end of chapter.
-\global\tableindent=1.0in
-@end tex
-
-The second edition of the Texinfo manual describes more than 20 new
-Texinfo mode commands and more than 50 previously undocumented Texinfo
-@@-commands.  This edition is more than twice the length of the first
-edition.@refill
-
-Here is a brief description of the new commands.@refill
-
-@c menu
-* New Texinfo Mode Commands::   The updating commands are especially useful.
-* New Commands::                Many newly described @@-commands.
-@c end menu
-
-@c node New Texinfo Mode Commands, New Commands, Obtaining TeX, Obtaining TeX
-@c appendixsec New Texinfo Mode Commands
-
-Texinfo mode provides commands and features especially designed for
-working with Texinfo files.  More than 20 new commands have been
-added, including commands for automatically creating and updating
-both nodes and menus.  This is a tedious task when done by hand.@refill
-
-The keybindings are intended to be somewhat mnemonic.@refill
-
-@c subheading Update all nodes and menus
-
-The @code{texinfo-master-menu} command is the primary command:
-
-@table @kbd
-@item C-c C-u m
-@itemx M-x texinfo-master-menu
-Create or update a master menu.
-With @kbd{C-u} as a prefix argument,
-first create or update all nodes
-and regular menus.
-@end table
-
-@c subheading Update Pointers
-
-@noindent
-Create or update `Next', `Previous', and `Up' node pointers.@refill
-
-@noindent
-@xref{Updating Nodes and Menus}.
-
-@table @kbd
-@item C-c C-u C-n
-@itemx M-x texinfo-update-node
-Update a node.
-
-@item C-c C-u C-e
-@itemx M-x texinfo-every-node-update
-Update every node in the buffer.
-@end table
-
-@c subheading Update Menus
-
-@noindent
-Create or update menus.@refill
-
-@noindent
-@xref{Updating Nodes and Menus}.
-
-@table @kbd
-@item C-c C-u C-m
-@itemx M-x texinfo-make-menu
-Make or update a menu.
-
-@item C-c C-u C-a
-@itemx M-x texinfo-all-menus-update
-Make or update all the menus in a buffer.
-With @kbd{C-u} as a prefix argument,
-first update all the nodes.
-@end table
-
-@c subheading Insert Title as Description
-
-@noindent
-Insert a node's chapter or section title in the space for the
-description in a menu entry line; position point so you can edit the
-insert.  (This command works somewhat differently than the other
-insertion commands, which insert only a predefined string.)@refill
-
-@noindent
-@xref{Inserting, Inserting Frequently Used Commands}.
-
-@table @kbd
-@item C-c C-c C-d
-Insert title.
-@end table
-
-@c subheading Format for Info
-
-@noindent
-Provide keybindings both for the Info formatting commands that are
-written in Emacs Lisp and for @code{makeinfo} that is written in
-C.@refill
-
-@noindent
-@xref{Info Formatting}.
-
-@noindent
-Use the Emacs lisp @code{texinfo-format@dots{}} commands:
-
-@table @kbd
-@item C-c C-e C-r
-Format the region.
-
-@item C-c C-e C-b
-Format the buffer.
-@end table
-
-@noindent
-Use @code{makeinfo}:
-
-@table @kbd
-@item C-c C-m C-r
-Format the region.
-
-@item C-c C-m C-b
-Format the buffer.
-
-@item C-c C-m C-l
-Recenter the @code{makeinfo} output buffer.
-
-@item C-c C-m C-k
-Kill the @code{makeinfo} formatting job.
-@end table
-
-@c subheading Typeset and Print
-
-@noindent
-Typeset and print Texinfo documents from within Emacs.
-
-@noindent
-@xref{Printing}.
-
-@table @kbd
-@item C-c C-t C-b
-Run @code{texi2dvi} on the buffer.
-
-@item C-c C-t C-r
-Run @TeX{} on the region.
-
-@item C-c C-t C-i
-Run @code{texindex}.
-
-@item C-c C-t C-p
-Print the DVI file.
-
-@item C-c C-t C-q
-Show the print queue.
-
-@item C-c C-t C-d
-Delete a job from the print queue.
-
-@item C-c C-t C-k
-Kill the current @TeX{} formatting job.
-
-@item C-c C-t C-x
-Quit a currently stopped @TeX{} formatting job.
-
-@item C-c C-t C-l
-Recenter the output buffer.
-@end table
-
-@c subheading Other Updating Commands
-
-@noindent
-The ``other updating commands'' do not have standard keybindings because
-they are used less frequently.@refill
-
-@noindent
-@xref{Other Updating Commands}.
-
-@table @kbd
-@item M-x texinfo-insert-node-lines
-Insert missing @code{@@node} lines using
-section titles as node names.
-
-@item M-x texinfo-multiple-files-update
-Update a multi-file document.
-With a numeric prefix, such as @kbd{C-u 8},
-update  @strong{every} pointer and
-menu in @strong{all} the files and
-then insert a master menu.
-
-@item M-x texinfo-indent-menu-description
-Indent descriptions in menus.
-
-@item M-x texinfo-sequential-node-update
-Insert node pointers in strict sequence.
-@end table
-
-@c no.de New Commands,  , New Texinfo Mode Commands, Obtaining TeX
-@c appendix.sec New Texinfo @@-Commands
-
-The second edition of the Texinfo manual describes more than 50
-commands that were not described in the first edition.  A third or so
-of these commands existed in Texinfo but were not documented in the
-manual; the others are new.  Here is a listing, with brief
-descriptions of them:@refill
-
-@c subheading Indexing
-
-@noindent
-Create your own index, and merge indices.@refill
-
-@noindent
-@xref{Indices}.
-
-@table @kbd
-@item @@defindex @var{index-name}
-Define a new index and its indexing command.
-See also the @code{@@defcodeindex} command.
-
-@c written verbosely to avoid overfull hbox
-@item @@synindex @var{from-index} @var{into-index}
-Merge the @var{from-index} index into the @var{into-index} index.
-See also the @code{@@syncodeindex} command.
-@end table
-
-@c subheading Definitions
-
-@noindent
-Describe functions, variables, macros,
-commands, user options, special forms, and other such artifacts in a
-uniform format.@refill
-
-@noindent
-@xref{Definition Commands}.
-
-@table @kbd
-@item @@deffn @var{category} @var{name} @var{arguments}@dots{}
-Format a description for functions, interactive
-commands, and similar entities.
-
-@item @@defvr, @@defop, @dots{}
-15 other related commands.
-@end table
-
-@c subheading Glyphs
-
-@noindent
-Indicate the results of evaluation, expansion,
-printed output, an error message, equivalence of expressions, and the
-location of point.@refill
-
-@noindent
-@xref{Glyphs}.
-
-@table @kbd
-@item @@equiv@{@}
-@itemx @equiv{}
-Equivalence:
-
-@item @@error@{@}
-@itemx @error{}
-Error message
-
-@item @@expansion@{@}
-@itemx @expansion{}
-Macro expansion
-
-@item @@point@{@}
-@itemx @point{}
-Position of point
-
-@item @@print@{@}
-@itemx @print{}
-Printed output
-
-@item @@result@{@}
-@itemx @result{}
-Result of an expression
-@end table
-
-@c subheading Page Headings
-
-@noindent
-Customize page headings.
-
-@noindent
-@xref{Headings}.
-
-@table @kbd
-@item @@headings @var{on-off-single-double}
-Headings on or off, single, or double-sided.
-
-@item @@evenfooting [@var{left}] @@| [@var{center}] @@| [@var{right}]
-Footings for even-numbered (left-hand) pages.
-
-@item @@evenheading, @@everyheading, @@oddheading, @dots{}
-Five other related commands.
-
-@item @@thischapter
-Insert name of chapter and chapter number.
-
-@item @@thischaptername, @@thisfile, @@thistitle, @@thispage
-Related commands.
-@end table
-
-@c subheading Formatting
-
-@noindent
-Format blocks of text.
-
-@noindent
-@xref{Quotations and Examples}, and@*
-@ref{Lists and Tables, , Making Lists and Tables}.
-
-@table @kbd
-@item @@cartouche
-Draw rounded box surrounding text (no effect in Info).
-
-@item @@enumerate @var{optional-arg}
-Enumerate a list with letters or numbers.
-
-@item @@exdent @var{line-of-text}
-Remove indentation.
-
-@item @@flushleft
-Left justify.
-
-@item @@flushright
-Right justify.
-
-@item @@format
-Do not narrow nor change font.
-
-@item @@ftable @var{formatting-command}
-@itemx @@vtable @var{formatting-command}
-Two-column table with indexing.
-
-@item @@lisp
-For an example of Lisp code.
-
-@item @@smallexample
-@itemx @@smalllisp
-Like @@table and @@lisp, but for (originally) @@smallbook.
-@end table
-
-@c subheading Conditionals
-
-@noindent
-Conditionally format text.
-
-@noindent
-@xref{set clear value, , @code{@@set} @code{@@clear} @code{@@value}}.@refill
-
-@table @kbd
-@item @@set @var{flag} [@var{string}]
-Set a flag.  Optionally, set value
-of @var{flag} to @var{string}.
-
-@item @@clear @var{flag}
-Clear a flag.
-
-@item @@value@{@var{flag}@}
-Replace with value to which @var{flag} is set.
-
-@item @@ifset @var{flag}
-Format, if @var{flag} is set.
-
-@item @@ifclear @var{flag}
-Ignore, if @var{flag} is set.
-@end table
-
-@c subheading @@heading series for Titles
-
-@noindent
-Produce unnumbered headings that do not appear in a table of contents.
-
-@noindent
-@xref{Structuring}.
-
-@table @kbd
-@item @@heading @var{title}
-Unnumbered section-like heading not listed
-in the table of contents of a printed manual.
-
-@item @@chapheading, @@majorheading, @@c subheading, @@subsubheading
-Related commands.
-@end table
-
-@need 1000
-@c subheading Font commands
-
-@need 1000
-@noindent
-@xref{Smallcaps}, and @*
-@ref{Fonts}.
-
-@table @kbd
-@item @@r@{@var{text}@}
-Print in roman font.
-
-@item @@sc@{@var{text}@}
-Print in @sc{small caps} font.
-@end table
-
-@c subheading Miscellaneous
-
-@noindent
-See @ref{title subtitle author, , @code{@@title} @code{@@subtitle} and @code{@@author} Commands},@*
-see @ref{Customized Highlighting},@*
-see @ref{Overfull hboxes},@*
-see @ref{Footnotes},@*
-see @ref{dmn, , Format a Dimension},@*
-see @ref{Raise/lower sections, , @code{@@raisesections} and @code{@@lowersections}},@*
-see @ref{math, , @code{@@math}: Inserting Mathematical Expressions}.@*
-see @ref{minus, , Inserting a Minus Sign},@*
-see @ref{paragraphindent, , Paragraph Indenting},@*
-see @ref{Cross Reference Commands},@*
-see @ref{title subtitle author, , @code{@@title} @code{@@subtitle} and @code{@@author}}, and@*
-see @ref{Custom Headings, , How to Make Your Own Headings}.
-
-@table @kbd
-@item @@author @var{author}
-Typeset author's name.
-
-@c @item @@definfoenclose @var{new-command}, @var{before}, @var{after},
-@c Define a highlighting command for Info.  (Info only.)
-
-@item @@finalout
-Produce cleaner printed output.
-
-@item @@footnotestyle @var{end-or-separate}
-Specify footnote style.
-
-@item @@dmn@{@var{dimension}@}
-Format a dimension.
-
-@item @@global@@let@var{new-cmd}=@var{existing-cmd}
-Define a highlighting command for @TeX{}. (@TeX{} only.)
-
-@item @@lowersections
-Reduce hierarchical level of sectioning commands.
-
-@item @@math@{@var{mathematical-expression}@}
-Format a mathematical expression.
-
-@item @@minus@{@}
-Generate a minus sign.
-
-@item @@paragraphindent @var{asis-or-number}
-Specify paragraph indentation.
-
-@item @@raisesections
-Raise hierarchical level of sectioning commands.
-
-@item @@ref@{@var{node-name}, @r{[}@var{entry}@r{]}, @r{[}@var{topic-or-title}@r{]}, @r{[}@var{info-file}@r{]}, @r{[}@var{manual}@r{]}@}
-Make a reference.  In the printed manual, the
-reference does not start with the word `see'.
-
-@item @@title @var{title}
-Typeset @var{title} in the alternative
-title page format.
-
-@item @@subtitle @var{subtitle}
-Typeset @var{subtitle} in the alternative
-title page format.
-
-@item @@today@{@}
-Insert the current date.
-@end table
-@tex
-% Switch width of first column of tables back to default value
-\global\tableindent=.8in
-@end tex
-@end ignore
-
-
-@node Copying This Manual
-@appendix Copying This Manual
-
-@menu
-* GNU Free Documentation License::  License for copying this manual.
-@end menu
-
-@include fdl.texi
-
-
-@node Command and Variable Index
-@unnumbered Command and Variable Index
-
-This is an alphabetical list of all the @@-commands, assorted Emacs Lisp
-functions, and several variables.  To make the list easier to use, the
-commands are listed without their preceding @samp{@@}.@refill
-
-@printindex fn
-
-
-@node Concept Index
-@unnumbered Concept Index
-
-@printindex cp
-
-
-@bye

Property changes on: head/contrib/texinfo/doc/texinfo.txi
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/doc/info.1
===================================================================
--- head/contrib/texinfo/doc/info.1	(revision 276550)
+++ head/contrib/texinfo/doc/info.1	(nonexistent)
@@ -1,89 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
-.TH INFO "1" "December 2004" "info 4.8" "User Commands"
-.SH NAME
-info \- read Info documents
-.SH SYNOPSIS
-.B info
-[\fIOPTION\fR]... [\fIMENU-ITEM\fR...]
-.SH DESCRIPTION
-Read documentation in Info format.
-.SH OPTIONS
-.TP
-\fB\-\-apropos\fR=\fISTRING\fR
-look up STRING in all indices of all manuals.
-.TP
-\fB\-d\fR, \fB\-\-directory\fR=\fIDIR\fR
-add DIR to INFOPATH.
-.TP
-\fB\-\-dribble\fR=\fIFILENAME\fR
-remember user keystrokes in FILENAME.
-.TP
-\fB\-f\fR, \fB\-\-file\fR=\fIFILENAME\fR
-specify Info file to visit.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-display this help and exit.
-.TP
-\fB\-\-index\-search\fR=\fISTRING\fR
-go to node pointed by index entry STRING.
-.TP
-\fB\-n\fR, \fB\-\-node\fR=\fINODENAME\fR
-specify nodes in first visited Info file.
-.TP
-\fB\-o\fR, \fB\-\-output\fR=\fIFILENAME\fR
-output selected nodes to FILENAME.
-.TP
-\fB\-R\fR, \fB\-\-raw\-escapes\fR
-output "raw" ANSI escapes (default).
-.TP
-\fB\-\-no\-raw\-escapes\fR
-output escapes as literal text.
-.TP
-\fB\-\-restore\fR=\fIFILENAME\fR
-read initial keystrokes from FILENAME.
-.TP
-\fB\-O\fR, \fB\-\-show\-options\fR, \fB\-\-usage\fR
-go to command\-line options node.
-.TP
-\fB\-\-subnodes\fR
-recursively output menu items.
-.TP
-\fB\-w\fR, \fB\-\-where\fR, \fB\-\-location\fR
-print physical location of Info file.
-.TP
-\fB\-\-vi\-keys\fR
-use vi\-like and less\-like key bindings.
-.TP
-\fB\-\-version\fR
-display version information and exit.
-.PP
-The first non\-option argument, if present, is the menu entry to start from;
-it is searched for in all `dir' files along INFOPATH.
-If it is not present, info merges all `dir' files and shows the result.
-Any remaining arguments are treated as the names of menu
-items relative to the initial node visited.
-.SH EXAMPLES
-.TP
-info
-show top\-level dir menu
-.TP
-info emacs
-start at emacs node from top\-level dir
-.TP
-info emacs buffers
-start at buffers node within emacs manual
-.TP
-info \fB\-\-show\-options\fR emacs
-start at node with emacs' command line options
-.TP
-info \fB\-f\fR ./foo.info
-show file ./foo.info, not searching dir
-.SH "REPORTING BUGS"
-Email bug reports to bug\-texinfo@gnu.org,
-general questions and discussion to help\-texinfo@gnu.org.
-Texinfo home page: http://www.gnu.org/software/texinfo/
-.SH COPYRIGHT
-Copyright \(co 2004 Free Software Foundation, Inc.
-There is NO warranty.  You may redistribute this software
-under the terms of the GNU General Public License.
-For more information about these matters, see the files named COPYING.

Property changes on: head/contrib/texinfo/doc/info.1
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/doc/fdl.texi
===================================================================
--- head/contrib/texinfo/doc/fdl.texi	(revision 276550)
+++ head/contrib/texinfo/doc/fdl.texi	(nonexistent)
@@ -1,452 +0,0 @@
-
-@node GNU Free Documentation License
-@appendixsec GNU Free Documentation License
-
-@cindex FDL, GNU Free Documentation License
-@center Version 1.2, November 2002
-
-@display
-Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-@end display
-
-@enumerate 0
-@item
-PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-functional and useful document @dfn{free} in the sense of freedom: to
-assure everyone the effective freedom to copy and redistribute it,
-with or without modifying it, either commercially or noncommercially.
-Secondarily, this License preserves for the author and publisher a way
-to get credit for their work, while not being considered responsible
-for modifications made by others.
-
-This License is a kind of ``copyleft'', which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-@item
-APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work, in any medium, that
-contains a notice placed by the copyright holder saying it can be
-distributed under the terms of this License.  Such a notice grants a
-world-wide, royalty-free license, unlimited in duration, to use that
-work under the conditions stated herein.  The ``Document'', below,
-refers to any such manual or work.  Any member of the public is a
-licensee, and is addressed as ``you''.  You accept the license if you
-copy, modify or distribute the work in a way requiring permission
-under copyright law.
-
-A ``Modified Version'' of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A ``Secondary Section'' is a named appendix or a front-matter section
-of the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall
-subject (or to related matters) and contains nothing that could fall
-directly within that overall subject.  (Thus, if the Document is in
-part a textbook of mathematics, a Secondary Section may not explain
-any mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The ``Invariant Sections'' are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.  If a
-section does not fit the above definition of Secondary then it is not
-allowed to be designated as Invariant.  The Document may contain zero
-Invariant Sections.  If the Document does not identify any Invariant
-Sections then there are none.
-
-The ``Cover Texts'' are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.  A Front-Cover Text may
-be at most 5 words, and a Back-Cover Text may be at most 25 words.
-
-A ``Transparent'' copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, that is suitable for revising the document
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup, or absence of markup, has been arranged to thwart
-or discourage subsequent modification by readers is not Transparent.
-An image format is not Transparent if used for any substantial amount
-of text.  A copy that is not ``Transparent'' is called ``Opaque''.
-
-Examples of suitable formats for Transparent copies include plain
-@sc{ascii} without markup, Texinfo input format, La@TeX{} input
-format, @acronym{SGML} or @acronym{XML} using a publicly available
-@acronym{DTD}, and standard-conforming simple @acronym{HTML},
-PostScript or @acronym{PDF} designed for human modification.  Examples
-of transparent image formats include @acronym{PNG}, @acronym{XCF} and
-@acronym{JPG}.  Opaque formats include proprietary formats that can be
-read and edited only by proprietary word processors, @acronym{SGML} or
-@acronym{XML} for which the @acronym{DTD} and/or processing tools are
-not generally available, and the machine-generated @acronym{HTML},
-PostScript or @acronym{PDF} produced by some word processors for
-output purposes only.
-
-The ``Title Page'' means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, ``Title Page'' means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-A section ``Entitled XYZ'' means a named subunit of the Document whose
-title either is precisely XYZ or contains XYZ in parentheses following
-text that translates XYZ in another language.  (Here XYZ stands for a
-specific section name mentioned below, such as ``Acknowledgements'',
-``Dedications'', ``Endorsements'', or ``History''.)  To ``Preserve the Title''
-of such a section when you modify the Document means that it remains a
-section ``Entitled XYZ'' according to this definition.
-
-The Document may include Warranty Disclaimers next to the notice which
-states that this License applies to the Document.  These Warranty
-Disclaimers are considered to be included by reference in this
-License, but only as regards disclaiming warranties: any other
-implication that these Warranty Disclaimers may have is void and has
-no effect on the meaning of this License.
-
-@item
-VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-@item
-COPYING IN QUANTITY
-
-If you publish printed copies (or copies in media that commonly have
-printed covers) of the Document, numbering more than 100, and the
-Document's license notice requires Cover Texts, you must enclose the
-copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a computer-network location from which the general network-using
-public has access to download using public-standard network protocols
-a complete Transparent copy of the Document, free of added material.
-If you use the latter option, you must take reasonably prudent steps,
-when you begin distribution of Opaque copies in quantity, to ensure
-that this Transparent copy will remain thus accessible at the stated
-location until at least one year after the last time you distribute an
-Opaque copy (directly or through your agents or retailers) of that
-edition to the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
-
-@item
-MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-@enumerate A
-@item
-Use in the Title Page (and on the covers, if any) a title distinct
-from that of the Document, and from those of previous versions
-(which should, if there were any, be listed in the History section
-of the Document).  You may use the same title as a previous version
-if the original publisher of that version gives permission.
-
-@item
-List on the Title Page, as authors, one or more persons or entities
-responsible for authorship of the modifications in the Modified
-Version, together with at least five of the principal authors of the
-Document (all of its principal authors, if it has fewer than five),
-unless they release you from this requirement.
-
-@item
-State on the Title page the name of the publisher of the
-Modified Version, as the publisher.
-
-@item
-Preserve all the copyright notices of the Document.
-
-@item
-Add an appropriate copyright notice for your modifications
-adjacent to the other copyright notices.
-
-@item
-Include, immediately after the copyright notices, a license notice
-giving the public permission to use the Modified Version under the
-terms of this License, in the form shown in the Addendum below.
-
-@item
-Preserve in that license notice the full lists of Invariant Sections
-and required Cover Texts given in the Document's license notice.
-
-@item
-Include an unaltered copy of this License.
-
-@item
-Preserve the section Entitled ``History'', Preserve its Title, and add
-to it an item stating at least the title, year, new authors, and
-publisher of the Modified Version as given on the Title Page.  If
-there is no section Entitled ``History'' in the Document, create one
-stating the title, year, authors, and publisher of the Document as
-given on its Title Page, then add an item describing the Modified
-Version as stated in the previous sentence.
-
-@item
-Preserve the network location, if any, given in the Document for
-public access to a Transparent copy of the Document, and likewise
-the network locations given in the Document for previous versions
-it was based on.  These may be placed in the ``History'' section.
-You may omit a network location for a work that was published at
-least four years before the Document itself, or if the original
-publisher of the version it refers to gives permission.
-
-@item
-For any section Entitled ``Acknowledgements'' or ``Dedications'', Preserve
-the Title of the section, and preserve in the section all the
-substance and tone of each of the contributor acknowledgements and/or
-dedications given therein.
-
-@item
-Preserve all the Invariant Sections of the Document,
-unaltered in their text and in their titles.  Section numbers
-or the equivalent are not considered part of the section titles.
-
-@item
-Delete any section Entitled ``Endorsements''.  Such a section
-may not be included in the Modified Version.
-
-@item
-Do not retitle any existing section to be Entitled ``Endorsements'' or
-to conflict in title with any Invariant Section.
-
-@item
-Preserve any Warranty Disclaimers.
-@end enumerate
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section Entitled ``Endorsements'', provided it contains
-nothing but endorsements of your Modified Version by various
-parties---for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-@item
-COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice, and that you preserve all their Warranty Disclaimers.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections Entitled ``History''
-in the various original documents, forming one section Entitled
-``History''; likewise combine any sections Entitled ``Acknowledgements'',
-and any sections Entitled ``Dedications''.  You must delete all
-sections Entitled ``Endorsements.''
-
-@item
-COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-
-@item
-AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, is called an ``aggregate'' if the copyright
-resulting from the compilation is not used to limit the legal rights
-of the compilation's users beyond what the individual works permit.
-When the Document is included in an aggregate, this License does not
-apply to the other works in the aggregate which are not themselves
-derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one half of
-the entire aggregate, the Document's Cover Texts may be placed on
-covers that bracket the Document within the aggregate, or the
-electronic equivalent of covers if the Document is in electronic form.
-Otherwise they must appear on printed covers that bracket the whole
-aggregate.
-
-@item
-TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License, and all the license notices in the
-Document, and any Warranty Disclaimers, provided that you also include
-the original English version of this License and the original versions
-of those notices and disclaimers.  In case of a disagreement between
-the translation and the original version of this License or a notice
-or disclaimer, the original version will prevail.
-
-If a section in the Document is Entitled ``Acknowledgements'',
-``Dedications'', or ``History'', the requirement (section 4) to Preserve
-its Title (section 1) will typically require changing the actual
-title.
-
-@item
-TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License.  Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License.  However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-@item
-FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
-@uref{http://www.gnu.org/copyleft/}.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License ``or any later version'' applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
-@end enumerate
-
-@page
-@appendixsubsec ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-@smallexample
-@group
-  Copyright (C)  @var{year}  @var{your name}.
-  Permission is granted to copy, distribute and/or modify this document
-  under the terms of the GNU Free Documentation License, Version 1.2
-  or any later version published by the Free Software Foundation;
-  with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
-  Texts.  A copy of the license is included in the section entitled ``GNU
-  Free Documentation License''.
-@end group
-@end smallexample
-
-If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the ``with...Texts.'' line with this:
-
-@smallexample
-@group
-    with the Invariant Sections being @var{list their titles}, with
-    the Front-Cover Texts being @var{list}, and with the Back-Cover Texts
-    being @var{list}.
-@end group
-@end smallexample
-
-If you have Invariant Sections without Cover Texts, or some other
-combination of the three, merge those two alternatives to suit the
-situation.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
-
-@c Local Variables:
-@c ispell-local-pdict: "ispell-dict"
-@c End:
-

Property changes on: head/contrib/texinfo/doc/fdl.texi
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/doc/makeinfo.1
===================================================================
--- head/contrib/texinfo/doc/makeinfo.1	(revision 276550)
+++ head/contrib/texinfo/doc/makeinfo.1	(nonexistent)
@@ -1,205 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
-.TH MAKEINFO "1" "December 2004" "makeinfo 4.8" "User Commands"
-.SH NAME
-makeinfo \- translate Texinfo documents
-.SH SYNOPSIS
-.B makeinfo
-[\fIOPTION\fR]... \fITEXINFO-FILE\fR...
-.SH DESCRIPTION
-Translate Texinfo source documentation to various other formats, by default
-Info files suitable for reading online with Emacs or standalone GNU Info.
-.SS "General options:"
-.TP
-\fB\-\-error\-limit\fR=\fINUM\fR
-quit after NUM errors (default 100).
-.TP
-\fB\-\-force\fR
-preserve output even if errors.
-.TP
-\fB\-\-help\fR
-display this help and exit.
-.TP
-\fB\-\-no\-validate\fR
-suppress node cross\-reference validation.
-.TP
-\fB\-\-no\-warn\fR
-suppress warnings (but not errors).
-.TP
-\fB\-\-reference\-limit\fR=\fINUM\fR
-warn about at most NUM references (default 1000).
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-explain what is being done.
-.TP
-\fB\-\-version\fR
-display version information and exit.
-.SS "Output format selection (default is to produce Info):"
-.TP
-\fB\-\-docbook\fR
-output Docbook XML rather than Info.
-.TP
-\fB\-\-html\fR
-output HTML rather than Info.
-.TP
-\fB\-\-xml\fR
-output Texinfo XML rather than Info.
-.TP
-\fB\-\-plaintext\fR
-output plain text rather than Info.
-.SS "General output options:"
-.TP
-\fB\-E\fR, \fB\-\-macro\-expand\fR FILE
-output macro\-expanded source to FILE.
-ignoring any @setfilename.
-.TP
-\fB\-\-no\-headers\fR
-suppress node separators, Node: lines, and menus
-from Info output (thus producing plain text)
-or from HTML (thus producing shorter output);
-also, write to standard output by default.
-.TP
-\fB\-\-no\-split\fR
-suppress splitting of Info or HTML output,
-generate only one output file.
-.TP
-\fB\-\-number\-sections\fR
-output chapter and sectioning numbers.
-.TP
-\fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR
-output to FILE (directory if split HTML),
-.SS "Options for Info and plain text:"
-.TP
-\fB\-\-enable\-encoding\fR
-output accented and special characters in
-Info output based on @documentencoding.
-.TP
-\fB\-\-fill\-column\fR=\fINUM\fR
-break Info lines at NUM characters (default 72).
-.TP
-\fB\-\-footnote\-style\fR=\fISTYLE\fR
-output footnotes in Info according to STYLE:
-`separate' to put them in their own node;
-`end' to put them at the end of the node
-.IP
-in which they are defined (default).
-.TP
-\fB\-\-paragraph\-indent\fR=\fIVAL\fR
-indent Info paragraphs by VAL spaces (default 3).
-If VAL is `none', do not indent; if VAL is
-`asis', preserve existing indentation.
-.TP
-\fB\-\-split\-size\fR=\fINUM\fR
-split Info files at size NUM (default 300000).
-.SS "Options for HTML:"
-.TP
-\fB\-\-css\-include\fR=\fIFILE\fR
-include FILE in HTML <style> output;
-read stdin if FILE is \-.
-.SS "Options for XML and Docbook:"
-.TP
-\fB\-\-output\-indent\fR=\fIVAL\fR
-indent XML elements by VAL spaces (default 2).
-If VAL is 0, ignorable whitespace is dropped.
-.SS "Input file options:"
-.TP
-\fB\-\-commands\-in\-node\-names\fR
-allow @ commands in node names.
-.TP
-\fB\-D\fR VAR
-define the variable VAR, as with @set.
-.TP
-\fB\-I\fR DIR
-append DIR to the @include search path.
-.TP
-\fB\-P\fR DIR
-prepend DIR to the @include search path.
-.TP
-\fB\-U\fR VAR
-undefine the variable VAR, as with @clear.
-.SS "Conditional processing in input:"
-.TP
-\fB\-\-ifdocbook\fR
-process @ifdocbook and @docbook even if
-not generating Docbook.
-.TP
-\fB\-\-ifhtml\fR
-process @ifhtml and @html even if not generating HTML.
-.TP
-\fB\-\-ifinfo\fR
-process @ifinfo even if not generating Info.
-.TP
-\fB\-\-ifplaintext\fR
-process @ifplaintext even if not generating plain text.
-.TP
-\fB\-\-iftex\fR
-process @iftex and @tex; implies \fB\-\-no\-split\fR.
-.TP
-\fB\-\-ifxml\fR
-process @ifxml and @xml.
-.TP
-\fB\-\-no\-ifdocbook\fR
-do not process @ifdocbook and @docbook text.
-.TP
-\fB\-\-no\-ifhtml\fR
-do not process @ifhtml and @html text.
-.TP
-\fB\-\-no\-ifinfo\fR
-do not process @ifinfo text.
-.TP
-\fB\-\-no\-ifplaintext\fR
-do not process @ifplaintext text.
-.TP
-\fB\-\-no\-iftex\fR
-do not process @iftex and @tex text.
-.TP
-\fB\-\-no\-ifxml\fR
-do not process @ifxml and @xml text.
-.IP
-Also, for the \fB\-\-no\-ifFORMAT\fR options, do process @ifnotFORMAT text.
-.IP
-The defaults for the @if... conditionals depend on the output format:
-if generating HTML, \fB\-\-ifhtml\fR is on and the others are off;
-if generating Info, \fB\-\-ifinfo\fR is on and the others are off;
-if generating plain text, \fB\-\-ifplaintext\fR is on and the others are off;
-if generating XML, \fB\-\-ifxml\fR is on and the others are off.
-.SH EXAMPLES
-.TP
-makeinfo foo.texi
-write Info to foo's @setfilename
-.TP
-makeinfo \fB\-\-html\fR foo.texi
-write HTML to @setfilename
-.TP
-makeinfo \fB\-\-xml\fR foo.texi
-write Texinfo XML to @setfilename
-.TP
-makeinfo \fB\-\-docbook\fR foo.texi
-write DocBook XML to @setfilename
-.TP
-makeinfo \fB\-\-no\-headers\fR foo.texi
-write plain text to standard output
-.IP
-makeinfo \fB\-\-html\fR \fB\-\-no\-headers\fR foo.texi write html without node lines, menus
-makeinfo \fB\-\-number\-sections\fR foo.texi   write Info with numbered sections
-makeinfo \fB\-\-no\-split\fR foo.texi          write one Info file however big
-.SH "REPORTING BUGS"
-Email bug reports to bug\-texinfo@gnu.org,
-general questions and discussion to help\-texinfo@gnu.org.
-Texinfo home page: http://www.gnu.org/software/texinfo/
-.SH COPYRIGHT
-Copyright \(co 2004 Free Software Foundation, Inc.
-There is NO warranty.  You may redistribute this software
-under the terms of the GNU General Public License.
-For more information about these matters, see the files named COPYING.
-.SH "SEE ALSO"
-The full documentation for
-.B makeinfo
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B makeinfo
-programs are properly installed at your site, the command
-.IP
-.B info makeinfo
-.PP
-should give you access to the complete manual.

Property changes on: head/contrib/texinfo/doc/makeinfo.1
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/doc/info.5
===================================================================
--- head/contrib/texinfo/doc/info.5	(revision 276550)
+++ head/contrib/texinfo/doc/info.5	(nonexistent)
@@ -1,62 +0,0 @@
-.\" info(5)
-.\" $Id: info.5,v 1.2 2004/04/11 17:56:45 karl Exp $
-.\"
-.\" Copyright (C) 1998 Free Software Foundation, Inc.
-.\"
-.\" Permission is granted to make and distribute verbatim copies of this
-.\" manual provided the copyright notice and this permission notice are
-.\" preserved on all copies.
-.\"
-.\" Permission is granted to copy and distribute modified versions of
-.\" this manual under the conditions for verbatim copying, provided that
-.\" the entire resulting derived work is distributed under the terms of a
-.\" permission notice identical to this one.
-.\"
-.\" Permission is granted to copy and distribute translations of this
-.\" manual into another language, under the above conditions for modified
-.\" versions, except that this permission notice may be stated in a
-.\" translation approved by the Foundation.
-.\"
-.TH INFO 5 "GNU Info" "FSF"
-.SH NAME
-info \- readable online documentation
-.SH DESCRIPTION
-The Info file format is an easily-parsable representation for online
-documents.  It can be read by
-.I emacs(1)
-and
-.I info(1)
-among other programs.
-.PP
-Info files are usually created from
-.I texinfo(5)
-sources by
-.IR makeinfo(1) ,
-but can be created from scratch if so desired.
-.PP
-For a full description of the Texinfo language and associated tools,
-please see the Texinfo manual (written in Texinfo itself).  Most likely,
-running this command from your shell:
-.RS
-.I info texinfo
-.RE
-or this key sequence from inside Emacs:
-.RS
-.I M-x info RET m texinfo RET
-.RE
-will get you there.
-.SH AVAILABILITY
-ftp://ftp.gnu.org/pub/gnu/texinfo-<version>.tar.gz
-.br
-or any GNU mirror site.
-.SH "REPORTING BUGS"
-Please send bug reports to bug-texinfo@gnu.org,
-general questions and discussion to help-texinfo@gnu.org.
-.SH "SEE ALSO"
-info(1), install-info(1), makeinfo(1), texi2dvi(1),
-.br
-texindex(1).
-.br
-emacs(1), tex(1).
-.br
-texinfo(5).

Property changes on: head/contrib/texinfo/doc/info.5
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/doc/texindex.1
===================================================================
--- head/contrib/texinfo/doc/texindex.1	(revision 276550)
+++ head/contrib/texinfo/doc/texindex.1	(nonexistent)
@@ -1,47 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
-.TH TEXINDEX "1" "December 2004" "texindex 4.8" "User Commands"
-.SH NAME
-texindex \- sort Texinfo index files
-.SH SYNOPSIS
-.B texindex
-[\fIOPTION\fR]... \fIFILE\fR...
-.SH DESCRIPTION
-Generate a sorted index for each TeX output FILE.
-Usually FILE... is specified as `foo.??' for a document `foo.texi'.
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-display this help and exit
-.TP
-\fB\-k\fR, \fB\-\-keep\fR
-keep temporary files around after processing
-.TP
-\fB\-\-no\-keep\fR
-do not keep temporary files around after processing (default)
-.TP
-\fB\-o\fR, \fB\-\-output\fR FILE
-send output to FILE
-.TP
-\fB\-\-version\fR
-display version information and exit
-.SH "REPORTING BUGS"
-Email bug reports to bug\-texinfo@gnu.org,
-general questions and discussion to help\-texinfo@gnu.org.
-Texinfo home page: http://www.gnu.org/software/texinfo/
-.SH COPYRIGHT
-Copyright \(co 2004 Free Software Foundation, Inc.
-There is NO warranty.  You may redistribute this software
-under the terms of the GNU General Public License.
-For more information about these matters, see the files named COPYING.
-.SH "SEE ALSO"
-The full documentation for
-.B texindex
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B texindex
-programs are properly installed at your site, the command
-.IP
-.B info texindex
-.PP
-should give you access to the complete manual.

Property changes on: head/contrib/texinfo/doc/texindex.1
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/doc/version.texi
===================================================================
--- head/contrib/texinfo/doc/version.texi	(revision 276550)
+++ head/contrib/texinfo/doc/version.texi	(nonexistent)
@@ -1,4 +0,0 @@
-@set UPDATED 29 December 2004
-@set UPDATED-MONTH December 2004
-@set EDITION 4.8
-@set VERSION 4.8

Property changes on: head/contrib/texinfo/doc/version.texi
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/lib/xstrdup.c
===================================================================
--- head/contrib/texinfo/lib/xstrdup.c	(revision 276550)
+++ head/contrib/texinfo/lib/xstrdup.c	(nonexistent)
@@ -1,33 +0,0 @@
-/* xstrdup.c -- copy a string with out of memory checking
-   Copyright (C) 1990, 1996, 1998, 2001, 2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-/* Specification.  */
-#include "xalloc.h"
-
-#include <string.h>
-
-/* Return a newly allocated copy of STRING.  */
-
-char *
-xstrdup (const char *string)
-{
-  return strcpy (xmalloc (strlen (string) + 1), string);
-}

Property changes on: head/contrib/texinfo/lib/xstrdup.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/lib/README
===================================================================
--- head/contrib/texinfo/lib/README	(revision 276550)
+++ head/contrib/texinfo/lib/README	(nonexistent)
@@ -1,13 +0,0 @@
-$Id: README,v 1.3 2004/04/11 17:56:46 karl Exp $
-texinfo/lib/README
-
-  Copyright (C) 2002 Free Software Foundation, Inc.
-
-  Copying and distribution of this file, with or without modification,
-  are permitted in any medium without royalty provided the copyright
-  notice and this notice are preserved.
-
-Common routines for the Texinfo programs.
-
-Many are common to other GNU packages as well.
-See the gnulib project at savannah: http://savannah.gnu.org/projects/gnulib

Property changes on: head/contrib/texinfo/lib/README
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/lib/substring.c
===================================================================
--- head/contrib/texinfo/lib/substring.c	(revision 276550)
+++ head/contrib/texinfo/lib/substring.c	(nonexistent)
@@ -1,35 +0,0 @@
-/* substring.c -- extract substring.
-   $Id: substring.c,v 1.2 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1999, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "system.h"
-
-char *
-substring (const char *start, const char *end)
-{
-  char *result = xmalloc (end - start + 1);
-  char *scan_result = result;
-  const char *scan = start;
-
-  while (scan < end)
-    *scan_result++ = *scan++;
-
-  *scan_result = 0;
-  return result;
-}
-

Property changes on: head/contrib/texinfo/lib/substring.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/lib/xalloc.h
===================================================================
--- head/contrib/texinfo/lib/xalloc.h	(revision 276550)
+++ head/contrib/texinfo/lib/xalloc.h	(nonexistent)
@@ -1,90 +0,0 @@
-/* xalloc.h -- malloc with out-of-memory checking
-
-   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2003, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef XALLOC_H_
-# define XALLOC_H_
-
-# include <stddef.h>
-
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-
-# ifndef __attribute__
-#  if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
-#   define __attribute__(x)
-#  endif
-# endif
-
-# ifndef ATTRIBUTE_NORETURN
-#  define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
-# endif
-
-/* This function is always triggered when memory is exhausted.
-   It must be defined by the application, either explicitly
-   or by using gnulib's xalloc-die module.  This is the
-   function to call when one wants the program to die because of a
-   memory allocation failure.  */
-extern void xalloc_die (void) ATTRIBUTE_NORETURN;
-
-void *xmalloc (size_t s);
-void *xnmalloc (size_t n, size_t s);
-void *xzalloc (size_t s);
-void *xcalloc (size_t n, size_t s);
-void *xrealloc (void *p, size_t s);
-void *xnrealloc (void *p, size_t n, size_t s);
-void *x2realloc (void *p, size_t *pn);
-void *x2nrealloc (void *p, size_t *pn, size_t s);
-void *xclone (void const *p, size_t s);
-char *xstrdup (const char *str);
-
-/* Return 1 if an array of N objects, each of size S, cannot exist due
-   to size arithmetic overflow.  S must be positive and N must be
-   nonnegative.  This is a macro, not an inline function, so that it
-   works correctly even when SIZE_MAX < N.
-
-   By gnulib convention, SIZE_MAX represents overflow in size
-   calculations, so the conservative dividend to use here is
-   SIZE_MAX - 1, since SIZE_MAX might represent an overflowed value.
-   However, malloc (SIZE_MAX) fails on all known hosts where
-   sizeof (ptrdiff_t) <= sizeof (size_t), so do not bother to test for
-   exactly-SIZE_MAX allocations on such hosts; this avoids a test and
-   branch when S is known to be 1.  */
-# define xalloc_oversized(n, s) \
-    ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n))
-
-/* These macros are deprecated; they will go away soon, and are retained
-   temporarily only to ease conversion to the functions described above.  */
-# define CCLONE(p, n) xclone (p, (n) * sizeof *(p))
-# define CLONE(p) xclone (p, sizeof *(p))
-# define NEW(type, var) type *var = xmalloc (sizeof (type))
-# define XCALLOC(type, n) xcalloc (n, sizeof (type))
-# define XMALLOC(type, n) xnmalloc (n, sizeof (type))
-# define XREALLOC(p, type, n) xnrealloc (p, n, sizeof (type))
-# define XFREE(p) free (p)
-
-
-# ifdef __cplusplus
-}
-# endif
-
-
-#endif /* !XALLOC_H_ */

Property changes on: head/contrib/texinfo/lib/xalloc.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/lib/gettext.h
===================================================================
--- head/contrib/texinfo/lib/gettext.h	(revision 276550)
+++ head/contrib/texinfo/lib/gettext.h	(nonexistent)
@@ -1,68 +0,0 @@
-/* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef _LIBGETTEXT_H
-#define _LIBGETTEXT_H 1
-
-/* NLS can be disabled through the configure --disable-nls option.  */
-#if ENABLE_NLS
-
-/* Get declarations of GNU message catalog functions.  */
-# include <libintl.h>
-
-#else
-
-/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
-   chokes if dcgettext is defined as a macro.  So include it now, to make
-   later inclusions of <locale.h> a NOP.  We don't include <libintl.h>
-   as well because people using "gettext.h" will not include <libintl.h>,
-   and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
-   is OK.  */
-#if defined(__sun)
-# include <locale.h>
-#endif
-
-/* Disabled NLS.
-   The casts to 'const char *' serve the purpose of producing warnings
-   for invalid uses of the value returned from these functions.
-   On pre-ANSI systems without 'const', the config.h file is supposed to
-   contain "#define const".  */
-# define gettext(Msgid) ((const char *) (Msgid))
-# define dgettext(Domainname, Msgid) ((const char *) (Msgid))
-# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
-# define ngettext(Msgid1, Msgid2, N) \
-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-# define dngettext(Domainname, Msgid1, Msgid2, N) \
-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-# define textdomain(Domainname) ((const char *) (Domainname))
-# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
-# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
-
-#endif
-
-/* A pseudo function call that serves as a marker for the automated
-   extraction of messages, but does not call gettext().  The run-time
-   translation is done at a different place in the code.
-   The argument, String, should be a literal string.  Concatenated strings
-   and other string expressions won't work.
-   The macro's expansion is not parenthesized, so that it is suitable as
-   initializer for static 'char[]' or 'const char[]' variables.  */
-#define gettext_noop(String) String
-
-#endif /* _LIBGETTEXT_H */

Property changes on: head/contrib/texinfo/lib/gettext.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/lib/system.h
===================================================================
--- head/contrib/texinfo/lib/system.h	(revision 276550)
+++ head/contrib/texinfo/lib/system.h	(nonexistent)
@@ -1,291 +0,0 @@
-/* system.h: system-dependent declarations; include this first.
-   $Id: system.h,v 1.12 2004/04/26 13:56:57 karl Exp $
-
-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef TEXINFO_SYSTEM_H
-#define TEXINFO_SYSTEM_H
-
-#define _GNU_SOURCE
-
-#include <config.h>
-
-#ifdef MIKTEX
-#include <gnu-miktex.h>
-#define S_ISDIR(x) ((x)&_S_IFDIR) 
-#else
-/* MiKTeX defines substring() in a separate DLL, where it has its
-   own __declspec declaration.  We don't want to try to duplicate 
-   this Microsoft-ism here.  */
-extern char *substring (const char *, const char *);
-#endif
-
-/* We follow the order of header inclusion from Autoconf's
-   ac_includes_default, more or less.  */
-#include <stdio.h>
-#include <sys/types.h>
-#include <ctype.h>
-
-/* All systems nowadays probably have these functions, but ... */
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-#ifndef HAVE_SETLOCALE
-#define setlocale(category,locale) /* empty */
-#endif
-
-/* For gettext (NLS).  */
-#define const
-#include "gettext.h"
-#undef const
-
-#define _(String) gettext (String)
-#define N_(String) (String)
-
-#ifdef STDC_HEADERS
-#define getopt system_getopt
-#include <stdlib.h>
-#undef getopt
-#else
-extern char *getenv ();
-#endif
-
-/* Don't use bcopy!  Use memmove if source and destination may overlap,
-   memcpy otherwise.  */
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-
-#if HAVE_STRINGS_H
-/* Always include <strings.h> if we have it.  This is because that's
-   what Autoconf's AC_CHECK_DECL does.  On IBM AIX 4.2, strncasecmp is
-   only declared in strings.h.  */
-# include <strings.h>
-#endif
-
-#if !HAVE_STRNCASECMP || !HAVE_STRCASECMP
-# include "strcase.h"
-#endif
-
-#if !HAVE_DECL_MEMCHR
-char *memchr ();
-#endif
-
-/* <unistd.h> defines _POSIX_VERSION, but Paul Eggert points out that is
-   only supposed to be used in user code, not other system headers.  */
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-#ifdef VMS
-#include <perror.h>
-#endif
-
-#ifndef HAVE_DECL_STRERROR
-extern char *strerror ();
-#endif
-
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-#ifndef PATH_MAX
-#ifndef _POSIX_PATH_MAX
-# define _POSIX_PATH_MAX 255
-#endif
-#define PATH_MAX _POSIX_PATH_MAX
-#endif
-
-#ifndef HAVE_DECL_STRCASECMP
-extern int strcasecmp ();
-#endif
-
-#ifndef HAVE_DECL_STRNCASECMP
-extern int strncasecmp ();
-#endif
-
-#ifndef HAVE_DECL_STRCOLL
-extern int strcoll ();
-#endif
-
-#include <sys/stat.h>
-#if STAT_MACROS_BROKEN
-# undef S_ISDIR
-#endif
-#if !defined(S_ISDIR) && defined(S_IFDIR)
-# define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
-#endif
-
-#ifdef HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif /* HAVE_SYS_FILE_H */
-
-#ifndef O_RDONLY
-/* Since <fcntl.h> is POSIX, prefer that to <sys/fcntl.h>.
-   This also avoids some useless warnings on (at least) Linux.  */
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#else /* not HAVE_FCNTL_H */
-#ifdef HAVE_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif /* not HAVE_SYS_FCNTL_H */
-#endif /* not HAVE_FCNTL_H */
-#endif /* not O_RDONLY */
-
-/* MS-DOS and similar non-Posix systems have some peculiarities:
-    - they distinguish between binary and text files;
-    - they use both `/' and `\\' as directory separator in file names;
-    - they can have a drive letter X: prepended to a file name;
-    - they have a separate root directory on each drive;
-    - their filesystems are case-insensitive;
-    - directories in environment variables (like INFOPATH) are separated
-        by `;' rather than `:';
-    - text files can have their lines ended either with \n or with \r\n pairs;
-   These are all parameterized here except the last, which is
-   handled by the source code as appropriate (mostly, in info/).  */
-#ifndef O_BINARY
-# ifdef _O_BINARY
-#  define O_BINARY _O_BINARY
-# else
-#  define O_BINARY 0
-# endif
-#endif /* O_BINARY */
-
-/* We'd like to take advantage of _doprnt if it's around, a la error.c,
-   but then we'd have no VA_SPRINTF.  */
-#if HAVE_VPRINTF
-# if __STDC__
-#  include <stdarg.h>
-#  define VA_START(args, lastarg) va_start(args, lastarg)
-# else
-#  include <varargs.h>
-#  define VA_START(args, lastarg) va_start(args)
-# endif
-# define VA_FPRINTF(file, fmt, ap) vfprintf (file, fmt, ap)
-# define VA_SPRINTF(str, fmt, ap) vsprintf (str, fmt, ap)
-#else /* not HAVE_VPRINTF */
-# define VA_START(args, lastarg)
-# define va_alist a1, a2, a3, a4, a5, a6, a7, a8
-# define va_dcl char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8;
-# define va_end(args)
-#endif
-
-#if O_BINARY
-# ifdef HAVE_IO_H
-#  include <io.h>
-# endif
-# ifdef __MSDOS__
-#  include <limits.h>
-#  ifdef __DJGPP__
-#   define HAVE_LONG_FILENAMES(dir)  (pathconf (dir, _PC_NAME_MAX) > 12)
-#   define NULL_DEVICE	"/dev/null"
-#   define DEFAULT_INFOPATH "c:/djgpp/info;/usr/local/info;/usr/info;."
-    /* DJGPP supports /dev/null, which is okay for Unix aficionados,
-       shell scripts and Makefiles, but interactive DOS die-hards
-       would probably want to have NUL as well.  */
-#   define ALSO_NULL_DEVICE  "NUL"
-#  else  /* O_BINARY && !__DJGPP__ */
-#   define HAVE_LONG_FILENAMES(dir)  (0)
-#   define NULL_DEVICE	"NUL"
-#  endif /* O_BINARY && !__DJGPP__ */
-#  define SET_SCREEN_SIZE_HELPER terminal_prep_terminal()
-#  define DEFAULT_INFO_PRINT_COMMAND ">PRN"
-# else   /* O_BINARY && !__MSDOS__ */
-#  define setmode(f,m)  _setmode(f,m)
-#  define HAVE_LONG_FILENAMES(dir)   (1)
-#  define NULL_DEVICE	"NUL"
-# endif  /* O_BINARY && !__MSDOS__ */
-# ifdef __CYGWIN__
-#  define DEFAULT_TMPDIR	"/tmp/"
-#  define PATH_SEP	":"
-# else  /* O_BINARY && !__CYGWIN__ */
-#  define DEFAULT_TMPDIR	"c:/"
-#  define PATH_SEP	";"
-# endif /* O_BINARY && !__CYGWIN__ */
-  /* Back to any O_BINARY system.  */
-# define FILENAME_CMP	strcasecmp
-# define FILENAME_CMPN	strncasecmp
-# define FOPEN_RBIN	"rb"
-# define FOPEN_WBIN	"wb"
-# define HAVE_DRIVE(n)	((n)[0] && (n)[1] == ':')
-# define IS_SLASH(c)	((c) == '/' || (c) == '\\')
-# define IS_ABSOLUTE(n)	(IS_SLASH((n)[0]) || ((n)[0] && (n)[1] == ':'))
-# define PIPE_USE_FORK	0
-# define SET_BINARY(f)  do {if (!isatty(f)) setmode(f,O_BINARY);} while(0)
-# define STRIP_DOT_EXE	1
-
-#else  /* not O_BINARY, i.e., Unix */
-# define SET_BINARY(f)	(void)0
-# define FOPEN_RBIN	"r"
-# define FOPEN_WBIN	"w"
-# define IS_SLASH(c)	((c) == '/')
-# define HAVE_DRIVE(n)	(0)
-# define IS_ABSOLUTE(n)	((n)[0] == '/')
-# define FILENAME_CMP	strcmp
-# define FILENAME_CMPN	strncmp
-# define HAVE_LONG_FILENAMES(dir)   (1)
-# define PATH_SEP	":"
-# define STRIP_DOT_EXE	0
-# ifdef VMS
-#  define DEFAULT_TMPDIR "sys$scratch:"
-# else
-#  define DEFAULT_TMPDIR "/tmp/"
-# endif
-# define NULL_DEVICE	"/dev/null"
-# define PIPE_USE_FORK	1
-#endif /* not O_BINARY */
-
-/* Everything but DJGPP.  */
-#ifndef ALSO_NULL_DEVICE
-# define ALSO_NULL_DEVICE  ""
-#endif
-
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-/* Some systems don't declare this function in pwd.h. */
-struct passwd *getpwnam (const char *name);
-
-/* Our library routines not included in any system library.  */
-extern void *xmalloc (size_t), *xrealloc (void *, size_t);
-extern char *xstrdup (const char *);
-extern void xexit (int);
-
-/* For convenience.  */
-#define STREQ(s1,s2) (strcmp (s1, s2) == 0)
-#define STRCASEEQ(s1,s2) (strcasecmp (s1, s2) == 0)
-#define STRNCASEEQ(s1,s2,n) (strncasecmp (s1, s2, n) == 0)
-
-/* We don't need anything fancy.  If we did need something fancy, gnulib
-   has it.  */
-#ifdef MIN
-#undef MIN
-#endif
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#ifdef MAX
-#undef MAX
-#endif
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-
-#endif /* TEXINFO_SYSTEM_H */

Property changes on: head/contrib/texinfo/lib/system.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/lib/xmalloc.c
===================================================================
--- head/contrib/texinfo/lib/xmalloc.c	(revision 276550)
+++ head/contrib/texinfo/lib/xmalloc.c	(nonexistent)
@@ -1,61 +0,0 @@
-/* xmalloc.c -- safe versions of malloc and realloc.
-
-   Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#if !defined (ALREADY_HAVE_XMALLOC)
-#include "system.h"
-
-static void
-memory_error_and_abort (const char *fname)
-{
-  fprintf (stderr, "%s: Out of virtual memory!\n", fname);
-  abort ();
-}
-
-/* Return a pointer to free()able block of memory large enough
-   to hold BYTES number of bytes.  If the memory cannot be allocated,
-   print an error message and abort. */
-void *
-xmalloc (size_t bytes)
-{
-  void *temp = malloc (bytes);
-
-  if (!temp)
-    memory_error_and_abort ("xmalloc");
-  return (temp);
-}
-
-void *
-xrealloc (void *pointer, size_t bytes)
-{
-  void *temp;
-
-  if (!pointer)
-    temp = malloc (bytes);
-  else
-    temp = realloc (pointer, bytes);
-
-  if (!temp)
-    memory_error_and_abort ("xrealloc");
-
-  return (temp);
-}
-
-#endif /* !ALREADY_HAVE_XMALLOC */

Property changes on: head/contrib/texinfo/lib/xmalloc.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/lib/xexit.c
===================================================================
--- head/contrib/texinfo/lib/xexit.c	(revision 276550)
+++ head/contrib/texinfo/lib/xexit.c	(nonexistent)
@@ -1,87 +0,0 @@
-/* xexit.c -- exit with attention to return values and closing stdout.
-   $Id: xexit.c,v 1.5 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1999, 2003, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "system.h"
-
-/* SunOS 4.1.1 gets STDC_HEADERS defined, but it doesn't provide
-   EXIT_FAILURE.  So far no system has defined one of EXIT_FAILURE and
-   EXIT_SUCCESS without the other.  */
-#ifdef EXIT_SUCCESS
- /* The following test is to work around the gross typo in
-    systems like Sony NEWS-OS Release 4.0C, whereby EXIT_FAILURE
-    is defined to 0, not 1.  */
-# if !EXIT_FAILURE
-#  undef EXIT_FAILURE
-#  define EXIT_FAILURE 1
-# endif
-#else /* not EXIT_SUCCESS */
-# ifdef VMS /* these values suppress some messages; from gnuplot */
-#   define EXIT_SUCCESS 1
-#   define EXIT_FAILURE 0x10000002
-# else /* not VMS */
-#  define EXIT_SUCCESS 0
-#  define EXIT_FAILURE 1
-# endif /* not VMS */
-#endif /* not EXIT_SUCCESS */
-
-
-/* Flush stdout first, exit if failure (therefore, xexit should be
-   called to exit every program, not just `return' from main).
-   Otherwise, if EXIT_STATUS is zero, exit successfully, else
-   unsuccessfully.  */
-
-void
-xexit (int exit_status)
-{
-  if (ferror (stdout))
-    {
-      fputs (_("ferror on stdout\n"), stderr);
-      exit_status = 1;
-    }
-  else if (fflush (stdout) != 0)
-    {
-      fputs (_("fflush error on stdout\n"), stderr);
-      exit_status = 1;
-    }
-
-  exit_status = exit_status == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
-
-  exit (exit_status);
-}
-
-
-/* Why do we care about stdout you may ask?  Here's why, from Jim
-   Meyering in the lib/closeout.c file.  */
-
-/* If a program writes *anything* to stdout, that program should close
-   stdout and make sure that the close succeeds.  Otherwise, suppose that
-   you go to the extreme of checking the return status of every function
-   that does an explicit write to stdout.  The last printf can succeed in
-   writing to the internal stream buffer, and yet the fclose(stdout) could
-   still fail (due e.g., to a disk full error) when it tries to write
-   out that buffered data.  Thus, you would be left with an incomplete
-   output file and the offending program would exit successfully.
-
-   Besides, it's wasteful to check the return value from every call
-   that writes to stdout -- just let the internal stream state record
-   the failure.  That's what the ferror test is checking below.
-
-   It's important to detect such failures and exit nonzero because many
-   tools (most notably `make' and other build-management systems) depend
-   on being able to detect failure in other tools via their exit status.  */

Property changes on: head/contrib/texinfo/lib/xexit.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/NEWS
===================================================================
--- head/contrib/texinfo/NEWS	(revision 276550)
+++ head/contrib/texinfo/NEWS	(nonexistent)
@@ -1,728 +0,0 @@
-$Id: NEWS,v 1.103 2004/12/24 16:43:58 karl Exp $
-This file records noteworthy changes, very tersely.
-See the manual for detailed information.
-
-  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-  2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-  Copying and distribution of this file, with or without modification,
-  are permitted in any medium without royalty provided the copyright
-  notice and this notice are preserved.
-
-
-*** IMPORTANT NEWS FOR ALL AUTHORS OF TEXINFO MANUALS ***
-
-As of version 4.2, Texinfo has a new command @copying to define the
-copyright and copying permissions for a manual.  It's important to
-switch to using it as soon as possible (as in your next release),
-because the historical method of doing copyright permissions using
-@ifinfo failed to output copyright information in the HTML (or XML)
-formats.  The manual has detailed explanations and examples.  For
-convenience, here's a url to one of the relevant sections:
-  http://www.gnu.org/software/texinfo/manual/texinfo/html_node/Document-Permissions.html
-
--------------------------------------------------------------------------------
-
-4.8 (31 December 2004)
-* Language:
-  . new command @euro for the Euro currency symbol, and
-    @documentencoding has some support for ISO-8859-15.
-  . new command @abbr for general abbreviations.
-  . new command @slanted to typeset text in a slanted font,
-    and @sansserif to typeset in a sans serif font.
-* makeinfo:
-  . An empty first argument to cross-reference commands, such as @xref,
-    causes an error.  This change was made in 4.1, but not mentioned in NEWS.
-  . HTML output:
-    - <a name="..."> constructs are added for the old-style
-      conversion of node names to HTML names, so that external references
-      to them can continue to work.
-    - "g_t" prefixed to targets for node names beginning with a
-      nonletter, for XHTML compatibility.
-  . Docbook output: recognize more image formats.
-* texi2dvi:
-  . new option --recode, to call recode for input character translation.
-* Distribution:
-  . new convenience script texi2pdf, equivalent to texi2dvi --pdf (from tetex).
-  . some cross-compiling support in configure && make.
-  . new configure option --disable-install-warnings, for TeX.
-    distributions which do have the files installed.
-  . automake 1.9.4.
-
-
-4.7 (9 April 2004)
-* Language:
-  . new commands @float, @caption, @shortcaption, @listoffloats for
-    initial implementation of floating material (figures, tables, etc).
-    Ironically, they do not yet actually float anywhere.
-  . new commands @docbook, @ifdocbook, @ifnotdocbook for conditional Docbook.
-  . new commands @ordf{} and @ordm{} for Spanish feminine/masculine ordinals.
-  . new commands @deftypecv[x] for class variables in typed OO languages.
-  . new command @registeredsymbol for the r-in-a-circle symbol.
-  . new command @headitem to make a heading row in @multitable.
-  . new command @LaTeX{} for the LaTeX logo.
-  . new command @comma{} to avoid comma-parsing problems.
-  . @url is now a synonym for @uref; new command @indicateurl has the
-    old meaning of just displaying a url as text.
-  . @quotation now accepts an optional argument for labelling the text
-      as a `Note', `Tip', etc.
-  . @defun (et al.) heading lines can now be continued with a lone @.
-  . @acronym accepts an optional argument for the meaning of the acronym.
-* makeinfo:
-  . New environment variable TEXINFO_OUTPUT_FORMAT determines the output
-    format at runtime, if no options are specified.
-  . New option --plaintext, equivalent to --no-headers with Info output.
-  . All outputs:
-    - sections are numbered by default.
-  . Info output:
-    - punctuation is inserted after @pxref and @ref, if needed to make
-      cross-references valid.
-    - line numbers included in index menus, so Info readers can go to
-      the exact line of an entry, not just a node.  Also in plaintext output.
-    - ^@^H[index^@^H] cookie included in index menus, so Info readers
-      can handle the ] etc. commands better.
-  . HTML output:
-    - new algorithm for cross-references to other manuals, for maximum
-      portability and stability.
-    - include node name in <title> with split output.
-    - @multicolumn fractions become percentages.
-    - entities used for bullets, quotes, dashes, and others.
-    - index entries are links to the exact locations.
-    - <h4> and <h5> used for @sub and @subsubsections again.
-    - accented dotless i supported.
-  . XML output: many new tags and structure to preserve more source features.
-  . Docbook output:
-    - upgraded DTD to Docbook XML 4.2, no longer using Docbook SGML.
-    - improved translation in general, for instance:
-    - line annotations and marked quotations.
-* texi2dvi:
-  . if available, use etex (pdfetex if --pdf) by default.
-  . if the input file includes thumbpdf.sty (for LaTeX), then run thumbpdf.
-  . more output if --debug.
-* texinfo.tex:
-  . @defun names are now printed in typewriter (instead of bold), and
-    within the arguments, @var text is printed in slanted typewriter.
-  . @tex code is executed inside a TeX group, so that any changes must
-    be prefixed with \global (or the equivalent) to be effective.  (This
-    change was actually made years ago, but never made it into the NEWS.)
-* info:
-  . new option --where (aka --location, -w) to report where an Info file
-    would be found, instead of reading it.
-  . by default, output ANSI terminal escape sequences as-is; new option
-    --no-raw-escapes overrides this.
-  . use the newly-generated index line numbers.
-* Distribution:
-  . new script gendocs.sh (not installed), for use by GNU maintainers in
-    getting their manuals on the GNU web site.  Documented in
-    maintain.texi (http://www.gnu.org/prep/maintain/).
-  . Most code uses ANSI C prototypes, to some extent.
-  . New translation: nb.
-  . automake 1.8.3, autoconf 2.59, gettext 0.14.1.
-
-
-4.6 (10 June 2003)
-* Language:
-  . new command @/ specifies an allowable breakpoint within a line.
-  . new command @dofirstparagraphindent to control whether the first
-    paragraph following a section heading is indented.  Default is to
-    omit this indentation, unlike the output up to now.
-  . new command @indent for explicitly indenting a paragraph.
-  . makeinfo writes a new construct for @image in Info output, so that
-    graphical Info browsers (such as Emacs Info under X) can display an
-    actual image.  (Standalone Info ignores this, since it runs in a tty.)
-* makeinfo:
-  . Common:
-    - search for image files in the include file search path.
-    - warns if @value is used on an undefined variable.
-  . Info output:
-    - default --split-size now 300,000 bytes, up from 50,000.
-    - with --enable-encoding and a given @documentencoding,
-      output a Local Variables section specifying that encoding, for use
-      with Emacs.
-  . HTML output:
-    - uses <h3> at the smallest.
-    - a few css <style> definitions are included to better
-      implement @format, @display, @small..., etc.
-    - new option --css-include=FILE includes FILE in the <style>.
-    - @cartouche now outputs a <table> with a border.
-* texinfo.tex:
-  . new Polish translation txi-pl.tex.
-* texi2dvi:
-  . --command=CMD replaces --texinfo=CMD; it inserts CMD at the first
-    line of LaTeX files now, or after the @setfilename for Texinfo files.
-* info:
-  . RET now goes to the nearest xref (rather like Emacs Info),
-    instead of the next xref starting on the current line.
-* Distribution:
-  . new Romanian (ro) translation.
-  . variables now declared const where appropriate.
-  . gettext 0.12.1, automake 1.7.5.
-
-
-4.5 (4 February 2003)
-* info:
-  . a bug in 4.4 prevented compressed info files from being found.
-* Distribution:
-  . detect sys/ptem.h on Solaris.
-
-
-4.4 (31 January 2003)
-* Language:
-  . The ' (ASCII apostrophe/right quote) character is finally allowed in
-    node and anchor names.  Thus, after installing this texinfo.tex,
-    existing .aux files will cause errors!  Remove them and rerun TeX to
-    generate good ones.
-  . @value constructs are now expanded in the filename arguments to
-    @include and @verbatiminclude.
-* makeinfo:
-  . @macro names may no longer include ^ or _, for the sake of math mode.
-  . bug fix: @copying text is now reflected in tag table positions;
-    before, nodes may not have been found with a long-enough @copying.
-  . bug fix: html @verb arg is quoted properly, and does not imply
-    a paragraph break.
-* texinfo.tex:
-  . @smallexample and the like now output in a smaller font (9pt) in all
-    paper formats, not just @smallbook and @afourpaper.
-  . new translation txi-tr.tex.
-  . bug fix: <>| and other characters do not disappear when they are
-    first on a line in @verbatim.
-* install-info:
-  . bug fix: don't translate the `* Menu' info keyword.
-* info:
-  . CTRL-H is treated like DEL in incremental search.
-  . arrow keys once again work in isearch contexts under Solaris.
-* infokey:
-  . use .info key bindings before defaults.
-  . allow prefix keys to be disabled.
-* Distribution:
-  . update to GNU FDL 1.2 (http://www.gnu.org/licenses/fdl.html).
-  . getopt and other common library files updated from gnulib
-    (http://savannah.gnu.org/projects/gnulib/).
-  . autoconf 2.57, automake 1.7.2.
-
-
-4.3 (14 November 2002)
-* Language:
-  . new command @tie{} to do a real tie (unbreakable interword space).
-* makeinfo:
-  . html output for @defun and friends now has font changes.
-  . html output has some class attributes.
-  . xml and docbook output improved in many details.
-* texinfo.tex:
-  . new Italian translations, txi-it.tex.
-  . pdf bookmarks for unnumbered sections work.
-  . type name for @defun and friends no longer extends into margin.
-* info:
-  . automatic-footnotes now off by default, for emacs compatibility.
-  . crash when MALLOC_CHECK_=2 fixed.
-* install-info:
-  . new option --infodir synonym for --info-dir, for compatibility with
-    the Debian install-info.
-  . support for bzip2-compressed files.
-* texindex:
-  . omit initial if the entire index is under one character.
-* Distribution:
- . development sources now available under CVS, see
-   http://savannah.gnu.org/projects/texinfo/
- . Turkish message translation.
- . gettext 0.11.5, autoconf 2.54, automake 1.7.1.
-
-
-4.2 (1 April 2002)
-* Language:
-  . new command @copying to define copying permissions.  See above.
-  . new conditionals @ifplaintext, @ifnotplaintext for the plain text
-    (--no-headers) output format.
-  . new command @\ to produce literal \ inside @math, since \ by itself
-    no longer works.
-* makeinfo:
-  . emit accesskey attributes for keyboard shortcuts to menu items.
-  . @{even,every,odd}{footing,header} are ignored by makeinfo now, so
-    they no longer need to be enclosed in @iftex.
-* texinfo.tex:
-  . bug fix for pdf-format table of contents.
-* info:
-  . bug fixes for -R (--raw-escapes).
-  . --help shows short option names.
-* Distribution:
-  . the doc.c, funs.h, and key.c files in info/ are no longer generated
-    at make time, to appease Automake's make distcheck.
-  . gettext 0.11.1, autoconf 2.53, automake 1.6 (with install-info kludge).
-
-
-4.1 (4 March 2002)
-* Language:
-  . new commands @verbatim and @verb for printing verbatim inserts.
-  . new command @verbatiminclude for verbatim include of files.
-  . new environment @documentdescription for defining the HTML description.
-  . new command @afivepaper for the A5 paper size.
-* makeinfo:
-  . supports xml and docbook output.
-  . supports HTML splitting by node, which is now the default.
-  . new option --split-size to control maximum size of split info files.
-  . new option --enable-encoding to enable
-* info:
-  . user-specified key bindings supported.
-  . ANSI escape sequences (as produced by groff) removed from man output
-    by default; use --raw-escapes to let them through if your terminal
-    supports them.
-  . RET terminates incremental search normally.
-* texinfo.tex:
-  . @math implies @tex, so all the usual plain TeX math is supported.
-  . smaller fonts for @smallexample, in all page sizes.
-  . improvements in the PDF support.
-* texi2dvi:
-  . new option -o to explicitly specify output filename.
-* Distribution:
-  . switch to GNU Free Documentation License (http://www.gnu.org/copyleft/).
-  . update to GNU gettext 0.11, autoconf 2.52, and automake 1.5.
-  . Danish, Swedish, and Hebrew message translations.
-
-
-4.0 (28 September 1999)
-* Language:
-  . New command @anchor for cross references to arbitrary points.
-  . New commands @documentlanguage sets the main document language,
-    and @documentencoding sets the document input encoding (although not
-    much is done yet with either).
-  . New command @pagesizes allows limited control of text area for typesetting.
-  . New command @acronym for abbreviations in all caps, such as `NASA'.
-  . New command @alias for simple command aliases.
-  . New command @definfoenclose for better control of info output.
-  . New commands @deftypeivar for typed instance variables of a class
-    and @deftypeop for typed operations of a class.
-  . New command @novalidate suppresses cross-reference checking and (in
-    TeX) auxiliary file creation.
-  . New commands @setcontentsaftertitlepage and
-    @setshortcontentsaftertitlepage to force printing the table of
-    contents after @end titlepage.  Also, @contents and @shortcontents
-    themselves can now appear at the beginning of the document as
-    well as the end.
-  . New markup commands: @env (for environment variables), @command (for
-    command names), @option (for command-line options).
-  . New commands @smallformat and @smalldisplay, a la @smallexample.
-  . New command @exampleindent to set indentation of example-like
-    environments a la @paragraphindent.
-  . @uref takes an optional third argument of text to show instead of
-    (rather than in addition to) the url for info and dvi output.
-  . @footnote works in an @item for a @table.
-* texinfo.tex:
-  . latest version always at ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex
-    (and mirrors).
-  . implements @macro.
-  . implements @paragraphindent (except asis).
-  . @emph and @i use true italic type (cmti) instead of slanted (cmsl).
-  . implements pdf output when run with pdftex.
-  . better support for internationalization via txi-??.tex files.
-  . footnotes now set in a smaller point size.
-* makeinfo:
-  . supports HTML output with the --html option.
-  . implication of --html: @top nodes should be wrapped in @ifnottex
-    rather than @ifinfo.  @ifinfo conditionals are not expanded with --html.
-  . new option --number-sections to output chapter/section numbers.
-  . dashes and quotes are not treated specially in node names.
-  . new option --commands-in-node-names to allow @-commands in node names.
-    (Not implemented in TeX, and most likely never will be.)
-  . @emph output uses _underscores_.
-  . @image looks for .png files before .jpg.
-  . only output `Making ... file' line when verbose.
-  . allow -v as synonym for --verbose.
-  . new command line options to specify which conditionals to process
-    (but --iftex is not fully implemented).
-  . warns if @var contains any of ,[]().
-  . @quote-arg implicitly done for all one-argument macros, so commas in
-    the argument text are allowed.
-  . \\ required in macro body to get single \, no other `escapes' defined.
-* info:
-  . ISO Latin 1 characters are displayed and input as-is by default.
-  . new option --vi-keys to enable vi-like and less-like key bindings.
-  . new command S does case-sensitive searching.
-  . new commands C-x n and C-x N repeat last search, respectively, in the
-    same and in reverse direction, without prompting for the string.  These
-    commands are bound to n and N under --vi-keys, like in Less.
-  . new command G menu1 menu2 ... searches for menu items from (dir),
-    as allowed on the command line.
-  . new command O (capital o, not zero) goes directly to the node that
-    describes command-line options.
-  . new command-line option --show-options causes the node which
-    describes command-line options to be the first node displayed.
-  . M-prior and M-DEL do new command info-scroll-other-window-backward.
-  . / searches like s does.
-  . If the search string includes upper-case letters, in both incremental
-    and non-incremental search, the search is case-sensitive.
-  . S searches case-sensitively even if the search string is all
-    lower-case.
-  . - makes the argument negative (so e.g. `- /' searches backward).
-  . l restores point in the window returned to.
-  . SPC/DEL do not move outside the current document.
-  . foo.info is found before foo.
-  . `info foo --index-search=bar' now searches for bar in foo's index.
-  . support for files compressed with bzip2.
-* install-info:
-  . handles gzipped dir files.
-  . sort entries into alphabetical order.
-  . install direntries only in preceding dircategory, not in all.
-  . --delete does not require the info file to exist.
-  . --delete can handle XEmacs-style dir entries.
-* texi2dvi:
-  . bug fixed: now uses only the @iftex and @tex parts of the source.
-  . process LaTeX source as well as Texinfo source.
-  . output PDF (using pdftex) with new option --pdf.
-  . handles --OPTION=ARG style of command line arguments.
-  . new option --batch for progress reports but no interaction.
-  . new option --clean to remove all auxiliary files.
-  . new option --quiet for silence (unless there are errors).
-  . new option -I for specifying directories for @include to search.
-  . handles LaTeX files (running BibTeX etc.).
-* Fixes to util/gen-dir-node and util/fix-info-dir (formerly util/update-info).
-* Distribution:
-  . Man pages included.
-  . Czech and Norwegian message translations.
-  . Various translations for texinfo.tex fixed words included.
-  . DJGPP support.
-
-
-3.12 (3 March 1998)
-* Elisp files removed, since they are only usefully distributed with Emacs.
-* Restore inclusion of compile-time $(infodir) to INFOPATH.
-* install-info creates a proper dir file.
-* Various portability fixes.
-
-
-3.11 (31 July 1997)
-* New commands:
-  - @uref to make a reference to a url; @url now only indicates such.
-  - @image to include graphics (epsf for TeX).
-  - @deftypemethod and @deftypemethodx to document methods in strongly
-    typed object-oriented languages, such as C++.
-  - @html for raw HTML.
-  - @ifnothtml @ifnotinfo @ifnottex for more precise conditionals.
-  - @kbdinputstyle to control when @kbd uses the slanted typewriter font.
-  - @email takes second optional argument.
-* texinfo.tex reads texinfo.cnf (if present) for site-wide TeX
-  configuration; for example, A4 paper sizes.
-* info:
-  - arrow keys supported.
-  - trailing : in INFOPATH appends default path.
-  - new option --index-search for online help support.
-* makeinfo:
-  - output files removed if errors unless (new option) --force.
-  - new option -P to prepend to search path.
-  - macro expansion file can be standard output.
-* install-info creates a new dir file if necessary.
-* update-info script to create a dir file from all info files.
-* Elisp: texnfo-tex.el and detexinfo.el removed from the distribution;
-  - texnfo-tex features are now part of standard TeX & Texinfo packages;
-  - makeinfo --no-headers does a better job than detexinfo.el.
-* Documentation:
-  - Updates, revisions, corrections in the manual.
-  - makeinfo.texi removed, as it was a copy of what was in texinfo.texi.
-* gettext support in sources, French and German translations included.
-* info man page removed; use the Texinfo manual.
-* Automake used, other portability fixes.
-
-3.10 (nonexistent)
-
-
-3.9 (4 October 1996)
-* makeinfo:
-  - Give a suppressible (with --no-validate) error for references
-    outside of any node.
-  - Keep track of multitable output correctly for split files; this
-    caused nodes after the first multitable to be ``undefined''.
-* install-info:
-  - Rename --infodir option to --info-dir.
-  - More robust error checking to avoid various crashes.
-* configure: Include replacements for memcpy and memmove functions in
-  the distribution, in case they are missing.
-
-
-3.8 (30 September 1996)
-* Define and/or document new and/or previously existing commands:
-  Accents: @" @' @, @" @= @^ @` @~ @H @d @dotaccent @dotless @ringaccent
-    @tieaccent @u @ubaraccent @v
-  Special characters: @AA @AE @L @O @OE @aa @ae @exclamdown @l @o @oe
-    @pounds @questiondown @ss
-  Special punctuation: @! @? @enddots
-  dir file maintenance: @dircategory @direntry; also new program, install-info
-  HTML support: @email @url @ifhtml...@end ifhtml
-  Macros: @macro @unmacro
-  Tables: @multitable @tab
-  Hyphenation: @- @hyphenation
-  Spacing: @  @<TAB> @<NEWLINE>
-  Sectioning:
-    @headings singleafter/doubleafter (change heading style after current page)
-    @centerchap
-    @setchapterstyle
-  Other:
-    @shorttitlepage (simple title pages)
-    @detailmenu...@end detailmenu (help makeinfo parse master menus)
-* Makeinfo prefers an input file named `foo.texinfo' or `foo.texi' or
-  `foo.txinfo' to just `foo' (the latter most likely being an executable).
-* Makeinfo implements @. @! @? correctly, as end-of-sentence punctuation.
-* @key marks its argument with a lozenge in TeX and <...> in Info.
-* TeX output has substantially decreased interline spacing and other
-  formatting changes.
-* Remove these obsolete and never-documented commands:
-    @infotop
-    @infoappendix @infoappendixsec @infoappendixsubsec @infoappendixsubsubsec
-    @infochapter @infosection @infosubsection @infosubsubsection
-    @infounnumbered @infounnumberedsec @infounnumberedsubsec
-      @infounnumberedsubsubsec
-    @input
-    @smallbreak @medbreak
-    @overfullrule
-    @br
-* Deprecate these obsolete commands, to be removed in the next release:
-    @ctrl
-    @infoinclude
-    @iappendix @iappendixsection @iappendixsec @iappendixsubsec
-      @iappendixsubsubsec
-    @ichapter @isection @isubsection @isubsubsection
-    @iunnumbered @iunnumberedsec @iunnumberedsubsec @iunnumberedsubsubsec
-    @setchapterstyle
-    @titlespec
-
-
-3.7 (24 December 1995)
-* Have --version print texinfo release number as well as the individual
-  program version.
-* Better man page cleaning.
-* Update Elisp files from current Emacs release.
-
-
-3.6 (21 June 1995)
-* Unmatched brace error reporting improved.
-* Missing comment terminator prevented compilation.
-
-
-3.5 (20 June 1995)
-* Autoconf update.
-* Support for parallel makes.
-* make install does not install Elisp files.
-
-
-3.4 (19 June 1995)
-* Handle @ifhtml in Elisp.
-* Update FSF address.
-
-
-3.3 (15 June 1995)
-* Portability changes.
-* Compile Elisp files.
-* Don't distribute .info* files.
-
-
-3.2 (9 June 1995)
-* Standalone Info can read Unix man pages.
-* New commands: @! @? @^ @" @enddots.
-* makeinfo -E does macro expansion (and nothing else).
-
-
-3.1 (23 May 1993)
-Just bug fixes, see ChangeLog for full details.
-
-
-3.0: first release of Texinfo version 2, with many new commands.
-
-
-
-Here is the separate NEWS for old releases of Info:
-
-Version 2.11,     Sat Apr  1 09:15:21 1995
-
-Changes since 2.7 beta:
-
-Although the basic code remains the same, there are numerous nits
-fixed, including some display bugs, and a memory leak.  Some changes
-that have taken place with larger impact include the way in which the
-(dir) node is built; I have added in support for "localdir"
-directories among other things.  Info files may be stored in
-compressed formats, and in their own subdirectories; menu items which
-do not explicitly name the node to which they are attached have the
-menu item name looked up as an Info file if it is not found within the
-current document.  This means that the menu item:
-
-* Info::		The Info documentation reader.
-
-in (dir) refers to the info node "(info)Top".
-
-Please see the ChangeLog and documentation for details on other
-changes.
-
-Version 2.7 beta, Wed Dec 30 02:02:38 1992
-Version 2.6 beta, Tue Dec 22 03:58:07 1992
-Version 2.5 beta, Tue Dec  8 14:50:35 1992
-Version 2.4 beta, Sat Nov 28 14:34:02 1992
-Version 2.3 beta, Fri Nov 27 01:04:13 1992
-Version 2.2 beta, Tue Nov 24 09:36:08 1992
-Version 2.1 beta, Tue Nov 17 23:29:36 1992
-
-Changes since 2.5 beta:
-
-Note that versions 2.6 and 2.7 Beta were only released to a select group.
-
-* "info-" removed from the front of M-x commands.
-
-* Automatic footnote display.  When you enter a node which contains
-  footnotes, and the variable "automatic-footnotes" is "On", Info pops
-  up a window containing the footnotes.  Likewise, when you leave that
-  node, the window containing the footnotes goes away.
-
-* Cleaner built in documentation, and documentation functions.
-
-  Use:
-    o `M-x describe-variable' to read a variable's documenation
-    o `M-x describe-key' to find out what a particular keystroke does.
-    o `M-x describe-function' to read a function's documentation.
-    o `M-x where-is' to find out what keys invoke a particular function.
-
-* Info can "tile" the displayed windows (via "M-x tile-windows").  If
-  the variable "automatic-tiling" is "On", then splitting a window or
-  deleting a window causes the remaining windows to be retiled.
-
-* You can save every keystroke you type in a "dribble file" by using the
-  `--dribble FILENAME' option.  You can initially read keystrokes from an
-  alternate input stream with `--restore FILENAME', or by redirecting
-  input on the command line `info < old-dribble'.
-
-* New behaviour of menu items.  If the label is the same as the
-  target node name, and the node couldn't be found in the current file,
-  treat the label as a file name.  For example, a menu entry in "DIR"
-  might contain:
-
-    * Emacs::		Cool text-editor.
-
-  Info would not find the node "(dir)Emacs", so just plain "(emacs)"
-  would be tried.
-
-* New variable "ISO-Latin" allows you to use European machines with
-  8-bit character sets.
-
-* Cleanups in echo area reading, and redisplay.  Cleanups in handling the
-  window which shows possible completions.
-
-* Info can now read files that have been compressed.  An array in filesys.c
-  maps extensions to programs that can decompress stdin, and write the results
-  to stdout.  Currently, ".Z"/uncompress, ".z"/gunzip, and ".Y"/unyabba are
-  supported.  The modeline for a compressed file shows "zz" in it.
-
-* There is a new variable "gc-compressed-files" which, if non-zero, says
-  it is okay to reclaim the file buffer space allocated to a file which
-  was compressed, if, and only if, that file's contents do not appear in
-  any history node.
-
-* New file `nodemenu.c' implements a few functions for manipulating
-  previously visited nodes.  `C-x C-b' (list-visited-nodes) produces a
-  menu of the nodes that could be reached by info-history-node in some
-  window.  `C-x b' (select-visited-node) is similar, but reads one of
-  the node names with completion.
-
-* Keystroke `M-r' (move_to_screen_line) allows the user to place the cursor at
-  the start of a specific screen line.  Without a numeric argument, place the
-  cursor on the center line; with an arg, place the cursor on that line.
-
-* Interruptible display implemented.  Basic display speedups and hacks.
-* The message "*** Tags Out of Date ***" now means what it says.
-* Index searching with `,' (info-index-next) has been improved.
-* When scrolling with C-v, C-M-v, or M-v, only "Page Only" scrolling
-  will happen.
-
-* Continous scrolling (along with `]' (info-global-next) and `['
-  (info-global-prev) works better.  `]' and `[' accept numeric
-  arguments, moving that many nodes in that case.
-
-* `C-x w' (info-toggle-wrap) controls how lines wider than the width
-  of the screen are displayed.  If a line is too long, a `$' is
-  displayed in the rightmost column of the window.
-
-* There are some new variables for controlling the behaviour of Info
-  interactively.  The current list of variables is as follows:
-
-  Variable Name      Default Value  Description
-  -------------      -------------  -----------
-  `automatic-footnotes' On	    When "On", footnotes appear and
-				    disappear automatically.
-
-  `automatic-tiling'    Off	    When "On", creating of deleting a
-				    window resizes other windows.
-
-  `visible-bell'        Off	    If non-zero, try to use a visible bell.
-
-  `errors-ring-bell'    On	    If non-zero, errors cause a ring.
-
-  `show-index-match'    On	    If non-zero, the portion of the string
-				    matched is highlighted by changing its
-				    case.
-
-  `scroll-behaviour'    Continuous  One of "Continuous", "Next Only", or
-				    "Page Only".  "Page Only" prevents you from
-				    scrolling past the bottom or top of a node.
-				    "Next Only" causes the Next or Prev node to
-				    be selected when you scroll past the bottom
-				    or top of a node.  "Continous" moves
-				    linearly through the files hierchichal
-				    structure.
-
-  `scroll-step'	        0	    Controls how scrolling is done for you when
-				    the cursor moves out of the current window.
-				    Non-zero means it is the number of lines
-				    you would like the screen to shift.  A
-				    value of 0 means to center the line
-				    containing the cursor in the window.
-
-  `gc-compressed-files' Off	    If non-zero means it is okay to reclaim the
-				    file buffer space allocated to a file which
-				    was compressed, if, and only if, that
-				    file's contents do not appear in the node
-				    list of any window.
-
-  `ISO-Latin'	        Off	    Non-zero means that you are using an ISO
-				    Latin character set.  By default, standard
-				    ASCII characters are assumed.
-________________________________________
-This release of Info is version 2.5 beta.
-
-Changes since 2.4 beta:
-
-* Index (i) and (,) commands fully implemented.
-* "configure" script now shipped with Info.
-* New function "set-variable" allows users to set various variables.
-* User-settable behaviour on end or beginning of node scrolling.  This
-  supercedes the SPC and DEL changes in 2.3 beta.
-
-________________________________________
-This release of Info is version 2.4 beta.
-
-Changes since 2.3 beta:
-
-* info-last-node now means move to the last node of this info file.
-* info-history-node means move backwards through this window's node history.
-* info-first-node moves to the first node in the Info file.  This node is
-  not necessarily "Top"!
-* SPC and DEL can select the Next or Prev node after printing an informative
-  message when pressed at the end/beg of a node.
-
-----------------------------------------
-This release of Info is version 2.3 beta.
-
-Changes since 2.2 beta:
-
-* M-x command lines if NAMED_COMMANDS is #defined.  Variable in Makefile.
-* Screen height changes made quite robust.
-* Interactive function "set-screen-height" implements user height changes.
-* Scrolling on some terminals is faster now.
-* C-l with numeric arguement is fixed.
-
-----------------------------------------
-This release of Info is version 2.2 beta.
-
-Changes since 2.0:
-
-* C-g can now interrupt multi-file searches.
-* Incremental search is fully implemented.
-* Loading large tag tables is much faster now.
-* makedoc.c replaces shell script, speeding incremental builds.
-* Scrolling in redisplay is implemented.
-* Recursive uses of the echo area made more robust.
-* Garbage collection of unreferenced nodes.

Property changes on: head/contrib/texinfo/NEWS
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/config.h
===================================================================
--- head/contrib/texinfo/config.h	(revision 276550)
+++ head/contrib/texinfo/config.h	(nonexistent)
@@ -1,422 +0,0 @@
-/* $FreeBSD$ */
-/* config.h.  Generated by configure.  */
-/* config.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define to 1 if using `alloca.c'. */
-/* #undef C_ALLOCA */
-
-/* Define to 1 if translation of program messages to the user's native
-   language is requested. */
-/* #undef ENABLE_NLS */
-
-/* Define to 1 if `TIOCGWINSZ' requires <sys/ioctl.h>. */
-/* #undef GWINSZ_IN_SYS_IOCTL */
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define to 1 if you have the <argz.h> header file. */
-/* #undef HAVE_ARGZ_H */
-
-/* Define to 1 if you have the `asprintf' function. */
-#define HAVE_ASPRINTF 1
-
-/* Define to 1 if you have the `bzero' function. */
-#define HAVE_BZERO 1
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
-   */
-/* #undef HAVE_DCGETTEXT */
-
-/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
-   don't. */
-#define HAVE_DECL_FEOF_UNLOCKED 1
-
-/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_FGETS_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
-   don't. */
-#define HAVE_DECL_GETC_UNLOCKED 1
-
-/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
-   */
-#define HAVE_DECL_GETENV 1
-
-/* Define to 1 if you have the declaration of `memchr', and to 0 if you don't.
-   */
-#define HAVE_DECL_MEMCHR 1
-
-/* Define to 1 if you have the declaration of `strcoll', and to 0 if you
-   don't. */
-#define HAVE_DECL_STRCOLL 1
-
-/* Define to 1 if you have the declaration of `strerror', and to 0 if you
-   don't. */
-#define HAVE_DECL_STRERROR 1
-
-/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
-   don't. */
-#define HAVE_DECL__SNPRINTF 0
-
-/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
-   don't. */
-#define HAVE_DECL__SNWPRINTF 0
-
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-/* #undef HAVE_DOPRNT */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `fwprintf' function. */
-#define HAVE_FWPRINTF 1
-
-/* Define to 1 if you have the `getcwd' function. */
-#define HAVE_GETCWD 1
-
-/* Define to 1 if you have the `getegid' function. */
-#define HAVE_GETEGID 1
-
-/* Define to 1 if you have the `geteuid' function. */
-#define HAVE_GETEUID 1
-
-/* Define to 1 if you have the `getgid' function. */
-#define HAVE_GETGID 1
-
-/* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-/* #undef HAVE_GETTEXT */
-
-/* Define to 1 if you have the `gettimeofday' function. */
-/* #undef HAVE_GETTIMEOFDAY */
-
-/* Define to 1 if you have the `getuid' function. */
-#define HAVE_GETUID 1
-
-/* Define if you have the iconv() function. */
-#define HAVE_ICONV 1
-
-/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
-#define HAVE_INTMAX_T 1
-
-/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
-#define HAVE_INTTYPES_H 1
-
-/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
-   declares uintmax_t. */
-#define HAVE_INTTYPES_H_WITH_UINTMAX 1
-
-/* Define to 1 if you have the <io.h> header file. */
-/* #undef HAVE_IO_H */
-
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#define HAVE_LANGINFO_CODESET 1
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#define HAVE_LC_MESSAGES 1
-
-/* Define to 1 if you have the `bsd' library (-lbsd). */
-/* #undef HAVE_LIBBSD */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <locale.h> header file. */
-#define HAVE_LOCALE_H 1
-
-/* Define if you have the 'long double' type. */
-#define HAVE_LONG_DOUBLE 1
-
-/* Define if you have the 'long long' type. */
-#define HAVE_LONG_LONG 1
-
-/* Define to 1 if you have the <malloc.h> header file. */
-/* #undef HAVE_MALLOC_H */
-
-/* Define to 1 if you have the `memcpy' function. */
-#define HAVE_MEMCPY 1
-
-/* Define to 1 if you have the `memmove' function. */
-#define HAVE_MEMMOVE 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mempcpy' function. */
-/* #undef HAVE_MEMPCPY */
-
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
-/* Define to 1 if you have the `mkstemp' function. */
-#define HAVE_MKSTEMP 1
-
-/* Define to 1 if you have a working `mmap' system call. */
-#define HAVE_MMAP 1
-
-/* Define to 1 if you have the `munmap' function. */
-#define HAVE_MUNMAP 1
-
-/* Define to 1 if you have the <ncurses/termcap.h> header file. */
-/* #undef HAVE_NCURSES_TERMCAP_H */
-
-/* Define to 1 if you have the <nl_types.h> header file. */
-#define HAVE_NL_TYPES_H 1
-
-/* Define if your printf() function supports format strings with positions. */
-#define HAVE_POSIX_PRINTF 1
-
-/* Define to 1 if you have the `putenv' function. */
-#define HAVE_PUTENV 1
-
-/* Define to 1 if you have the <pwd.h> header file. */
-#define HAVE_PWD_H 1
-
-/* Define to 1 if you have the `setenv' function. */
-#define HAVE_SETENV 1
-
-/* Define to 1 if you have the `setlocale' function. */
-#define HAVE_SETLOCALE 1
-
-/* Define to 1 if you have the `setvbuf' function. */
-#define HAVE_SETVBUF 1
-
-/* Define to 1 if you have the `sigaction' function. */
-#define HAVE_SIGACTION 1
-
-/* Define to 1 if you have the `sigprocmask' function. */
-#define HAVE_SIGPROCMASK 1
-
-/* Define to 1 if you have the `sigsetmask' function. */
-#define HAVE_SIGSETMASK 1
-
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
-   uintmax_t. */
-#define HAVE_STDINT_H_WITH_UINTMAX 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `stpcpy' function. */
-#define HAVE_STPCPY 1
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#define HAVE_STRCASECMP 1
-
-/* Define to 1 if you have the `strchr' function. */
-#define HAVE_STRCHR 1
-
-/* Define to 1 if you have the `strcoll' function and it is properly defined.
-   */
-#define HAVE_STRCOLL 1
-
-/* Define to 1 if you have the `strdup' function. */
-#define HAVE_STRDUP 1
-
-/* Define to 1 if you have the `strerror' function. */
-#define HAVE_STRERROR 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strncasecmp' function. */
-#define HAVE_STRNCASECMP 1
-
-/* Define to 1 if you have the `strtoul' function. */
-#define HAVE_STRTOUL 1
-
-/* Define to 1 if you have the <sys/fcntl.h> header file. */
-#define HAVE_SYS_FCNTL_H 1
-
-/* Define to 1 if you have the <sys/file.h> header file. */
-#define HAVE_SYS_FILE_H 1
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/ptem.h> header file. */
-/* #undef HAVE_SYS_PTEM_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/stream.h> header file. */
-/* #undef HAVE_SYS_STREAM_H */
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/ttold.h> header file. */
-/* #undef HAVE_SYS_TTOLD_H */
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/wait.h> header file. */
-#define HAVE_SYS_WAIT_H 1
-
-/* Define to 1 if you have the <termcap.h> header file. */
-#define HAVE_TERMCAP_H 1
-
-/* Define to 1 if you have the <termios.h> header file. */
-#define HAVE_TERMIOS_H 1
-
-/* Define to 1 if you have the <termio.h> header file. */
-/* #undef HAVE_TERMIO_H */
-
-/* Define to 1 if you have the `tsearch' function. */
-#define HAVE_TSEARCH 1
-
-/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-#define HAVE_UINTMAX_T 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define if you have the 'unsigned long long' type. */
-#define HAVE_UNSIGNED_LONG_LONG 1
-
-/* Define to 1 if you have the `vprintf' function. */
-#define HAVE_VPRINTF 1
-
-/* Define if you have the 'wchar_t' type. */
-#define HAVE_WCHAR_T 1
-
-/* Define to 1 if you have the `wcslen' function. */
-#define HAVE_WCSLEN 1
-
-/* Define if you have the 'wint_t' type. */
-#define HAVE_WINT_T 1
-
-/* Define to 1 if you have the `__argz_count' function. */
-/* #undef HAVE___ARGZ_COUNT */
-
-/* Define to 1 if you have the `__argz_next' function. */
-/* #undef HAVE___ARGZ_NEXT */
-
-/* Define to 1 if you have the `__argz_stringify' function. */
-/* #undef HAVE___ARGZ_STRINGIFY */
-
-/* Define to 1 if you have the `__fsetlocking' function. */
-/* #undef HAVE___FSETLOCKING */
-
-/* Define to 1 if you have the `__secure_getenv' function. */
-/* #undef HAVE___SECURE_GETENV */
-
-/* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
-
-/* Define if integer division by zero raises signal SIGFPE. */
-#define INTDIV0_RAISES_SIGFPE 1
-
-/* Name of package */
-#define PACKAGE "texinfo"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "GNU Texinfo"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GNU Texinfo 4.8"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "texinfo"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "4.8"
-
-/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
-/* #undef PRI_MACROS_BROKEN */
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* Define as the maximum value of type 'size_t', if the system doesn't define
-   it. */
-/* #undef SIZE_MAX */
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
-
-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-/* #undef STAT_MACROS_BROKEN */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-/* #undef TM_IN_SYS_TIME */
-
-/* Version number of package */
-#define VERSION "4.8"
-
-/* Define to 1 if on MINIX. */
-/* #undef _MINIX */
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-/* #undef _POSIX_SOURCE */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to rpl_mkstemp if the replacement function should be used. */
-/* #undef mkstemp */
-
-/* Define to `long' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define as the type of the result of subtracting two pointers, if the system
-   doesn't define it. */
-/* #undef ptrdiff_t */
-
-/* Define to empty if the C compiler doesn't support this keyword. */
-/* #undef signed */
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to unsigned long or unsigned long long if <stdint.h> and
-   <inttypes.h> don't define. */
-/* #undef uintmax_t */

Property changes on: head/contrib/texinfo/config.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/infomap.c
===================================================================
--- head/contrib/texinfo/info/infomap.c	(revision 276550)
+++ head/contrib/texinfo/info/infomap.c	(nonexistent)
@@ -1,1831 +0,0 @@
-/* infomap.c -- keymaps for Info.
-   $Id: infomap.c,v 1.10 2004/07/30 20:43:40 karl Exp $
-
-   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-#include "infomap.h"
-#include "funs.h"
-#include "terminal.h"
-
-#if defined(INFOKEY)
-#include "infokey.h"
-#include "variables.h"
-#endif /* INFOKEY */
-
-static int keymap_bind_keyseq (Keymap map, const char *keyseq,
-    KEYMAP_ENTRY *keyentry);
-
-/* Return a new keymap which has all the uppercase letters mapped to run
-   the function info_do_lowercase_version (). */
-Keymap
-keymap_make_keymap (void)
-{
-  int i;
-  Keymap keymap;
-
-  keymap = (Keymap)xmalloc (256 * sizeof (KEYMAP_ENTRY));
-
-  for (i = 0; i < 256; i++)
-    {
-      keymap[i].type = ISFUNC;
-      keymap[i].function = (InfoCommand *)NULL;
-    }
-
-  for (i = 'A'; i < ('Z' + 1); i++)
-    {
-      keymap[i].type = ISFUNC;
-#if defined(INFOKEY)
-      keymap[Meta(i)].type = ISFUNC;
-      keymap[Meta(i)].function =
-#endif /* INFOKEY */
-      keymap[i].function = InfoCmd(info_do_lowercase_version);
-    }
-
-  return (keymap);
-}
-
-#if defined(INFOKEY)
-static FUNCTION_KEYSEQ *
-find_function_keyseq (Keymap map, int c, Keymap rootmap)
-{
-  FUNCTION_KEYSEQ *k;
-
-  if (map[c].type != ISFUNC)
-    abort();
-  if (map[c].function == NULL)
-    return NULL;
-  for (k = map[c].function->keys; k; k = k->next)
-    {
-      const unsigned char *p;
-      Keymap m = rootmap;
-      if (k->map != rootmap)
-	continue;
-      for (p = (unsigned char *) k->keyseq; *p && m[*p].type == ISKMAP; p++)
-	m = (Keymap)m[*p].function;
-      if (*p != c || p[1])
-	continue;
-      if (m[*p].type != ISFUNC)
-	abort ();
-      break;
-    }
-  return k;
-}
-
-static void
-add_function_keyseq (InfoCommand *function,
-    const char *keyseq, Keymap rootmap)
-{
-  FUNCTION_KEYSEQ *ks;
-
-  if (function == NULL ||
-      function == InfoCmd(info_do_lowercase_version) ||
-      function == InfoCmd(ea_insert))
-    return;
-  ks = (FUNCTION_KEYSEQ *)xmalloc (sizeof(FUNCTION_KEYSEQ));
-  ks->next = function->keys;
-  ks->map = rootmap;
-  ks->keyseq = xstrdup(keyseq);
-  function->keys = ks;
-}
-
-static void
-remove_function_keyseq (InfoCommand *function,
-    const char *keyseq, Keymap rootmap)
-{
-
-  FUNCTION_KEYSEQ *k, *kp;
-
-  if (function == NULL ||
-      function == InfoCmd(info_do_lowercase_version) ||
-      function == InfoCmd(ea_insert))
-    return;
-  for (kp = NULL, k = function->keys; k; kp = k, k = k->next)
-    if (k->map == rootmap && strcmp(k->keyseq, keyseq) == 0)
-      break;
-  if (!k)
-    abort ();
-  if (kp)
-    kp->next = k->next;
-  else
-    function->keys = k->next;
-}
-#endif /* INFOKEY */
-
-/* Return a new keymap which is a copy of MAP. */
-Keymap
-keymap_copy_keymap (Keymap map, Keymap rootmap, Keymap newroot)
-{
-  int i;
-  Keymap keymap;
-#if defined(INFOKEY)
-  FUNCTION_KEYSEQ *ks;
-#endif /* INFOKEY */
-
-  keymap = keymap_make_keymap ();
-  if (!newroot)
-    newroot = keymap;
-
-  for (i = 0; i < 256; i++)
-    {
-      keymap[i].type = map[i].type;
-      switch (map[i].type)
-	{
-	case ISFUNC:
-	  keymap[i].function = map[i].function;
-#if defined(INFOKEY)
-	  ks = find_function_keyseq (map, i, rootmap);
-	  if (ks)
-	    add_function_keyseq(map[i].function, ks->keyseq, newroot);
-#endif /* INFOKEY */
-	  break;
-	case ISKMAP:
-	  keymap[i].function = (InfoCommand *)keymap_copy_keymap
-            ((Keymap)map[i].function, rootmap, NULL);
-	  break;
-	}
-    }
-  return (keymap);
-}
-
-/* Free the keymap and its descendants. */
-void
-keymap_discard_keymap (Keymap map, Keymap rootmap)
-{
-  int i;
-
-  if (!map)
-    return;
-  if (!rootmap)
-    rootmap = map;
-
-  for (i = 0; i < 256; i++)
-    {
-#if defined(INFOKEY)
-      FUNCTION_KEYSEQ *ks;
-#endif /* INFOKEY */
-      switch (map[i].type)
-        {
-        case ISFUNC:
-#if defined(INFOKEY)
-	  ks = find_function_keyseq(map, i, rootmap);
-	  if (ks)
-	    remove_function_keyseq (map[i].function, ks->keyseq, rootmap);
-#endif /* INFOKEY */
-          break;
-
-        case ISKMAP:
-          keymap_discard_keymap ((Keymap)map[i].function, rootmap);
-          break;
-
-        }
-    }
-  free(map);
-}
-
-/* Conditionally bind key sequence. */
-static int
-keymap_bind_keyseq (Keymap map,
-    const char *keyseq, KEYMAP_ENTRY *keyentry)
-{
-  Keymap m = map;
-  const unsigned char *s = (unsigned char *) keyseq;
-  int c;
-
-  if (s == NULL || *s == '\0') return 0;
-
-  while ((c = *s++) != '\0')
-    {
-#if defined(INFOKEY)
-      FUNCTION_KEYSEQ *ks;
-#endif /* INFOKEY */
-      switch (m[c].type)
-        {
-        case ISFUNC:
-#if defined(INFOKEY)
-	  ks = find_function_keyseq(m, c, map);
-	  if (ks)
-	    remove_function_keyseq (m[c].function, ks->keyseq, map);
-#else /* !INFOKEY */
-          if (!(m[c].function == NULL || (
-                m != map &&
-                m[c].function == InfoCmd(info_do_lowercase_version))
-	      ))
-            return 0;
-#endif /* !INFOKEY */
-
-          if (*s != '\0')
-            {
-              m[c].type = ISKMAP;
-              /* Here we are casting the Keymap pointer returned from
-                 keymap_make_keymap to an InfoCommand pointer.  Ugh.
-                 This makes the `function' structure garbage
-                 if it's actually interpreted as an InfoCommand.
-                 Should really be using a union, and taking steps to
-                 avoid the possible error.  */
-              m[c].function = (InfoCommand *)keymap_make_keymap ();
-            }
-          break;
-
-        case ISKMAP:
-#if defined(INFOKEY)
-	  if (*s == '\0')
-	    keymap_discard_keymap ((Keymap)m[c].function, map);
-#else /* !INFOKEY */
-          if (*s == '\0')
-            return 0;
-#endif
-          break;
-        }
-      if (*s != '\0')
-        {
-          m = (Keymap)m[c].function;
-        }
-      else
-        {
-#if defined(INFOKEY)
-	  add_function_keyseq (keyentry->function, keyseq, map);
-#endif /* INFOKEY */
-          m[c] = *keyentry;
-        }
-    }
-
-  return 1;
-}
-
-/* Initialize the standard info keymaps. */
-
-Keymap info_keymap = NULL;
-Keymap echo_area_keymap = NULL;
-
-#if !defined(INFOKEY)
-
-static void
-initialize_emacs_like_keymaps ()
-{
-  int i;
-  Keymap map;
-
-  if (!info_keymap)
-    {
-      info_keymap = keymap_make_keymap ();
-      echo_area_keymap = keymap_make_keymap ();
-    }
-
-  info_keymap[ESC].type = ISKMAP;
-  info_keymap[ESC].function = (InfoCommand *)keymap_make_keymap ();
-  info_keymap[Control ('x')].type = ISKMAP;
-  info_keymap[Control ('x')].function = (InfoCommand *)keymap_make_keymap ();
-
-  /* Bind the echo area insert routines.  Let's make all characters
-     insertable by default, regardless of which character set we might
-     be using.  */
-  for (i = 0; i < 256; i++)
-    echo_area_keymap[i].function = ea_insert;
-
-  echo_area_keymap[ESC].type = ISKMAP;
-  echo_area_keymap[ESC].function = (InfoCommand *) keymap_make_keymap ();
-  echo_area_keymap[Control ('x')].type = ISKMAP;
-  echo_area_keymap[Control ('x')].function
-    = (InfoCommand *) keymap_make_keymap ();
-
-  /* Bind numeric arg functions for both echo area and info window maps. */
-  for (i = '0'; i < '9' + 1; i++)
-    {
-      ((Keymap) info_keymap[ESC].function)[i].function
-        = ((Keymap) echo_area_keymap[ESC].function)[i].function
-        = info_add_digit_to_numeric_arg;
-    }
-  ((Keymap) info_keymap[ESC].function)['-'].function =
-    ((Keymap) echo_area_keymap[ESC].function)['-'].function =
-      info_add_digit_to_numeric_arg;
-
-  info_keymap['-'].function = info_add_digit_to_numeric_arg;
-
-  /* Bind the echo area routines. */
-  map = echo_area_keymap;
-
-  map[Control ('a')].function = ea_beg_of_line;
-  map[Control ('b')].function = ea_backward;
-  map[Control ('d')].function = ea_delete;
-  map[Control ('e')].function = ea_end_of_line;
-  map[Control ('f')].function = ea_forward;
-  map[Control ('g')].function = ea_abort;
-  map[Control ('h')].function = ea_rubout;
-  map[Control ('k')].function = ea_kill_line;
-  map[Control ('l')].function = info_redraw_display;
-  map[Control ('q')].function = ea_quoted_insert;
-  map[Control ('t')].function = ea_transpose_chars;
-  map[Control ('u')].function = info_universal_argument;
-  map[Control ('y')].function = ea_yank;
-
-  map[LFD].function = ea_newline;
-  map[RET].function = ea_newline;
-  map[SPC].function = ea_complete;
-  map[TAB].function = ea_complete;
-  map['?'].function = ea_possible_completions;
-#ifdef __MSDOS__
-  /* PC users will lynch me if I don't give them their usual DEL effect...  */
-  map[DEL].function = ea_delete;
-#else
-  map[DEL].function = ea_rubout;
-#endif
-
-  /* Bind the echo area ESC keymap. */
-  map = (Keymap)echo_area_keymap[ESC].function;
-
-  map[Control ('g')].function = ea_abort;
-  map[Control ('v')].function = ea_scroll_completions_window;
-  map['b'].function = ea_backward_word;
-  map['d'].function = ea_kill_word;
-  map['f'].function = ea_forward_word;
-#if defined (NAMED_FUNCTIONS)
-  /* map['x'].function = info_execute_command; */
-#endif /* NAMED_FUNCTIONS */
-  map['y'].function = ea_yank_pop;
-  map['?'].function = ea_possible_completions;
-  map[TAB].function = ea_tab_insert;
-  map[DEL].function = ea_backward_kill_word;
-
-  /* Bind the echo area Control-x keymap. */
-  map = (Keymap)echo_area_keymap[Control ('x')].function;
-
-  map['o'].function = info_next_window;
-  map[DEL].function = ea_backward_kill_line;
-
-  /* Arrow key bindings for echo area keymaps.  It seems that some
-     terminals do not match their termcap entries, so it's best to just
-     define everything with both of the usual prefixes.  */
-  map = echo_area_keymap;
-  keymap_bind_keyseq (map, term_ku, &map[Control ('p')]); /* up */
-  keymap_bind_keyseq (map, "\033OA", &map[Control ('p')]);
-  keymap_bind_keyseq (map, "\033[A", &map[Control ('p')]);
-  keymap_bind_keyseq (map, term_kd, &map[Control ('n')]); /* down */
-  keymap_bind_keyseq (map, "\033OB", &map[Control ('n')]);
-  keymap_bind_keyseq (map, "\033[B", &map[Control ('n')]);
-  keymap_bind_keyseq (map, term_kr, &map[Control ('f')]); /* right */
-  keymap_bind_keyseq (map, "\033OC", &map[Control ('f')]);
-  keymap_bind_keyseq (map, "\033[C", &map[Control ('f')]);
-  keymap_bind_keyseq (map, term_kl, &map[Control ('b')]); /* left */
-  keymap_bind_keyseq (map, "\033OD", &map[Control ('b')]);
-  keymap_bind_keyseq (map, "\033[D", &map[Control ('b')]);
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);	/* delete */
-  keymap_bind_keyseq (map, term_kh, &map[Control ('a')]); /* home */
-  keymap_bind_keyseq (map, term_ke, &map[Control ('e')]); /* end */
-
-  map = (Keymap)echo_area_keymap[ESC].function;
-  keymap_bind_keyseq (map, term_kl, &map['b']); /* left */
-  keymap_bind_keyseq (map, "\033OA", &map['b']);
-  keymap_bind_keyseq (map, "\033[A", &map['b']);
-  keymap_bind_keyseq (map, term_kr, &map['f']); /* right */
-  keymap_bind_keyseq (map, "\033OB", &map['f']);
-  keymap_bind_keyseq (map, "\033[B", &map['f']);
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);	/* delete */
-
-  map = (Keymap)echo_area_keymap[Control ('x')].function;
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);	/* delete */
-
-  /* Bind commands for Info window keymaps. */
-  map = info_keymap;
-  map[TAB].function = info_move_to_next_xref;
-  map[LFD].function = info_select_reference_this_line;
-  map[RET].function = info_select_reference_this_line;
-  map[SPC].function = info_scroll_forward;
-  map[Control ('a')].function = info_beginning_of_line;
-  map[Control ('b')].function = info_backward_char;
-  map[Control ('e')].function = info_end_of_line;
-  map[Control ('f')].function = info_forward_char;
-  map[Control ('g')].function = info_abort_key;
-  map[Control ('h')].function = info_get_help_window;
-  map[Control ('l')].function = info_redraw_display;
-  map[Control ('n')].function = info_next_line;
-  map[Control ('p')].function = info_prev_line;
-  map[Control ('r')].function = isearch_backward;
-  map[Control ('s')].function = isearch_forward;
-  map[Control ('u')].function = info_universal_argument;
-  map[Control ('v')].function = info_scroll_forward_page_only;
-  map[','].function = info_next_index_match;
-  map['/'].function = info_search;
-
-  for (i = '1'; i < '9' + 1; i++)
-    map[i].function = info_menu_digit;
-  map['0'].function = info_last_menu_item;
-
-  map['<'].function = info_first_node;
-  map['>'].function = info_last_node;
-  map['?'].function = info_get_help_window;
-  map['['].function = info_global_prev_node;
-  map[']'].function = info_global_next_node;
-
-  map['b'].function = info_beginning_of_node;
-  map['d'].function = info_dir_node;
-  map['e'].function = info_end_of_node;
-  map['f'].function = info_xref_item;
-  map['g'].function = info_goto_node;
-  map['G'].function = info_menu_sequence;
-  map['h'].function = info_get_info_help_node;
-  map['i'].function = info_index_search;
-  map['I'].function = info_goto_invocation_node;
-  map['l'].function = info_history_node;
-  map['m'].function = info_menu_item;
-  map['n'].function = info_next_node;
-  map['O'].function = info_goto_invocation_node;
-  map['p'].function = info_prev_node;
-  map['q'].function = info_quit;
-  map['r'].function = info_xref_item;
-  map['s'].function = info_search;
-  map['S'].function = info_search_case_sensitively;
-  map['t'].function = info_top_node;
-  map['u'].function = info_up_node;
-  map[DEL].function = info_scroll_backward;
-
-  /* Bind members in the ESC map for Info windows. */
-  map = (Keymap)info_keymap[ESC].function;
-  map[Control ('f')].function = info_show_footnotes;
-  map[Control ('g')].function = info_abort_key;
-  map[TAB].function = info_move_to_prev_xref;
-  map[Control ('v')].function = info_scroll_other_window;
-  map['<'].function = info_beginning_of_node;
-  map['>'].function = info_end_of_node;
-  map['b'].function = info_backward_word;
-  map['f'].function = info_forward_word;
-  map['r'].function = info_move_to_window_line;
-  map['v'].function = info_scroll_backward_page_only;
-#if defined (NAMED_FUNCTIONS)
-  map['x'].function = info_execute_command;
-#endif /* NAMED_FUNCTIONS */
-  map[DEL].function = info_scroll_other_window_backward;
-
-  /* Bind members in the Control-X map for Info windows. */
-  map = (Keymap)info_keymap[Control ('x')].function;
-
-  map[Control ('b')].function = list_visited_nodes;
-  map[Control ('c')].function = info_quit;
-  map[Control ('f')].function = info_view_file;
-  map[Control ('g')].function = info_abort_key;
-  map[Control ('v')].function = info_view_file;
-  map['0'].function = info_delete_window;
-  map['1'].function = info_keep_one_window;
-  map['2'].function = info_split_window;
-  map['^'].function = info_grow_window;
-  map['b'].function = select_visited_node;
-  map['k'].function = info_kill_node;
-  map['n'].function = info_search_next;
-  map['N'].function = info_search_previous;
-  map['o'].function = info_next_window;
-  map['t'].function = info_tile_windows;
-  map['w'].function = info_toggle_wrap;
-
-  /* Arrow key bindings for Info windows keymap. */
-  map = info_keymap;
-  keymap_bind_keyseq (map, term_kN, &map[Control ('v')]); /* pagedown */
-  keymap_bind_keyseq (map, term_ku, &map[Control ('p')]); /* up */
-  keymap_bind_keyseq (map, "\033OA", &map[Control ('p')]);
-  keymap_bind_keyseq (map, "\033[A", &map[Control ('p')]);
-  keymap_bind_keyseq (map, term_kd, &map[Control ('n')]); /* down */
-  keymap_bind_keyseq (map, "\033OB", &map[Control ('n')]);
-  keymap_bind_keyseq (map, "\033[B", &map[Control ('n')]);
-  keymap_bind_keyseq (map, term_kr, &map[Control ('f')]); /* right */
-  keymap_bind_keyseq (map, "\033OC", &map[Control ('f')]);
-  keymap_bind_keyseq (map, "\033[C", &map[Control ('f')]);
-  keymap_bind_keyseq (map, term_kl, &map[Control ('b')]); /* left */
-  keymap_bind_keyseq (map, "\033OD", &map[Control ('b')]);
-  keymap_bind_keyseq (map, "\033[D", &map[Control ('b')]);
-  keymap_bind_keyseq (map, term_kh, &map['b']);	/* home */
-  keymap_bind_keyseq (map, term_ke, &map['e']);	/* end */
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);	/* delete */
-
-  map = (Keymap)info_keymap[ESC].function;
-  keymap_bind_keyseq (map, term_kl, &map['b']); /* left */
-  keymap_bind_keyseq (map, "\033OA", &map['b']);
-  keymap_bind_keyseq (map, "\033[A", &map['b']);
-  keymap_bind_keyseq (map, term_kr, &map['f']); /* right */
-  keymap_bind_keyseq (map, "\033OB", &map['f']);
-  keymap_bind_keyseq (map, "\033[B", &map['f']);
-  keymap_bind_keyseq (map, term_kN, &map[Control ('v')]); /* pagedown */
-  keymap_bind_keyseq (map, term_kP, &map[DEL]); /* pageup */
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);	/* delete */
-
-  /* The alternative to this definition of a `main map' key in the
-     `ESC map' section, is something like:
-    keymap_bind_keyseq (map, term_kP, &((KeyMap)map[ESC].function).map['v']);
-  */
-  keymap_bind_keyseq (info_keymap/*sic*/, term_kP, &map['v']); /* pageup */
-}
-
-static void
-initialize_vi_like_keymaps ()
-{
-  int i;
-  Keymap map;
-
-  if (!info_keymap)
-    {
-      info_keymap = keymap_make_keymap ();
-      echo_area_keymap = keymap_make_keymap ();
-    }
-
-  info_keymap[ESC].type = ISKMAP;
-  info_keymap[ESC].function = (InfoCommand *)keymap_make_keymap ();
-  info_keymap[Control ('x')].type = ISKMAP;
-  info_keymap[Control ('x')].function = (InfoCommand *)keymap_make_keymap ();
-
-  /* Bind the echo area insert routines. */
-  for (i = 0; i < 256; i++)
-    echo_area_keymap[i].function = ea_insert;
-
-  echo_area_keymap[ESC].type = ISKMAP;
-  echo_area_keymap[ESC].function = (InfoCommand *)keymap_make_keymap ();
-  echo_area_keymap[Control ('x')].type = ISKMAP;
-  echo_area_keymap[Control ('x')].function =
-    (InfoCommand *)keymap_make_keymap ();
-
-  /* Bind numeric arg functions for both echo area and info window maps. */
-  for (i = '0'; i < '9' + 1; i++)
-    {
-      info_keymap[i].function =
-        ((Keymap) echo_area_keymap[ESC].function)[i].function =
-	info_add_digit_to_numeric_arg;
-    }
-  info_keymap['-'].function =
-    ((Keymap) echo_area_keymap[ESC].function)['-'].function =
-      info_add_digit_to_numeric_arg;
-
-  /* Bind the echo area routines. */
-  map = echo_area_keymap;
-
-  map[Control ('a')].function = ea_beg_of_line;
-  map[Control ('b')].function = ea_backward;
-  map[Control ('d')].function = ea_delete;
-  map[Control ('e')].function = ea_end_of_line;
-  map[Control ('f')].function = ea_forward;
-  map[Control ('g')].function = ea_abort;
-  map[Control ('h')].function = ea_rubout;
-  map[Control ('k')].function = ea_kill_line;
-  map[Control ('l')].function = info_redraw_display;
-  map[Control ('q')].function = ea_quoted_insert;
-  map[Control ('t')].function = ea_transpose_chars;
-  map[Control ('u')].function = ea_abort;
-  map[Control ('v')].function = ea_quoted_insert;
-  map[Control ('y')].function = ea_yank;
-
-  map[LFD].function = ea_newline;
-  map[RET].function = ea_newline;
-  map[SPC].function = ea_complete;
-  map[TAB].function = ea_complete;
-  map['?'].function = ea_possible_completions;
-#ifdef __MSDOS__
-  /* PC users will lynch me if I don't give them their usual DEL effect...  */
-  map[DEL].function = ea_delete;
-#else
-  map[DEL].function = ea_rubout;
-#endif
-
-  /* Bind the echo area ESC keymap. */
-  map = (Keymap)echo_area_keymap[ESC].function;
-
-  map[Control ('g')].function = ea_abort;
-  map[Control ('h')].function = ea_backward_kill_word;
-  map[Control ('v')].function = ea_scroll_completions_window;
-  map['0'].function = ea_beg_of_line;
-  map['$'].function = ea_end_of_line;
-  map['b'].function = ea_backward_word;
-  map['d'].function = ea_kill_word;
-  map['f'].function = ea_forward_word;
-  map['h'].function = ea_backward;
-  map['l'].function = ea_forward;
-  map['w'].function = ea_forward_word;
-  map['x'].function = ea_delete;
-  map['X'].function = ea_kill_word;
-  map['y'].function = ea_yank_pop;
-  map['?'].function = ea_possible_completions;
-  map[TAB].function = ea_tab_insert;
-  map[DEL].function = ea_kill_word;
-
-  /* Bind the echo area Control-x keymap. */
-  map = (Keymap)echo_area_keymap[Control ('x')].function;
-
-  map['o'].function = info_next_window;
-  map[DEL].function = ea_backward_kill_line;
-
-  /* Arrow key bindings for echo area keymaps.  It seems that some
-     terminals do not match their termcap entries, so it's best to just
-     define everything with both of the usual prefixes.  */
-  map = echo_area_keymap;
-  keymap_bind_keyseq (map, term_ku, &map[Control ('p')]); /* up */
-  keymap_bind_keyseq (map, "\033OA", &map[Control ('p')]);
-  keymap_bind_keyseq (map, "\033[A", &map[Control ('p')]);
-  keymap_bind_keyseq (map, term_kd, &map[Control ('n')]); /* down */
-  keymap_bind_keyseq (map, "\033OB", &map[Control ('n')]);
-  keymap_bind_keyseq (map, "\033[B", &map[Control ('n')]);
-  keymap_bind_keyseq (map, term_kr, &map[Control ('f')]); /* right */
-  keymap_bind_keyseq (map, "\033OC", &map[Control ('f')]);
-  keymap_bind_keyseq (map, "\033[C", &map[Control ('f')]);
-  keymap_bind_keyseq (map, term_kl, &map[Control ('b')]); /* left */
-  keymap_bind_keyseq (map, "\033OD", &map[Control ('b')]);
-  keymap_bind_keyseq (map, "\033[D", &map[Control ('b')]);
-  keymap_bind_keyseq (map, term_kh, &map[Control ('a')]); /* home */
-  keymap_bind_keyseq (map, term_ke, &map[Control ('e')]); /* end */
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);	/* delete */
-
-  map = (Keymap)echo_area_keymap[ESC].function;
-  keymap_bind_keyseq (map, term_kl, &map['b']); /* left */
-  keymap_bind_keyseq (map, "\033OA", &map['b']);
-  keymap_bind_keyseq (map, "\033[A", &map['b']);
-  keymap_bind_keyseq (map, term_kr, &map['f']); /* right */
-  keymap_bind_keyseq (map, "\033OB", &map['f']);
-  keymap_bind_keyseq (map, "\033[B", &map['f']);
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);	/* delete */
-
-  map = (Keymap)echo_area_keymap[Control ('x')].function;
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);
-
-  /* Bind commands for Info window keymaps. */
-  map = info_keymap;
-  map[TAB].function = info_move_to_next_xref;
-  map[LFD].function = info_down_line;
-  map[RET].function = info_down_line;
-  map[SPC].function = info_scroll_forward;
-  map[Control ('a')].function = info_beginning_of_line;
-  map[Control ('b')].function = info_scroll_backward_page_only;
-  map[Control ('d')].function = info_scroll_half_screen_down;
-  map[Control ('e')].function = info_down_line;
-  map[Control ('f')].function = info_scroll_forward_page_only;
-  map[Control ('g')].function = info_abort_key;
-  map[Control ('k')].function = info_up_line;
-  map[Control ('l')].function = info_redraw_display;
-  map[Control ('n')].function = info_down_line;
-  map[Control ('p')].function = info_up_line;
-  map[Control ('r')].function = info_redraw_display;
-  map[Control ('s')].function = isearch_forward;
-  map[Control ('u')].function = info_scroll_half_screen_up;
-  map[Control ('v')].function = info_scroll_forward_page_only;
-  map[Control ('y')].function = info_up_line;
-  map[','].function = info_next_index_match;
-  map['/'].function = info_search;
-
-  for (i = '1'; i < '9' + 1; i++)
-    ((Keymap) info_keymap[ESC].function)[i].function = info_menu_digit;
-  ((Keymap) info_keymap[ESC].function)['0'].function = info_last_menu_item;
-
-  map['<'].function = info_first_node;
-  map['>'].function = info_last_node;
-  map['?'].function = info_search_backward;
-  map['['].function = info_global_prev_node;
-  map[']'].function = info_global_next_node;
-  map['\''].function = info_history_node;
-
-  map['b'].function = info_scroll_backward;
-  map['d'].function = info_scroll_half_screen_down;
-  map['e'].function = info_down_line;
-  map['E'].function = info_view_file;
-  map['f'].function = info_scroll_forward_page_only;
-  map['F'].function = info_scroll_forward_page_only;
-  map['g'].function = info_first_node;
-  map['G'].function = info_last_node;
-  map['h'].function = info_get_help_window;
-  map['H'].function = info_get_help_window;
-  map['i'].function = info_index_search;
-  map['I'].function = info_goto_invocation_node;
-  map['j'].function = info_next_line;
-  map['k'].function = info_prev_line;
-  map['l'].function = info_history_node;
-  map['m'].function = info_menu_item;
-  map['n'].function = info_search_next;
-  map['N'].function = info_search_previous;
-  map['O'].function = info_goto_invocation_node;
-  map['p'].function = info_prev_node;
-  map['q'].function = info_quit;
-  map['Q'].function = info_quit;
-  map['r'].function = info_redraw_display;
-  map['R'].function = info_redraw_display;
-  map['s'].function = info_search;
-  map['S'].function = info_search_case_sensitively;
-  map['t'].function = info_top_node;
-  map['u'].function = info_scroll_half_screen_up;
-  map['w'].function = info_scroll_backward_page_only_set_window;
-  map['y'].function = info_up_line;
-  map['z'].function = info_scroll_forward_page_only_set_window;
-  map['Z'].function = NULL;	/* unbind, so it works to bind "ZZ" below */
-  map[DEL].function = info_scroll_backward;
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);
-  keymap_bind_keyseq (map, ":q", &map['q']);
-  keymap_bind_keyseq (map, ":Q", &map['q']);
-  keymap_bind_keyseq (map, "ZZ", &map['q']);
-
-  /* Bind members in the ESC map for Info windows. */
-  map = (Keymap)info_keymap[ESC].function;
-  map[Control ('f')].function = info_show_footnotes;
-  map[Control ('g')].function = info_abort_key;
-  map[TAB].function = info_move_to_prev_xref;
-  map[SPC].function = info_scroll_forward_page_only;
-  map[Control ('v')].function = info_scroll_other_window;
-  map['<'].function = info_beginning_of_node;
-  map['>'].function = info_end_of_node;
-  map['/'].function = info_search;
-  map['?'].function = info_search_backward;
-  map['b'].function = info_beginning_of_node;
-  map['d'].function = info_dir_node;
-  map['e'].function = info_end_of_node;
-  map['f'].function = info_xref_item;
-  map['g'].function = info_select_reference_this_line;
-  map['h'].function = info_get_info_help_node;
-  map['m'].function = info_menu_item;
-  map['n'].function = info_search;
-  map['N'].function = info_search_backward;
-  map['r'].function = isearch_backward;
-  map['s'].function = isearch_forward;
-  map['t'].function = info_top_node;
-  map['v'].function = info_scroll_backward_page_only;
-#if defined (NAMED_FUNCTIONS)
-  map['x'].function = info_execute_command;
-#endif /* NAMED_FUNCTIONS */
-  map[DEL].function = info_scroll_other_window_backward;
-
-  /* Bind members in the Control-X map for Info windows. */
-  map = (Keymap)info_keymap[Control ('x')].function;
-
-  map[Control ('b')].function = list_visited_nodes;
-  map[Control ('c')].function = info_quit;
-  map[Control ('f')].function = info_view_file;
-  map[Control ('g')].function = info_abort_key;
-  map[Control ('v')].function = info_view_file;
-  map[LFD].function = info_select_reference_this_line;
-  map[RET].function = info_select_reference_this_line;
-  map['0'].function = info_delete_window;
-  map['1'].function = info_keep_one_window;
-  map['2'].function = info_split_window;
-  map['^'].function = info_grow_window;
-  map['b'].function = select_visited_node;
-  map['g'].function = info_goto_node;
-  map['i'].function = info_index_search;
-  map['I'].function = info_goto_invocation_node;
-  map['k'].function = info_kill_node;
-  map['n'].function = info_next_node;
-  map['o'].function = info_next_window;
-  map['O'].function = info_goto_invocation_node;
-  map['p'].function = info_prev_node;
-  map['r'].function = info_xref_item;
-  map['t'].function = info_tile_windows;
-  map['u'].function = info_up_node;
-  map['w'].function = info_toggle_wrap;
-  map[','].function = info_next_index_match;
-  keymap_bind_keyseq (info_keymap, ":e", &map[Control ('v')]);
-
-  /* Arrow key bindings for Info windows keymap. */
-  map = info_keymap;
-  keymap_bind_keyseq (map, term_kN, &map[Control ('v')]); /* pagedown */
-  keymap_bind_keyseq (map, term_ku, &map[Control ('p')]); /* up */
-  keymap_bind_keyseq (map, "\033OA", &map[Control ('p')]);
-  keymap_bind_keyseq (map, "\033[A", &map[Control ('p')]);
-  keymap_bind_keyseq (map, term_kd, &map[Control ('n')]); /* down */
-  keymap_bind_keyseq (map, "\033OB", &map[Control ('n')]);
-  keymap_bind_keyseq (map, "\033[B", &map[Control ('n')]);
-  keymap_bind_keyseq (map, term_kr, &map[Control ('f')]); /* right */
-  keymap_bind_keyseq (map, "\033OC", &map[Control ('f')]);
-  keymap_bind_keyseq (map, "\033[C", &map[Control ('f')]);
-  keymap_bind_keyseq (map, term_kl, &map[Control ('b')]); /* left */
-  keymap_bind_keyseq (map, "\033OD", &map[Control ('b')]);
-  keymap_bind_keyseq (map, "\033[D", &map[Control ('b')]);
-  keymap_bind_keyseq (map, term_kh, &map['b']);	/* home */
-  keymap_bind_keyseq (map, term_ke, &map['e']);	/* end */
-
-  map = (Keymap)info_keymap[ESC].function;
-  keymap_bind_keyseq (map, term_kl, &map['b']); /* left */
-  keymap_bind_keyseq (map, "\033OA", &map['b']);
-  keymap_bind_keyseq (map, "\033[A", &map['b']);
-  keymap_bind_keyseq (map, term_kr, &map['f']); /* right */
-  keymap_bind_keyseq (map, "\033OB", &map['f']);
-  keymap_bind_keyseq (map, "\033[B", &map['f']);
-  keymap_bind_keyseq (map, term_kN, &map[Control ('v')]); /* pagedown */
-  keymap_bind_keyseq (map, term_kP, &map[DEL]); /* pageup */
-  keymap_bind_keyseq (map, term_kD, &map[DEL]);	/* delete */
-
-  /* The alternative to this definition of a `main map' key in the
-     `ESC map' section, is something like:
-    keymap_bind_keyseq (map, term_kP, &((KeyMap)map[ESC].function).map['v']);
-  */
-  keymap_bind_keyseq (info_keymap/*sic*/, term_kP, &map['v']); /* pageup */
-}
-
-void
-initialize_info_keymaps ()
-{
-  if (vi_keys_p)
-    initialize_vi_like_keymaps ();
-  else
-    initialize_emacs_like_keymaps ();
-}
-
-#else /* defined(INFOKEY) */
-
-/* Make sure that we don't have too many command codes defined. */
-
-#if A_NCOMMANDS > A_MAX_COMMAND + 1
-#error "too many commands defined"
-#endif
-
-/* Initialize the keymaps from the .info keymap file. */
-
-#define NUL	'\0'
-
-static unsigned char default_emacs_like_info_keys[] =
-{
-	0,	/* suppress-default-keybindings flag */
-	TAB, NUL,			A_info_move_to_next_xref,
-	LFD, NUL,			A_info_select_reference_this_line,
-	RET, NUL,			A_info_select_reference_this_line,
-	SPC, NUL,			A_info_scroll_forward,
-	CONTROL('a'), NUL,		A_info_beginning_of_line,
-	CONTROL('b'), NUL,		A_info_backward_char,
-	CONTROL('e'), NUL,		A_info_end_of_line,
-	CONTROL('f'), NUL,		A_info_forward_char,
-	CONTROL('g'), NUL,		A_info_abort_key,
-	CONTROL('h'), NUL,		A_info_get_help_window,
-	CONTROL('l'), NUL,		A_info_redraw_display,
-	CONTROL('n'), NUL,		A_info_next_line,
-	CONTROL('p'), NUL,		A_info_prev_line,
-	CONTROL('r'), NUL,		A_isearch_backward,
-	CONTROL('s'), NUL,		A_isearch_forward,
-	CONTROL('u'), NUL,		A_info_universal_argument,
-	CONTROL('v'), NUL,		A_info_scroll_forward_page_only,
-	',', NUL,			A_info_next_index_match,
-	'/', NUL,			A_info_search,
-	'0', NUL,			A_info_last_menu_item,
-	'1', NUL,			A_info_menu_digit,
-	'2', NUL,			A_info_menu_digit,
-	'3', NUL,			A_info_menu_digit,
-	'4', NUL,			A_info_menu_digit,
-	'5', NUL,			A_info_menu_digit,
-	'6', NUL,			A_info_menu_digit,
-	'7', NUL,			A_info_menu_digit,
-	'8', NUL,			A_info_menu_digit,
-	'9', NUL,			A_info_menu_digit,
-	'<', NUL,			A_info_first_node,
-	'>', NUL,			A_info_last_node,
-	'?', NUL,			A_info_get_help_window,
-	'[', NUL,			A_info_global_prev_node,
-	']', NUL,			A_info_global_next_node,
-	'b', NUL,			A_info_beginning_of_node,
-	'd', NUL,			A_info_dir_node,
-	'e', NUL,			A_info_end_of_node,
-	'f', NUL,			A_info_xref_item,
-	'g', NUL,			A_info_goto_node,
-	'G', NUL,			A_info_menu_sequence,
-	'h', NUL,			A_info_get_info_help_node,
-	'i', NUL,			A_info_index_search,
-	'l', NUL,			A_info_history_node,
-	'm', NUL,			A_info_menu_item,
-	'n', NUL,			A_info_next_node,
-	'O', NUL,			A_info_goto_invocation_node,
-	'p', NUL,			A_info_prev_node,
-	'q', NUL,			A_info_quit,
-	'r', NUL,			A_info_xref_item,
-	's', NUL,			A_info_search,
-	'S', NUL,			A_info_search_case_sensitively,
-	't', NUL,			A_info_top_node,
-	'u', NUL,			A_info_up_node,
-	DEL, NUL,			A_info_scroll_backward,
-	ESC, '0', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '1', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '2', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '3', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '4', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '5', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '6', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '7', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '8', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '9', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '-', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, CONTROL('f'), NUL,		A_info_show_footnotes,
-	ESC, CONTROL('g'), NUL,		A_info_abort_key,
-	ESC, TAB, NUL,			A_info_move_to_prev_xref,
-	ESC, CONTROL('v'), NUL,		A_info_scroll_other_window,
-	ESC, '<', NUL,			A_info_beginning_of_node,
-	ESC, '>', NUL,			A_info_end_of_node,
-	ESC, 'b', NUL,			A_info_backward_word,
-	ESC, 'f', NUL,			A_info_forward_word,
-	ESC, 'r', NUL,			A_info_move_to_window_line,
-	ESC, 'v', NUL,			A_info_scroll_backward_page_only,
-	Meta('0'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('1'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('2'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('3'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('4'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('5'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('6'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('7'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('8'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('9'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('-'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta(CONTROL('f')), NUL,	A_info_show_footnotes,
-	Meta(CONTROL('g')), NUL,	A_info_abort_key,
-	Meta(TAB), NUL,			A_info_move_to_prev_xref,
-	Meta(CONTROL('v')), NUL,	A_info_scroll_other_window,
-	Meta('<'), NUL,			A_info_beginning_of_node,
-	Meta('>'), NUL,			A_info_end_of_node,
-	Meta('b'), NUL,			A_info_backward_word,
-	Meta('f'), NUL,			A_info_forward_word,
-	Meta('r'), NUL,			A_info_move_to_window_line,
-	Meta('v'), NUL,			A_info_scroll_backward_page_only,
-#if defined (NAMED_FUNCTIONS)
-	ESC, 'x', NUL,			A_info_execute_command,
-	Meta('x'), NUL,			A_info_execute_command,
-#endif /* NAMED_FUNCTIONS */
-
-	CONTROL('x'), CONTROL('b'), NUL,	A_list_visited_nodes,
-	CONTROL('x'), CONTROL('c'), NUL,	A_info_quit,
-	CONTROL('x'), CONTROL('f'), NUL,	A_info_view_file,
-	CONTROL('x'), CONTROL('g'), NUL,	A_info_abort_key,
-	CONTROL('x'), CONTROL('v'), NUL,	A_info_view_file,
-	CONTROL('x'), '0', NUL,		A_info_delete_window,
-	CONTROL('x'), '1', NUL,		A_info_keep_one_window,
-	CONTROL('x'), '2', NUL,		A_info_split_window,
-	CONTROL('x'), '^', NUL,		A_info_grow_window,
-	CONTROL('x'), 'b', NUL,		A_select_visited_node,
-	CONTROL('x'), 'k', NUL,		A_info_kill_node,
-	CONTROL('x'), 'n', NUL,		A_info_search_next,
-	CONTROL('x'), 'N', NUL,		A_info_search_previous,
-	CONTROL('x'), 'o', NUL,		A_info_next_window,
-	CONTROL('x'), 't', NUL,		A_info_tile_windows,
-	CONTROL('x'), 'w', NUL,		A_info_toggle_wrap,
-
-/*	Arrow key bindings for info keymaps.  It seems that some
-	terminals do not match their termcap entries, so it's best to just
-	define everything with both of the usual prefixes.  */
-
-	SK_ESCAPE, SK_PAGE_UP, NUL,		A_info_scroll_backward_page_only,
-	SK_ESCAPE, SK_PAGE_DOWN, NUL,		A_info_scroll_forward_page_only,
-	SK_ESCAPE, SK_UP_ARROW, NUL,		A_info_prev_line,
-	'\033', 'O', 'A', NUL,			A_info_prev_line,
-	'\033', '[', 'A', NUL,			A_info_prev_line,
-	SK_ESCAPE, SK_DOWN_ARROW, NUL,		A_info_next_line,
-	'\033', 'O', 'B', NUL,			A_info_next_line,
-	'\033', '[', 'B', NUL,			A_info_next_line,
-	SK_ESCAPE, SK_RIGHT_ARROW, NUL,		A_info_forward_char,
-	'\033', 'O', 'C', NUL,			A_info_forward_char,
-	'\033', '[', 'C', NUL,			A_info_forward_char,
-	SK_ESCAPE, SK_LEFT_ARROW, NUL,		A_info_backward_char,
-	'\033', 'O', 'D', NUL,			A_info_backward_char,
-	'\033', '[', 'D', NUL,			A_info_backward_char,
-	SK_ESCAPE, SK_HOME, NUL,		A_info_beginning_of_node,
-	SK_ESCAPE, SK_END, NUL,			A_info_end_of_node,
-	SK_ESCAPE, SK_DELETE, NUL,		A_info_scroll_backward,
-
-	ESC, SK_ESCAPE, SK_PAGE_UP, NUL,	A_info_scroll_other_window_backward,
-	ESC, SK_ESCAPE, SK_PAGE_DOWN, NUL,	A_info_scroll_other_window,
-	ESC, SK_ESCAPE, SK_UP_ARROW, NUL,	A_info_prev_line,
-	ESC, '\033', 'O', 'A', NUL,		A_info_prev_line,
-	ESC, '\033', '[', 'A', NUL,		A_info_prev_line,
-	ESC, SK_ESCAPE, SK_DOWN_ARROW, NUL,	A_info_next_line,
-	ESC, '\033', 'O', 'B', NUL,		A_info_next_line,
-	ESC, '\033', '[', 'B', NUL,		A_info_next_line,
-	ESC, SK_ESCAPE, SK_RIGHT_ARROW, NUL,	A_info_forward_word,
-	ESC, '\033', 'O', 'C', NUL,		A_info_forward_word,
-	ESC, '\033', '[', 'C', NUL,		A_info_forward_word,
-	ESC, SK_ESCAPE, SK_LEFT_ARROW, NUL,	A_info_backward_word,
-	ESC, '\033', 'O', 'D', NUL,		A_info_backward_word,
-	ESC, '\033', '[', 'D', NUL,		A_info_backward_word,
-};
-
-static unsigned char default_emacs_like_ea_keys[] =
-{
-	0,	/* suppress-default-keybindings flag */
-	ESC, '0', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '1', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '2', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '3', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '4', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '5', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '6', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '7', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '8', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '9', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '-', NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('0'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('1'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('2'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('3'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('4'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('5'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('6'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('7'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('8'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('9'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('-'), NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, CONTROL('g'), NUL,		A_ea_abort,
-	ESC, CONTROL('v'), NUL,		A_ea_scroll_completions_window,
-	ESC, 'b', NUL,			A_ea_backward_word,
-	ESC, 'd', NUL,			A_ea_kill_word,
-	ESC, 'f', NUL,			A_ea_forward_word,
-	ESC, 'y', NUL,			A_ea_yank_pop,
-	ESC, '?', NUL,			A_ea_possible_completions,
-	ESC, TAB, NUL,			A_ea_tab_insert,
-	ESC, DEL, NUL,			A_ea_backward_kill_word,
-	Meta(CONTROL('g')), NUL,	A_ea_abort,
-	Meta(CONTROL('v')), NUL,	A_ea_scroll_completions_window,
-	Meta('b'), NUL,			A_ea_backward_word,
-	Meta('d'), NUL,			A_ea_kill_word,
-	Meta('f'), NUL,			A_ea_forward_word,
-	Meta('y'), NUL,			A_ea_yank_pop,
-	Meta('?'), NUL,			A_ea_possible_completions,
-	Meta(TAB), NUL,			A_ea_tab_insert,
-	Meta(DEL), NUL,			A_ea_backward_kill_word,
-	CONTROL('a'), NUL,		A_ea_beg_of_line,
-	CONTROL('b'), NUL,		A_ea_backward,
-	CONTROL('d'), NUL,		A_ea_delete,
-	CONTROL('e'), NUL,		A_ea_end_of_line,
-	CONTROL('f'), NUL,		A_ea_forward,
-	CONTROL('g'), NUL,		A_ea_abort,
-	CONTROL('h'), NUL,		A_ea_rubout,
-/*	CONTROL('k') */
-	SK_ESCAPE, SK_LITERAL, NUL,	A_ea_kill_line,
-	CONTROL('l'), NUL,		A_info_redraw_display,
-	CONTROL('q'), NUL,		A_ea_quoted_insert,
-	CONTROL('t'), NUL,		A_ea_transpose_chars,
-	CONTROL('u'), NUL,		A_info_universal_argument,
-	CONTROL('y'), NUL,		A_ea_yank,
-	LFD, NUL,			A_ea_newline,
-	RET, NUL,			A_ea_newline,
-	SPC, NUL,			A_ea_complete,
-	TAB, NUL,			A_ea_complete,
-	'?', NUL,			A_ea_possible_completions,
-#ifdef __MSDOS__
-        /* PC users will lynch me if I don't give them their usual DEL
-	   effect...  */
-	DEL, NUL,			A_ea_delete,
-#else
-	DEL, NUL,			A_ea_rubout,
-#endif
-#if defined (NAMED_FUNCTIONS)
-  /* 	ESC, 'x', NUL,			A_info_execute_command, */
-  /* 	Meta('x'), NUL,			A_info_execute_command, */
-#endif /* NAMED_FUNCTIONS */
-	CONTROL('x'), 'o', NUL,		A_info_next_window,
-  	CONTROL('x'), DEL, NUL,		A_ea_backward_kill_line,
-
-/*	Arrow key bindings for echo area keymaps.  It seems that some
-	terminals do not match their termcap entries, so it's best to just
-	define everything with both of the usual prefixes.  */
-
-	SK_ESCAPE, SK_RIGHT_ARROW, NUL,		A_ea_forward,
-	'\033', 'O', 'C', NUL,			A_ea_forward,
-	'\033', '[', 'C', NUL,			A_ea_forward,
-	SK_ESCAPE, SK_LEFT_ARROW, NUL,		A_ea_backward,
-	'\033', 'O', 'D', NUL,			A_ea_backward,
-	'\033', '[', 'D', NUL,			A_ea_backward,
-	ESC, SK_ESCAPE, SK_RIGHT_ARROW, NUL,	A_ea_forward_word,
-	ESC, '\033', 'O', 'C', NUL,		A_ea_forward_word,
-	ESC, '\033', '[', 'C', NUL,		A_ea_forward_word,
-	ESC, SK_ESCAPE, SK_LEFT_ARROW, NUL,	A_ea_backward_word,
-	ESC, '\033', 'O', 'D', NUL,		A_ea_backward_word,
-	ESC, '\033', '[', 'D', NUL,		A_ea_backward_word,
-#ifdef __MSDOS__
-	SK_ESCAPE, SK_DELETE, NUL,		A_ea_delete,
-#else
-	SK_ESCAPE, SK_DELETE, NUL,		A_ea_rubout,
-#endif
-	SK_ESCAPE, SK_HOME, NUL,		A_ea_beg_of_line,
-	SK_ESCAPE, SK_END, NUL,			A_ea_end_of_line,
-	ESC, SK_ESCAPE, SK_DELETE, NUL,		A_ea_backward_kill_word,
-	CONTROL('x'), SK_ESCAPE, SK_DELETE, NUL,A_ea_backward_kill_line,
-};
-
-static unsigned char default_vi_like_info_keys[] =
-{
-	0,	/* suppress-default-keybindings flag */
-	'0', NUL,			A_info_add_digit_to_numeric_arg,
-	'1', NUL,			A_info_add_digit_to_numeric_arg,
-	'2', NUL,			A_info_add_digit_to_numeric_arg,
-	'3', NUL,			A_info_add_digit_to_numeric_arg,
-	'4', NUL,			A_info_add_digit_to_numeric_arg,
-	'5', NUL,			A_info_add_digit_to_numeric_arg,
-	'6', NUL,			A_info_add_digit_to_numeric_arg,
-	'7', NUL,			A_info_add_digit_to_numeric_arg,
-	'8', NUL,			A_info_add_digit_to_numeric_arg,
-	'9', NUL,			A_info_add_digit_to_numeric_arg,
-	'-', NUL,			A_info_add_digit_to_numeric_arg,
-	TAB, NUL,			A_info_move_to_next_xref,
-	LFD, NUL,			A_info_down_line,
-	RET, NUL,			A_info_down_line,
-	SPC, NUL,			A_info_scroll_forward,
-	CONTROL('a'), NUL,		A_info_beginning_of_line,
-	CONTROL('b'), NUL,		A_info_scroll_backward_page_only,
-	CONTROL('d'), NUL,		A_info_scroll_half_screen_down,
-	CONTROL('e'), NUL,		A_info_down_line,
-	CONTROL('f'), NUL,		A_info_scroll_forward_page_only,
-	CONTROL('g'), NUL,		A_info_abort_key,
-	CONTROL('k'), NUL,		A_info_up_line,
-	CONTROL('l'), NUL,		A_info_redraw_display,
-	CONTROL('n'), NUL,		A_info_down_line,
-	CONTROL('p'), NUL,		A_info_up_line,
-	CONTROL('r'), NUL,		A_info_redraw_display,
-	CONTROL('s'), NUL,		A_isearch_forward,
-	CONTROL('u'), NUL,		A_info_scroll_half_screen_up,
-	CONTROL('v'), NUL,		A_info_scroll_forward_page_only,
-	CONTROL('y'), NUL,		A_info_up_line,
-	',', NUL,			A_info_next_index_match,
-	'/', NUL,			A_info_search,
-	ESC, '0', NUL,			A_info_last_menu_item,
-	ESC, '1', NUL,			A_info_menu_digit,
-	ESC, '2', NUL,			A_info_menu_digit,
-	ESC, '3', NUL,			A_info_menu_digit,
-	ESC, '4', NUL,			A_info_menu_digit,
-	ESC, '5', NUL,			A_info_menu_digit,
-	ESC, '6', NUL,			A_info_menu_digit,
-	ESC, '7', NUL,			A_info_menu_digit,
-	ESC, '8', NUL,			A_info_menu_digit,
-	ESC, '9', NUL,			A_info_menu_digit,
-	Meta('0'), NUL,			A_info_last_menu_item,
-	Meta('1'), NUL,			A_info_menu_digit,
-	Meta('2'), NUL,			A_info_menu_digit,
-	Meta('3'), NUL,			A_info_menu_digit,
-	Meta('4'), NUL,			A_info_menu_digit,
-	Meta('5'), NUL,			A_info_menu_digit,
-	Meta('6'), NUL,			A_info_menu_digit,
-	Meta('7'), NUL,			A_info_menu_digit,
-	Meta('8'), NUL,			A_info_menu_digit,
-	Meta('9'), NUL,			A_info_menu_digit,
-	'<', NUL,			A_info_first_node,
-	'>', NUL,			A_info_last_node,
-	'?', NUL,			A_info_search_backward,
-	'[', NUL,			A_info_global_prev_node,
-	']', NUL,			A_info_global_next_node,
-	'\'', NUL,			A_info_history_node,
-	'b', NUL,			A_info_scroll_backward,
-	'd', NUL,			A_info_scroll_half_screen_down,
-	'e', NUL,			A_info_down_line,
-	'E', NUL,			A_info_view_file,
-	':', 'e', NUL,			A_info_view_file,
-	'f', NUL,			A_info_scroll_forward_page_only,
-	'F', NUL,			A_info_scroll_forward_page_only,
-	'g', NUL,			A_info_first_node,
-	'G', NUL,			A_info_last_node,
-	'h', NUL,			A_info_get_help_window,
-	'H', NUL,			A_info_get_help_window,
-	'i', NUL,			A_info_index_search,
-	'I', NUL,			A_info_goto_invocation_node,
-	'j', NUL,			A_info_next_line,
-	'k', NUL,			A_info_prev_line,
-	'l', NUL,			A_info_history_node,
-	'm', NUL,			A_info_menu_item,
-	'n', NUL,			A_info_search_next,
-	'N', NUL,			A_info_search_previous,
-	'O', NUL,			A_info_goto_invocation_node,
-	'p', NUL,			A_info_prev_node,
-	'q', NUL,			A_info_quit,
-	'Q', NUL,			A_info_quit,
-	':', 'q', NUL,			A_info_quit,
-	':', 'Q', NUL,			A_info_quit,
-	'Z', 'Z', NUL,			A_info_quit,
-	'r', NUL,			A_info_redraw_display,
-	'R', NUL,			A_info_redraw_display,
-	's', NUL,			A_info_search,
-	'S', NUL,			A_info_search_case_sensitively,
-	't', NUL,			A_info_top_node,
-	'u', NUL,			A_info_scroll_half_screen_up,
-	'w', NUL,			A_info_scroll_backward_page_only_set_window,
-	'y', NUL,			A_info_up_line,
-	'z', NUL,			A_info_scroll_forward_page_only_set_window,
-	DEL, NUL,			A_info_scroll_backward,
-	ESC, CONTROL('f'), NUL,		A_info_show_footnotes,
-	ESC, CONTROL('g'), NUL,		A_info_abort_key,
-	ESC, TAB, NUL,			A_info_move_to_prev_xref,
-	ESC, SPC, NUL,			A_info_scroll_forward_page_only,
-	ESC, CONTROL('v'), NUL,		A_info_scroll_other_window,
-	ESC, '<', NUL,			A_info_beginning_of_node,
-	ESC, '>', NUL,			A_info_end_of_node,
-	ESC, '/', NUL,			A_info_search,
-	ESC, '?', NUL,			A_info_search_backward,
-	ESC, 'b', NUL,			A_info_beginning_of_node,
-	ESC, 'd', NUL,			A_info_dir_node,
-	ESC, 'e', NUL,			A_info_end_of_node,
-	ESC, 'f', NUL,			A_info_xref_item,
-	ESC, 'g', NUL,			A_info_select_reference_this_line,
-	ESC, 'h', NUL,			A_info_get_info_help_node,
-	ESC, 'm', NUL,			A_info_menu_item,
-	ESC, 'n', NUL,			A_info_search,
-	ESC, 'N', NUL,			A_info_search_backward,
-	ESC, 'r', NUL,			A_isearch_backward,
-	ESC, 's', NUL,			A_isearch_forward,
-	ESC, 't', NUL,			A_info_top_node,
-	ESC, 'v', NUL,			A_info_scroll_backward_page_only,
-#if defined (NAMED_FUNCTIONS)
-	ESC, 'x', NUL,			A_info_execute_command,
-	Meta('x'), NUL,			A_info_execute_command,
-#endif /* NAMED_FUNCTIONS */
-	ESC, DEL, NUL,			A_info_scroll_other_window_backward,
-	CONTROL('x'), CONTROL('b'), NUL,	A_list_visited_nodes,
-	CONTROL('x'), CONTROL('c'), NUL,	A_info_quit,
-	CONTROL('x'), CONTROL('f'), NUL,	A_info_view_file,
-	CONTROL('x'), CONTROL('g'), NUL,	A_info_abort_key,
-	CONTROL('x'), CONTROL('v'), NUL,	A_info_view_file,
-	CONTROL('x'), LFD, NUL,		A_info_select_reference_this_line,
-	CONTROL('x'), RET, NUL,		A_info_select_reference_this_line,
-	CONTROL('x'), '0', NUL,		A_info_delete_window,
-	CONTROL('x'), '1', NUL,		A_info_keep_one_window,
-	CONTROL('x'), '2', NUL,		A_info_split_window,
-	CONTROL('x'), '^', NUL,		A_info_grow_window,
-	CONTROL('x'), 'b', NUL,		A_select_visited_node,
-	CONTROL('x'), 'g', NUL,		A_info_goto_node,
-	CONTROL('x'), 'i', NUL,		A_info_index_search,
-	CONTROL('x'), 'I', NUL,		A_info_goto_invocation_node,
-	CONTROL('x'), 'k', NUL,		A_info_kill_node,
-	CONTROL('x'), 'n', NUL,		A_info_next_node,
-	CONTROL('x'), 'o', NUL,		A_info_next_window,
-	CONTROL('x'), 'O', NUL,		A_info_goto_invocation_node,
-	CONTROL('x'), 'p', NUL,		A_info_prev_node,
-	CONTROL('x'), 'r', NUL,		A_info_xref_item,
-	CONTROL('x'), 't', NUL,		A_info_tile_windows,
-	CONTROL('x'), 'u', NUL,		A_info_up_node,
-	CONTROL('x'), 'w', NUL,		A_info_toggle_wrap,
-	CONTROL('x'), ',', NUL,		A_info_next_index_match,
-
-/*	Arrow key bindings for info keymaps.  It seems that some
-	terminals do not match their termcap entries, so it's best to just
-	define everything with both of the usual prefixes.  */
-
-	SK_ESCAPE, SK_PAGE_UP, NUL,		A_info_scroll_backward_page_only,
-	SK_ESCAPE, SK_PAGE_DOWN, NUL,		A_info_scroll_forward_page_only,
-	SK_ESCAPE, SK_UP_ARROW, NUL,		A_info_up_line,
-	'\033', 'O', 'A', NUL,			A_info_up_line,
-	'\033', '[', 'A', NUL,			A_info_up_line,
-	SK_ESCAPE, SK_DOWN_ARROW, NUL,		A_info_down_line,
-	'\033', 'O', 'B', NUL,			A_info_down_line,
-	'\033', '[', 'B', NUL,			A_info_down_line,
-	SK_ESCAPE, SK_RIGHT_ARROW, NUL,		A_info_scroll_forward_page_only,
-	'\033', 'O', 'C', NUL,			A_info_scroll_forward_page_only,
-	'\033', '[', 'C', NUL,			A_info_scroll_forward_page_only,
-	SK_ESCAPE, SK_LEFT_ARROW, NUL,		A_info_scroll_backward_page_only,
-	'\033', 'O', 'D', NUL,			A_info_scroll_backward_page_only,
-	'\033', '[', 'D', NUL,			A_info_scroll_backward_page_only,
-	SK_ESCAPE, SK_HOME, NUL,		A_info_beginning_of_node,
-	SK_ESCAPE, SK_END, NUL,			A_info_end_of_node,
-	ESC, SK_ESCAPE, SK_PAGE_DOWN, NUL,	A_info_scroll_other_window,
-	ESC, SK_ESCAPE, SK_PAGE_UP, NUL,	A_info_scroll_other_window_backward,
-	ESC, SK_ESCAPE, SK_DELETE, NUL,		A_info_scroll_other_window_backward,
-	ESC, SK_ESCAPE, SK_UP_ARROW, NUL,	A_info_prev_node,
-	ESC, '\033', 'O', 'A', NUL,		A_info_prev_node,
-	ESC, '\033', '[', 'A', NUL,		A_info_prev_node,
-	ESC, SK_ESCAPE, SK_DOWN_ARROW, NUL,	A_info_next_node,
-	ESC, '\033', 'O', 'B', NUL,		A_info_next_node,
-	ESC, '\033', '[', 'B', NUL,		A_info_next_node,
-	ESC, SK_ESCAPE, SK_RIGHT_ARROW, NUL,	A_info_xref_item,
-	ESC, '\033', 'O', 'C', NUL,		A_info_xref_item,
-	ESC, '\033', '[', 'C', NUL,		A_info_xref_item,
-	ESC, SK_ESCAPE, SK_LEFT_ARROW, NUL,	A_info_beginning_of_node,
-	ESC, '\033', 'O', 'D', NUL,		A_info_beginning_of_node,
-	ESC, '\033', '[', 'D', NUL,		A_info_beginning_of_node,
-	CONTROL('x'), SK_ESCAPE, SK_DELETE, NUL,A_ea_backward_kill_line,
-};
-
-static unsigned char default_vi_like_ea_keys[] =
-{
-	0,	/* suppress-default-keybindings flag */
-	ESC, '1', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '2', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '3', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '4', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '5', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '6', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '7', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '8', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '9', NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, '-', NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('1'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('2'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('3'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('4'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('5'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('6'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('7'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('8'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('9'), NUL,			A_info_add_digit_to_numeric_arg,
-	Meta('-'), NUL,			A_info_add_digit_to_numeric_arg,
-	ESC, CONTROL('g'), NUL,		A_ea_abort,
-	ESC, CONTROL('h'), NUL,		A_ea_backward_kill_word,
-	ESC, CONTROL('v'), NUL,		A_ea_scroll_completions_window,
-	ESC, '0', NUL,			A_ea_beg_of_line,
-	ESC, '$', NUL,			A_ea_end_of_line,
-	ESC, 'b', NUL,			A_ea_backward_word,
-	ESC, 'd', NUL,			A_ea_kill_word,
-	ESC, 'f', NUL,			A_ea_forward_word,
-	ESC, 'h', NUL,			A_ea_forward,
-	ESC, 'l', NUL,			A_ea_backward,
-	ESC, 'w', NUL,			A_ea_forward_word,
-	ESC, 'x', NUL,			A_ea_delete,
-	ESC, 'X', NUL,			A_ea_kill_word,
-	ESC, 'y', NUL,			A_ea_yank_pop,
-	ESC, '?', NUL,			A_ea_possible_completions,
-	ESC, TAB, NUL,			A_ea_tab_insert,
-	ESC, DEL, NUL,			A_ea_kill_word,
-	Meta(CONTROL('g')), NUL,	A_ea_abort,
-	Meta(CONTROL('h')), NUL,	A_ea_backward_kill_word,
-	Meta(CONTROL('v')), NUL,	A_ea_scroll_completions_window,
-	Meta('0'), NUL,			A_ea_beg_of_line,
-	Meta('$'), NUL,			A_ea_end_of_line,
-	Meta('b'), NUL,			A_ea_backward_word,
-	Meta('d'), NUL,			A_ea_kill_word,
-	Meta('f'), NUL,			A_ea_forward_word,
-	Meta('h'), NUL,			A_ea_forward,
-	Meta('l'), NUL,			A_ea_backward,
-	Meta('w'), NUL,			A_ea_forward_word,
-	Meta('x'), NUL,			A_ea_delete,
-	Meta('X'), NUL,			A_ea_kill_word,
-	Meta('y'), NUL,			A_ea_yank_pop,
-	Meta('?'), NUL,			A_ea_possible_completions,
-	Meta(TAB), NUL,			A_ea_tab_insert,
-	Meta(DEL), NUL,			A_ea_kill_word,
-	CONTROL('a'), NUL,		A_ea_beg_of_line,
-	CONTROL('b'), NUL,		A_ea_backward,
-	CONTROL('d'), NUL,		A_ea_delete,
-	CONTROL('e'), NUL,		A_ea_end_of_line,
-	CONTROL('f'), NUL,		A_ea_forward,
-	CONTROL('g'), NUL,		A_ea_abort,
-	CONTROL('h'), NUL,		A_ea_rubout,
-/*	CONTROL('k') */
-	SK_ESCAPE, SK_LITERAL, NUL,	A_ea_kill_line,
-	CONTROL('l'), NUL,		A_info_redraw_display,
-	CONTROL('q'), NUL,		A_ea_quoted_insert,
-	CONTROL('t'), NUL,		A_ea_transpose_chars,
-	CONTROL('u'), NUL,		A_ea_abort,
-	CONTROL('v'), NUL,		A_ea_quoted_insert,
-	CONTROL('y'), NUL,		A_ea_yank,
-	LFD, NUL,			A_ea_newline,
-	RET, NUL,			A_ea_newline,
-	SPC, NUL,			A_ea_complete,
-	TAB, NUL,			A_ea_complete,
-	'?', NUL,			A_ea_possible_completions,
-#ifdef __MSDOS__
-        /* PC users will lynch me if I don't give them their usual DEL
-	   effect...  */
-	DEL, NUL,			A_ea_delete,
-#else
-	DEL, NUL,			A_ea_rubout,
-#endif
-	CONTROL('x'), 'o', NUL,		A_info_next_window,
-  	CONTROL('x'), DEL, NUL,		A_ea_backward_kill_line,
-
-  /* Arrow key bindings for echo area keymaps.  It seems that some
-     terminals do not match their termcap entries, so it's best to just
-     define everything with both of the usual prefixes.  */
-
-	SK_ESCAPE, SK_RIGHT_ARROW, NUL,		A_ea_forward,
-	'\033', 'O', 'C', NUL,			A_ea_forward,
-	'\033', '[', 'C', NUL,			A_ea_forward,
-	SK_ESCAPE, SK_LEFT_ARROW, NUL,		A_ea_backward,
-	'\033', 'O', 'D', NUL,			A_ea_backward,
-	'\033', '[', 'D', NUL,			A_ea_backward,
-	SK_ESCAPE, SK_HOME, NUL,		A_ea_beg_of_line,
-	SK_ESCAPE, SK_END, NUL,			A_ea_end_of_line,
-#ifdef __MSDOS__
-	SK_ESCAPE, SK_DELETE, NUL,		A_ea_delete,
-#else
-	SK_DELETE, SK_DELETE, NUL,		A_ea_rubout,
-#endif
-	ESC, SK_ESCAPE, SK_RIGHT_ARROW, NUL,	A_ea_forward_word,
-	ESC, '\033', 'O', 'C', NUL,		A_ea_forward_word,
-	ESC, '\033', '[', 'C', NUL,		A_ea_forward_word,
-	ESC, SK_ESCAPE, SK_LEFT_ARROW, NUL,	A_ea_backward_word,
-	ESC, '\033', 'O', 'D', NUL,		A_ea_backward_word,
-	ESC, '\033', '[', 'D', NUL,		A_ea_backward_word,
-	ESC, SK_ESCAPE, SK_DELETE, NUL,		A_ea_kill_word,
-	CONTROL('x'), SK_ESCAPE, SK_DELETE, NUL,A_ea_backward_kill_line,
-};
-
-static unsigned char *user_info_keys;
-static unsigned int user_info_keys_len;
-static unsigned char *user_ea_keys;
-static unsigned int user_ea_keys_len;
-static unsigned char *user_vars;
-static unsigned int user_vars_len;
-
-/*
- * Return the size of a file, or 0 if the size can't be determined.
- */
-static unsigned long
-filesize(int f)
-{
-	long pos = lseek(f, 0L, SEEK_CUR);
-	long sz = -1L;
-	if (pos != -1L)
-	{
-		sz = lseek(f, 0L, SEEK_END);
-		lseek(f, pos, SEEK_SET);
-	}
-	return sz == -1L ? 0L : sz;
-}
-
-/* Get an integer from a infokey file.
-   Integers are stored as two bytes, low order first, in radix INFOKEY_RADIX.
- */
-static int
-getint(unsigned char **sp)
-{
-	int n;
-
-	if ( !((*sp)[0] < INFOKEY_RADIX && (*sp)[1] < INFOKEY_RADIX) )
-		return -1;
-	n = (*sp)[0] + (*sp)[1] * INFOKEY_RADIX;
-	*sp += 2;
-	return n;
-}
-
-
-/* Fetch the contents of the standard infokey file "$HOME/.info".  Return
-   true if ok, false if not.  */
-static int
-fetch_user_maps(void)
-{
-	char *filename = NULL;
-	char *homedir;
-	int f;
-	unsigned char *buf;
-	unsigned long len;
-	long nread;
-	unsigned char *p;
-	int n;
-
-	/* Find and open file. */
-	if ((filename = getenv("INFOKEY")) != NULL)
-		filename = xstrdup(filename);
-	else if ((homedir = getenv("HOME")) != NULL)
-	{
-		filename = xmalloc(strlen(homedir) + 2 + strlen(INFOKEY_FILE));
-		strcpy(filename, homedir);
-		strcat(filename, "/");
-		strcat(filename, INFOKEY_FILE);
-	}
-#ifdef __MSDOS__
-	/* Poor baby, she doesn't have a HOME...  */
-	else
-		filename = xstrdup(INFOKEY_FILE); /* try current directory */
-#endif
-	if (filename == NULL || (f = open(filename, O_RDONLY)) == (-1))
-	{
-		if (filename && errno != ENOENT)
-		{
-			info_error(filesys_error_string(filename, errno),
-                            NULL, NULL);
-			free(filename);
-		}
-		return 0;
-	}
-	SET_BINARY (f);
-
-	/* Ensure that the file is a reasonable size. */
-	len = filesize(f);
-	if (len < INFOKEY_NMAGIC + 2 || len > 100 * 1024)
-	{
-		/* Bad file (a valid file must have at least 9 chars, and
-		   more than 100 KB is a problem). */
-		if (len < INFOKEY_NMAGIC + 2)
-			info_error((char *) _("Ignoring invalid infokey file `%s' - too small"),
-				   filename, NULL);
-		else
-			info_error((char *) _("Ignoring invalid infokey file `%s' - too big"),
-				   filename, NULL);
-		close(f);
-		free(filename);
-		return 0;
-	}
-
-	/* Read the file into a buffer. */
-	buf = (unsigned char *)xmalloc((int)len);
-	nread = read(f, buf, (unsigned int) len);
-	close(f);
-	if ((unsigned int) nread != len)
-	{
-		info_error((char *) _("Error reading infokey file `%s' - short read"),
-                    filename, NULL);
-		free(buf);
-		free(filename);
-		return 0;
-	}
-
-	/* Check the header, trailer, and version of the file to increase
-	   our confidence that the contents are valid.  */
-	if (	buf[0] != INFOKEY_MAGIC_S0
-		|| buf[1] != INFOKEY_MAGIC_S1
-		|| buf[2] != INFOKEY_MAGIC_S2
-		|| buf[3] != INFOKEY_MAGIC_S3
-		|| buf[len - 4] != INFOKEY_MAGIC_E0
-		|| buf[len - 3] != INFOKEY_MAGIC_E1
-		|| buf[len - 2] != INFOKEY_MAGIC_E2
-		|| buf[len - 1] != INFOKEY_MAGIC_E3
-	)
-	{
-		info_error((char *) _("Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"),
-                    filename, NULL);
-		free(filename);
-		return 0;
-	}
-	if (len < INFOKEY_NMAGIC + strlen(VERSION) + 1
-            || strcmp(VERSION, (char *) (buf + 4)) != 0)
-	{
-		info_error
-                  ((char *) _("Your infokey file `%s' is out of date -- run infokey to update it"),
-                    filename, NULL);
-		free(filename);
-		return 0;
-	}
-
-	/* Extract the pieces.  */
-	for (p = buf + 4 + strlen(VERSION) + 1;
-             (unsigned int) (p - buf) < len - 4;
-             p += n)
-	{
-		int s = *p++;
-
-		n = getint(&p);
-		if (n < 0 || (unsigned int) n > len - 4 - (p - buf))
-		{
-			info_error((char *) _("Invalid infokey file `%s' (bad section length) -- run infokey to update it"),
-                            filename, NULL);
-			free(filename);
-			return 0;
-		}
-
-		switch (s)
-		{
-		case INFOKEY_SECTION_INFO:
-			user_info_keys = p;
-			user_info_keys_len = n;
-			break;
-		case INFOKEY_SECTION_EA:
-			user_ea_keys = p;
-			user_ea_keys_len = n;
-			break;
-		case INFOKEY_SECTION_VAR:
-			user_vars = p;
-			user_vars_len = n;
-			break;
-		default:
-			info_error((char *) _("Invalid infokey file `%s' (bad section code) -- run infokey to update it"),
-                            filename, NULL);
-			free(filename);
-			return 0;
-		}
-	}
-
-	free(filename);
-	return 1;
-}
-
-/* Decode special key sequences from the infokey file.  Return zero
-   if the key sequence includes special keys which the terminal
-   doesn't define.
- */
-static int
-decode_keys(unsigned char *src, unsigned int slen,
-    unsigned char *dst, unsigned int dlen)
-{
-	unsigned char *s = src;
-	unsigned char *d = dst;
-
-#define To_dst(c) do { \
-  if ((unsigned int) (d - dst) < dlen) *d++ = (c); \
-} while (0)
-
-	while ((unsigned int) (s - src) < slen)
-	{
-		unsigned char c = ISMETA(*s) ? UNMETA(*s) : *s;
-
-		if (c == SK_ESCAPE)
-		{
-			char *t;
-			static char lit[] = { SK_ESCAPE, NUL };
-
-			switch ((unsigned int) (s + 1 - src) < slen ? s[1] : '\0')
-			{
-			case SK_RIGHT_ARROW:	t = term_kr; break;
-			case SK_LEFT_ARROW:	t = term_kl; break;
-			case SK_UP_ARROW:	t = term_ku; break;
-			case SK_DOWN_ARROW:	t = term_kd; break;
-			case SK_PAGE_UP:	t = term_kP; break;
-			case SK_PAGE_DOWN:	t = term_kN; break;
-			case SK_HOME:		t = term_kh; break;
-			case SK_END:		t = term_ke; break;
-			case SK_DELETE:		t = term_kx; break;
-			case SK_INSERT:		t = term_ki; break;
-			case SK_LITERAL:
-			default:		t = lit; break;
-			}
-			if (t == NULL)
-				return 0;
-			while (*t)
-				To_dst(ISMETA(*s) ? Meta(*t++) : *t++);
-			s += 2;
-		}
-		else
-		{
-			if (ISMETA(*s))
-				To_dst(Meta(*s++));
-			else
-				To_dst(*s++);
-		}
-	}
-
-	To_dst('\0');
-
-	return 1;
-
-#undef To_dst
-
-}
-
-/* Convert an infokey file section to keymap bindings.  Return false if
-   the default bindings are to be suppressed.  */
-static int
-section_to_keymaps(Keymap map, unsigned char *table, unsigned int len)
-{
-	int stop;
-	unsigned char *p;
-	unsigned char *seq = NULL;
-	unsigned int seqlen = 0;
-	enum { getseq, gotseq, getaction } state = getseq;
-
-	stop = len > 0 ? table[0] : 0;
-
-	for (p = table + 1; (unsigned int) (p - table) < len; p++)
-	{
-		switch (state)
-		{
-		case getseq:
-			if (*p)
-			{
-				seq = p;
-				state = gotseq;
-			}
-			break;
-
-		case gotseq:
-			if (!*p)
-			{
-				seqlen = p - seq;
-				state = getaction;
-			}
-			break;
-
-		case getaction:
-			{
-				unsigned int action = *p;
-				unsigned char keyseq[256];
-				KEYMAP_ENTRY ke;
-
-				state = getseq;
-				/* If decode_keys returns zero, it
-				   means that seq includes keys which
-				   the terminal doesn't support, like
-				   PageDown.  In that case, don't bind
-				   the key sequence.  */
-				if (decode_keys(seq, seqlen, keyseq,
-						sizeof keyseq))
-				{
-					keyseq[sizeof keyseq - 1] = '\0';
-					ke.type = ISFUNC;
-					ke.function =
-					  action < A_NCOMMANDS
-					  ? &function_doc_array[action]
-					  : NULL;
-					keymap_bind_keyseq(map,
-                                            (const char *) keyseq, &ke);
-				}
-			}
-			break;
-		}
-	}
-	if (state != getseq)
-		info_error((char *) _("Bad data in infokey file -- some key bindings ignored"),
-                    NULL, NULL);
-	return !stop;
-}
-
-/* Convert an infokey file section to variable settings.
- */
-static void
-section_to_vars(unsigned char *table, unsigned int len)
-{
-	enum { getvar, gotvar, getval, gotval } state = getvar;
-	unsigned char *var = NULL;
-	unsigned char *val = NULL;
-	unsigned char *p;
-
-	for (p = table; (unsigned int) (p - table) < len; p++)
-	  {
-	    switch (state)
-	      {
-	      case getvar:
-		if (*p)
-		  {
-		    var = p;
-		    state = gotvar;
-		  }
-		break;
-
-	      case gotvar:
-		if (!*p)
-		  state = getval;
-		break;
-
-	      case getval:
-		if (*p)
-		  {
-		    val = p;
-		    state = gotval;
-		  }
-		break;
-
-	      case gotval:
-		if (!*p)
-		  {
-		    set_variable_to_value((char *) var, (char *) val);
-		    state = getvar;
-		  }
-		break;
-	      }
-	  }
-      if (state != getvar)
-	info_error((char *) _("Bad data in infokey file -- some var settings ignored"),
-            NULL, NULL);
-}
-
-void
-initialize_info_keymaps (void)
-{
-  int i;
-  int suppress_info_default_bindings = 0;
-  int suppress_ea_default_bindings = 0;
-
-  if (!info_keymap)
-    {
-      info_keymap = keymap_make_keymap ();
-      echo_area_keymap = keymap_make_keymap ();
-    }
-
-  /* Bind the echo area insert routines. */
-  for (i = 0; i < 256; i++)
-    if (isprint (i))
-      echo_area_keymap[i].function = InfoCmd(ea_insert);
-
-  /* Get user-defined keys and variables.  */
-  if (fetch_user_maps())
-    {
-      if (user_info_keys_len && user_info_keys[0])
-	suppress_info_default_bindings = 1;
-      if (user_ea_keys_len && user_ea_keys[0])
-	suppress_ea_default_bindings = 1;
-    }
-
-  /* Apply the default bindings, unless the user says to suppress
-     them.  */
-  if (vi_keys_p)
-    {
-      if (!suppress_info_default_bindings)
-	section_to_keymaps(info_keymap, default_vi_like_info_keys,
-			   sizeof(default_vi_like_info_keys));
-      if (!suppress_ea_default_bindings)
-	  section_to_keymaps(echo_area_keymap, default_vi_like_ea_keys,
-			     sizeof(default_vi_like_ea_keys));
-    }
-  else
-    {
-      if (!suppress_info_default_bindings)
-	section_to_keymaps(info_keymap, default_emacs_like_info_keys,
-			   sizeof(default_emacs_like_info_keys));
-      if (!suppress_ea_default_bindings)
-	  section_to_keymaps(echo_area_keymap, default_emacs_like_ea_keys,
-			     sizeof(default_emacs_like_ea_keys));
-    }
-
-  /* If the user specified custom bindings, apply them on top of the
-     default ones.  */
-  if (user_info_keys_len)
-    section_to_keymaps(info_keymap, user_info_keys, user_info_keys_len);
-
-  if (user_ea_keys_len)
-    section_to_keymaps(echo_area_keymap, user_ea_keys, user_ea_keys_len);
-
-  if (user_vars_len)
-    section_to_vars(user_vars, user_vars_len);
-}
-
-#endif /* defined(INFOKEY) */
-/* vim: set sw=2 cino={1s>2sn-s^-se-s: */

Property changes on: head/contrib/texinfo/info/infomap.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/infokey.c
===================================================================
--- head/contrib/texinfo/info/infokey.c	(revision 276550)
+++ head/contrib/texinfo/info/infokey.c	(nonexistent)
@@ -1,924 +0,0 @@
-/* infokey.c -- compile ~/.infokey to ~/.info.
-   $Id: infokey.c,v 1.9 2004/12/14 00:15:36 karl Exp $
-
-   Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Andrew Bettison <andrewb@zip.com.au>. */
-
-#include "info.h"
-#include "infomap.h"
-#include "infokey.h"
-#include "key.h"
-#include "getopt.h"
-
-static char *program_name = "infokey";
-
-/* Non-zero means print version info only. */
-static int print_version_p = 0;
-
-/* Non-zero means print a short description of the options. */
-static int print_help_p = 0;
-
-/* String specifying the source file.  This is set by the user on the
-   command line, or a default is used. */
-static char *input_filename = (char *) NULL;
-
-/* String specifying the name of the file to output to.  This is
-   set by the user on the command line, or a default is used. */
-static char *output_filename = (char *) NULL;
-
-/* Structure describing the options that Infokey accepts.  We pass this
-   structure to getopt_long ().  If you add or otherwise change this
-   structure, you must also change the string which follows it. */
-static struct option long_options[] =
-{
-  {"output", 1, 0, 'o'},
-  {"help", 0, &print_help_p, 1},
-  {"version", 0, &print_version_p, 1},
-  {NULL, 0, NULL, 0}
-};
-
-/* String describing the shorthand versions of the long options found above. */
-static char *short_options = "o:";
-
-/* Structure for holding the compiled sections. */
-enum sect_e
-  {
-    info = 0,
-    ea = 1,
-    var = 2
-  };
-struct sect
-  {
-    unsigned int cur;
-    unsigned char data[INFOKEY_MAX_SECTIONLEN];
-  };
-
-/* Some "forward" declarations. */
-static char *mkpath (const char *dir, const char *file);
-static int compile (FILE *fp, const char *filename, struct sect *sections);
-static int write_infokey_file (FILE *fp, struct sect *sections);
-static void syntax_error (const char *filename,
-    unsigned int linenum, const char *fmt,
-    const void *a1, const void *a2, const void *a3, const void *a4);
-static void error_message (int error_code, const char *fmt,
-    const void *a1, const void *a2, const void *a3, const void *a4);
-static void suggest_help (void);
-static void short_help (void);
-
-
-/* **************************************************************** */
-/*                                                                  */
-/*             Main Entry Point to the Infokey Program              */
-/*                                                                  */
-/* **************************************************************** */
-
-int
-main (int argc, char **argv)
-{
-  int getopt_long_index;	/* Index returned by getopt_long (). */
-
-#ifdef HAVE_SETLOCALE
-  /* Set locale via LC_ALL.  */
-  setlocale (LC_ALL, "");
-#endif
-
-#ifdef ENABLE_NLS
-  /* Set the text message domain.  */
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-#endif
-
-  while (1)
-    {
-      int option_character;
-
-      option_character = getopt_long
-	(argc, argv, short_options, long_options, &getopt_long_index);
-
-      /* getopt_long () returns EOF when there are no more long options. */
-      if (option_character == EOF)
-	break;
-
-      /* If this is a long option, then get the short version of it. */
-      if (option_character == 0 && long_options[getopt_long_index].flag == 0)
-	option_character = long_options[getopt_long_index].val;
-
-      /* Case on the option that we have received. */
-      switch (option_character)
-	{
-	case 0:
-	  break;
-
-	  /* User is specifying the name of a file to output to. */
-	case 'o':
-	  if (output_filename)
-	    free (output_filename);
-	  output_filename = xstrdup (optarg);
-	  break;
-
-	default:
-	  suggest_help ();
-	  xexit (1);
-	}
-    }
-
-  /* If the user specified --version, then show the version and exit. */
-  if (print_version_p)
-    {
-      printf ("%s (GNU %s) %s\n", program_name, PACKAGE, VERSION);
-      puts ("");
-      printf (_ ("Copyright (C) %s Free Software Foundation, Inc.\n\
-There is NO warranty.  You may redistribute this software\n\
-under the terms of the GNU General Public License.\n\
-For more information about these matters, see the files named COPYING.\n"),
-	      "2003");
-      xexit (0);
-    }
-
-  /* If the `--help' option was present, show the help and exit. */
-  if (print_help_p)
-    {
-      short_help ();
-      xexit (0);
-    }
-
-  /* If there is one argument remaining, it is the name of the input
-     file. */
-  if (optind == argc - 1)
-    {
-      if (input_filename)
-	free (input_filename);
-      input_filename = xstrdup (argv[optind]);
-    }
-  else if (optind != argc)
-    {
-      error_message (0, _("incorrect number of arguments"),
-          NULL, NULL, NULL, NULL);
-      suggest_help ();
-      xexit (1);
-    }
-
-  /* Use default filenames where none given. */
-  {
-    char *homedir;
-
-    homedir = getenv ("HOME");
-#ifdef __MSDOS__
-    if (!homedir)
-      homedir = ".";
-#endif
-    if (!input_filename)
-      input_filename = mkpath (homedir, INFOKEY_SRCFILE);
-    if (!output_filename)
-      output_filename = mkpath (homedir, INFOKEY_FILE);
-  }
-
-  {
-    FILE *inf;
-    FILE *outf;
-    int write_error;
-    static struct sect sections[3];
-
-    /* Open the input file. */
-    inf = fopen (input_filename, "r");
-    if (!inf)
-      {
-	error_message (errno, _("cannot open input file `%s'"),
-            input_filename, NULL, NULL, NULL);
-	xexit (1);
-      }
-
-    /* Compile the input file to its verious sections, then write the
-       section data to the output file. */
-
-    if (compile (inf, input_filename, sections))
-      {
-	/* Open the output file. */
-	outf = fopen (output_filename, FOPEN_WBIN);
-	if (!outf)
-	  {
-	    error_message (errno, _("cannot create output file `%s'"),
-                output_filename, NULL, NULL, NULL);
-	    xexit (1);
-	  }
-
-	/* Write the contents of the output file and close it.  If there is
-	   an error writing to the file, delete it and exit with a failure
-	   status.  */
-	write_error = 0;
-	if (!write_infokey_file (outf, sections))
-	  {
-	    error_message (errno, _("error writing to `%s'"),
-                output_filename, NULL, NULL, NULL);
-	    write_error = 1;
-	  }
-	if (fclose (outf) == EOF)
-	  {
-	    error_message (errno, _("error closing output file `%s'"),
-                output_filename, NULL, NULL, NULL);
-	    write_error = 1;
-	  }
-	if (write_error)
-	  {
-	    unlink (output_filename);
-	    xexit (1);
-	  }
-      }
-
-    /* Close the input file. */
-    fclose (inf);
-  }
-
-  return 0;
-}
-
-static char *
-mkpath (const char *dir, const char *file)
-{
-  char *p;
-
-  p = xmalloc (strlen (dir) + 1 + strlen (file) + 2);
-  strcpy (p, dir);
-  strcat (p, "/");
-  strcat (p, file);
-  return p;
-}
-
-
-/* Compilation - the real work.
-
-	Source file syntax
-	------------------
-	The source file is a line-based text file with the following
-	structure:
-
-		# comments
-		# more comments
-
-		#info
-		u	prev-line
-		d	next-line
-		^a	invalid		# just beep
-		\ku	prev-line
-		#stop
-		\kd	next-line
-		q	quit		# of course!
-
-		#echo-area
-		^a	echo-area-beg-of-line
-		^e	echo-area-end-of-line
-		\kr	echo-area-forward
-		\kl	echo-area-backward
-		\kh	echo-area-beg-of-line
-		\ke	echo-area-end-of-line
-
-		#var
-		scroll-step=1
-		ISO-Latin=Off
-
-	Lines starting with '#' are comments, and are ignored.  Blank
-	lines are ignored.  Each section is introduced by one of the
-	following lines:
-
-		#info
-		#echo-area
-		#var
-
-	The sections may occur in any order.  Each section may be
-	omitted completely.  If the 'info' section is the first in the
-	file, its '#info' line may be omitted.
-
-	The 'info' and 'echo-area' sections
-	-----------------------------------
-	Each line in the 'info' or 'echo-area' sections has the
-	following syntax:
-
-		key-sequence SPACE action-name [ SPACE [ # comment ] ] \n
-
-	Where SPACE is one or more white space characters excluding
-	newline, "action-name" is the name of a GNU Info command,
-	"comment" is any sequence of characters excluding newline, and
-	"key-sequence" is a concatenation of one or more key definitions
-	using the following syntax:
-
-	   1.	A carat ^ followed by one character indicates a single
-	   	control character;
-
-	   2.	A backslash \ followed by one, two, or three octal
-		digits indicates a single character having that ASCII
-		code;
-
-	   3.	\n indicates a single NEWLINE;
-		\e indicates a single ESC;
-		\r indicates a single CR;
-		\t indicates a single TAB;
-		\b indicates a single BACKSPACE;
-
-	   4.	\ku indicates the Up Arrow key;
-	   	\kd indicates the Down Arrow key;
-	   	\kl indicates the Left Arrow key;
-	   	\kr indicates the Right Arrow key;
-	   	\kP indicates the Page Up (PRIOR) key;
-	   	\kN indicates the Page Down (NEXT) key;
-	   	\kh indicates the Home key;
-	   	\ke indicates the End key;
-	   	\kx indicates the DEL key;
-		\k followed by any other character indicates a single
-		control-K, and the following character is interpreted
-		as in rules 1, 2, 3, 5 and 6.
-
-	   5.	\m followed by any sequence defined in rules 1, 2, 3, 4
-		or 6 indicates the "Meta" modification of that key.
-
-	   6.	A backslash \ followed by any character not described
-	   	above indicates that character itself.  In particular:
-		\\ indicates a single backslash \,
-		\  (backslash-space) indicates a single space,
-		\^ indicates a single caret ^,
-
-	If the following line:
-
-		#stop
-
-	occurs anywhere in an 'info' or 'echo-area' section, that
-	indicates to GNU Info to suppress all of its default key
-	bindings in that context.
-
-	The 'var' section
-	-----------------
-	Each line in the 'var' section has the following syntax:
-
-		variable-name = value \n
-
-	Where "variable-name" is the name of a GNU Info variable and
-	"value" is the value that GNU Info will assign to that variable
-	when commencing execution.  There must be no white space in the
-	variable name, nor between the variable name and the '='.  All
-	characters immediately following the '=', up to but not
-	including the terminating newline, are considered to be the
-	value that will be assigned.  In other words, white space
-	following the '=' is not ignored.
- */
-
-static int add_to_section (struct sect *s, const char *str, unsigned int len);
-static int lookup_action (const char *actname);
-
-/* Compile the input file into its various sections.  Return true if no
-   error was encountered.
- */
-static int
-compile (FILE *fp, const char *filename, struct sect *sections)
-{
-  int error = 0;
-  char rescan = 0;
-  unsigned int lnum = 0;
-  int c = 0;
-
-  /* This parser is a true state machine, with no sneaky fetching
-     of input characters inside the main loop.  In other words, all
-     state is fully represented by the following variables:
-   */
-  enum
-    {
-      start_of_line,
-      start_of_comment,
-      in_line_comment,
-      in_trailing_comment,
-      get_keyseq,
-      got_keyseq,
-      get_action,
-      got_action,
-      get_varname,
-      got_varname,
-      get_equals,
-      got_equals,
-      get_value
-    }
-  state = start_of_line;
-  enum sect_e section = info;
-  enum
-    {
-      normal,
-      slosh,
-      control,
-      octal,
-      special_key
-    }
-  seqstate;		/* used if state == get_keyseq */
-  char meta = 0;
-  char ocnt = 0;	/* used if state == get_keyseq && seqstate == octal */
-
-  /* Data is accumulated in the following variables.  The code
-     avoids overflowing these strings, and throws an error
-     where appropriate if a string limit is exceeded.  These string
-     lengths are arbitrary (and should be large enough) and their
-     lengths are not hard-coded anywhere else, so increasing them
-     here will not break anything.  */
-  char oval = 0;
-  char comment[10];
-  unsigned int clen = 0;
-  char seq[20];
-  unsigned int slen = 0;
-  char act[80];
-  unsigned int alen = 0;
-  char varn[80];
-  unsigned int varlen = 0;
-  char val[80];
-  unsigned int vallen = 0;
-
-#define	To_seq(c) \
-		  do { \
-		    if (slen < sizeof seq) \
-		      seq[slen++] = meta ? Meta(c) : (c); \
-		    else \
-		      { \
-			syntax_error(filename, lnum, _("key sequence too long"), \
-                            NULL, NULL, NULL, NULL); \
-			error = 1; \
-		      } \
-		    meta = 0; \
-		  } while (0)
-
-  sections[info].cur = 1;
-  sections[info].data[0] = 0;
-  sections[ea].cur = 1;
-  sections[ea].data[0] = 0;
-  sections[var].cur = 0;
-
-  while (!error && (rescan || (c = fgetc (fp)) != EOF))
-    {
-      rescan = 0;
-      switch (state)
-	{
-	case start_of_line:
-	  lnum++;
-	  if (c == '#')
-	    state = start_of_comment;
-	  else if (c != '\n')
-	    {
-	      switch (section)
-		{
-		case info:
-		case ea:
-		  state = get_keyseq;
-		  seqstate = normal;
-		  slen = 0;
-		  break;
-		case var:
-		  state = get_varname;
-		  varlen = 0;
-		  break;
-		}
-	      rescan = 1;
-	    }
-	  break;
-
-	case start_of_comment:
-	  clen = 0;
-	  state = in_line_comment;
-	  /* fall through */
-	case in_line_comment:
-	  if (c == '\n')
-	    {
-	      state = start_of_line;
-	      comment[clen] = '\0';
-	      if (strcmp (comment, "info") == 0)
-		section = info;
-	      else if (strcmp (comment, "echo-area") == 0)
-		section = ea;
-	      else if (strcmp (comment, "var") == 0)
-		section = var;
-	      else if (strcmp (comment, "stop") == 0
-		       && (section == info || section == ea))
-		sections[section].data[0] = 1;
-	    }
-	  else if (clen < sizeof comment - 1)
-	    comment[clen++] = c;
-	  break;
-
-	case in_trailing_comment:
-	  if (c == '\n')
-	    state = start_of_line;
-	  break;
-
-	case get_keyseq:
-	  switch (seqstate)
-	    {
-	    case normal:
-	      if (c == '\n' || isspace (c))
-		{
-		  state = got_keyseq;
-		  rescan = 1;
-		  if (slen == 0)
-		    {
-		      syntax_error (filename, lnum, _("missing key sequence"),
-                          NULL, NULL, NULL, NULL);
-		      error = 1;
-		    }
-		}
-	      else if (c == '\\')
-		seqstate = slosh;
-	      else if (c == '^')
-		seqstate = control;
-	      else
-		To_seq (c);
-	      break;
-
-	    case slosh:
-	      switch (c)
-		{
-		case '0': case '1': case '2': case '3':
-		case '4': case '5': case '6': case '7':
-		  seqstate = octal;
-		  oval = c - '0';
-		  ocnt = 1;
-		  break;
-		case 'b':
-		  To_seq ('\b');
-		  seqstate = normal;
-		  break;
-		case 'e':
-		  To_seq ('\033');
-		  seqstate = normal;
-		  break;
-		case 'n':
-		  To_seq ('\n');
-		  seqstate = normal;
-		  break;
-		case 'r':
-		  To_seq ('\r');
-		  seqstate = normal;
-		  break;
-		case 't':
-		  To_seq ('\t');
-		  seqstate = normal;
-		  break;
-		case 'm':
-		  meta = 1;
-		  seqstate = normal;
-		  break;
-		case 'k':
-		  seqstate = special_key;
-		  break;
-		default:
-		  /* Backslash followed by any other char
-		     just means that char.  */
-		  To_seq (c);
-		  seqstate = normal;
-		  break;
-		}
-	      break;
-
-	    case octal:
-	      switch (c)
-		{
-		case '0': case '1': case '2': case '3':
-		case '4': case '5': case '6': case '7':
-		  if (++ocnt <= 3)
-		    oval = oval * 8 + c - '0';
-		  if (ocnt == 3)
-		    seqstate = normal;
-		  break;
-		default:
-		  ocnt = 4;
-		  seqstate = normal;
-		  rescan = 1;
-		  break;
-		}
-	      if (seqstate != octal)
-		{
-		  if (oval)
-		    To_seq (oval);
-		  else
-		    {
-		      syntax_error (filename, lnum,
-                          _("NUL character (\\000) not permitted"),
-                          NULL, NULL, NULL, NULL);
-		      error = 1;
-		    }
-		}
-	      break;
-
-	    case special_key:
-	      To_seq (SK_ESCAPE);
-	      switch (c)
-		{
-		case 'u': To_seq (SK_UP_ARROW); break;
-		case 'd': To_seq (SK_DOWN_ARROW); break;
-		case 'r': To_seq (SK_RIGHT_ARROW); break;
-		case 'l': To_seq (SK_LEFT_ARROW); break;
-		case 'U': To_seq (SK_PAGE_UP); break;
-		case 'D': To_seq (SK_PAGE_DOWN); break;
-		case 'h': To_seq (SK_HOME); break;
-		case 'e': To_seq (SK_END); break;
-		case 'x': To_seq (SK_DELETE); break;
-		default:  To_seq (SK_LITERAL); rescan = 1; break;
-		}
-	      seqstate = normal;
-	      break;
-
-	    case control:
-	      if (CONTROL (c))
-		To_seq (CONTROL (c));
-	      else
-		{
-		  syntax_error (filename, lnum,
-                      (char *) _("NUL character (^%c) not permitted"),
-                      (void *) (long) c, NULL, NULL, NULL);
-		  error = 1;
-		}
-	      seqstate = normal;
-	      break;
-	    }
-	  break;
-
-	case got_keyseq:
-	  if (isspace (c) && c != '\n')
-	    break;
-	  state = get_action;
-	  alen = 0;
-	  /* fall through */
-	case get_action:
-	  if (c == '\n' || isspace (c))
-	    {
-	      int a;
-
-	      state = got_action;
-	      rescan = 1;
-	      if (alen == 0)
-		{
-		  syntax_error (filename, lnum, (char *) _("missing action name"),
-				(void *) (long) c, NULL, NULL, NULL);
-		  error = 1;
-		}
-	      else
-		{
-		  act[alen] = '\0';
-		  a = lookup_action (act);
-		  if (a != -1)
-		    {
-		      char av = a;
-
-		      if (!(add_to_section (&sections[section], seq, slen)
-			    && add_to_section (&sections[section], "", 1)
-			    && add_to_section (&sections[section], &av, 1)))
-			{
-			  syntax_error (filename, lnum, _("section too long"),
-                              NULL, NULL, NULL, NULL);
-			  error = 1;
-			}
-		    }
-		  else
-		    {
-		      syntax_error (filename, lnum, _("unknown action `%s'"),
-                          act, NULL, NULL, NULL);
-		      error = 1;
-		    }
-		}
-	    }
-	  else if (alen < sizeof act - 1)
-	    act[alen++] = c;
-	  else
-	    {
-	      syntax_error (filename, lnum, _("action name too long"),
-                  NULL, NULL, NULL, NULL);
-	      error = 1;
-	    }
-	  break;
-
-	case got_action:
-	  if (c == '#')
-	    state = in_trailing_comment;
-	  else if (c == '\n')
-	    state = start_of_line;
-	  else if (!isspace (c))
-	    {
-	      syntax_error (filename, lnum,
-                  _("extra characters following action `%s'"),
-                  act, NULL, NULL, NULL);
-	      error = 1;
-	    }
-	  break;
-
-	case get_varname:
-	  if (c == '=')
-	    {
-	      if (varlen == 0)
-		{
-		  syntax_error (filename, lnum, _("missing variable name"),
-                      NULL, NULL, NULL, NULL);
-		  error = 1;
-		}
-	      state = get_value;
-	      vallen = 0;
-	    }
-	  else if (c == '\n' || isspace (c))
-	    {
-	      syntax_error (filename, lnum,
-                  _("missing `=' immediately after variable name"),
-                  NULL, NULL, NULL, NULL);
-	      error = 1;
-	    }
-	  else if (varlen < sizeof varn)
-	    varn[varlen++] = c;
-	  else
-	    {
-	      syntax_error (filename, lnum, _("variable name too long"),
-                  NULL, NULL, NULL, NULL);
-	      error = 1;
-	    }
-	  break;
-
-	case get_value:
-	  if (c == '\n')
-	    {
-	      state = start_of_line;
-	      if (!(add_to_section (&sections[section], varn, varlen)
-		    && add_to_section (&sections[section], "", 1)
-		    && add_to_section (&sections[section], val, vallen)
-		    && add_to_section (&sections[section], "", 1)))
-		{
-		  syntax_error (filename, lnum, _("section too long"),
-                      NULL, NULL, NULL, NULL);
-		  error = 1;
-		}
-	    }
-	  else if (vallen < sizeof val)
-	    val[vallen++] = c;
-	  else
-	    {
-	      syntax_error (filename, lnum, _("value too long"),
-                  NULL, NULL, NULL, NULL);
-	      error = 1;
-	    }
-	  break;
-
-        case get_equals:
-        case got_equals:
-        case got_varname:
-          break;
-	}
-    }
-
-#undef To_seq
-
-  return !error;
-}
-
-/* Add some characters to a section's data.  Return true if all the
-   characters fit, or false if the section's size limit was exceeded.
- */
-static int
-add_to_section (struct sect *s, const char *str, unsigned int len)
-{
-  if (s->cur + len > sizeof s->data)
-    return 0;
-  strncpy ((char *) s->data + s->cur, str, len);
-  s->cur += len;
-  return 1;
-}
-
-/* Translate from an action name to its numeric code.  This uses the
-   auto-generated array in key.c.
- */
-static int
-lookup_action (const char *actname)
-{
-  int i;
-
-  if (strcmp ("invalid", actname) == 0)
-    return A_INVALID;
-  for (i = 0; function_key_array[i].name != NULL; i++)
-    if (strcmp (function_key_array[i].name, actname) == 0)
-      return function_key_array[i].code;
-  return -1;
-}
-
-/* Put an integer to an infokey file.
-   Integers are stored as two bytes, low order first,
-   in radix INFOKEY_RADIX.
- */
-static int
-putint (int i, FILE *fp)
-{
-  return fputc (i % INFOKEY_RADIX, fp) != EOF
-    && fputc ((i / INFOKEY_RADIX) % INFOKEY_RADIX, fp) != EOF;
-}
-
-/* Write an entire section to an infokey file.  If the section is
-   empty, simply omit it.
- */
-static int
-putsect (struct sect *s, int code, FILE *fp)
-{
-  if (s->cur == 0)
-    return 1;
-  return fputc (code, fp) != EOF
-    && putint (s->cur, fp)
-    && fwrite (s->data, s->cur, 1, fp) == 1;
-}
-
-/* Write an entire infokey file, given an array containing its sections.
- */
-static int
-write_infokey_file (FILE *fp, struct sect *sections)
-{
-  /* Get rid of sections with no effect. */
-  if (sections[info].cur == 1 && sections[info].data[0] == 0)
-    sections[info].cur = 0;
-  if (sections[ea].cur == 1 && sections[ea].data[0] == 0)
-    sections[ea].cur = 0;
-
-  /* Write all parts of the file out in order (no lseeks),
-     checking for errors all the way. */
-  return fputc (INFOKEY_MAGIC_S0, fp) != EOF
-    && fputc (INFOKEY_MAGIC_S1, fp) != EOF
-    && fputc (INFOKEY_MAGIC_S2, fp) != EOF
-    && fputc (INFOKEY_MAGIC_S3, fp) != EOF
-    && fputs (VERSION, fp) != EOF
-    && fputc ('\0', fp) != EOF
-    && putsect (&sections[info], INFOKEY_SECTION_INFO, fp)
-    && putsect (&sections[ea], INFOKEY_SECTION_EA, fp)
-    && putsect (&sections[var], INFOKEY_SECTION_VAR, fp)
-    && fputc (INFOKEY_MAGIC_E0, fp) != EOF
-    && fputc (INFOKEY_MAGIC_E1, fp) != EOF
-    && fputc (INFOKEY_MAGIC_E2, fp) != EOF
-    && fputc (INFOKEY_MAGIC_E3, fp) != EOF;
-}
-
-
-/* Error handling. */
-
-/* Give the user a "syntax error" message in the form
-	progname: "filename", line N: message
- */
-static void
-error_message (int error_code, const char *fmt,
-    const void *a1, const void *a2, const void *a3, const void *a4)
-{
-  fprintf (stderr, "%s: ", program_name);
-  fprintf (stderr, fmt, a1, a2, a3, a4);
-  if (error_code)
-    fprintf (stderr, " - %s", strerror (error_code));
-  fprintf (stderr, "\n");
-}
-
-/* Give the user a generic error message in the form
-	progname: message
- */
-static void
-syntax_error (const char *filename,
-    unsigned int linenum, const char *fmt,
-    const void *a1, const void *a2, const void *a3, const void *a4)
-{
-  fprintf (stderr, "%s: ", program_name);
-  fprintf (stderr, _("\"%s\", line %u: "), filename, linenum);
-  fprintf (stderr, fmt, a1, a2, a3, a4);
-  fprintf (stderr, "\n");
-}
-
-/* Produce a gentle rtfm. */
-static void
-suggest_help (void)
-{
-  fprintf (stderr, _("Try --help for more information.\n"));
-}
-
-/* Produce a scaled down description of the available options to Info. */
-static void
-short_help (void)
-{
-  printf (_("\
-Usage: %s [OPTION]... [INPUT-FILE]\n\
-\n\
-Compile infokey source file to infokey file.  Reads INPUT-FILE (default\n\
-$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info.\n\
-\n\
-Options:\n\
-  --output FILE        output to FILE instead of $HOME/.info\n\
-  --help               display this help and exit.\n\
-  --version            display version information and exit.\n\
-"), program_name);
-
-  puts (_("\n\
-Email bug reports to bug-texinfo@gnu.org,\n\
-general questions and discussion to help-texinfo@gnu.org.\n\
-Texinfo home page: http://www.gnu.org/software/texinfo/"));
-
-  xexit (0);
-}

Property changes on: head/contrib/texinfo/info/infokey.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/info-utils.h
===================================================================
--- head/contrib/texinfo/info/info-utils.h	(revision 276550)
+++ head/contrib/texinfo/info/info-utils.h	(nonexistent)
@@ -1,136 +0,0 @@
-/* info-utils.h -- Exported functions and variables from info-utils.c.
-   $Id: info-utils.h,v 1.4 2004/04/11 17:56:45 karl Exp $   
-
-   Copyright (C) 1993, 1996, 1998, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#ifndef INFO_UTILS_H
-#define INFO_UTILS_H
-
-#include "nodes.h"
-#include "window.h"
-#include "search.h"
-
-/* Structure which describes a node reference, such as a menu entry or
-   cross reference.  Arrays of such references can be built by calling
-   info_menus_of_node () or info_xrefs_of_node (). */
-typedef struct {
-  char *label;          /* User Label. */
-  char *filename;       /* File where this node can be found. */
-  char *nodename;       /* Name of the node. */
-  int start, end;       /* Offsets within the containing node of LABEL. */
-  int line_number;      /* Specific line number a menu item points to.  */
-} REFERENCE;
-
-/* When non-zero, various display and input functions handle ISO Latin
-   character sets correctly. */
-extern int ISO_Latin_p;
-
-/* Variable which holds the most recent filename parsed as a result of
-   calling info_parse_xxx (). */
-extern char *info_parsed_filename;
-
-/* Variable which holds the most recent nodename parsed as a result of
-   calling info_parse_xxx (). */
-extern char *info_parsed_nodename;
-
-/* Parse the filename and nodename out of STRING.  If STRING doesn't
-   contain a filename (i.e., it is NOT (FILENAME)NODENAME) then set
-   INFO_PARSED_FILENAME to NULL.  If second argument NEWLINES_OKAY is
-   non-zero, it says to allow the nodename specification to cross a
-   newline boundary (i.e., only `,', `.', or `TAB' can end the spec). */
-void info_parse_node (char *string, int newlines_okay);
-
-/* Return a NULL terminated array of REFERENCE * which represents the menu
-   found in NODE.  If there is no menu in NODE, just return a NULL pointer. */
-extern REFERENCE **info_menu_of_node (NODE *node);
-
-/* Return a NULL terminated array of REFERENCE * which represents the cross
-   refrences found in NODE.  If there are no cross references in NODE, just
-   return a NULL pointer. */
-extern REFERENCE **info_xrefs_of_node (NODE *node);
-
-/* Glean cross references from BINDING->buffer + BINDING->start until
-   BINDING->end.  Return an array of REFERENCE * that represents each
-   cross reference in this range. */
-extern REFERENCE **info_xrefs (SEARCH_BINDING *binding);
-
-/* Get the entry associated with LABEL in REFERENCES.  Return a pointer to
-   the reference if found, or NULL. */
-extern REFERENCE *info_get_labeled_reference (char *label,
-    REFERENCE **references);
-
-/* Glean menu entries from BINDING->buffer + BINDING->start until we
-   have looked at the entire contents of BINDING.  Return an array
-   of REFERENCE * that represents each menu item in this range. */
-extern REFERENCE **info_menu_items (SEARCH_BINDING *binding);
-
-/* A utility function for concatenating REFERENCE **.  Returns a new
-   REFERENCE ** which is the concatenation of REF1 and REF2.  The REF1
-   and REF2 arrays are freed, but their contents are not. */
-REFERENCE **info_concatenate_references (REFERENCE **ref1, REFERENCE **ref2);
-
-/* Copy an existing reference into new memory.  */
-extern REFERENCE *info_copy_reference (REFERENCE *src);
-
-/* Free the data associated with REFERENCES. */
-extern void info_free_references (REFERENCE **references);
-
-/* Search for sequences of whitespace or newlines in STRING, replacing
-   all such sequences with just a single space.  Remove whitespace from
-   start and end of string. */
-void canonicalize_whitespace (char *string);
-
-/* Return a pointer to a string which is the printed representation
-   of CHARACTER if it were printed at HPOS. */
-extern char *printed_representation (unsigned char character, int hpos);
-
-/* Return a pointer to the part of PATHNAME that simply defines the file. */
-extern char *filename_non_directory (char *pathname);
-
-/* Return non-zero if NODE is one especially created by Info. */
-extern int internal_info_node_p (NODE *node);
-
-/* Make NODE appear to be one especially created by Info, and give it NAME. */
-extern void name_internal_node (NODE *node, char *name);
-
-/* Return the window displaying NAME, the name of an internally created
-   Info window. */
-extern WINDOW *get_internal_info_window (char *name);
-
-/* Return a window displaying the node NODE. */
-extern WINDOW *get_window_of_node (NODE *node);
-
-/* Return the node addressed by LABEL in NODE (usually one of "Prev:",
-   "Next:", "Up:", "File:", or "Node:".  After a call to this function,
-   the globals `info_parsed_nodename' and `info_parsed_filename' contain
-   the information. */
-extern void info_parse_label (char *label, NODE *node);
-
-#define info_file_label_of_node(n) info_parse_label (INFO_FILE_LABEL, n)
-#define info_next_label_of_node(n) info_parse_label (INFO_NEXT_LABEL, n)
-#define info_up_label_of_node(n)   info_parse_label (INFO_UP_LABEL, n)
-#define info_prev_label_of_node(n) \
-  do { \
-    info_parse_label (INFO_PREV_LABEL, n); \
-    if (!info_parsed_nodename && !info_parsed_filename) \
-      info_parse_label (INFO_ALTPREV_LABEL, n); \
-  } while (0)
-
-#endif /* not INFO_UTILS_H */

Property changes on: head/contrib/texinfo/info/info-utils.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/info-utils.c
===================================================================
--- head/contrib/texinfo/info/info-utils.c	(revision 276550)
+++ head/contrib/texinfo/info/info-utils.c	(nonexistent)
@@ -1,701 +0,0 @@
-/* info-utils.c -- miscellanous.
-   $Id: info-utils.c,v 1.4 2004/04/11 17:56:45 karl Exp $
-
-   Copyright (C) 1993, 1998, 2003, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Originally written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-#include "info-utils.h"
-#if defined (HANDLE_MAN_PAGES)
-#  include "man.h"
-#endif /* HANDLE_MAN_PAGES */
-
-/* When non-zero, various display and input functions handle ISO Latin
-   character sets correctly. */
-int ISO_Latin_p = 1;
-
-/* Variable which holds the most recent filename parsed as a result of
-   calling info_parse_xxx (). */
-char *info_parsed_filename = (char *)NULL;
-
-/* Variable which holds the most recent nodename parsed as a result of
-   calling info_parse_xxx (). */
-char *info_parsed_nodename = (char *)NULL;
-
-/* Variable which holds the most recent line number parsed as a result of
-   calling info_parse_xxx (). */
-int info_parsed_line_number = 0;
-
-/* Functions to remember a filename or nodename for later return. */
-static void save_filename (char *filename);
-static void saven_filename (char *filename, int len);
-static void save_nodename (char *nodename);
-static void saven_nodename (char *nodename, int len);
-
-/* How to get a reference (either menu or cross). */
-static REFERENCE **info_references_internal (char *label,
-    SEARCH_BINDING *binding);
-
-/* Parse the filename and nodename out of STRING.  If STRING doesn't
-   contain a filename (i.e., it is NOT (FILENAME)NODENAME) then set
-   INFO_PARSED_FILENAME to NULL.  If second argument NEWLINES_OKAY is
-   non-zero, it says to allow the nodename specification to cross a
-   newline boundary (i.e., only `,', `.', or `TAB' can end the spec). */
-void
-info_parse_node (char *string, int newlines_okay)
-{
-  register int i = 0;
-
-  /* Default the answer. */
-  save_filename ((char *)NULL);
-  save_nodename ((char *)NULL);
-
-  /* Special case of nothing passed.  Return nothing. */
-  if (!string || !*string)
-    return;
-
-  string += skip_whitespace (string);
-
-  /* Check for (FILENAME)NODENAME. */
-  if (*string == '(')
-    {
-      i = 0;
-      /* Advance past the opening paren. */
-      string++;
-
-      /* Find the closing paren. */
-      while (string[i] && string[i] != ')')
-        i++;
-
-      /* Remember parsed filename. */
-      saven_filename (string, i);
-
-      /* Point directly at the nodename. */
-      string += i;
-
-      if (*string)
-        string++;
-    }
-
-  /* Parse out nodename. */
-  i = skip_node_characters (string, newlines_okay);
-  saven_nodename (string, i);
-  canonicalize_whitespace (info_parsed_nodename);
-  if (info_parsed_nodename && !*info_parsed_nodename)
-    {
-      free (info_parsed_nodename);
-      info_parsed_nodename = (char *)NULL;
-    }
-
-  /* Parse ``(line ...)'' part of menus, if any.  */
-  {
-    char *rest = string + i;
-
-    /* Advance only if it's not already at end of string.  */
-    if (*rest)
-      rest++;
-
-    /* Skip any whitespace first, and then a newline in case the item
-       was so long to contain the ``(line ...)'' string in the same
-       physical line.  */
-    while (whitespace(*rest))
-      rest++;
-    if (*rest == '\n')
-      {
-        rest++;
-        while (whitespace(*rest))
-          rest++;
-      }
-
-    /* Are we looking at an opening parenthesis?  That can only mean
-       we have a winner. :)  */
-    if (strncmp (rest, "(line ", strlen ("(line ")) == 0)
-      {
-        rest += strlen ("(line ");
-        info_parsed_line_number = strtol (rest, NULL, 0);
-      }
-    else
-      info_parsed_line_number = 0;
-  }
-}
-
-/* Return the node addressed by LABEL in NODE (usually one of "Prev:",
-   "Next:", "Up:", "File:", or "Node:".  After a call to this function,
-   the global INFO_PARSED_NODENAME and INFO_PARSED_FILENAME contain
-   the information. */
-void
-info_parse_label (char *label, NODE *node)
-{
-  register int i;
-  char *nodeline;
-
-  /* Default answer to failure. */
-  save_nodename ((char *)NULL);
-  save_filename ((char *)NULL);
-
-  /* Find the label in the first line of this node. */
-  nodeline = node->contents;
-  i = string_in_line (label, nodeline);
-
-  if (i == -1)
-    return;
-
-  nodeline += i;
-  nodeline += skip_whitespace (nodeline);
-  info_parse_node (nodeline, DONT_SKIP_NEWLINES);
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                  Finding and Building Menus                      */
-/*                                                                  */
-/* **************************************************************** */
-
-/* Return a NULL terminated array of REFERENCE * which represents the menu
-   found in NODE.  If there is no menu in NODE, just return a NULL pointer. */
-REFERENCE **
-info_menu_of_node (NODE *node)
-{
-  long position;
-  SEARCH_BINDING tmp_search;
-  REFERENCE **menu = (REFERENCE **)NULL;
-
-  tmp_search.buffer = node->contents;
-  tmp_search.start = 0;
-  tmp_search.end = node->nodelen;
-  tmp_search.flags = S_FoldCase;
-
-  /* Find the start of the menu. */
-  position = search_forward (INFO_MENU_LABEL, &tmp_search);
-
-  if (position == -1)
-    return ((REFERENCE **) NULL);
-
-  /* We have the start of the menu now.  Glean menu items from the rest
-     of the node. */
-  tmp_search.start = position + strlen (INFO_MENU_LABEL);
-  tmp_search.start += skip_line (tmp_search.buffer + tmp_search.start);
-  tmp_search.start--;
-  menu = info_menu_items (&tmp_search);
-  return (menu);
-}
-
-/* Return a NULL terminated array of REFERENCE * which represents the cross
-   refrences found in NODE.  If there are no cross references in NODE, just
-   return a NULL pointer. */
-REFERENCE **
-info_xrefs_of_node (NODE *node)
-{
-  SEARCH_BINDING tmp_search;
-
-#if defined (HANDLE_MAN_PAGES)
-  if (node->flags & N_IsManPage)
-    return (xrefs_of_manpage (node));
-#endif
-
-  tmp_search.buffer = node->contents;
-  tmp_search.start = 0;
-  tmp_search.end = node->nodelen;
-  tmp_search.flags = S_FoldCase;
-
-  return (info_xrefs (&tmp_search));
-}
-
-/* Glean menu entries from BINDING->buffer + BINDING->start until we
-   have looked at the entire contents of BINDING.  Return an array
-   of REFERENCE * that represents each menu item in this range. */
-REFERENCE **
-info_menu_items (SEARCH_BINDING *binding)
-{
-  return (info_references_internal (INFO_MENU_ENTRY_LABEL, binding));
-}
-
-/* Glean cross references from BINDING->buffer + BINDING->start until
-   BINDING->end.  Return an array of REFERENCE * that represents each
-   cross reference in this range. */
-REFERENCE **
-info_xrefs (SEARCH_BINDING *binding)
-{
-  return (info_references_internal (INFO_XREF_LABEL, binding));
-}
-
-/* Glean cross references or menu items from BINDING.  Return an array
-   of REFERENCE * that represents the items found. */
-static REFERENCE **
-info_references_internal (char *label, SEARCH_BINDING *binding)
-{
-  SEARCH_BINDING tmp_search;
-  REFERENCE **refs = (REFERENCE **)NULL;
-  int refs_index = 0, refs_slots = 0;
-  int searching_for_menu_items = 0;
-  long position;
-
-  tmp_search.buffer = binding->buffer;
-  tmp_search.start = binding->start;
-  tmp_search.end = binding->end;
-  tmp_search.flags = S_FoldCase | S_SkipDest;
-
-  searching_for_menu_items = (strcasecmp (label, INFO_MENU_ENTRY_LABEL) == 0);
-
-  while ((position = search_forward (label, &tmp_search)) != -1)
-    {
-      int offset, start;
-      char *refdef;
-      REFERENCE *entry;
-
-      tmp_search.start = position;
-      tmp_search.start += skip_whitespace (tmp_search.buffer + tmp_search.start);
-      start = tmp_search.start - binding->start;
-      refdef = tmp_search.buffer + tmp_search.start;
-      offset = string_in_line (":", refdef);
-
-      /* When searching for menu items, if no colon, there is no
-         menu item on this line. */
-      if (offset == -1)
-        {
-          if (searching_for_menu_items)
-            continue;
-          else
-            {
-              int temp;
-
-              temp = skip_line (refdef);
-              offset = string_in_line (":", refdef + temp);
-              if (offset == -1)
-                continue;       /* Give up? */
-              else
-                offset += temp;
-            }
-        }
-
-      entry = (REFERENCE *)xmalloc (sizeof (REFERENCE));
-      entry->filename = (char *)NULL;
-      entry->nodename = (char *)NULL;
-      entry->label = (char *)xmalloc (offset);
-      strncpy (entry->label, refdef, offset - 1);
-      entry->label[offset - 1] = '\0';
-      canonicalize_whitespace (entry->label);
-
-      refdef += offset;
-      entry->start = start;
-      entry->end = refdef - binding->buffer;
-
-      /* If this reference entry continues with another ':' then the
-         nodename is the same as the label. */
-      if (*refdef == ':')
-        {
-          entry->nodename = xstrdup (entry->label);
-        }
-      else
-        {
-          /* This entry continues with a specific nodename.  Parse the
-             nodename from the specification. */
-
-          refdef += skip_whitespace_and_newlines (refdef);
-
-          if (searching_for_menu_items)
-            info_parse_node (refdef, DONT_SKIP_NEWLINES);
-          else
-            info_parse_node (refdef, SKIP_NEWLINES);
-
-          if (info_parsed_filename)
-            entry->filename = xstrdup (info_parsed_filename);
-
-          if (info_parsed_nodename)
-            entry->nodename = xstrdup (info_parsed_nodename);
-
-          entry->line_number = info_parsed_line_number;
-        }
-
-      add_pointer_to_array
-        (entry, refs_index, refs, refs_slots, 50, REFERENCE *);
-    }
-  return (refs);
-}
-
-/* Get the entry associated with LABEL in REFERENCES.  Return a pointer
-   to the ENTRY if found, or NULL. */
-REFERENCE *
-info_get_labeled_reference (char *label, REFERENCE **references)
-{
-  register int i;
-  REFERENCE *entry;
-
-  for (i = 0; references && (entry = references[i]); i++)
-    {
-      if (strcmp (label, entry->label) == 0)
-        return (entry);
-    }
-  return ((REFERENCE *)NULL);
-}
-
-/* A utility function for concatenating REFERENCE **.  Returns a new
-   REFERENCE ** which is the concatenation of REF1 and REF2.  The REF1
-   and REF2 arrays are freed, but their contents are not. */
-REFERENCE **
-info_concatenate_references (REFERENCE **ref1, REFERENCE **ref2)
-{
-  register int i, j;
-  REFERENCE **result;
-  int size;
-
-  /* With one argument passed as NULL, simply return the other arg. */
-  if (!ref1)
-    return (ref2);
-  else if (!ref2)
-    return (ref1);
-
-  /* Get the total size of the slots that we will need. */
-  for (i = 0; ref1[i]; i++);
-  size = i;
-  for (i = 0; ref2[i]; i++);
-  size += i;
-
-  result = (REFERENCE **)xmalloc ((1 + size) * sizeof (REFERENCE *));
-
-  /* Copy the contents over. */
-  for (i = 0; ref1[i]; i++)
-    result[i] = ref1[i];
-
-  j = i;
-  for (i = 0; ref2[i]; i++)
-    result[j++] = ref2[i];
-
-  result[j] = (REFERENCE *)NULL;
-  free (ref1);
-  free (ref2);
-  return (result);
-}
-
-
-
-/* Copy a reference structure.  Since we tend to free everything at
-   every opportunity, we don't share any points, but copy everything into
-   new memory.  */
-REFERENCE *
-info_copy_reference (REFERENCE *src)
-{
-  REFERENCE *dest = xmalloc (sizeof (REFERENCE));
-  dest->label = src->label ? xstrdup (src->label) : NULL;
-  dest->filename = src->filename ? xstrdup (src->filename) : NULL;
-  dest->nodename = src->nodename ? xstrdup (src->nodename) : NULL;
-  dest->start = src->start;
-  dest->end = src->end;
-  
-  return dest;
-}
-
-
-
-/* Free the data associated with REFERENCES. */
-void
-info_free_references (REFERENCE **references)
-{
-  register int i;
-  REFERENCE *entry;
-
-  if (references)
-    {
-      for (i = 0; references && (entry = references[i]); i++)
-        {
-          maybe_free (entry->label);
-          maybe_free (entry->filename);
-          maybe_free (entry->nodename);
-
-          free (entry);
-        }
-
-      free (references);
-    }
-}
-
-/* Search for sequences of whitespace or newlines in STRING, replacing
-   all such sequences with just a single space.  Remove whitespace from
-   start and end of string. */
-void
-canonicalize_whitespace (char *string)
-{
-  register int i, j;
-  int len, whitespace_found, whitespace_loc = 0;
-  char *temp;
-
-  if (!string)
-    return;
-
-  len = strlen (string);
-  temp = (char *)xmalloc (1 + len);
-
-  /* Search for sequences of whitespace or newlines.  Replace all such
-     sequences in the string with just a single space. */
-
-  whitespace_found = 0;
-  for (i = 0, j = 0; string[i]; i++)
-    {
-      if (whitespace_or_newline (string[i]))
-        {
-          whitespace_found++;
-          whitespace_loc = i;
-          continue;
-        }
-      else
-        {
-          if (whitespace_found && whitespace_loc)
-            {
-              whitespace_found = 0;
-
-              /* Suppress whitespace at start of string. */
-              if (j)
-                temp[j++] = ' ';
-            }
-
-          temp[j++] = string[i];
-        }
-    }
-
-  /* Kill trailing whitespace. */
-  if (j && whitespace (temp[j - 1]))
-    j--;
-
-  temp[j] = '\0';
-  strcpy (string, temp);
-  free (temp);
-}
-
-/* String representation of a char returned by printed_representation (). */
-static char the_rep[10];
-
-/* Return a pointer to a string which is the printed representation
-   of CHARACTER if it were printed at HPOS. */
-char *
-printed_representation (unsigned char character, int hpos)
-{
-  register int i = 0;
-  int printable_limit = ISO_Latin_p ? 255 : 127;
-
-  if (raw_escapes_p && character == '\033')
-    the_rep[i++] = character;
-  /* Show CTRL-x as ^X.  */
-  else if (iscntrl (character) && character < 127)
-    {
-      switch (character)
-        {
-        case '\r':
-        case '\n':
-          the_rep[i++] = character;
-          break;
-
-        case '\t':
-          {
-            int tw;
-
-            tw = ((hpos + 8) & 0xf8) - hpos;
-            while (i < tw)
-              the_rep[i++] = ' ';
-          }
-          break;
-
-        default:
-          the_rep[i++] = '^';
-          the_rep[i++] = (character | 0x40);
-        }
-    }
-  /* Show META-x as 0370.  */
-  else if (character > printable_limit)
-    {
-      sprintf (the_rep + i, "\\%0o", character);
-      i = strlen (the_rep);
-    }
-  else if (character == DEL)
-    {
-      the_rep[i++] = '^';
-      the_rep[i++] = '?';
-    }
-  else
-    the_rep[i++] = character;
-
-  the_rep[i] = 0;
-
-  return the_rep;
-}
-
-
-/* **************************************************************** */
-/*                                                                  */
-/*                  Functions Static To This File                   */
-/*                                                                  */
-/* **************************************************************** */
-
-/* Amount of space allocated to INFO_PARSED_FILENAME via xmalloc (). */
-static int parsed_filename_size = 0;
-
-/* Amount of space allocated to INFO_PARSED_NODENAME via xmalloc (). */
-static int parsed_nodename_size = 0;
-
-static void save_string (char *string, char **string_p, int *string_size_p);
-static void saven_string (char *string, int len, char **string_p,
-    int *string_size_p);
-
-/* Remember FILENAME in PARSED_FILENAME.  An empty FILENAME is translated
-   to a NULL pointer in PARSED_FILENAME. */
-static void
-save_filename (char *filename)
-{
-  save_string (filename, &info_parsed_filename, &parsed_filename_size);
-}
-
-/* Just like save_filename (), but you pass the length of the string. */
-static void
-saven_filename (char *filename, int len)
-{
-  saven_string (filename, len,
-                &info_parsed_filename, &parsed_filename_size);
-}
-
-/* Remember NODENAME in PARSED_NODENAME.  An empty NODENAME is translated
-   to a NULL pointer in PARSED_NODENAME. */
-static void
-save_nodename (char *nodename)
-{
-  save_string (nodename, &info_parsed_nodename, &parsed_nodename_size);
-}
-
-/* Just like save_nodename (), but you pass the length of the string. */
-static void
-saven_nodename (char *nodename, int len)
-{
-  saven_string (nodename, len,
-                &info_parsed_nodename, &parsed_nodename_size);
-}
-
-/* Remember STRING in STRING_P.  STRING_P should currently have STRING_SIZE_P
-   bytes allocated to it.  An empty STRING is translated to a NULL pointer
-   in STRING_P. */
-static void
-save_string (char *string, char **string_p, int *string_size_p)
-{
-  if (!string || !*string)
-    {
-      if (*string_p)
-        free (*string_p);
-
-      *string_p = (char *)NULL;
-      *string_size_p = 0;
-    }
-  else
-    {
-      if (strlen (string) >= (unsigned int) *string_size_p)
-        *string_p = (char *)xrealloc
-          (*string_p, (*string_size_p = 1 + strlen (string)));
-
-      strcpy (*string_p, string);
-    }
-}
-
-/* Just like save_string (), but you also pass the length of STRING. */
-static void
-saven_string (char *string, int len, char **string_p, int *string_size_p)
-{
-  if (!string)
-    {
-      if (*string_p)
-        free (*string_p);
-
-      *string_p = (char *)NULL;
-      *string_size_p = 0;
-    }
-  else
-    {
-      if (len >= *string_size_p)
-        *string_p = (char *)xrealloc (*string_p, (*string_size_p = 1 + len));
-
-      strncpy (*string_p, string, len);
-      (*string_p)[len] = '\0';
-    }
-}
-
-/* Return a pointer to the part of PATHNAME that simply defines the file. */
-char *
-filename_non_directory (char *pathname)
-{
-  register char *filename = pathname + strlen (pathname);
-
-  if (HAVE_DRIVE (pathname))
-    pathname += 2;
-
-  while (filename > pathname && !IS_SLASH (filename[-1]))
-    filename--;
-
-  return (filename);
-}
-
-/* Return non-zero if NODE is one especially created by Info. */
-int
-internal_info_node_p (NODE *node)
-{
-#if defined (NEVER)
-  if (node &&
-      (node->filename && !*node->filename) &&
-      !node->parent && node->nodename)
-    return (1);
-  else
-    return (0);
-#else
-  return ((node != (NODE *)NULL) && ((node->flags & N_IsInternal) != 0));
-#endif /* !NEVER */
-}
-
-/* Make NODE appear to be one especially created by Info. */
-void
-name_internal_node (NODE *node, char *name)
-{
-  if (!node)
-    return;
-
-  node->filename = "";
-  node->parent = (char *)NULL;
-  node->nodename = name;
-  node->flags |= N_IsInternal;
-}
-
-/* Return the window displaying NAME, the name of an internally created
-   Info window. */
-WINDOW *
-get_internal_info_window (char *name)
-{
-  WINDOW *win;
-
-  for (win = windows; win; win = win->next)
-    if (internal_info_node_p (win->node) &&
-        (strcmp (win->node->nodename, name) == 0))
-      break;
-
-  return (win);
-}
-
-/* Return a window displaying the node NODE. */
-WINDOW *
-get_window_of_node (NODE *node)
-{
-  WINDOW *win = (WINDOW *)NULL;
-
-  for (win = windows; win; win = win->next)
-    if (win->node == node)
-      break;
-
-  return (win);
-}

Property changes on: head/contrib/texinfo/info/info-utils.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/man.c
===================================================================
--- head/contrib/texinfo/info/man.c	(revision 276550)
+++ head/contrib/texinfo/info/man.c	(nonexistent)
@@ -1,734 +0,0 @@
-/*  man.c: How to read and format man files.
-    $Id: man.c,v 1.4 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox Thu May  4 09:17:52 1995 (bfox@ai.mit.edu). */
-
-#include "info.h"
-#include <sys/ioctl.h>
-#include "signals.h"
-#if defined (HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#endif
-#if defined (HAVE_SYS_WAIT_H)
-#include <sys/wait.h>
-#endif
-
-#include "tilde.h"
-#include "man.h"
-
-#if !defined (_POSIX_VERSION)
-#define pid_t int
-#endif
-
-#if defined (FD_SET)
-#  if defined (hpux)
-#    define fd_set_cast(x) (int *)(x)
-#  else
-#    define fd_set_cast(x) (fd_set *)(x)
-#  endif /* !hpux */
-#endif /* FD_SET */
-
-#if STRIP_DOT_EXE
-static char const * const exec_extensions[] = {
-  ".exe", ".com", ".bat", ".btm", ".sh", ".ksh", ".pl", ".sed", "", NULL
-};
-#else
-static char const * const exec_extensions[] = { "", NULL };
-#endif
-
-static char *read_from_fd (int fd);
-static void clean_manpage (char *manpage);
-static NODE *manpage_node_of_file_buffer (FILE_BUFFER *file_buffer,
-    char *pagename);
-static char *get_manpage_contents (char *pagename);
-
-NODE *
-make_manpage_node (char *pagename)
-{
-  return (info_get_node (MANPAGE_FILE_BUFFER_NAME, pagename));
-}
-
-NODE *
-get_manpage_node (FILE_BUFFER *file_buffer, char *pagename)
-{
-  NODE *node;
-
-  node = manpage_node_of_file_buffer (file_buffer, pagename);
-
-  if (!node)
-    {
-      char *page;
-
-      page = get_manpage_contents (pagename);
-
-      if (page)
-        {
-          char header[1024];
-          long oldsize, newsize;
-          int hlen, plen;
-	  char *old_contents = file_buffer->contents;
-
-          sprintf (header, "\n\n%c\n%s %s,  %s %s,  %s (dir)\n\n",
-                   INFO_COOKIE,
-                   INFO_FILE_LABEL, file_buffer->filename,
-                   INFO_NODE_LABEL, pagename,
-                   INFO_UP_LABEL);
-          oldsize = file_buffer->filesize;
-          hlen = strlen (header);
-          plen = strlen (page);
-          newsize = (oldsize + hlen + plen);
-          file_buffer->contents =
-            (char *)xrealloc (file_buffer->contents, 1 + newsize);
-          memcpy (file_buffer->contents + oldsize, header, hlen);
-          memcpy (file_buffer->contents + oldsize + hlen, page, plen);
-          file_buffer->contents[newsize] = '\0';
-          file_buffer->filesize = newsize;
-          file_buffer->finfo.st_size = newsize;
-          build_tags_and_nodes (file_buffer);
-          free (page);
-	  /* We have just relocated file_buffer->contents from under
-	     the feet of info_windows[] array.  Therefore, all the
-	     nodes on that list which are showing man pages have their
-	     contents member pointing into the blue.  Undo that harm.  */
-	  if (old_contents && oldsize && old_contents != file_buffer->contents)
-	    {
-	      int iw;
-	      INFO_WINDOW *info_win;
-	      char *old_contents_end = old_contents + oldsize;
-
-	      for (iw = 0; (info_win = info_windows[iw]); iw++)
-		{
-		  int in;
-
-		  for (in = 0; in < info_win->nodes_index; in++)
-		    {
-		      NODE *tmp_node = info_win->nodes[in];
-
-		      /* It really only suffices to see that node->filename
-			 is "*manpages*".  But after several hours of
-			 debugging this, would you blame me for being a bit
-			 paranoid?  */
-		      if (tmp_node && tmp_node->filename
-                          && tmp_node->contents
-                          && strcmp (tmp_node->filename,
-				  MANPAGE_FILE_BUFFER_NAME) == 0
-                          && tmp_node->contents >= old_contents
-                          && tmp_node->contents + tmp_node->nodelen
-                                <= old_contents_end)
-			{
-			  info_win->nodes[in] =
-			    manpage_node_of_file_buffer (file_buffer,
-                                tmp_node->nodename);
-			  free (tmp_node->nodename);
-			  free (tmp_node);
-			}
-		    }
-		}
-	    }
-        }
-
-      node = manpage_node_of_file_buffer (file_buffer, pagename);
-    }
-
-  return (node);
-}
-
-FILE_BUFFER *
-create_manpage_file_buffer (void)
-{
-  FILE_BUFFER *file_buffer = make_file_buffer ();
-  file_buffer->filename = xstrdup (MANPAGE_FILE_BUFFER_NAME);
-  file_buffer->fullpath = xstrdup (MANPAGE_FILE_BUFFER_NAME);
-  file_buffer->finfo.st_size = 0;
-  file_buffer->filesize = 0;
-  file_buffer->contents = (char *)NULL;
-  file_buffer->flags = (N_IsInternal | N_CannotGC | N_IsManPage);
-
-  return (file_buffer);
-}
-
-/* Scan the list of directories in PATH looking for FILENAME.  If we find
-   one that is an executable file, return it as a new string.  Otherwise,
-   return a NULL pointer. */
-static char *
-executable_file_in_path (char *filename, char *path)
-{
-  struct stat finfo;
-  char *temp_dirname;
-  int statable, dirname_index;
-
-  dirname_index = 0;
-
-  while ((temp_dirname = extract_colon_unit (path, &dirname_index)))
-    {
-      char *temp;
-      char *temp_end;
-      int i;
-
-      /* Expand a leading tilde if one is present. */
-      if (*temp_dirname == '~')
-        {
-          char *expanded_dirname;
-
-          expanded_dirname = tilde_expand_word (temp_dirname);
-          free (temp_dirname);
-          temp_dirname = expanded_dirname;
-        }
-
-      temp = (char *)xmalloc (34 + strlen (temp_dirname) + strlen (filename));
-      strcpy (temp, temp_dirname);
-      if (!IS_SLASH (temp[(strlen (temp)) - 1]))
-        strcat (temp, "/");
-      strcat (temp, filename);
-      temp_end = temp + strlen (temp);
-
-      free (temp_dirname);
-
-      /* Look for FILENAME, possibly with any of the extensions
-	 in EXEC_EXTENSIONS[].  */
-      for (i = 0; exec_extensions[i]; i++)
-	{
-	  if (exec_extensions[i][0])
-	    strcpy (temp_end, exec_extensions[i]);
-	  statable = (stat (temp, &finfo) == 0);
-
-	  /* If we have found a regular executable file, then use it. */
-	  if ((statable) && (S_ISREG (finfo.st_mode)) &&
-	      (access (temp, X_OK) == 0))
-	    return (temp);
-	}
-
-      free (temp);
-    }
-  return ((char *)NULL);
-}
-
-/* Return the full pathname of the system man page formatter. */
-static char *
-find_man_formatter (void)
-{
-  return (executable_file_in_path ("man", (char *)getenv ("PATH")));
-}
-
-static char *manpage_pagename = (char *)NULL;
-static char *manpage_section  = (char *)NULL;
-
-static void
-get_page_and_section (char *pagename)
-{
-  register int i;
-
-  if (manpage_pagename)
-    free (manpage_pagename);
-
-  if (manpage_section)
-    free (manpage_section);
-
-  manpage_pagename = (char *)NULL;
-  manpage_section  = (char *)NULL;
-
-  for (i = 0; pagename[i] != '\0' && pagename[i] != '('; i++);
-
-  manpage_pagename = (char *)xmalloc (1 + i);
-  strncpy (manpage_pagename, pagename, i);
-  manpage_pagename[i] = '\0';
-
-  if (pagename[i] == '(')
-    {
-      int start;
-
-      start = i + 1;
-
-      for (i = start; pagename[i] != '\0' && pagename[i] != ')'; i++);
-
-      manpage_section = (char *)xmalloc (1 + (i - start));
-      strncpy (manpage_section, pagename + start, (i - start));
-      manpage_section[i - start] = '\0';
-    }
-}
-
-#if PIPE_USE_FORK
-static void
-reap_children (int sig)
-{
-  wait (NULL);
-}
-#endif
-
-static char *
-get_manpage_contents (char *pagename)
-{
-  static char *formatter_args[4] = { (char *)NULL };
-  int pipes[2];
-  pid_t child;
-  RETSIGTYPE (*sigsave) (int signum);
-  char *formatted_page = NULL;
-  int arg_index = 1;
-
-  if (formatter_args[0] == (char *)NULL)
-    formatter_args[0] = find_man_formatter ();
-
-  if (formatter_args[0] == (char *)NULL)
-    return ((char *)NULL);
-
-  get_page_and_section (pagename);
-
-  if (manpage_section != (char *)NULL)
-    formatter_args[arg_index++] = manpage_section;
-
-  formatter_args[arg_index++] = manpage_pagename;
-  formatter_args[arg_index] = (char *)NULL;
-
-  /* Open a pipe to this program, read the output, and save it away
-     in FORMATTED_PAGE.  The reader end of the pipe is pipes[0]; the
-     writer end is pipes[1]. */
-#if PIPE_USE_FORK
-  pipe (pipes);
-
-  sigsave = signal (SIGCHLD, reap_children);
-
-  child = fork ();
-  if (child == -1)
-    return ((char *)NULL);
-
-  if (child != 0)
-    {
-      /* In the parent, close the writing end of the pipe, and read from
-         the exec'd child. */
-      close (pipes[1]);
-      formatted_page = read_from_fd (pipes[0]);
-      close (pipes[0]);
-      signal (SIGCHLD, sigsave);
-    }
-  else
-    { /* In the child, close the read end of the pipe, make the write end
-         of the pipe be stdout, and execute the man page formatter. */
-      close (pipes[0]);
-      freopen (NULL_DEVICE, "w", stderr);
-      freopen (NULL_DEVICE, "r", stdin);
-      dup2 (pipes[1], fileno (stdout));
-
-      execv (formatter_args[0], formatter_args);
-
-      /* If we get here, we couldn't exec, so close out the pipe and
-         exit. */
-      close (pipes[1]);
-      xexit (0);
-    }
-#else  /* !PIPE_USE_FORK */
-  /* Cannot fork/exec, but can popen/pclose.  */
-  {
-    FILE *fpipe;
-    char *cmdline = xmalloc (strlen (formatter_args[0])
-			     + strlen (manpage_pagename)
-			     + (arg_index > 2 ? strlen (manpage_section) : 0)
- 			     + 3);
-    int save_stderr = dup (fileno (stderr));
-    int fd_err = open (NULL_DEVICE, O_WRONLY, 0666);
-
-    if (fd_err > 2)
-      dup2 (fd_err, fileno (stderr)); /* Don't print errors. */
-    sprintf (cmdline, "%s %s %s", formatter_args[0], manpage_pagename,
-				  arg_index > 2 ? manpage_section : "");
-    fpipe = popen (cmdline, "r");
-    free (cmdline);
-    if (fd_err > 2)
-      close (fd_err);
-    dup2 (save_stderr, fileno (stderr));
-    if (fpipe == 0)
-      return ((char *)NULL);
-    formatted_page = read_from_fd (fileno (fpipe));
-    if (pclose (fpipe) == -1)
-      {
-	if (formatted_page)
-	  free (formatted_page);
-	return ((char *)NULL);
-      }
-  }
-#endif /* !PIPE_USE_FORK */
-
-  /* If we have the page, then clean it up. */
-  if (formatted_page)
-    clean_manpage (formatted_page);
-
-  return (formatted_page);
-}
-
-static void
-clean_manpage (char *manpage)
-{
-  register int i, j;
-  int newline_count = 0;
-  char *newpage;
-
-  newpage = (char *)xmalloc (1 + strlen (manpage));
-
-  for (i = 0, j = 0; (newpage[j] = manpage[i]); i++, j++)
-    {
-      if (manpage[i] == '\n')
-        newline_count++;
-      else
-        newline_count = 0;
-
-      if (newline_count == 3)
-        {
-          j--;
-          newline_count--;
-        }
-
-      /* A malformed man page could have a \b as its first character,
-         in which case decrementing j by 2 will cause us to write into
-         newpage[-1], smashing the hidden info stored there by malloc.  */
-      if (manpage[i] == '\b' || (manpage[i] == '\f' && j > 0))
-        j -= 2;
-      else if (!raw_escapes_p)
-	{
-	  /* Remove the ANSI escape sequences for color, boldface,
-	     underlining, and italics, generated by some versions of
-	     Groff.  */
-	  if (manpage[i] == '\033' && manpage[i + 1] == '['
-	      && isdigit (manpage[i + 2]))
-	    {
-	      if (isdigit (manpage[i + 3]) && manpage[i + 4] == 'm')
-		{
-		  i += 4;
-		  j--;
-		}
-	      else if (manpage[i + 3] == 'm')
-		{
-		  i += 3;
-		  j--;
-		}
-	      /* Else do nothing: it's some unknown escape sequence,
-		 so let's leave it alone.  */
-	    }
-	}
-    }
-
-  newpage[j++] = 0;
-
-  strcpy (manpage, newpage);
-  free (newpage);
-}
-
-static NODE *
-manpage_node_of_file_buffer (FILE_BUFFER *file_buffer, char *pagename)
-{
-  NODE *node = (NODE *)NULL;
-  TAG *tag = (TAG *)NULL;
-
-  if (file_buffer->contents)
-    {
-      register int i;
-
-      for (i = 0; (tag = file_buffer->tags[i]); i++)
-        {
-          if (strcasecmp (pagename, tag->nodename) == 0)
-            break;
-        }
-    }
-
-  if (tag)
-    {
-      node = (NODE *)xmalloc (sizeof (NODE));
-      node->filename = file_buffer->filename;
-      node->nodename = xstrdup (tag->nodename);
-      node->contents = file_buffer->contents + tag->nodestart;
-      node->nodelen = tag->nodelen;
-      node->flags    = 0;
-      node->display_pos = 0;
-      node->parent   = (char *)NULL;
-      node->flags = (N_HasTagsTable | N_IsManPage);
-      node->contents += skip_node_separator (node->contents);
-    }
-
-  return (node);
-}
-
-static char *
-read_from_fd (int fd)
-{
-  struct timeval timeout;
-  char *buffer = (char *)NULL;
-  int bsize = 0;
-  int bindex = 0;
-  int select_result;
-#if defined (FD_SET)
-  fd_set read_fds;
-
-  timeout.tv_sec = 15;
-  timeout.tv_usec = 0;
-
-  FD_ZERO (&read_fds);
-  FD_SET (fd, &read_fds);
-
-  select_result = select (fd + 1, fd_set_cast (&read_fds), 0, 0, &timeout);
-#else /* !FD_SET */
-  select_result = 1;
-#endif /* !FD_SET */
-
-  switch (select_result)
-    {
-    case 0:
-    case -1:
-      break;
-
-    default:
-      {
-        int amount_read;
-        int done = 0;
-
-        while (!done)
-          {
-            while ((bindex + 1024) > (bsize))
-              buffer = (char *)xrealloc (buffer, (bsize += 1024));
-            buffer[bindex] = '\0';
-
-            amount_read = read (fd, buffer + bindex, 1023);
-
-            if (amount_read < 0)
-              {
-                done = 1;
-              }
-            else
-              {
-                bindex += amount_read;
-                buffer[bindex] = '\0';
-                if (amount_read == 0)
-                  done = 1;
-              }
-          }
-      }
-    }
-
-  if ((buffer != (char *)NULL) && (*buffer == '\0'))
-    {
-      free (buffer);
-      buffer = (char *)NULL;
-    }
-
-  return (buffer);
-}
-
-static char *reference_section_starters[] =
-{
-  "\nRELATED INFORMATION",
-  "\nRELATED\tINFORMATION",
-  "RELATED INFORMATION\n",
-  "RELATED\tINFORMATION\n",
-  "\nSEE ALSO",
-  "\nSEE\tALSO",
-  "SEE ALSO\n",
-  "SEE\tALSO\n",
-  (char *)NULL
-};
-
-static SEARCH_BINDING frs_binding;
-
-static SEARCH_BINDING *
-find_reference_section (NODE *node)
-{
-  register int i;
-  long position = -1;
-
-  frs_binding.buffer = node->contents;
-  frs_binding.start = 0;
-  frs_binding.end = node->nodelen;
-  frs_binding.flags = S_SkipDest;
-
-  for (i = 0; reference_section_starters[i] != (char *)NULL; i++)
-    {
-      position = search_forward (reference_section_starters[i], &frs_binding);
-      if (position != -1)
-        break;
-    }
-
-  if (position == -1)
-    return ((SEARCH_BINDING *)NULL);
-
-  /* We found the start of the reference section, and point is right after
-     the string which starts it.  The text from here to the next header
-     (or end of buffer) contains the only references in this manpage. */
-  frs_binding.start = position;
-
-  for (i = frs_binding.start; i < frs_binding.end - 2; i++)
-    {
-      if ((frs_binding.buffer[i] == '\n') &&
-          (!whitespace (frs_binding.buffer[i + 1])))
-        {
-          frs_binding.end = i;
-          break;
-        }
-    }
-
-  return (&frs_binding);
-}
-
-REFERENCE **
-xrefs_of_manpage (NODE *node)
-{
-  SEARCH_BINDING *reference_section;
-  REFERENCE **refs = (REFERENCE **)NULL;
-  int refs_index = 0;
-  int refs_slots = 0;
-  long position;
-
-  reference_section = find_reference_section (node);
-
-  if (reference_section == (SEARCH_BINDING *)NULL)
-    return ((REFERENCE **)NULL);
-
-  /* Grovel the reference section building a list of references found there.
-     A reference is alphabetic characters followed by non-whitespace text
-     within parenthesis. */
-  reference_section->flags = 0;
-
-  while ((position = search_forward ("(", reference_section)) != -1)
-    {
-      register int start, end;
-
-      for (start = position; start > reference_section->start; start--)
-        if (whitespace (reference_section->buffer[start]))
-          break;
-
-      start++;
-
-      for (end = position; end < reference_section->end; end++)
-        {
-          if (whitespace (reference_section->buffer[end]))
-            {
-              end = start;
-              break;
-            }
-
-          if (reference_section->buffer[end] == ')')
-            {
-              end++;
-              break;
-            }
-        }
-
-      if (end != start)
-        {
-          REFERENCE *entry;
-          int len = end - start;
-
-          entry = (REFERENCE *)xmalloc (sizeof (REFERENCE));
-          entry->label = (char *)xmalloc (1 + len);
-          strncpy (entry->label, (reference_section->buffer) + start, len);
-          entry->label[len] = '\0';
-          entry->filename = xstrdup (node->filename);
-          entry->nodename = xstrdup (entry->label);
-          entry->start = start;
-          entry->end = end;
-
-          add_pointer_to_array
-            (entry, refs_index, refs, refs_slots, 10, REFERENCE *);
-        }
-
-      reference_section->start = position + 1;
-    }
-
-  return (refs);
-}
-
-long
-locate_manpage_xref (NODE *node, long int start, int dir)
-{
-  REFERENCE **refs;
-  long position = -1;
-
-  refs = xrefs_of_manpage (node);
-
-  if (refs)
-    {
-      register int i, count;
-      REFERENCE *entry;
-
-      for (i = 0; refs[i]; i++);
-      count = i;
-
-      if (dir > 0)
-        {
-          for (i = 0; (entry = refs[i]); i++)
-            if (entry->start > start)
-              {
-                position = entry->start;
-                break;
-              }
-        }
-      else
-        {
-          for (i = count - 1; i > -1; i--)
-            {
-              entry = refs[i];
-
-              if (entry->start < start)
-                {
-                  position = entry->start;
-                  break;
-                }
-            }
-        }
-
-      info_free_references (refs);
-    }
-  return (position);
-}
-
-/* This one was a little tricky.  The binding buffer that is passed in has
-   a START and END value of 0 -- strlen (window-line-containing-point).
-   The BUFFER is a pointer to the start of that line. */
-REFERENCE **
-manpage_xrefs_in_binding (NODE *node, SEARCH_BINDING *binding)
-{
-  register int i;
-  REFERENCE **all_refs = xrefs_of_manpage (node);
-  REFERENCE **brefs = (REFERENCE **)NULL;
-  REFERENCE *entry;
-  int brefs_index = 0;
-  int brefs_slots = 0;
-  int start, end;
-
-  if (!all_refs)
-    return ((REFERENCE **)NULL);
-
-  start = binding->start + (binding->buffer - node->contents);
-  end = binding->end + (binding->buffer - node->contents);
-
-  for (i = 0; (entry = all_refs[i]); i++)
-    {
-      if ((entry->start > start) && (entry->end < end))
-        {
-          add_pointer_to_array
-            (entry, brefs_index, brefs, brefs_slots, 10, REFERENCE *);
-        }
-      else
-        {
-          maybe_free (entry->label);
-          maybe_free (entry->filename);
-          maybe_free (entry->nodename);
-          free (entry);
-        }
-    }
-
-  free (all_refs);
-  return (brefs);
-}

Property changes on: head/contrib/texinfo/info/man.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/display.c
===================================================================
--- head/contrib/texinfo/info/display.c	(revision 276550)
+++ head/contrib/texinfo/info/display.c	(nonexistent)
@@ -1,646 +0,0 @@
-/* display.c -- How to display Info windows.
-   $Id: display.c,v 1.7 2004/04/11 17:56:45 karl Exp $
-
-   Copyright (C) 1993, 1997, 2003, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Originally written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-#include "display.h"
-
-extern int info_any_buffered_input_p (void); /* Found in session.c. */
-
-static void free_display (DISPLAY_LINE **display);
-static DISPLAY_LINE **make_display (int width, int height);
-
-void handle_tag (char *tag);
-void handle_tag_start (char *tag);
-void handle_tag_end (char *tag);
-
-/* An array of display lines which tell us what is currently visible on
-   the display.  */
-DISPLAY_LINE **the_display = (DISPLAY_LINE **)NULL;
-
-/* Non-zero means do no output. */
-int display_inhibited = 0;
-
-/* Initialize THE_DISPLAY to WIDTH and HEIGHT, with nothing in it. */
-void
-display_initialize_display (int width, int height)
-{
-  free_display (the_display);
-  the_display = make_display (width, height);
-  display_clear_display (the_display);
-}
-
-/* Clear all of the lines in DISPLAY making the screen blank. */
-void
-display_clear_display (DISPLAY_LINE **display)
-{
-  register int i;
-
-  for (i = 0; display[i]; i++)
-    {
-      display[i]->text[0] = '\0';
-      display[i]->textlen = 0;
-      display[i]->inverse = 0;
-    }
-}
-
-/* Non-zero if we didn't completely redisplay a window. */
-int display_was_interrupted_p = 0;
-
-/* Update the windows pointed to by WINDOW in the_display.  This actually
-   writes the text on the screen. */
-void
-display_update_display (WINDOW *window)
-{
-  register WINDOW *win;
-
-  display_was_interrupted_p = 0;
-
-  /* For every window in the list, check contents against the display. */
-  for (win = window; win; win = win->next)
-    {
-      /* Only re-display visible windows which need updating. */
-      if (((win->flags & W_WindowVisible) == 0) ||
-          ((win->flags & W_UpdateWindow) == 0) ||
-          (win->height == 0))
-        continue;
-
-      display_update_one_window (win);
-      if (display_was_interrupted_p)
-        break;
-    }
-
-  /* Always update the echo area. */
-  display_update_one_window (the_echo_area);
-}
-
-void
-handle_tag_start (char *tag)
-{
-  /* TODO really handle this tag.  */
-  return;
-}
-
-void
-handle_tag_end (char *tag)
-{
-  /* TODO really handle this tag.  */
-  return;
-}
-
-void
-handle_tag (char *tag)
-{
-    if (tag[0] == '/')
-      {
-	tag++;
-	handle_tag_end (tag);
-      }
-    else
-      handle_tag_start (tag);
-}
-
-/* Display WIN on the_display.  Unlike display_update_display (), this
-   function only does one window. */
-void
-display_update_one_window (WINDOW *win)
-{
-  register char *nodetext;      /* Current character to display. */
-  register char *last_node_char; /* Position of the last character in node. */
-  register int i;               /* General use index. */
-  char *printed_line;           /* Buffer for a printed line. */
-  int pl_index = 0;             /* Index into PRINTED_LINE. */
-  int line_index = 0;           /* Number of lines done so far. */
-  int pl_ignore = 0;		/* How many chars use zero width on screen. */
-  int allocated_win_width;
-  DISPLAY_LINE **display = the_display;
-
-  /* If display is inhibited, that counts as an interrupted display. */
-  if (display_inhibited)
-    display_was_interrupted_p = 1;
-
-  /* If the window has no height, or display is inhibited, quit now. */
-  if (!win->height || display_inhibited)
-    return;
-
-  /* If the window's first row doesn't appear in the_screen, then it
-     cannot be displayed.  This can happen when the_echo_area is the
-     window to be displayed, and the screen has shrunk to less than one
-     line. */
-  if ((win->first_row < 0) || (win->first_row > the_screen->height))
-    return;
-
-  /* Print each line in the window into our local buffer, and then
-     check the contents of that buffer against the display.  If they
-     differ, update the display. */
-  allocated_win_width = win->width + 1;
-  printed_line = (char *)xmalloc (allocated_win_width);
-
-  if (!win->node || !win->line_starts)
-    goto done_with_node_display;
-
-  nodetext = win->line_starts[win->pagetop];
-  last_node_char = win->node->contents + win->node->nodelen;
-
-  for (; nodetext < last_node_char; nodetext++)
-    {
-      char *rep = NULL, *rep_carried_over, rep_temp[2];
-      int replen;
-
-      if (isprint (*nodetext))
-        {
-          rep_temp[0] = *nodetext;
-          replen = 1;
-          rep_temp[1] = '\0';
-          rep = rep_temp;
-        }
-      else
-        {
-          if (*nodetext == '\r' || *nodetext == '\n')
-            {
-              replen = win->width - pl_index + pl_ignore;
-            }
-	  else if (*nodetext == '\0'
-		   && (nodetext + 2) < last_node_char
-		   && *(nodetext + 1) == '\b'
-		   && *(nodetext + 2) == '[')
-	    {
-	      /* Found new style tag/cookie \0\b[
-		 Read until the closing tag \0\b] */
-	      int element_len = 0;
-	      char *element;
-
-	      /* Skip the escapes.  */
-	      nodetext += 3;
-
-	      while (!(*nodetext == '\0'
-		    && *(nodetext + 1) == '\b'
-		    && *(nodetext + 2) == ']'))
-		{
-		  nodetext++;
-		  element_len++;
-		}
-
-	      element = (char *) malloc (element_len + 1);
-	      strncpy (element, nodetext - element_len, element_len);
-
-	      /* Skip the escapes.  */
-	      nodetext += 2;
-	      pl_ignore += element_len + 5;
-	      /* Append string terminator.  */
-	      element[element_len] = '\0';
-
-	      handle_tag (element);
-
-	      /* Over and out */
-	      free (element);
-
-	      continue;
-	    }
-          else
-            {
-              rep = printed_representation (*nodetext, pl_index);
-              replen = strlen (rep);
-            }
-        }
-
-      /* Support ANSI escape sequences under -R.  */
-      if (raw_escapes_p
-	  && *nodetext == '\033'
-	  && nodetext[1] == '['
-	  && isdigit (nodetext[2]))
-	{
-	  if (nodetext[3] == 'm')
-	    pl_ignore += 4;
-	  else if (isdigit (nodetext[3]) && nodetext[4] == 'm')
-	    pl_ignore += 5;
-	}
-      while (pl_index + 2 >= allocated_win_width - 1)
-	{
-	  allocated_win_width *= 2;
-	  printed_line = (char *)xrealloc (printed_line, allocated_win_width);
-	}
-
-      /* If this character can be printed without passing the width of
-         the line, then stuff it into the line. */
-      if (replen + pl_index < win->width + pl_ignore)
-        {
-          /* Optimize if possible. */
-          if (replen == 1)
-            {
-              printed_line[pl_index++] = *rep;
-            }
-          else
-            {
-              for (i = 0; i < replen; i++)
-                printed_line[pl_index++] = rep[i];
-            }
-        }
-      else
-        {
-          DISPLAY_LINE *entry;
-
-          /* If this character cannot be printed in this line, we have
-             found the end of this line as it would appear on the screen.
-             Carefully print the end of the line, and then compare. */
-          if (*nodetext == '\n' || *nodetext == '\r' || *nodetext == '\t')
-            {
-              printed_line[pl_index] = '\0';
-              rep_carried_over = (char *)NULL;
-            }
-          else
-            {
-              /* The printed representation of this character extends into
-                 the next line.  Remember the offset of the last character
-                 printed out of REP so that we can carry the character over
-                 to the next line. */
-              for (i = 0; pl_index < (win->width + pl_ignore - 1);)
-                printed_line[pl_index++] = rep[i++];
-
-              rep_carried_over = rep + i;
-
-              /* If printing the last character in this window couldn't
-                 possibly cause the screen to scroll, place a backslash
-                 in the rightmost column. */
-              if (1 + line_index + win->first_row < the_screen->height)
-                {
-                  if (win->flags & W_NoWrap)
-                    printed_line[pl_index++] = '$';
-                  else
-                    printed_line[pl_index++] = '\\';
-                }
-              printed_line[pl_index] = '\0';
-            }
-
-          /* We have the exact line as it should appear on the screen.
-             Check to see if this line matches the one already appearing
-             on the screen. */
-          entry = display[line_index + win->first_row];
-
-          /* If the screen line is inversed, then we have to clear
-             the line from the screen first.  Why, I don't know.
-             (But don't do this if we have no visible entries, as can
-             happen if the window is shrunk very small.)  */
-          if ((entry && entry->inverse)
-	      /* Need to erase the line if it has escape sequences.  */
-	      || (raw_escapes_p && strchr (entry->text, '\033') != 0))
-            {
-              terminal_goto_xy (0, line_index + win->first_row);
-              terminal_clear_to_eol ();
-              entry->inverse = 0;
-              entry->text[0] = '\0';
-              entry->textlen = 0;
-            }
-
-          /* Find the offset where these lines differ. */
-          for (i = 0; i < pl_index; i++)
-            if (printed_line[i] != entry->text[i])
-              break;
-
-          /* If the lines are not the same length, or if they differed
-             at all, we must do some redrawing. */
-          if ((i != pl_index) || (pl_index != entry->textlen))
-            {
-              /* Move to the proper point on the terminal. */
-              terminal_goto_xy (i, line_index + win->first_row);
-
-              /* If there is any text to print, print it. */
-              if (i != pl_index)
-                terminal_put_text (printed_line + i);
-
-              /* If the printed text didn't extend all the way to the edge
-                 of the window, and text was appearing between here and the
-                 edge of the window, clear from here to the end of the line. */
-              if ((pl_index < win->width + pl_ignore
-		   && pl_index < entry->textlen)
-		  || (entry->inverse))
-                terminal_clear_to_eol ();
-
-              fflush (stdout);
-
-              /* Update the display text buffer. */
-	      if (strlen (printed_line) > (unsigned int) screenwidth)
-		/* printed_line[] can include more than screenwidth
-		   characters if we are under -R and there are escape
-		   sequences in it.  However, entry->text was
-		   allocated (in display_initialize_display) for
-		   screenwidth characters only.  */
-		entry->text = xrealloc (entry->text, strlen (printed_line)+1);
-              strcpy (entry->text + i, printed_line + i);
-              entry->textlen = pl_index;
-
-              /* Lines showing node text are not in inverse.  Only modelines
-                 have that distinction. */
-              entry->inverse = 0;
-            }
-
-          /* We have done at least one line.  Increment our screen line
-             index, and check against the bottom of the window. */
-          if (++line_index == win->height)
-            break;
-
-          /* A line has been displayed, and the screen reflects that state.
-             If there is typeahead pending, then let that typeahead be read
-             now, instead of continuing with the display. */
-          if (info_any_buffered_input_p ())
-            {
-              free (printed_line);
-              display_was_interrupted_p = 1;
-              return;
-            }
-
-          /* Reset PL_INDEX to the start of the line. */
-          pl_index = 0;
-	  pl_ignore = 0;	/* this is computed per line */
-
-          /* If there are characters from REP left to print, stuff them
-             into the buffer now. */
-          if (rep_carried_over)
-            for (; rep[pl_index]; pl_index++)
-              printed_line[pl_index] = rep[pl_index];
-
-          /* If this window has chosen not to wrap lines, skip to the end
-             of the physical line in the buffer, and start a new line here. */
-          if (pl_index && (win->flags & W_NoWrap))
-            {
-              char *begin;
-
-              pl_index = 0;
-              printed_line[0] = '\0';
-
-              begin = nodetext;
-
-              while ((nodetext < last_node_char) && (*nodetext != '\n'))
-                nodetext++;
-            }
-        }
-    }
-
- done_with_node_display:
-  /* We have reached the end of the node or the end of the window.  If it
-     is the end of the node, then clear the lines of the window from here
-     to the end of the window. */
-  for (; line_index < win->height; line_index++)
-    {
-      DISPLAY_LINE *entry = display[line_index + win->first_row];
-
-      /* If this line has text on it then make it go away. */
-      if (entry && entry->textlen)
-        {
-          entry->textlen = 0;
-          entry->text[0] = '\0';
-
-          terminal_goto_xy (0, line_index + win->first_row);
-          terminal_clear_to_eol ();
-        }
-    }
-
-  /* Finally, if this window has a modeline it might need to be redisplayed.
-     Check the window's modeline against the one in the display, and update
-     if necessary. */
-  if ((win->flags & W_InhibitMode) == 0)
-    {
-      window_make_modeline (win);
-      line_index = win->first_row + win->height;
-
-      /* This display line must both be in inverse, and have the same
-         contents. */
-      if ((!display[line_index]->inverse) ||
-          (strcmp (display[line_index]->text, win->modeline) != 0))
-        {
-          terminal_goto_xy (0, line_index);
-          terminal_begin_inverse ();
-          terminal_put_text (win->modeline);
-          terminal_end_inverse ();
-          strcpy (display[line_index]->text, win->modeline);
-          display[line_index]->inverse = 1;
-          display[line_index]->textlen = strlen (win->modeline);
-          fflush (stdout);
-        }
-    }
-
-  /* Okay, this window doesn't need updating anymore. */
-  win->flags &= ~W_UpdateWindow;
-  free (printed_line);
-  fflush (stdout);
-}
-
-/* Scroll the region of the_display starting at START, ending at END, and
-   moving the lines AMOUNT lines.  If AMOUNT is less than zero, the lines
-   are moved up in the screen, otherwise down.  Actually, it is possible
-   for no scrolling to take place in the case that the terminal doesn't
-   support it.  This doesn't matter to us. */
-void
-display_scroll_display (int start, int end, int amount)
-{
-  register int i, last;
-  DISPLAY_LINE *temp;
-
-  /* If this terminal cannot do scrolling, give up now. */
-  if (!terminal_can_scroll)
-    return;
-
-  /* If there isn't anything displayed on the screen because it is too
-     small, quit now. */
-  if (!the_display[0])
-    return;
-
-  /* If there is typeahead pending, then don't actually do any scrolling. */
-  if (info_any_buffered_input_p ())
-    return;
-
-  /* Do it on the screen. */
-  terminal_scroll_terminal (start, end, amount);
-
-  /* Now do it in the display buffer so our contents match the screen. */
-  if (amount > 0)
-    {
-      last = end + amount;
-
-      /* Shift the lines to scroll right into place. */
-      for (i = 0; i < (end - start); i++)
-        {
-          temp = the_display[last - i];
-          the_display[last - i] = the_display[end - i];
-          the_display[end - i] = temp;
-        }
-
-      /* The lines have been shifted down in the buffer.  Clear all of the
-         lines that were vacated. */
-      for (i = start; i != (start + amount); i++)
-        {
-          the_display[i]->text[0] = '\0';
-          the_display[i]->textlen = 0;
-          the_display[i]->inverse = 0;
-        }
-    }
-
-  if (amount < 0)
-    {
-      last = start + amount;
-      for (i = 0; i < (end - start); i++)
-        {
-          temp = the_display[last + i];
-          the_display[last + i] = the_display[start + i];
-          the_display[start + i] = temp;
-        }
-
-      /* The lines have been shifted up in the buffer.  Clear all of the
-         lines that are left over. */
-      for (i = end + amount; i != end; i++)
-        {
-          the_display[i]->text[0] = '\0';
-          the_display[i]->textlen = 0;
-          the_display[i]->inverse = 0;
-        }
-    }
-}
-
-/* Try to scroll lines in WINDOW.  OLD_PAGETOP is the pagetop of WINDOW before
-   having had its line starts recalculated.  OLD_STARTS is the list of line
-   starts that used to appear in this window.  OLD_COUNT is the number of lines
-   that appear in the OLD_STARTS array. */
-void
-display_scroll_line_starts (WINDOW *window, int old_pagetop,
-    char **old_starts, int old_count)
-{
-  register int i, old, new;     /* Indices into the line starts arrays. */
-  int last_new, last_old;       /* Index of the last visible line. */
-  int old_first, new_first;     /* Index of the first changed line. */
-  int unchanged_at_top = 0;
-  int already_scrolled = 0;
-
-  /* Locate the first line which was displayed on the old window. */
-  old_first = old_pagetop;
-  new_first = window->pagetop;
-
-  /* Find the last line currently visible in this window. */
-  last_new = window->pagetop + (window->height - 1);
-  if (last_new > window->line_count)
-    last_new = window->line_count - 1;
-
-  /* Find the last line which used to be currently visible in this window. */
-  last_old = old_pagetop + (window->height - 1);
-  if (last_old > old_count)
-    last_old = old_count - 1;
-
-  for (old = old_first, new = new_first;
-       old < last_old && new < last_new;
-       old++, new++)
-    if (old_starts[old] != window->line_starts[new])
-      break;
-    else
-      unchanged_at_top++;
-
-  /* Loop through the old lines looking for a match in the new lines. */
-  for (old = old_first + unchanged_at_top; old < last_old; old++)
-    {
-      for (new = new_first; new < last_new; new++)
-        if (old_starts[old] == window->line_starts[new])
-          {
-            /* Find the extent of the matching lines. */
-            for (i = 0; (old + i) < last_old; i++)
-              if (old_starts[old + i] != window->line_starts[new + i])
-                break;
-
-            /* Scroll these lines if there are enough of them. */
-            {
-              int start, end, amount;
-
-              start = (window->first_row
-                       + ((old + already_scrolled) - old_pagetop));
-              amount = new - (old + already_scrolled);
-              end = window->first_row + window->height;
-
-              /* If we are shifting the block of lines down, then the last
-                 AMOUNT lines will become invisible.  Thus, don't bother
-                 scrolling them. */
-              if (amount > 0)
-                end -= amount;
-
-              if ((end - start) > 0)
-                {
-                  display_scroll_display (start, end, amount);
-
-                  /* Some lines have been scrolled.  Simulate the scrolling
-                     by offsetting the value of the old index. */
-                  old += i;
-                  already_scrolled += amount;
-                }
-            }
-          }
-    }
-}
-
-/* Move the screen cursor to directly over the current character in WINDOW. */
-void
-display_cursor_at_point (WINDOW *window)
-{
-  int vpos, hpos;
-
-  vpos = window_line_of_point (window) - window->pagetop + window->first_row;
-  hpos = window_get_cursor_column (window);
-  terminal_goto_xy (hpos, vpos);
-  fflush (stdout);
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                   Functions Static to this File                  */
-/*                                                                  */
-/* **************************************************************** */
-
-/* Make a DISPLAY_LINE ** with width and height. */
-static DISPLAY_LINE **
-make_display (int width, int height)
-{
-  register int i;
-  DISPLAY_LINE **display;
-
-  display = (DISPLAY_LINE **)xmalloc ((1 + height) * sizeof (DISPLAY_LINE *));
-
-  for (i = 0; i < height; i++)
-    {
-      display[i] = (DISPLAY_LINE *)xmalloc (sizeof (DISPLAY_LINE));
-      display[i]->text = (char *)xmalloc (1 + width);
-      display[i]->textlen = 0;
-      display[i]->inverse = 0;
-    }
-  display[i] = (DISPLAY_LINE *)NULL;
-  return (display);
-}
-
-/* Free the storage allocated to DISPLAY. */
-static void
-free_display (DISPLAY_LINE **display)
-{
-  register int i;
-  register DISPLAY_LINE *display_line;
-
-  if (!display)
-    return;
-
-  for (i = 0; (display_line = display[i]); i++)
-    {
-      free (display_line->text);
-      free (display_line);
-    }
-  free (display);
-}

Property changes on: head/contrib/texinfo/info/display.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/infomap.h
===================================================================
--- head/contrib/texinfo/info/infomap.h	(revision 276550)
+++ head/contrib/texinfo/info/infomap.h	(nonexistent)
@@ -1,82 +0,0 @@
-/* infomap.h -- description of a keymap in Info and related functions.
-   $Id: infomap.h,v 1.3 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1993, 2001, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#ifndef INFOMAP_H
-#define INFOMAP_H
-
-#include "info.h"
-
-#define ESC '\033'
-#define DEL '\177'
-#define TAB '\011'      
-#define RET '\r'
-#define LFD '\n'
-#define SPC ' '
-
-#define meta_character_threshold (DEL + 1)
-#define control_character_threshold (SPC)
-
-#define meta_character_bit 0x80
-#define control_character_bit 0x40
-
-#define Meta_p(c) (((c) > meta_character_threshold))
-#define Control_p(c) ((c) < control_character_threshold)
-
-#define Meta(c) ((c) | (meta_character_bit))
-#define UnMeta(c) ((c) & (~meta_character_bit))
-#define Control(c) ((toupper (c)) & (~control_character_bit))
-#define UnControl(c) (tolower ((c) | control_character_bit))
-
-/* A keymap contains one entry for each key in the ASCII set.
-   Each entry consists of a type and a pointer.
-   FUNCTION is the address of a function to run, or the
-   address of a keymap to indirect through.
-   TYPE says which kind of thing FUNCTION is. */
-typedef struct keymap_entry
-{
-  char type;
-  InfoCommand *function;
-} KEYMAP_ENTRY;
-
-typedef KEYMAP_ENTRY *Keymap;
-
-/* The values that TYPE can have in a keymap entry. */
-#define ISFUNC 0
-#define ISKMAP 1
-
-extern Keymap info_keymap;
-extern Keymap echo_area_keymap;
-
-/* Return a new keymap which has all the uppercase letters mapped to run
-   the function info_do_lowercase_version (). */
-extern Keymap keymap_make_keymap (void);
-
-/* Return a new keymap which is a copy of MAP. */
-extern Keymap keymap_copy_keymap (Keymap map, Keymap rootmap,
-    Keymap newroot);
-
-/* Free MAP and it's descendents. */
-extern void keymap_discard_keymap (Keymap map, Keymap rootmap);
-
-/* Initialize the info keymaps. */
-extern void initialize_info_keymaps (void);
-
-#endif /* not INFOMAP_H */

Property changes on: head/contrib/texinfo/info/infomap.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/variables.c
===================================================================
--- head/contrib/texinfo/info/variables.c	(revision 276550)
+++ head/contrib/texinfo/info/variables.c	(nonexistent)
@@ -1,305 +0,0 @@
-/* variables.c -- how to manipulate user visible variables in Info.
-   $Id: variables.c,v 1.3 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1993, 1997, 2001, 2002, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-#include "variables.h"
-
-/* **************************************************************** */
-/*                                                                  */
-/*                  User Visible Variables in Info                  */
-/*                                                                  */
-/* **************************************************************** */
-
-/* Choices used by the completer when reading a zero/non-zero value for
-   a variable. */
-static char *on_off_choices[] = { "Off", "On", (char *)NULL };
-
-VARIABLE_ALIST info_variables[] = {
-  { "automatic-footnotes",
-      N_("When \"On\", footnotes appear and disappear automatically"),
-      &auto_footnotes_p, (char **)on_off_choices },
-
-  { "automatic-tiling",
-      N_("When \"On\", creating or deleting a window resizes other windows"),
-      &auto_tiling_p, (char **)on_off_choices },
-
-  { "visible-bell",
-      N_("When \"On\", flash the screen instead of ringing the bell"),
-      &terminal_use_visible_bell_p, (char **)on_off_choices },
-
-  { "errors-ring-bell",
-      N_("When \"On\", errors cause the bell to ring"),
-      &info_error_rings_bell_p, (char **)on_off_choices },
-
-  { "gc-compressed-files",
-      N_("When \"On\", Info garbage collects files which had to be uncompressed"),
-      &gc_compressed_files, (char **)on_off_choices },
-  { "show-index-match",
-      N_("When \"On\", the portion of the matched search string is highlighted"),
-      &show_index_match, (char **)on_off_choices },
-
-  { "scroll-behaviour",
-      N_("Controls what happens when scrolling is requested at the end of a node"),
-      &info_scroll_behaviour, (char **)info_scroll_choices },
-
-  { "scroll-step",
-      N_("The number lines to scroll when the cursor moves out of the window"),
-      &window_scroll_step, (char **)NULL },
-
-  { "ISO-Latin",
-      N_("When \"On\", Info accepts and displays ISO Latin characters"),
-      &ISO_Latin_p, (char **)on_off_choices },
-
-  { (char *)NULL, (char *)NULL, (int *)NULL, (char **)NULL }
-};
-
-DECLARE_INFO_COMMAND (describe_variable, _("Explain the use of a variable"))
-{
-  VARIABLE_ALIST *var;
-  char *description;
-
-  /* Get the variable's name. */
-  var = read_variable_name ((char *) _("Describe variable: "), window);
-
-  if (!var)
-    return;
-
-  description = (char *)xmalloc (20 + strlen (var->name)
-				 + strlen (_(var->doc)));
-
-  if (var->choices)
-    sprintf (description, "%s (%s): %s.",
-             var->name, var->choices[*(var->value)], _(var->doc));
-  else
-    sprintf (description, "%s (%d): %s.",
-	     var->name, *(var->value), _(var->doc));
-
-  window_message_in_echo_area ("%s", description, NULL);
-  free (description);
-}
-
-DECLARE_INFO_COMMAND (set_variable, _("Set the value of an Info variable"))
-{
-  VARIABLE_ALIST *var;
-  char *line;
-
-  /* Get the variable's name and value. */
-  var = read_variable_name ((char *) _("Set variable: "), window);
-
-  if (!var)
-    return;
-
-  /* Read a new value for this variable. */
-  {
-    char prompt[100];
-
-    if (!var->choices)
-      {
-        int potential_value;
-
-        if (info_explicit_arg || count != 1)
-          potential_value = count;
-        else
-          potential_value = *(var->value);
-
-        sprintf (prompt, _("Set %s to value (%d): "),
-                 var->name, potential_value);
-        line = info_read_in_echo_area (active_window, prompt);
-
-        /* If no error was printed, clear the echo area. */
-        if (!info_error_was_printed)
-          window_clear_echo_area ();
-
-        /* User aborted? */
-        if (!line)
-          return;
-
-        /* If the user specified a value, get that, otherwise, we are done. */
-        canonicalize_whitespace (line);
-        if (*line)
-          *(var->value) = atoi (line);
-        else
-          *(var->value) = potential_value;
-
-        free (line);
-      }
-    else
-      {
-        register int i;
-        REFERENCE **array = (REFERENCE **)NULL;
-        int array_index = 0;
-        int array_slots = 0;
-
-        for (i = 0; var->choices[i]; i++)
-          {
-            REFERENCE *entry;
-
-            entry = (REFERENCE *)xmalloc (sizeof (REFERENCE));
-            entry->label = xstrdup (var->choices[i]);
-            entry->nodename = (char *)NULL;
-            entry->filename = (char *)NULL;
-
-            add_pointer_to_array
-              (entry, array_index, array, array_slots, 10, REFERENCE *);
-          }
-
-        sprintf (prompt, _("Set %s to value (%s): "),
-                 var->name, var->choices[*(var->value)]);
-
-        /* Ask the completer to read a variable value for us. */
-        line = info_read_completing_in_echo_area (window, prompt, array);
-
-        info_free_references (array);
-
-        if (!echo_area_is_active)
-          window_clear_echo_area ();
-
-        /* User aborted? */
-        if (!line)
-          {
-            info_abort_key (active_window, 0, 0);
-            return;
-          }
-
-        /* User accepted default choice?  If so, no change. */
-        if (!*line)
-          {
-            free (line);
-            return;
-          }
-
-        /* Find the choice in our list of choices. */
-        for (i = 0; var->choices[i]; i++)
-          if (strcmp (var->choices[i], line) == 0)
-            break;
-
-        if (var->choices[i])
-          *(var->value) = i;
-      }
-  }
-}
-
-/* Read the name of an Info variable in the echo area and return the
-   address of a VARIABLE_ALIST member.  A return value of NULL indicates
-   that no variable could be read. */
-VARIABLE_ALIST *
-read_variable_name (char *prompt, WINDOW *window)
-{
-  register int i;
-  char *line;
-  REFERENCE **variables;
-
-  /* Get the completion array of variable names. */
-  variables = make_variable_completions_array ();
-
-  /* Ask the completer to read a variable for us. */
-  line =
-    info_read_completing_in_echo_area (window, prompt, variables);
-
-  info_free_references (variables);
-
-  if (!echo_area_is_active)
-    window_clear_echo_area ();
-
-  /* User aborted? */
-  if (!line)
-    {
-      info_abort_key (active_window, 0, 0);
-      return ((VARIABLE_ALIST *)NULL);
-    }
-
-  /* User accepted "default"?  (There is none.) */
-  if (!*line)
-    {
-      free (line);
-      return ((VARIABLE_ALIST *)NULL);
-    }
-
-  /* Find the variable in our list of variables. */
-  for (i = 0; info_variables[i].name; i++)
-    if (strcmp (info_variables[i].name, line) == 0)
-      break;
-
-  if (!info_variables[i].name)
-    return ((VARIABLE_ALIST *)NULL);
-  else
-    return (&(info_variables[i]));
-}
-
-/* Make an array of REFERENCE which actually contains the names of the
-   variables available in Info. */
-REFERENCE **
-make_variable_completions_array (void)
-{
-  register int i;
-  REFERENCE **array = (REFERENCE **)NULL;
-  int array_index = 0, array_slots = 0;
-
-  for (i = 0; info_variables[i].name; i++)
-    {
-      REFERENCE *entry;
-
-      entry = (REFERENCE *) xmalloc (sizeof (REFERENCE));
-      entry->label = xstrdup (info_variables[i].name);
-      entry->nodename = (char *)NULL;
-      entry->filename = (char *)NULL;
-
-      add_pointer_to_array
-        (entry, array_index, array, array_slots, 200, REFERENCE *);
-    }
-
-  return (array);
-}
-
-#if defined(INFOKEY)
-
-void
-set_variable_to_value(char *name, char *value)
-{
-	register int i;
-
-	/* Find the variable in our list of variables. */
-	for (i = 0; info_variables[i].name; i++)
-		if (strcmp(info_variables[i].name, name) == 0)
-			break;
-
-	if (!info_variables[i].name)
-		return;
-
-	if (info_variables[i].choices)
-	{
-		register int j;
-
-		/* Find the choice in our list of choices. */
-		for (j = 0; info_variables[i].choices[j]; j++)
-			if (strcmp (info_variables[i].choices[j], value) == 0)
-				break;
-
-		if (info_variables[i].choices[j])
-			*info_variables[i].value = j;
-	}
-	else
-	{
-		*info_variables[i].value = atoi(value);
-	}
-}
-
-#endif /* INFOKEY */

Property changes on: head/contrib/texinfo/info/variables.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/infokey.h
===================================================================
--- head/contrib/texinfo/info/infokey.h	(revision 276550)
+++ head/contrib/texinfo/info/infokey.h	(nonexistent)
@@ -1,128 +0,0 @@
-/* infokey.h -- Custom keystroke definition support.
-   $Id: infokey.h,v 1.2 2004/04/11 17:56:45 karl Exp $
-
-   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Andrew Bettison <andrewb@zip.com.au>.
-
-   This design was derived from the "lesskey" system in less 3.4.0. by
-   Mark Nudelman.
-
-   The following terminology is confusing:
-	source file = $HOME/.infokey
-	infokey file = $HOME/.info
-   Oh, well.
- */
-
-
-/* Default source file, where user writes text definitions to be
-   compiled to the infokey file.  MS-DOS doesn't allow leading
-   dots in file names.  */
-#ifdef __MSDOS__
-#define INFOKEY_SRCFILE		"_infokey"
-#else
-#define INFOKEY_SRCFILE		".infokey"
-#endif
-
-/* Default "infokey file", where compiled user defs are kept and
-   read by Info.  MS-DOS doesn't allow leading dots in file names.  */
-#ifdef __MSDOS__
-#define INFOKEY_FILE		"_info"
-#else
-#define INFOKEY_FILE		".info"
-#endif
-
-/*
-Format of entire infokey file:
-
-	4 bytes		magic number S
-	X bytes		version string
-	1 byte '\0'	terminator
-
-	any number of sections:
-		1 byte		section id
-		2 bytes		section length (N)
-		N bytes		section definitions: format depends on section
-
-	4 bytes		magic number E
-
-Format of INFO and EA sections:
-	
-	1 byte		flag: 1 == suppress default key bindings
-	Repeat:
-		X bytes		key sequence
-		1 byte '\0'	terminator
-		1 byte		action code (A_xxx)
-
-Format of VAR section:
-	
-	Repeat:
-		X bytes		variable name
-		1 byte '\0'	terminator
-		Y bytes		value
-		1 byte '\0'	terminator
-
-*/
-
-#define	INFOKEY_NMAGIC		8
-
-#define	INFOKEY_MAGIC_S0	'\001'
-#define	INFOKEY_MAGIC_S1	'I'
-#define	INFOKEY_MAGIC_S2	'n'
-#define	INFOKEY_MAGIC_S3	'f'
-
-#define	INFOKEY_SECTION_INFO	'i'
-#define	INFOKEY_SECTION_EA	'e'
-#define	INFOKEY_SECTION_VAR	'v'
-
-#define	INFOKEY_MAGIC_E0	'A'
-#define	INFOKEY_MAGIC_E1	'l'
-#define	INFOKEY_MAGIC_E2	'f'
-#define	INFOKEY_MAGIC_E3	'n'
-
-#define	INFOKEY_RADIX		64
-#define	INFOKEY_MAX_SECTIONLEN	500
-#define	INFOKEY_MAX_DEFLEN	16
-
-#define	A_MAX_COMMAND		120
-#define	A_INVALID		121
-
-/* Character transformations (independent of info's own) */
-
-#define	CONTROL(c)		((c) & 0x1f)
-#define	ISCONTROL(c)		(((c) & ~0x1f) == 0)
-#define	META(c)			((c) | 0x80)
-#define	UNMETA(c)		((c) & ~0x80)
-#define	ISMETA(c)		(((c) & 0x80) != 0)
-
-/* Special keys (keys which output different strings on different terminals) */
-
-#define SK_ESCAPE		CONTROL('k')
-#define SK_RIGHT_ARROW		1
-#define SK_LEFT_ARROW		2
-#define SK_UP_ARROW		3
-#define SK_DOWN_ARROW		4
-#define SK_PAGE_UP		5
-#define SK_PAGE_DOWN		6
-#define SK_HOME			7
-#define SK_END			8
-#define SK_DELETE		9
-#define SK_INSERT		10
-#define SK_CTL_LEFT_ARROW	11
-#define SK_CTL_RIGHT_ARROW	12
-#define SK_CTL_DELETE		13
-#define SK_LITERAL		40

Property changes on: head/contrib/texinfo/info/infokey.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/man.h
===================================================================
--- head/contrib/texinfo/info/man.h	(revision 276550)
+++ head/contrib/texinfo/info/man.h	(nonexistent)
@@ -1,39 +0,0 @@
-/* man.h: Defines and external function declarations for man.c.
-   $Id: man.h,v 1.3 2004/04/11 17:56:46 karl Exp $
-
-   This file is part of GNU Info, a program for reading online documentation
-   stored in Info format.
-
-   Copyright (C) 1993, 1997, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Author: Brian J. Fox (bfox@ai.mit.edu) Sat May  6 16:19:13 1995. */
-
-#ifndef INFO_MAN_H
-#define INFO_MAN_H
-
-#define MANPAGE_FILE_BUFFER_NAME "*manpages*"
-
-extern NODE *make_manpage_node (char *pagename);
-extern NODE *get_manpage_node (FILE_BUFFER *file_buffer,
-    char *pagename);
-extern FILE_BUFFER *create_manpage_file_buffer (void);
-extern long locate_manpage_xref (NODE *node, long int start, int dir);
-extern REFERENCE **xrefs_of_manpage (NODE *node);
-extern REFERENCE **manpage_xrefs_in_binding (NODE *node,
-    SEARCH_BINDING *binding);
-
-#endif /* INFO_MAN_H */

Property changes on: head/contrib/texinfo/info/man.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/display.h
===================================================================
--- head/contrib/texinfo/info/display.h	(revision 276550)
+++ head/contrib/texinfo/info/display.h	(nonexistent)
@@ -1,78 +0,0 @@
-/* display.h -- How the display in Info is done.
-   $Id: display.h,v 1.3 2004/04/11 17:56:45 karl Exp $
-
-   This file is part of GNU Info, a program for reading online documentation
-   stored in Info format.
-
-   Copyright (C) 1993, 1997, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#ifndef INFO_DISPLAY_H
-#define INFO_DISPLAY_H
-
-#include "info-utils.h"
-#include "terminal.h"
-
-typedef struct {
-  char *text;			/* Text of the line as it appears. */
-  int textlen;			/* Printable Length of TEXT. */
-  int inverse;			/* Non-zero means this line is inverse. */
-} DISPLAY_LINE;
-
-/* An array of display lines which tell us what is currently visible on
-   the display.  */
-extern DISPLAY_LINE **the_display;
-
-/* Non-zero means do no output. */
-extern int display_inhibited;
-
-/* Non-zero if we didn't completely redisplay a window. */
-extern int display_was_interrupted_p;
-
-/* Initialize THE_DISPLAY to WIDTH and HEIGHT, with nothing in it. */
-extern void display_initialize_display (int width, int height);
-
-/* Clear all of the lines in DISPLAY making the screen blank. */
-extern void display_clear_display (DISPLAY_LINE **display);
-
-/* Update the windows pointed to by WINDOWS in THE_DISPLAY.  This actually
-   writes the text on the screen. */
-extern void display_update_display (WINDOW *window);
-
-/* Display WIN on THE_DISPLAY.  Unlike display_update_display (), this
-   function only does one window. */
-extern void display_update_one_window (WINDOW *win);
-
-/* Move the screen cursor to directly over the current character in WINDOW. */
-extern void display_cursor_at_point (WINDOW *window);
-
-/* Scroll the region of the_display starting at START, ending at END, and
-   moving the lines AMOUNT lines.  If AMOUNT is less than zero, the lines
-   are moved up in the screen, otherwise down.  Actually, it is possible
-   for no scrolling to take place in the case that the terminal doesn't
-   support it.  This doesn't matter to us. */
-extern void display_scroll_display (int start, int end, int amount);
-
-/* Try to scroll lines in WINDOW.  OLD_PAGETOP is the pagetop of WINDOW before
-   having had its line starts recalculated.  OLD_STARTS is the list of line
-   starts that used to appear in this window.  OLD_COUNT is the number of lines
-   that appear in the OLD_STARTS array. */
-extern void display_scroll_line_starts (WINDOW *window, int old_pagetop,
-    char **old_starts, int old_count);
-
-#endif /* not INFO_DISPLAY_H */

Property changes on: head/contrib/texinfo/info/display.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/dribble.c
===================================================================
--- head/contrib/texinfo/info/dribble.c	(revision 276550)
+++ head/contrib/texinfo/info/dribble.c	(nonexistent)
@@ -1,68 +0,0 @@
-/* dribble.c -- dribble files for Info.
-   $Id: dribble.c,v 1.3 2004/04/11 17:56:45 karl Exp $
-
-   Copyright (C) 1993, 1998, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-#include "dribble.h"
-
-/* When non-zero, it is a stream to write all input characters to for the
-   duration of this info session. */
-FILE *info_dribble_file = (FILE *)NULL;
-
-/* Open a dribble file named NAME, perhaps closing an already open one.
-   This sets the global variable INFO_DRIBBLE_FILE to the open stream. */
-void
-open_dribble_file (char *name)
-{
-  /* Perhaps close existing dribble file. */
-  close_dribble_file ();
-
-  /* Keystrokes can be non-printable characters, so we need binary I/O.  */
-  info_dribble_file = fopen (name, FOPEN_WBIN);
-
-#if defined (HAVE_SETVBUF)
-  if (info_dribble_file)
-#  if defined (SETVBUF_REVERSED)
-    setvbuf (info_dribble_file, _IONBF, (char *)NULL, 1);
-#  else
-    setvbuf (info_dribble_file, (char *)NULL, _IONBF, 1);
-#  endif /* !SETVBUF_REVERSED */
-#endif /* HAVE_SETVBUF */
-}
-
-/* If there is a dribble file already open, close it. */
-void
-close_dribble_file (void)
-{
-  if (info_dribble_file)
-    {
-      fflush (info_dribble_file);
-      fclose (info_dribble_file);
-      info_dribble_file = (FILE *)NULL;
-    }
-}
-
-/* Write some output to our existing dribble file. */
-void
-dribble (unsigned char byte)
-{
-  if (info_dribble_file)
-    fwrite (&byte, sizeof (unsigned char), 1, info_dribble_file);
-}

Property changes on: head/contrib/texinfo/info/dribble.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/variables.h
===================================================================
--- head/contrib/texinfo/info/variables.h	(revision 276550)
+++ head/contrib/texinfo/info/variables.h	(nonexistent)
@@ -1,66 +0,0 @@
-/* variables.h -- Description of user visible variables in Info.
-   $Id: variables.h,v 1.3 2004/04/11 17:56:46 karl Exp $
-
-   This file is part of GNU Info, a program for reading online documentation
-   stored in Info format.
-
-   Copyright (C) 1993, 1997, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#ifndef INFO_VARIABLES_H
-#define INFO_VARIABLES_H
-
-/* A variable (in the Info sense) is an integer value with a user-visible
-   name.  You may supply an array of strings to complete over when the
-   variable is set; in that case, the variable is set to the index of the
-   string that the user chose.  If you supply a null list, the user can
-   set the variable to a numeric value. */
-
-/* Structure describing a user visible variable. */
-typedef struct {
-  char *name;                   /* Polite name. */
-  char *doc;                    /* Documentation string. */
-  int *value;                   /* Address of value. */
-  char **choices;               /* Array of strings or NULL if numeric only. */
-} VARIABLE_ALIST;
-
-/* Read the name of an Info variable in the echo area and return the
-   address of a VARIABLE_ALIST member.  A return value of NULL indicates
-   that no variable could be read. */
-extern VARIABLE_ALIST *read_variable_name (char *prompt, WINDOW *window);
-
-/* Make an array of REFERENCE which actually contains the names of the
-   variables available in Info. */
-extern REFERENCE **make_variable_completions_array (void);
-
-/* Set the value of an info variable. */
-extern void set_variable (WINDOW *window, int count, unsigned char key);
-extern void describe_variable (WINDOW *window, int count, unsigned char key);
-
-/* The list of user-visible variables. */
-extern int auto_footnotes_p;
-extern int auto_tiling_p;
-extern int terminal_use_visible_bell_p;
-extern int info_error_rings_bell_p;
-extern int gc_compressed_files;
-extern int show_index_match;
-extern int info_scroll_behaviour;
-extern int window_scroll_step;
-extern int ISO_Latin_p;
-
-#endif /* not INFO_VARIABLES_H */

Property changes on: head/contrib/texinfo/info/variables.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/echo-area.c
===================================================================
--- head/contrib/texinfo/info/echo-area.c	(revision 276550)
+++ head/contrib/texinfo/info/echo-area.c	(nonexistent)
@@ -1,1524 +0,0 @@
-/* echo-area.c -- how to read a line in the echo area.
-   $Id: echo-area.c,v 1.7 2004/12/14 00:15:36 karl Exp $
-
-   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-
-#if defined (FD_SET)
-#  if defined (hpux)
-#    define fd_set_cast(x) (int *)(x)
-#  else
-#    define fd_set_cast(x) (fd_set *)(x)
-#  endif /* !hpux */
-#endif /* FD_SET */
-
-/* Non-zero means that C-g was used to quit reading input. */
-int info_aborted_echo_area = 0;
-
-/* Non-zero means that the echo area is being used to read input. */
-int echo_area_is_active = 0;
-
-/* The address of the last command executed in the echo area. */
-VFunction *ea_last_executed_command = (VFunction *)NULL;
-
-/* Non-zero means that the last command executed while reading input
-   killed some text. */
-int echo_area_last_command_was_kill = 0;
-
-/* Variables which hold on to the current state of the input line. */
-static char input_line[1 + EA_MAX_INPUT];
-static char *input_line_prompt;
-static int input_line_point;
-static int input_line_beg;
-static int input_line_end;
-static NODE input_line_node = {
-  (char *)NULL, (char *)NULL, (char *)NULL, input_line,
-  EA_MAX_INPUT, 0, N_IsInternal
-};
-
-static void echo_area_initialize_node (void);
-static void push_echo_area (void), pop_echo_area (void);
-static int echo_area_stack_contains_completions_p (void);
-
-static void ea_kill_text (int from, int to);
-
-/* Non-zero means we force the user to complete. */
-static int echo_area_must_complete_p = 0;
-static int completions_window_p (WINDOW *window);
-
-/* If non-null, this is a window which was specifically created to display
-   possible completions output.  We remember it so we can delete it when
-   appropriate. */
-static WINDOW *echo_area_completions_window = (WINDOW *)NULL;
-
-/* Variables which keep track of the window which was active prior to
-   entering the echo area. */
-static WINDOW *calling_window = (WINDOW *)NULL;
-static NODE *calling_window_node = (NODE *)NULL;
-static long calling_window_point = 0;
-static long calling_window_pagetop = 0;
-
-/* Remember the node and pertinent variables of the calling window. */
-static void
-remember_calling_window (WINDOW *window)
-{
-  /* Only do this if the calling window is not the completions window, or,
-     if it is the completions window and there is no other window. */
-  if (!completions_window_p (window) ||
-      ((window == windows) && !(window->next)))
-    {
-      calling_window = window;
-      calling_window_node = window->node;
-      calling_window_point = window->point;
-      calling_window_pagetop = window->pagetop;
-    }
-}
-
-/* Restore the caller's window so that it shows the node that it was showing
-   on entry to info_read_xxx_echo_area (). */
-static void
-restore_calling_window (void)
-{
-  register WINDOW *win, *compwin = (WINDOW *)NULL;
-
-  /* If the calling window is still visible, and it is the window that
-     we used for completions output, then restore the calling window. */
-  for (win = windows; win; win = win->next)
-    {
-      if (completions_window_p (win))
-        compwin = win;
-
-      if (win == calling_window && win == compwin)
-        {
-          window_set_node_of_window (calling_window, calling_window_node);
-          calling_window->point = calling_window_point;
-          calling_window->pagetop = calling_window_pagetop;
-          compwin = (WINDOW *)NULL;
-          break;
-        }
-    }
-
-  /* Delete the completions window if it is still present, it isn't the
-     last window on the screen, and there aren't any prior echo area reads
-     pending which created a completions window. */
-  if (compwin)
-    {
-      if ((compwin != windows || windows->next) &&
-          !echo_area_stack_contains_completions_p ())
-        {
-          WINDOW *next;
-          int pagetop = 0;
-          int start = 0;
-          int end = 0;
-          int amount = 0;
-
-          next = compwin->next;
-          if (next)
-            {
-              start = next->first_row;
-              end = start + next->height;
-              amount = - (compwin->height + 1);
-              pagetop = next->pagetop;
-            }
-
-          info_delete_window_internal (compwin);
-
-          /* This is not necessary because info_delete_window_internal ()
-             calls echo_area_inform_of_deleted_window (), which does the
-             right thing. */
-#if defined (UNNECESSARY)
-          echo_area_completions_window = (WINDOW *)NULL;
-#endif /* UNNECESSARY */
-
-          if (next)
-            {
-              display_scroll_display (start, end, amount);
-              next->pagetop = pagetop;
-              display_update_display (windows);
-            }
-        }
-    }
-}
-
-/* Set up a new input line with PROMPT. */
-static void
-initialize_input_line (char *prompt)
-{
-  input_line_prompt = prompt;
-  if (prompt)
-    strcpy (input_line, prompt);
-  else
-    input_line[0] = '\0';
-
-  input_line_beg = input_line_end = input_line_point = strlen (prompt);
-}
-
-static char *
-echo_area_after_read (void)
-{
-  char *return_value;
-
-  if (info_aborted_echo_area)
-    {
-      info_aborted_echo_area = 0;
-      return_value = (char *)NULL;
-    }
-  else
-    {
-      if (input_line_beg == input_line_end)
-        return_value = xstrdup ("");
-      else
-        {
-          int line_len = input_line_end - input_line_beg;
-          return_value = (char *) xmalloc (1 + line_len);
-          strncpy (return_value, &input_line[input_line_beg], line_len);
-          return_value[line_len] = '\0';
-        }
-    }
-  return (return_value);
-}
-
-/* Read a line of text in the echo area.  Return a malloc ()'ed string,
-   or NULL if the user aborted out of this read.  WINDOW is the currently
-   active window, so that we can restore it when we need to.  PROMPT, if
-   non-null, is a prompt to print before reading the line. */
-char *
-info_read_in_echo_area (WINDOW *window, char *prompt)
-{
-  char *line;
-
-  /* If the echo area is already active, remember the current state. */
-  if (echo_area_is_active)
-    push_echo_area ();
-
-  /* Initialize our local variables. */
-  initialize_input_line (prompt);
-
-  /* Initialize the echo area for the first (but maybe not the last) time. */
-  echo_area_initialize_node ();
-
-  /* Save away the original node of this window, and the window itself,
-     so echo area commands can temporarily use this window. */
-  remember_calling_window (window);
-
-  /* Let the rest of Info know that the echo area is active. */
-  echo_area_is_active++;
-  active_window = the_echo_area;
-
-  /* Read characters in the echo area. */
-  info_read_and_dispatch ();
-
-  echo_area_is_active--;
-
-  /* Restore the original active window and show point in it. */
-  active_window = calling_window;
-  restore_calling_window ();
-  display_cursor_at_point (active_window);
-  fflush (stdout);
-
-  /* Get the value of the line. */
-  line = echo_area_after_read ();
-
-  /* If there is a previous loop waiting for us, restore it now. */
-  if (echo_area_is_active)
-    pop_echo_area ();
-
-  /* Return the results to the caller. */
-  return (line);
-}
-
-/* (re) Initialize the echo area node. */
-static void
-echo_area_initialize_node (void)
-{
-  register int i;
-
-  for (i = input_line_end; (unsigned int) i < sizeof (input_line); i++)
-    input_line[i] = ' ';
-
-  input_line[i - 1] = '\n';
-  window_set_node_of_window (the_echo_area, &input_line_node);
-  input_line[input_line_end] = '\n';
-}
-
-/* Prepare to read characters in the echo area.  This can initialize the
-   echo area node, but its primary purpose is to side effect the input
-   line buffer contents. */
-void
-echo_area_prep_read (void)
-{
-  if (the_echo_area->node != &input_line_node)
-    echo_area_initialize_node ();
-
-  the_echo_area->point = input_line_point;
-  input_line[input_line_end] = '\n';
-  display_update_one_window (the_echo_area);
-  display_cursor_at_point (active_window);
-}
-
-
-/* **************************************************************** */
-/*                                                                  */
-/*                   Echo Area Movement Commands                    */
-/*                                                                  */
-/* **************************************************************** */
-
-DECLARE_INFO_COMMAND (ea_forward, _("Move forward a character"))
-{
-  if (count < 0)
-    ea_backward (window, -count, key);
-  else
-    {
-      input_line_point += count;
-      if (input_line_point > input_line_end)
-        input_line_point = input_line_end;
-    }
-}
-
-DECLARE_INFO_COMMAND (ea_backward, _("Move backward a character"))
-{
-  if (count < 0)
-    ea_forward (window, -count, key);
-  else
-    {
-      input_line_point -= count;
-      if (input_line_point < input_line_beg)
-        input_line_point = input_line_beg;
-    }
-}
-
-DECLARE_INFO_COMMAND (ea_beg_of_line, _("Move to the start of this line"))
-{
-  input_line_point = input_line_beg;
-}
-
-DECLARE_INFO_COMMAND (ea_end_of_line, _("Move to the end of this line"))
-{
-  input_line_point = input_line_end;
-}
-
-#define alphabetic(c) (islower (c) || isupper (c) || isdigit (c))
-
-/* Move forward a word in the input line. */
-DECLARE_INFO_COMMAND (ea_forward_word, _("Move forward a word"))
-{
-  int c;
-
-  if (count < 0)
-    ea_backward_word (window, -count, key);
-  else
-    {
-      while (count--)
-        {
-          if (input_line_point == input_line_end)
-            return;
-
-          /* If we are not in a word, move forward until we are in one.
-             Then, move forward until we hit a non-alphabetic character. */
-          c = input_line[input_line_point];
-
-          if (!alphabetic (c))
-            {
-              while (++input_line_point < input_line_end)
-                {
-                  c = input_line[input_line_point];
-                  if (alphabetic (c))
-                    break;
-                }
-            }
-
-          if (input_line_point == input_line_end)
-            return;
-
-          while (++input_line_point < input_line_end)
-            {
-              c = input_line[input_line_point];
-              if (!alphabetic (c))
-                break;
-            }
-        }
-    }
-}
-
-DECLARE_INFO_COMMAND (ea_backward_word, _("Move backward a word"))
-{
-  int c;
-
-  if (count < 0)
-    ea_forward_word (window, -count, key);
-  else
-    {
-      while (count--)
-        {
-          if (input_line_point == input_line_beg)
-            return;
-
-          /* Like ea_forward_word (), except that we look at the
-             characters just before point. */
-
-          c = input_line[input_line_point - 1];
-
-          if (!alphabetic (c))
-            {
-              while ((--input_line_point) != input_line_beg)
-                {
-                  c = input_line[input_line_point - 1];
-                  if (alphabetic (c))
-                    break;
-                }
-            }
-
-          while (input_line_point != input_line_beg)
-            {
-              c = input_line[input_line_point - 1];
-              if (!alphabetic (c))
-                break;
-              else
-                --input_line_point;
-            }
-        }
-    }
-}
-
-DECLARE_INFO_COMMAND (ea_delete, _("Delete the character under the cursor"))
-{
-  register int i;
-
-  if (count < 0)
-    ea_rubout (window, -count, key);
-  else
-    {
-      if (input_line_point == input_line_end)
-        return;
-
-      if (info_explicit_arg || count > 1)
-        {
-          int orig_point;
-
-          orig_point = input_line_point;
-          ea_forward (window, count, key);
-          ea_kill_text (orig_point, input_line_point);
-          input_line_point = orig_point;
-        }
-      else
-        {
-          for (i = input_line_point; i < input_line_end; i++)
-            input_line[i] = input_line[i + 1];
-
-          input_line_end--;
-        }
-    }
-}
-
-DECLARE_INFO_COMMAND (ea_rubout, _("Delete the character behind the cursor"))
-{
-  if (count < 0)
-    ea_delete (window, -count, key);
-  else
-    {
-      int start;
-
-      if (input_line_point == input_line_beg)
-        return;
-
-      start = input_line_point;
-      ea_backward (window, count, key);
-
-      if (info_explicit_arg || count > 1)
-        ea_kill_text (start, input_line_point);
-      else
-        ea_delete (window, count, key);
-    }
-}
-
-DECLARE_INFO_COMMAND (ea_abort, _("Cancel or quit operation"))
-{
-  /* If any text, just discard it, and restore the calling window's node.
-     If no text, quit. */
-  if (input_line_end != input_line_beg)
-    {
-      terminal_ring_bell ();
-      input_line_end = input_line_point = input_line_beg;
-      if (calling_window->node != calling_window_node)
-        restore_calling_window ();
-    }
-  else
-    info_aborted_echo_area = 1;
-}
-
-DECLARE_INFO_COMMAND (ea_newline, _("Accept (or force completion of) this line"))
-{
-  /* Stub does nothing.  Simply here to see if it has been executed. */
-}
-
-DECLARE_INFO_COMMAND (ea_quoted_insert, _("Insert next character verbatim"))
-{
-  unsigned char character;
-
-  character = info_get_another_input_char ();
-  ea_insert (window, count, character);
-}
-
-DECLARE_INFO_COMMAND (ea_insert, _("Insert this character"))
-{
-  register int i;
-
-  if ((input_line_end + 1) == EA_MAX_INPUT)
-    {
-      terminal_ring_bell ();
-      return;
-    }
-
-  for (i = input_line_end + 1; i != input_line_point; i--)
-    input_line[i] = input_line[i - 1];
-
-  input_line[input_line_point] = key;
-  input_line_point++;
-  input_line_end++;
-}
-
-DECLARE_INFO_COMMAND (ea_tab_insert, _("Insert a TAB character"))
-{
-  ea_insert (window, count, '\t');
-}
-
-/* Transpose the characters at point.  If point is at the end of the line,
-   then transpose the characters before point. */
-DECLARE_INFO_COMMAND (ea_transpose_chars, _("Transpose characters at point"))
-{
-  /* Handle conditions that would make it impossible to transpose
-     characters. */
-  if (!count || !input_line_point || (input_line_end - input_line_beg) < 2)
-    return;
-
-  while (count)
-    {
-      int t;
-      if (input_line_point == input_line_end)
-        {
-          t = input_line[input_line_point - 1];
-
-          input_line[input_line_point - 1] = input_line[input_line_point - 2];
-          input_line[input_line_point - 2] = t;
-        }
-      else
-        {
-          t = input_line[input_line_point];
-
-          input_line[input_line_point] = input_line[input_line_point - 1];
-          input_line[input_line_point - 1] = t;
-
-          if (count < 0 && input_line_point != input_line_beg)
-            input_line_point--;
-          else
-            input_line_point++;
-        }
-
-      if (count < 0)
-        count++;
-      else
-        count--;
-    }
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                   Echo Area Killing and Yanking                  */
-/*                                                                  */
-/* **************************************************************** */
-
-static char **kill_ring = (char **)NULL;
-static int kill_ring_index = 0; /* Number of kills appearing in KILL_RING. */
-static int kill_ring_slots = 0; /* Number of slots allocated to KILL_RING. */
-static int kill_ring_loc = 0;   /* Location of current yank pointer. */
-
-/* The largest number of kills that we remember at one time. */
-static int max_retained_kills = 15;
-
-DECLARE_INFO_COMMAND (ea_yank, _("Yank back the contents of the last kill"))
-{
-  register int i;
-  register char *text;
-
-  if (!kill_ring_index)
-    {
-      inform_in_echo_area ((char *) _("Kill ring is empty"));
-      return;
-    }
-
-  text = kill_ring[kill_ring_loc];
-
-  for (i = 0; text[i]; i++)
-    ea_insert (window, 1, text[i]);
-}
-
-/* If the last command was yank, or yank_pop, and the text just before
-   point is identical to the current kill item, then delete that text
-   from the line, rotate the index down, and yank back some other text. */
-DECLARE_INFO_COMMAND (ea_yank_pop, _("Yank back a previous kill"))
-{
-  register int len;
-
-  if (((ea_last_executed_command != (VFunction *) ea_yank) &&
-       (ea_last_executed_command != (VFunction *) ea_yank_pop)) ||
-      (kill_ring_index == 0))
-    return;
-
-  len = strlen (kill_ring[kill_ring_loc]);
-
-  /* Delete the last yanked item from the line. */
-  {
-    register int i, counter;
-
-    counter = input_line_end - input_line_point;
-    
-    for (i = input_line_point - len; counter; i++, counter--)
-      input_line[i] = input_line[i + len];
-
-    input_line_end -= len;
-    input_line_point -= len;
-  }
-
-  /* Get a previous kill, and yank that. */
-  kill_ring_loc--;
-  if (kill_ring_loc < 0)
-    kill_ring_loc = kill_ring_index - 1;
-
-  ea_yank (window, count, key);
-}
-
-/* Delete the text from point to end of line. */
-DECLARE_INFO_COMMAND (ea_kill_line, _("Kill to the end of the line"))
-{
-  if (count < 0)
-    {
-      ea_kill_text (input_line_point, input_line_beg);
-      input_line_point = input_line_beg;
-    }
-  else
-    ea_kill_text (input_line_point, input_line_end);
-}
-
-/* Delete the text from point to beg of line. */
-DECLARE_INFO_COMMAND (ea_backward_kill_line,
-                      _("Kill to the beginning of the line"))
-{
-  if (count < 0)
-    ea_kill_text (input_line_point, input_line_end);
-  else
-    {
-      ea_kill_text (input_line_point, input_line_beg);
-      input_line_point = input_line_beg;
-    }
-}
-
-/* Delete from point to the end of the current word. */
-DECLARE_INFO_COMMAND (ea_kill_word, _("Kill the word following the cursor"))
-{
-  int orig_point = input_line_point;
-
-  if (count < 0)
-    ea_backward_kill_word (window, -count, key);
-  else
-    {
-      ea_forward_word (window, count, key);
-
-      if (input_line_point != orig_point)
-        ea_kill_text (orig_point, input_line_point);
-
-      input_line_point = orig_point;
-    }
-}
-
-/* Delete from point to the start of the current word. */
-DECLARE_INFO_COMMAND (ea_backward_kill_word,
-                      _("Kill the word preceding the cursor"))
-{
-  int orig_point = input_line_point;
-
-  if (count < 0)
-    ea_kill_word (window, -count, key);
-  else
-    {
-      ea_backward_word (window, count, key);
-
-      if (input_line_point != orig_point)
-        ea_kill_text (orig_point, input_line_point);
-    }
-}
-
-/* The way to kill something.  This appends or prepends to the last
-   kill, if the last command was a kill command.  If FROM is less
-   than TO, then the killed text is appended to the most recent kill,
-   otherwise it is prepended.  If the last command was not a kill command,
-   then a new slot is made for this kill. */
-static void
-ea_kill_text (int from, int to)
-{
-  register int i, counter, distance;
-  int killing_backwards, slot;
-  char *killed_text;
-
-  killing_backwards = (from > to);
-
-  /* If killing backwards, reverse the values of FROM and TO. */
-  if (killing_backwards)
-    {
-      int temp = from;
-      from = to;
-      to = temp;
-    }
-
-  /* Remember the text that we are about to delete. */
-  distance = to - from;
-  killed_text = (char *)xmalloc (1 + distance);
-  strncpy (killed_text, &input_line[from], distance);
-  killed_text[distance] = '\0';
-
-  /* Actually delete the text from the line. */
-  counter = input_line_end - to;
-
-  for (i = from; counter; i++, counter--)
-    input_line[i] = input_line[i + distance];
-
-  input_line_end -= distance;
-
-  /* If the last command was a kill, append or prepend the killed text to
-     the last command's killed text. */
-  if (echo_area_last_command_was_kill)
-    {
-      char *old, *new;
-
-      slot = kill_ring_loc;
-      old = kill_ring[slot];
-      new = (char *)xmalloc (1 + strlen (old) + strlen (killed_text));
-
-      if (killing_backwards)
-        {
-          /* Prepend TEXT to current kill. */
-          strcpy (new, killed_text);
-          strcat (new, old);
-        }
-      else
-        {
-          /* Append TEXT to current kill. */
-          strcpy (new, old);
-          strcat (new, killed_text);
-        }
-
-      free (old);
-      free (killed_text);
-      kill_ring[slot] = new;
-    }
-  else
-    {
-      /* Try to store the kill in a new slot, unless that would cause there
-         to be too many remembered kills. */
-      slot = kill_ring_index;
-
-      if (slot == max_retained_kills)
-        slot = 0;
-
-      if (slot + 1 > kill_ring_slots)
-        kill_ring = (char **) xrealloc
-          (kill_ring,
-           (kill_ring_slots += max_retained_kills) * sizeof (char *));
-
-      if (slot != kill_ring_index)
-        free (kill_ring[slot]);
-      else
-        kill_ring_index++;
-
-      kill_ring[slot] = killed_text;
-
-      kill_ring_loc = slot;
-    }
-
-  /* Notice that the last command was a kill. */
-  echo_area_last_command_was_kill++;
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                      Echo Area Completion                        */
-/*                                                                  */
-/* **************************************************************** */
-
-/* Pointer to an array of REFERENCE to complete over. */
-static REFERENCE **echo_area_completion_items = (REFERENCE **)NULL;
-
-/* Sorted array of REFERENCE * which is the possible completions found in
-   the variable echo_area_completion_items.  If there is only one element,
-   it is the only possible completion. */
-static REFERENCE **completions_found = (REFERENCE **)NULL;
-static int completions_found_index = 0;
-static int completions_found_slots = 0;
-
-/* The lowest common denominator found while completing. */
-static REFERENCE *LCD_completion;
-
-/* Internal functions used by the user calls. */
-static void build_completions (void), completions_must_be_rebuilt (void);
-
-/* Variable which holds the output of completions. */
-static NODE *possible_completions_output_node = (NODE *)NULL;
-
-static char *compwin_name = "*Completions*";
-
-/* Return non-zero if WINDOW is a window used for completions output. */
-static int
-completions_window_p (WINDOW *window)
-{
-  int result = 0;
-
-  if (internal_info_node_p (window->node) &&
-      (strcmp (window->node->nodename, compwin_name) == 0))
-    result = 1;
-
-  return (result);
-}
-
-/* Workhorse for completion readers.  If FORCE is non-zero, the user cannot
-   exit unless the line read completes, or is empty. */
-char *
-info_read_completing_internal (WINDOW *window, char *prompt,
-    REFERENCE **completions, int force)
-{
-  char *line;
-
-  /* If the echo area is already active, remember the current state. */
-  if (echo_area_is_active)
-    push_echo_area ();
-
-  echo_area_must_complete_p = force;
-
-  /* Initialize our local variables. */
-  initialize_input_line (prompt);
-
-  /* Initialize the echo area for the first (but maybe not the last) time. */
-  echo_area_initialize_node ();
-
-  /* Save away the original node of this window, and the window itself,
-     so echo area commands can temporarily use this window. */
-  remember_calling_window (window);
-
-  /* Save away the list of items to complete over. */
-  echo_area_completion_items = completions;
-  completions_must_be_rebuilt ();
-
-  active_window = the_echo_area;
-  echo_area_is_active++;
-
-  /* Read characters in the echo area. */
-  while (1)
-    {
-      info_read_and_dispatch ();
-
-      line = echo_area_after_read ();
-
-      /* Force the completion to take place if the user hasn't accepted
-         a default or aborted, and if FORCE is active. */
-      if (force && line && *line && completions)
-        {
-          register int i;
-
-          build_completions ();
-
-          /* If there is only one completion, then make the line be that
-             completion. */
-          if (completions_found_index == 1)
-            {
-              free (line);
-              line = xstrdup (completions_found[0]->label);
-              break;
-            }
-
-          /* If one of the completions matches exactly, then that is okay, so
-             return the current line. */
-          for (i = 0; i < completions_found_index; i++)
-            if (strcasecmp (completions_found[i]->label, line) == 0)
-              {
-                free (line);
-                line = xstrdup (completions_found[i]->label);
-                break;
-              }
-
-          /* If no match, go back and try again. */
-          if (i == completions_found_index)
-            {
-              if (!completions_found_index)
-                inform_in_echo_area ((char *) _("No completions"));
-              else
-                inform_in_echo_area ((char *) _("Not complete"));
-              continue;
-            }
-        }
-      break;
-    }
-  echo_area_is_active--;
-
-  /* Restore the original active window and show point in it. */
-  active_window = calling_window;
-  restore_calling_window ();
-  display_cursor_at_point (active_window);
-  fflush (stdout);
-
-  echo_area_completion_items = (REFERENCE **)NULL;
-  completions_must_be_rebuilt ();
-
-  /* If there is a previous loop waiting for us, restore it now. */
-  if (echo_area_is_active)
-    pop_echo_area ();
-
-  return (line);
-}
-  
-/* Read a line in the echo area with completion over COMPLETIONS. */
-char *
-info_read_completing_in_echo_area (WINDOW *window,
-    char *prompt, REFERENCE **completions)
-{
-  return (info_read_completing_internal (window, prompt, completions, 1));
-}
-
-/* Read a line in the echo area allowing completion over COMPLETIONS, but
-   not requiring it. */
-char *
-info_read_maybe_completing (WINDOW *window,
-    char *prompt, REFERENCE **completions)
-{
-  return (info_read_completing_internal (window, prompt, completions, 0));
-}
-
-DECLARE_INFO_COMMAND (ea_possible_completions, _("List possible completions"))
-{
-  if (!echo_area_completion_items)
-    {
-      ea_insert (window, count, key);
-      return;
-    }
-
-  build_completions ();
-
-  if (!completions_found_index)
-    {
-      terminal_ring_bell ();
-      inform_in_echo_area ((char *) _("No completions"));
-    }
-  else if ((completions_found_index == 1) && (key != '?'))
-    {
-      inform_in_echo_area ((char *) _("Sole completion"));
-    }
-  else
-    {
-      register int i, l;
-      int limit, iterations, max_label = 0;
-
-      initialize_message_buffer ();
-      printf_to_message_buffer (completions_found_index == 1
-                                ? (char *) _("One completion:\n")
-                                : (char *) _("%d completions:\n"),
-				(void *) (long) completions_found_index,
-				NULL, NULL);
-
-      /* Find the maximum length of a label. */
-      for (i = 0; i < completions_found_index; i++)
-        {
-          int len = strlen (completions_found[i]->label);
-          if (len > max_label)
-            max_label = len;
-        }
-
-      max_label += 4;
-
-      /* Find out how many columns we should print in. */
-      limit = calling_window->width / max_label;
-      if (limit != 1 && (limit * max_label == calling_window->width))
-        limit--;
-
-      /* Avoid a possible floating exception.  If max_label > width then
-         the limit will be 0 and a divide-by-zero fault will result. */
-      if (limit == 0)
-        limit = 1;
-
-      /* How many iterations of the printing loop? */
-      iterations = (completions_found_index + (limit - 1)) / limit;
-
-      /* Watch out for special case.  If the number of completions is less
-         than LIMIT, then just do the inner printing loop. */
-      if (completions_found_index < limit)
-        iterations = 1;
-
-      /* Print the sorted items, up-and-down alphabetically. */
-      for (i = 0; i < iterations; i++)
-        {
-          register int j;
-
-          for (j = 0, l = i; j < limit; j++)
-            {
-              if (l >= completions_found_index)
-                break;
-              else
-                {
-                  char *label;
-                  int printed_length, k;
-
-                  label = completions_found[l]->label;
-                  printed_length = strlen (label);
-                  printf_to_message_buffer ("%s", label, NULL, NULL);
-
-                  if (j + 1 < limit)
-                    {
-                      for (k = 0; k < max_label - printed_length; k++)
-                        printf_to_message_buffer (" ", NULL, NULL, NULL);
-                    }
-                }
-              l += iterations;
-            }
-          printf_to_message_buffer ("\n", NULL, NULL, NULL);
-        }
-
-      /* Make a new node to hold onto possible completions.  Don't destroy
-         dangling pointers. */
-      {
-        NODE *temp;
-
-        temp = message_buffer_to_node ();
-        add_gcable_pointer (temp->contents);
-        name_internal_node (temp, compwin_name);
-        possible_completions_output_node = temp;
-      }
-
-      /* Find a suitable window for displaying the completions output.
-         First choice is an existing window showing completions output.
-         If there is only one window, and it is large, make another
-         (smaller) window, and use that one.  Otherwise, use the caller's
-         window. */
-      {
-        WINDOW *compwin;
-
-        compwin = get_internal_info_window (compwin_name);
-
-        if (!compwin)
-          {
-            /* If we can split the window to display most of the completion
-               items, then do so. */
-            if (calling_window->height > (iterations * 2)
-		&& calling_window->height / 2 >= WINDOW_MIN_SIZE)
-              {
-                int start, pagetop;
-#ifdef SPLIT_BEFORE_ACTIVE
-                int end;
-#endif
-
-                active_window = calling_window;
-
-                /* Perhaps we can scroll this window on redisplay. */
-                start = calling_window->first_row;
-                pagetop = calling_window->pagetop;
-
-                compwin =
-                  window_make_window (possible_completions_output_node);
-                active_window = the_echo_area;
-                window_change_window_height
-                  (compwin, -(compwin->height - (iterations + 2)));
-
-                window_adjust_pagetop (calling_window);
-                remember_calling_window (calling_window);
-
-#if defined (SPLIT_BEFORE_ACTIVE)
-                /* If the pagetop hasn't changed, scrolling the calling
-                   window is a reasonable thing to do. */
-                if (pagetop == calling_window->pagetop)
-                  {
-                    end = start + calling_window->height;
-                    display_scroll_display
-                      (start, end, calling_window->prev->height + 1);
-                  }
-#else /* !SPLIT_BEFORE_ACTIVE */
-                /* If the pagetop has changed, set the new pagetop here. */
-                if (pagetop != calling_window->pagetop)
-                  {
-                    int newtop = calling_window->pagetop;
-                    calling_window->pagetop = pagetop;
-                    set_window_pagetop (calling_window, newtop);
-                  }
-#endif /* !SPLIT_BEFORE_ACTIVE */
-
-                echo_area_completions_window = compwin;
-                remember_window_and_node (compwin, compwin->node);
-              }
-            else
-              compwin = calling_window;
-          }
-
-        if (compwin->node != possible_completions_output_node)
-          {
-            window_set_node_of_window
-              (compwin, possible_completions_output_node);
-            remember_window_and_node (compwin, compwin->node);
-          }
-
-        display_update_display (windows);
-      }
-    }
-}
-
-DECLARE_INFO_COMMAND (ea_complete, _("Insert completion"))
-{
-  if (!echo_area_completion_items)
-    {
-      ea_insert (window, count, key);
-      return;
-    }
-
-  /* If KEY is SPC, and we are not forcing completion to take place, simply
-     insert the key. */
-  if (!echo_area_must_complete_p && key == SPC)
-    {
-      ea_insert (window, count, key);
-      return;
-    }
-
-  if (ea_last_executed_command == (VFunction *) ea_complete)
-    {
-      /* If the keypress is a SPC character, and we have already tried
-         completing once, and there are several completions, then check
-         the batch of completions to see if any continue with a space.
-         If there are some, insert the space character and continue. */
-      if (key == SPC && completions_found_index > 1)
-        {
-          register int i, offset;
-
-          offset = input_line_end - input_line_beg;
-
-          for (i = 0; i < completions_found_index; i++)
-            if (completions_found[i]->label[offset] == ' ')
-              break;
-
-          if (completions_found[i])
-            ea_insert (window, 1, ' ');
-          else
-            {
-              ea_possible_completions (window, count, key);
-              return;
-            }
-        }
-      else
-        {
-          ea_possible_completions (window, count, key);
-          return;
-        }
-    }
-
-  input_line_point = input_line_end;
-  build_completions ();
-
-  if (!completions_found_index)
-    terminal_ring_bell ();
-  else if (LCD_completion->label[0] == '\0')
-    ea_possible_completions (window, count, key);
-  else
-    {
-      register int i;
-      input_line_point = input_line_end = input_line_beg;
-      for (i = 0; LCD_completion->label[i]; i++)
-        ea_insert (window, 1, LCD_completion->label[i]);
-    }
-}
-
-/* Utility REFERENCE used to store possible LCD. */
-static REFERENCE LCD_reference = {
-    (char *)NULL, (char *)NULL, (char *)NULL, 0, 0, 0
-};
-
-static void remove_completion_duplicates (void);
-
-/* Variables which remember the state of the most recent call
-   to build_completions (). */
-static char *last_completion_request = (char *)NULL;
-static REFERENCE **last_completion_items = (REFERENCE **)NULL;
-
-/* How to tell the completion builder to reset internal state. */
-static void
-completions_must_be_rebuilt (void)
-{
-  maybe_free (last_completion_request);
-  last_completion_request = (char *)NULL;
-  last_completion_items = (REFERENCE **)NULL;
-}
-
-/* Build a list of possible completions from echo_area_completion_items,
-   and the contents of input_line. */
-static void
-build_completions (void)
-{
-  register int i, len;
-  register REFERENCE *entry;
-  char *request;
-  int informed_of_lengthy_job = 0;
-
-  /* If there are no items to complete over, exit immediately. */
-  if (!echo_area_completion_items)
-    {
-      completions_found_index = 0;
-      LCD_completion = (REFERENCE *)NULL;
-      return;
-    }
-
-  /* Check to see if this call to build completions is the same as the last
-     call to build completions. */
-  len = input_line_end - input_line_beg;
-  request = (char *)xmalloc (1 + len);
-  strncpy (request, &input_line[input_line_beg], len);
-  request[len] = '\0';
-
-  if (last_completion_request && last_completion_items &&
-      last_completion_items == echo_area_completion_items &&
-      (strcmp (last_completion_request, request) == 0))
-    {
-      free (request);
-      return;
-    }
-
-  maybe_free (last_completion_request);
-  last_completion_request = request;
-  last_completion_items = echo_area_completion_items;
-
-  /* Always start at the beginning of the list. */
-  completions_found_index = 0;
-  LCD_completion = (REFERENCE *)NULL;
-
-  for (i = 0; (entry = echo_area_completion_items[i]); i++)
-    {
-      if (strncasecmp (request, entry->label, len) == 0)
-        add_pointer_to_array (entry, completions_found_index,
-                              completions_found, completions_found_slots,
-                              20, REFERENCE *);
-
-      if (!informed_of_lengthy_job && completions_found_index > 100)
-        {
-          informed_of_lengthy_job = 1;
-          window_message_in_echo_area ((char *) _("Building completions..."),
-              NULL, NULL);
-        }
-    }
-
-  if (!completions_found_index)
-    return;
-
-  /* Sort and prune duplicate entries from the completions array. */
-  remove_completion_duplicates ();
-
-  /* If there is only one completion, just return that. */
-  if (completions_found_index == 1)
-    {
-      LCD_completion = completions_found[0];
-      return;
-    }
-
-  /* Find the least common denominator. */
-  {
-    long shortest = 100000;
-
-    for (i = 1; i < completions_found_index; i++)
-      {
-        register int j;
-        int c1, c2;
-
-        for (j = 0;
-             (c1 = info_tolower (completions_found[i - 1]->label[j])) &&
-             (c2 = info_tolower (completions_found[i]->label[j]));
-             j++)
-          if (c1 != c2)
-            break;
-
-        if (shortest > j)
-          shortest = j;
-      }
-
-    maybe_free (LCD_reference.label);
-    LCD_reference.label = (char *)xmalloc (1 + shortest);
-    /* Since both the sorting done inside remove_completion_duplicates
-       and all the comparisons above are case-insensitive, it's
-       possible that the completion we are going to return is
-       identical to what the user typed but for the letter-case.  This
-       is confusing, since the user could type FOOBAR<TAB> and get her
-       string change letter-case for no good reason.  So try to find a
-       possible completion whose letter-case is identical, and if so,
-       use that.  */
-    if (completions_found_index > 1)
-      {
-	int req_len = strlen (request);
-
-        for (i = 0; i < completions_found_index; i++)
-          if (strncmp (request, completions_found[i]->label, req_len) == 0)
-            break;
-        /* If none of the candidates match exactly, use the first one.  */
-        if (i >= completions_found_index)
-          i = 0;
-      }
-    strncpy (LCD_reference.label, completions_found[i]->label, shortest);
-    LCD_reference.label[shortest] = '\0';
-    LCD_completion = &LCD_reference;
-  }
-
-  if (informed_of_lengthy_job)
-    echo_area_initialize_node ();
-}
-
-/* Function called by qsort. */
-static int
-compare_references (const void *entry1, const void *entry2)
-{
-  REFERENCE **e1 = (REFERENCE **) entry1;
-  REFERENCE **e2 = (REFERENCE **) entry2;
-
-  return (strcasecmp ((*e1)->label, (*e2)->label));
-}
-
-/* Prune duplicate entries from COMPLETIONS_FOUND. */
-static void
-remove_completion_duplicates (void)
-{
-  register int i, j;
-  REFERENCE **temp;
-  int newlen;
-
-  if (!completions_found_index)
-    return;
-
-  /* Sort the items. */
-  qsort (completions_found, completions_found_index, sizeof (REFERENCE *),
-         compare_references);
-
-  for (i = 0, newlen = 1; i < completions_found_index - 1; i++)
-    {
-      if (strcmp (completions_found[i]->label,
-                  completions_found[i + 1]->label) == 0)
-        completions_found[i] = (REFERENCE *)NULL;
-      else
-        newlen++;
-    }
-
-  /* We have marked all the dead slots.  It is faster to copy the live slots
-     twice than to prune the dead slots one by one. */
-  temp = (REFERENCE **)xmalloc ((1 + newlen) * sizeof (REFERENCE *));
-  for (i = 0, j = 0; i < completions_found_index; i++)
-    if (completions_found[i])
-      temp[j++] = completions_found[i];
-
-  for (i = 0; i < newlen; i++)
-    completions_found[i] = temp[i];
-
-  completions_found[i] = (REFERENCE *)NULL;
-  completions_found_index = newlen;
-  free (temp);
-}
-
-/* Scroll the "other" window.  If there is a window showing completions, scroll
-   that one, otherwise scroll the window which was active on entering the read
-   function. */
-DECLARE_INFO_COMMAND (ea_scroll_completions_window, _("Scroll the completions window"))
-{
-  WINDOW *compwin;
-  int old_pagetop;
-
-  compwin = get_internal_info_window (compwin_name);
-
-  if (!compwin)
-    compwin = calling_window;
-
-  old_pagetop = compwin->pagetop;
-
-  /* Let info_scroll_forward () do the work, and print any messages that
-     need to be displayed. */
-  info_scroll_forward (compwin, count, key);
-}
-
-/* Function which gets called when an Info window is deleted while the
-   echo area is active.  WINDOW is the window which has just been deleted. */
-void
-echo_area_inform_of_deleted_window (WINDOW *window)
-{
-  /* If this is the calling_window, forget what we remembered about it. */
-  if (window == calling_window)
-    {
-      if (active_window != the_echo_area)
-        remember_calling_window (active_window);
-      else
-        remember_calling_window (windows);
-    }
-
-  /* If this window was the echo_area_completions_window, then notice that
-     the window has been deleted. */
-  if (window == echo_area_completions_window)
-    echo_area_completions_window = (WINDOW *)NULL;
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                 Pushing and Popping the Echo Area                */
-/*                                                                  */
-/* **************************************************************** */
-
-/* Push and Pop the echo area. */
-typedef struct {
-  char *line;
-  char *prompt;
-  REFERENCE **comp_items;
-  int point, beg, end;
-  int must_complete;
-  NODE node;
-  WINDOW *compwin;
-} PUSHED_EA;
-
-static PUSHED_EA **pushed_echo_areas = (PUSHED_EA **)NULL;
-static int pushed_echo_areas_index = 0;
-static int pushed_echo_areas_slots = 0;
-
-/* Pushing the echo_area has a side effect of zeroing the completion_items. */
-static void
-push_echo_area (void)
-{
-  PUSHED_EA *pushed;
-
-  pushed = (PUSHED_EA *)xmalloc (sizeof (PUSHED_EA));
-  pushed->line = xstrdup (input_line);
-  pushed->prompt = input_line_prompt;
-  pushed->point = input_line_point;
-  pushed->beg = input_line_beg;
-  pushed->end = input_line_end;
-  pushed->node = input_line_node;
-  pushed->comp_items = echo_area_completion_items;
-  pushed->must_complete = echo_area_must_complete_p;
-  pushed->compwin = echo_area_completions_window;
-
-  add_pointer_to_array (pushed, pushed_echo_areas_index, pushed_echo_areas,
-                        pushed_echo_areas_slots, 4, PUSHED_EA *);
-
-  echo_area_completion_items = (REFERENCE **)NULL;
-}
-
-static void
-pop_echo_area (void)
-{
-  PUSHED_EA *popped;
-
-  popped = pushed_echo_areas[--pushed_echo_areas_index];
-
-  strcpy (input_line, popped->line);
-  free (popped->line);
-  input_line_prompt = popped->prompt;
-  input_line_point = popped->point;
-  input_line_beg = popped->beg;
-  input_line_end = popped->end;
-  input_line_node = popped->node;
-  echo_area_completion_items = popped->comp_items;
-  echo_area_must_complete_p = popped->must_complete;
-  echo_area_completions_window = popped->compwin;
-  completions_must_be_rebuilt ();
-
-  /* If the completion window no longer exists, forget about it. */
-  if (echo_area_completions_window)
-    {
-      register WINDOW *win;
-
-      for (win = windows; win; win = win->next)
-        if (echo_area_completions_window == win)
-          break;
-
-      /* If the window wasn't found, then it has already been deleted. */
-      if (!win)
-        echo_area_completions_window = (WINDOW *)NULL;
-    }
-
-  free (popped);
-}
-
-/* Returns non-zero if any of the prior stacked calls to read in the echo
-   area produced a completions window. */
-static int
-echo_area_stack_contains_completions_p (void)
-{
-  register int i;
-
-  for (i = 0; i < pushed_echo_areas_index; i++)
-    if (pushed_echo_areas[i]->compwin)
-      return (1);
-
-  return (0);
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*             Error Messages While Reading in Echo Area            */
-/*                                                                  */
-/* **************************************************************** */
-
-#if defined (HAVE_SYS_TIME_H)
-#  include <sys/time.h>
-#  define HAVE_STRUCT_TIMEVAL
-#endif /* HAVE_SYS_TIME_H */
-
-static void
-pause_or_input (void)
-{
-#ifdef FD_SET
-  struct timeval timer;
-  fd_set readfds;
-  int ready;
-
-  FD_ZERO (&readfds);
-  FD_SET (fileno (stdin), &readfds);
-  timer.tv_sec = 2;
-  timer.tv_usec = 0;
-  ready = select (fileno (stdin) + 1, &readfds, (fd_set *) NULL,
-                  (fd_set *) NULL, &timer);
-#endif /* FD_SET */
-}
-
-/* Print MESSAGE right after the end of the current line, and wait
-   for input or a couple of seconds, whichever comes first.  Then flush the
-   informational message that was printed. */
-void
-inform_in_echo_area (const char *message)
-{
-  int i;
-  char *text;
-  int avail = EA_MAX_INPUT + 1 - input_line_end;
-
-  text = xstrdup (message);
-  for (i = 0; text[i] && text[i] != '\n' && i < avail; i++)
-    ;
-  text[i] = 0;
-
-  echo_area_initialize_node ();
-  sprintf (&input_line[input_line_end], "%s[%s]\n",
-           echo_area_is_active ? " ": "", text);
-  free (text);
-  the_echo_area->point = input_line_point;
-  display_update_one_window (the_echo_area);
-  display_cursor_at_point (active_window);
-  fflush (stdout);
-  pause_or_input ();
-  echo_area_initialize_node ();
-}

Property changes on: head/contrib/texinfo/info/echo-area.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/termdep.h
===================================================================
--- head/contrib/texinfo/info/termdep.h	(revision 276550)
+++ head/contrib/texinfo/info/termdep.h	(nonexistent)
@@ -1,59 +0,0 @@
-/* termdep.h -- system things that terminal.c depends on.
-   $Id: termdep.h,v 1.2 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1993, 1996, 1997, 1998, 2001, 2002 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#ifndef INFO_TERMDEP_H
-#define INFO_TERMDEP_H
-
-/* NeXT supplies <termios.h> but it is broken.  Probably Autoconf should
-   have a separate test, but anyway ... */
-#ifdef NeXT
-#undef HAVE_TERMIOS_H
-#endif
-
-#ifdef HAVE_TERMIOS_H
-#  include <termios.h>
-#else
-#  if defined (HAVE_TERMIO_H)
-#    include <termio.h>
-#    if defined (HAVE_SYS_PTEM_H)
-#      if defined (M_UNIX) || !defined (M_XENIX)
-#        include <sys/stream.h>
-#        include <sys/ptem.h>
-#        undef TIOCGETC
-#      else /* M_XENIX */
-#        define tchars tc
-#      endif /* M_XENIX */
-#    endif /* HAVE_SYS_PTEM_H */
-#  else /* !HAVE_TERMIO_H */
-#    include <sgtty.h>
-#  endif /* !HAVE_TERMIO_H */
-#endif /* !HAVE_TERMIOS_H */
-
-#ifdef GWINSZ_IN_SYS_IOCTL
-#  include <sys/ioctl.h>
-#endif
-
-#ifdef HAVE_SYS_TTOLD_H
-#  include <sys/ttold.h>
-#endif /* HAVE_SYS_TTOLD_H */
-
-#endif /* not INFO_TERMDEP_H */

Property changes on: head/contrib/texinfo/info/termdep.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/dribble.h
===================================================================
--- head/contrib/texinfo/info/dribble.h	(revision 276550)
+++ head/contrib/texinfo/info/dribble.h	(nonexistent)
@@ -1,41 +0,0 @@
-/* dribble.h -- Functions and vars declared in dribble.c. */
-
-/* This file is part of GNU Info, a program for reading online documentation
-   stored in Info format.
-
-   Copyright (C) 1993, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#if !defined (_DRIBBLE_H_)
-#define _DRIBBLE_H_
-
-/* When non-zero, it is a stream to write all input characters to for the
-   duration of this info session. */
-extern FILE *info_dribble_file;
-
-/* Open a dribble file named NAME, perhaps closing an already open one.
-   This sets the global variable INFO_DRIBBLE_FILE to the open stream. */
-extern void open_dribble_file (char *name);
-
-/* If there is a dribble file already open, close it. */
-extern void close_dribble_file (void);
-
-/* Write some output to our existing dribble file. */
-extern void dribble (unsigned char byte);
-
-#endif /* !_DRIBBLE_H_ */

Property changes on: head/contrib/texinfo/info/dribble.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/nodemenu.c
===================================================================
--- head/contrib/texinfo/info/nodemenu.c	(revision 276550)
+++ head/contrib/texinfo/info/nodemenu.c	(nonexistent)
@@ -1,347 +0,0 @@
-/* nodemenu.c -- produce a menu of all visited nodes.
-   $Id: nodemenu.c,v 1.5 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1993, 1997, 1998, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-
-NODE * get_visited_nodes (Function *filter_func);
-
-/* Return a line describing the format of a node information line. */
-static const char *
-nodemenu_format_info (void)
-{
-  return (_("\n\
-* Menu:\n\
-  (File)Node                        Lines   Size   Containing File\n\
-  ----------                        -----   ----   ---------------"));
-}
-
-/* Produce a formatted line of information about NODE.  Here is what we want
-   the output listing to look like:
-
-* Menu:
-  (File)Node                        Lines   Size   Containing File
-  ----------                        -----   ----   ---------------
-* (emacs)Buffers::                  48      2230   /usr/gnu/info/emacs/emacs-1
-* (autoconf)Writing configure.in::  123     58789  /usr/gnu/info/autoconf/autoconf-1
-* (dir)Top::                        40      589    /usr/gnu/info/dir
-*/
-static char *
-format_node_info (NODE *node)
-{
-  register int i, len;
-  char *parent, *containing_file;
-  static char *line_buffer = (char *)NULL;
-
-  if (!line_buffer)
-    line_buffer = (char *)xmalloc (1000);
-
-  if (node->parent)
-    {
-      parent = filename_non_directory (node->parent);
-      if (!parent)
-        parent = node->parent;
-    }
-  else
-    parent = (char *)NULL;
-
-  containing_file = node->filename;
-
-  if (!parent && !*containing_file)
-    sprintf (line_buffer, "* %s::", node->nodename);
-  else
-    {
-      char *file = (char *)NULL;
-
-      if (parent)
-        file = parent;
-      else
-        file = filename_non_directory (containing_file);
-
-      if (!file)
-        file = containing_file;
-
-      if (!*file)
-        file = "dir";
-
-      sprintf (line_buffer, "* (%s)%s::", file, node->nodename);
-    }
-
-  len = pad_to (36, line_buffer);
-
-  {
-    int lines = 1;
-
-    for (i = 0; i < node->nodelen; i++)
-      if (node->contents[i] == '\n')
-        lines++;
-
-    sprintf (line_buffer + len, "%d", lines);
-  }
-
-  len = pad_to (44, line_buffer);
-  sprintf (line_buffer + len, "%ld", node->nodelen);
-
-  if (node->filename && *(node->filename))
-    {
-      len = pad_to (51, line_buffer);
-      strcpy (line_buffer + len, node->filename);
-    }
-
-  return xstrdup (line_buffer);
-}
-
-/* Little string comparison routine for qsort (). */
-static int
-compare_strings (const void *entry1, const void *entry2)
-{
-  char **e1 = (char **) entry1;
-  char **e2 = (char **) entry2;
-
-  return (strcasecmp (*e1, *e2));
-}
-
-/* The name of the nodemenu node. */
-static char *nodemenu_nodename = "*Node Menu*";
-
-/* Produce an informative listing of all the visited nodes, and return it
-   in a node.  If FILTER_FUNC is non-null, it is a function which filters
-   which nodes will appear in the listing.  FILTER_FUNC takes an argument
-   of NODE, and returns non-zero if the node should appear in the listing. */
-NODE *
-get_visited_nodes (Function *filter_func)
-{
-  register int i, iw_index;
-  INFO_WINDOW *info_win;
-  NODE *node;
-  char **lines = (char **)NULL;
-  int lines_index = 0, lines_slots = 0;
-
-  if (!info_windows)
-    return ((NODE *)NULL);
-
-  for (iw_index = 0; (info_win = info_windows[iw_index]); iw_index++)
-    {
-      for (i = 0; i < info_win->nodes_index; i++)
-        {
-          node = info_win->nodes[i];
-
-          /* We skip mentioning "*Node Menu*" nodes. */
-          if (internal_info_node_p (node) &&
-              (strcmp (node->nodename, nodemenu_nodename) == 0))
-            continue;
-
-          if (node && (!filter_func || (*filter_func) (node)))
-            {
-              char *line;
-
-              line = format_node_info (node);
-              add_pointer_to_array
-                (line, lines_index, lines, lines_slots, 20, char *);
-            }
-        }
-    }
-
-  /* Sort the array of information lines, if there are any. */
-  if (lines)
-    {
-      register int j, newlen;
-      char **temp;
-
-      qsort (lines, lines_index, sizeof (char *), compare_strings);
-
-      /* Delete duplicates. */
-      for (i = 0, newlen = 1; i < lines_index - 1; i++)
-        {
-	  /* Use FILENAME_CMP here, since the most important piece
-	     of info in each line is the file name of the node.  */
-          if (FILENAME_CMP (lines[i], lines[i + 1]) == 0)
-            {
-              free (lines[i]);
-              lines[i] = (char *)NULL;
-            }
-          else
-            newlen++;
-        }
-
-      /* We have free ()'d and marked all of the duplicate slots.
-         Copy the live slots rather than pruning the dead slots. */
-      temp = (char **)xmalloc ((1 + newlen) * sizeof (char *));
-      for (i = 0, j = 0; i < lines_index; i++)
-        if (lines[i])
-          temp[j++] = lines[i];
-
-      temp[j] = (char *)NULL;
-      free (lines);
-      lines = temp;
-      lines_index = newlen;
-    }
-
-  initialize_message_buffer ();
-
-  printf_to_message_buffer
-    ("%s", replace_in_documentation
-     ((char *) _("Here is the menu of nodes you have recently visited.\n\
-Select one from this menu, or use `\\[history-node]' in another window.\n"), 0),
-     NULL, NULL);
-
-  printf_to_message_buffer ("%s\n", (char *) nodemenu_format_info (),
-      NULL, NULL);
-
-  for (i = 0; (lines != (char **)NULL) && (i < lines_index); i++)
-    {
-      printf_to_message_buffer ("%s\n", lines[i], NULL, NULL);
-      free (lines[i]);
-    }
-
-  if (lines)
-    free (lines);
-
-  node = message_buffer_to_node ();
-  add_gcable_pointer (node->contents);
-  return (node);
-}
-
-DECLARE_INFO_COMMAND (list_visited_nodes,
-   _("Make a window containing a menu of all of the currently visited nodes"))
-{
-  WINDOW *new;
-  NODE *node;
-
-  set_remembered_pagetop_and_point (window);
-
-  /* If a window is visible and showing the buffer list already, re-use it. */
-  for (new = windows; new; new = new->next)
-    {
-      node = new->node;
-
-      if (internal_info_node_p (node) &&
-          (strcmp (node->nodename, nodemenu_nodename) == 0))
-        break;
-    }
-
-  /* If we couldn't find an existing window, try to use the next window
-     in the chain. */
-  if (!new)
-    {
-      if (window->next)
-        new = window->next;
-      /* If there is more than one window, wrap around. */
-      else if (window != windows)
-        new = windows;
-    }
-
-  /* If we still don't have a window, make a new one to contain the list. */
-  if (!new)
-    {
-      WINDOW *old_active;
-
-      old_active = active_window;
-      active_window = window;
-      new = window_make_window ((NODE *)NULL);
-      active_window = old_active;
-    }
-
-  /* If we couldn't make a new window, use this one. */
-  if (!new)
-    new = window;
-
-  /* Lines do not wrap in this window. */
-  new->flags |= W_NoWrap;
-  node = get_visited_nodes ((Function *)NULL);
-  name_internal_node (node, nodemenu_nodename);
-
-#if 0
-  /* Even if this is an internal node, we don't want the window
-     system to treat it specially.  So we turn off the internalness
-     of it here. */
-  /* Why?  We depend on internal_info_node_p returning true, so we must
-     not remove the flag.  Otherwise, the *Node Menu* nodes themselves
-     appear in the node menu.  --Andreas Schwab
-     <schwab@issan.informatik.uni-dortmund.de>.  */
-  node->flags &= ~N_IsInternal;
-#endif
-
-  /* If this window is already showing a node menu, reuse the existing node
-     slot. */
-  {
-    int remember_me = 1;
-
-#if defined (NOTDEF)
-    if (internal_info_node_p (new->node) &&
-        (strcmp (new->node->nodename, nodemenu_nodename) == 0))
-      remember_me = 0;
-#endif /* NOTDEF */
-
-    window_set_node_of_window (new, node);
-
-    if (remember_me)
-      remember_window_and_node (new, node);
-  }
-
-  active_window = new;
-}
-
-DECLARE_INFO_COMMAND (select_visited_node,
-      _("Select a node which has been previously visited in a visible window"))
-{
-  char *line;
-  NODE *node;
-  REFERENCE **menu;
-
-  node = get_visited_nodes ((Function *)NULL);
-
-  menu = info_menu_of_node (node);
-  free (node);
-
-  line =
-    info_read_completing_in_echo_area (window,
-        (char *) _("Select visited node: "), menu);
-
-  window = active_window;
-
-  /* User aborts, just quit. */
-  if (!line)
-    {
-      info_abort_key (window, 0, 0);
-      info_free_references (menu);
-      return;
-    }
-
-  if (*line)
-    {
-      REFERENCE *entry;
-
-      /* Find the selected label in the references. */
-      entry = info_get_labeled_reference (line, menu);
-
-      if (!entry)
-        info_error ((char *) _("The reference disappeared! (%s)."), line, NULL);
-      else
-        info_select_reference (window, entry);
-    }
-
-  free (line);
-  info_free_references (menu);
-
-  if (!info_error_was_printed)
-    window_clear_echo_area ();
-}

Property changes on: head/contrib/texinfo/info/nodemenu.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/echo-area.h
===================================================================
--- head/contrib/texinfo/info/echo-area.h	(revision 276550)
+++ head/contrib/texinfo/info/echo-area.h	(nonexistent)
@@ -1,85 +0,0 @@
-/* echo-area.h -- Functions used in reading information from the echo area.
-   $Id: echo-area.h,v 1.4 2004/08/07 22:03:08 karl Exp $
-
-   This file is part of GNU Info, a program for reading online documentation
-   stored in Info format.
-
-   Copyright (C) 1993, 1997, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#ifndef INFO_ECHO_AREA_H
-#define INFO_ECHO_AREA_H
-
-#define EA_MAX_INPUT 256
-
-extern int echo_area_is_active, info_aborted_echo_area;
-
-/* Non-zero means that the last command executed while reading input
-   killed some text. */
-extern int echo_area_last_command_was_kill;
-
-extern void inform_in_echo_area (const char *message);
-extern void echo_area_inform_of_deleted_window (WINDOW *window);
-extern void echo_area_prep_read (void);
-extern VFunction *ea_last_executed_command;
-extern char * info_read_completing_internal (WINDOW *window, char *prompt,
-    REFERENCE **completions, int force);
-
-/* Read a line of text in the echo area.  Return a malloc ()'ed string,
-   or NULL if the user aborted out of this read.  WINDOW is the currently
-   active window, so that we can restore it when we need to.  PROMPT, if
-   non-null, is a prompt to print before reading the line. */
-extern char *info_read_in_echo_area (WINDOW *window, char *prompt);
-
-/* Read a line in the echo area with completion over COMPLETIONS.
-   Takes arguments of WINDOW, PROMPT, and COMPLETIONS, a REFERENCE **. */
-char *info_read_completing_in_echo_area (WINDOW *window,
-    char *prompt, REFERENCE **completions);
-
-/* Read a line in the echo area allowing completion over COMPLETIONS, but
-   not requiring it.  Takes arguments of WINDOW, PROMPT, and COMPLETIONS,
-   a REFERENCE **. */
-extern char *info_read_maybe_completing (WINDOW *window,
-    char *prompt, REFERENCE **completions);
-
-extern void ea_insert (WINDOW *window, int count, unsigned char key);
-extern void ea_quoted_insert (WINDOW *window, int count, unsigned char key);
-extern void ea_beg_of_line (WINDOW *window, int count, unsigned char key);
-extern void ea_backward (WINDOW *window, int count, unsigned char key);
-extern void ea_delete (WINDOW *window, int count, unsigned char key);
-extern void ea_end_of_line (WINDOW *window, int count, unsigned char key);
-extern void ea_forward (WINDOW *window, int count, unsigned char key);
-extern void ea_abort (WINDOW *window, int count, unsigned char key);
-extern void ea_rubout (WINDOW *window, int count, unsigned char key);
-extern void ea_complete (WINDOW *window, int count, unsigned char key);
-extern void ea_newline (WINDOW *window, int count, unsigned char key);
-extern void ea_kill_line (WINDOW *window, int count, unsigned char key);
-extern void ea_backward_kill_line (WINDOW *window, int count, unsigned char key);
-extern void ea_transpose_chars (WINDOW *window, int count, unsigned char key);
-extern void ea_yank (WINDOW *window, int count, unsigned char key);
-extern void ea_tab_insert (WINDOW *window, int count, unsigned char key);
-extern void ea_possible_completions (WINDOW *window, int count, unsigned char key);
-extern void ea_backward_word (WINDOW *window, int count, unsigned char key);
-extern void ea_kill_word (WINDOW *window, int count, unsigned char key);
-extern void ea_forward_word (WINDOW *window, int count, unsigned char key);
-extern void ea_yank_pop (WINDOW *window, int count, unsigned char key);
-extern void ea_backward_kill_word (WINDOW *window, int count, unsigned char key);
-extern void ea_scroll_completions_window (WINDOW *window, int count,
-    unsigned char key);
-
-#endif /* not INFO_ECHO_AREA_H */

Property changes on: head/contrib/texinfo/info/echo-area.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/terminal.c
===================================================================
--- head/contrib/texinfo/info/terminal.c	(revision 276550)
+++ head/contrib/texinfo/info/terminal.c	(nonexistent)
@@ -1,873 +0,0 @@
-/* terminal.c -- how to handle the physical terminal for Info.
-   $Id: terminal.c,v 1.3 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1997, 1998,
-   1999, 2001, 2002, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Originally written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-#include "terminal.h"
-#include "termdep.h"
-
-#include <sys/types.h>
-#include <signal.h>
-
-/* The Unix termcap interface code. */
-#ifdef HAVE_NCURSES_TERMCAP_H
-#include <ncurses/termcap.h>
-#else
-#ifdef HAVE_TERMCAP_H
-#include <termcap.h>
-#else
-/* On Solaris2, sys/types.h #includes sys/reg.h, which #defines PC.
-   Unfortunately, PC is a global variable used by the termcap library. */
-#undef PC
-
-/* Termcap requires these variables, whether we access them or not. */
-char *BC, *UP;
-char PC;      /* Pad character */
-short ospeed; /* Terminal output baud rate */
-extern int tgetnum (), tgetflag (), tgetent ();
-extern char *tgetstr (), *tgoto ();
-extern void tputs ();
-#endif /* not HAVE_TERMCAP_H */
-#endif /* not HAVE_NCURSES_TERMCAP_H */
-
-/* Function "hooks".  If you make one of these point to a function, that
-   function is called when appropriate instead of its namesake.  Your
-   function is called with exactly the same arguments that were passed
-   to the namesake function. */
-VFunction *terminal_begin_inverse_hook = (VFunction *)NULL;
-VFunction *terminal_end_inverse_hook = (VFunction *)NULL;
-VFunction *terminal_prep_terminal_hook = (VFunction *)NULL;
-VFunction *terminal_unprep_terminal_hook = (VFunction *)NULL;
-VFunction *terminal_up_line_hook = (VFunction *)NULL;
-VFunction *terminal_down_line_hook = (VFunction *)NULL;
-VFunction *terminal_clear_screen_hook = (VFunction *)NULL;
-VFunction *terminal_clear_to_eol_hook = (VFunction *)NULL;
-VFunction *terminal_get_screen_size_hook = (VFunction *)NULL;
-VFunction *terminal_goto_xy_hook = (VFunction *)NULL;
-VFunction *terminal_initialize_terminal_hook = (VFunction *)NULL;
-VFunction *terminal_new_terminal_hook = (VFunction *)NULL;
-VFunction *terminal_put_text_hook = (VFunction *)NULL;
-VFunction *terminal_ring_bell_hook = (VFunction *)NULL;
-VFunction *terminal_write_chars_hook = (VFunction *)NULL;
-VFunction *terminal_scroll_terminal_hook = (VFunction *)NULL;
-
-/* **************************************************************** */
-/*                                                                  */
-/*                      Terminal and Termcap                        */
-/*                                                                  */
-/* **************************************************************** */
-
-/* A buffer which holds onto the current terminal description, and a pointer
-   used to float within it.  And the name of the terminal.  */
-static char *term_buffer = NULL;
-static char *term_string_buffer = NULL;
-static char *term_name;
-
-/* Some strings to control terminal actions.  These are output by tputs (). */
-static char *term_goto, *term_clreol, *term_cr, *term_clrpag;
-static char *term_begin_use, *term_end_use;
-static char *term_AL, *term_DL, *term_al, *term_dl;
-
-static char *term_keypad_on, *term_keypad_off;
-
-/* How to go up a line. */
-static char *term_up;
-
-/* How to go down a line. */
-static char *term_dn;
-
-/* An audible bell, if the terminal can be made to make noise. */
-static char *audible_bell;
-
-/* A visible bell, if the terminal can be made to flash the screen. */
-static char *visible_bell;
-
-/* The string to write to turn on the meta key, if this term has one. */
-static char *term_mm;
-
-/* The string to turn on inverse mode, if this term has one. */
-static char *term_invbeg;
-
-/* The string to turn off inverse mode, if this term has one. */
-static char *term_invend;
-
-/* Although I can't find any documentation that says this is supposed to
-   return its argument, all the code I've looked at (termutils, less)
-   does so, so fine.  */
-static int
-output_character_function (int c)
-{
-  putc (c, stdout);
-  return c;
-}
-
-/* Macro to send STRING to the terminal. */
-#define send_to_terminal(string) \
-  do { \
-    if (string) \
-      tputs (string, 1, output_character_function); \
-     } while (0)
-
-/* Tell the terminal that we will be doing cursor addressable motion.  */
-static void
-terminal_begin_using_terminal (void)
-{
-  RETSIGTYPE (*sigsave) (int signum);
-
-  if (term_keypad_on)
-      send_to_terminal (term_keypad_on);
-  
-  if (!term_begin_use || !*term_begin_use)
-    return;
-
-#ifdef SIGWINCH
-  sigsave = signal (SIGWINCH, SIG_IGN); 
-#endif
-
-  send_to_terminal (term_begin_use);
-  fflush (stdout);
-  if (STREQ (term_name, "sun-cmd"))
-    /* Without this fflush and sleep, running info in a shelltool or
-       cmdtool (TERM=sun-cmd) with scrollbars loses -- the scrollbars are
-       not restored properly.
-       From: strube@physik3.gwdg.de (Hans Werner Strube).  */
-    sleep (1);
-
-#ifdef SIGWINCH
-  signal (SIGWINCH, sigsave);
-#endif
-}
-
-/* Tell the terminal that we will not be doing any more cursor
-   addressable motion. */
-static void
-terminal_end_using_terminal (void)
-{
-  RETSIGTYPE (*sigsave) (int signum);
-
-  if (term_keypad_off)
-      send_to_terminal (term_keypad_off);
-  
-  if (!term_end_use || !*term_end_use)
-    return;
-
-#ifdef SIGWINCH
-  sigsave = signal (SIGWINCH, SIG_IGN);
-#endif
-
-  send_to_terminal (term_end_use);
-  fflush (stdout);
-  if (STREQ (term_name, "sun-cmd"))
-    /* See comments at other sleep.  */
-    sleep (1);
-
-#ifdef SIGWINCH
-  signal (SIGWINCH, sigsave);
-#endif
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                   Necessary Terminal Functions                   */
-/*                                                                  */
-/* **************************************************************** */
-
-/* The functions and variables on this page implement the user visible
-   portion of the terminal interface. */
-
-/* The width and height of the terminal. */
-int screenwidth, screenheight;
-
-/* Non-zero means this terminal can't really do anything. */
-int terminal_is_dumb_p = 0;
-
-/* Non-zero means that this terminal has a meta key. */
-int terminal_has_meta_p = 0;
-
-/* Non-zero means that this terminal can produce a visible bell. */
-int terminal_has_visible_bell_p = 0;
-
-/* Non-zero means to use that visible bell if at all possible. */
-int terminal_use_visible_bell_p = 0;
-
-/* Non-zero means that the terminal can do scrolling. */
-int terminal_can_scroll = 0;
-
-/* The key sequences output by the arrow keys, if this terminal has any. */
-char *term_ku = NULL;
-char *term_kd = NULL;
-char *term_kr = NULL;
-char *term_kl = NULL;
-char *term_kP = NULL;   /* page-up */
-char *term_kN = NULL;   /* page-down */
-char *term_kh = NULL;	/* home */
-char *term_ke = NULL;	/* end */
-char *term_kD = NULL;	/* delete */
-char *term_ki = NULL;	/* ins */
-char *term_kx = NULL;	/* del */
-
-/* Move the cursor to the terminal location of X and Y. */
-void
-terminal_goto_xy (int x, int y)
-{
-  if (terminal_goto_xy_hook)
-    (*terminal_goto_xy_hook) (x, y);
-  else
-    {
-      if (term_goto)
-        tputs (tgoto (term_goto, x, y), 1, output_character_function);
-    }
-}
-
-/* Print STRING to the terminal at the current position. */
-void
-terminal_put_text (char *string)
-{
-  if (terminal_put_text_hook)
-    (*terminal_put_text_hook) (string);
-  else
-    {
-      printf ("%s", string);
-    }
-}
-
-/* Print NCHARS from STRING to the terminal at the current position. */
-void
-terminal_write_chars (char *string, int nchars)
-{
-  if (terminal_write_chars_hook)
-    (*terminal_write_chars_hook) (string, nchars);
-  else
-    {
-      if (nchars)
-        fwrite (string, 1, nchars, stdout);
-    }
-}
-
-/* Clear from the current position of the cursor to the end of the line. */
-void
-terminal_clear_to_eol (void)
-{
-  if (terminal_clear_to_eol_hook)
-    (*terminal_clear_to_eol_hook) ();
-  else
-    {
-      send_to_terminal (term_clreol);
-    }
-}
-
-/* Clear the entire terminal screen. */
-void
-terminal_clear_screen (void)
-{
-  if (terminal_clear_screen_hook)
-    (*terminal_clear_screen_hook) ();
-  else
-    {
-      send_to_terminal (term_clrpag);
-    }
-}
-
-/* Move the cursor up one line. */
-void
-terminal_up_line (void)
-{
-  if (terminal_up_line_hook)
-    (*terminal_up_line_hook) ();
-  else
-    {
-      send_to_terminal (term_up);
-    }
-}
-
-/* Move the cursor down one line. */
-void
-terminal_down_line (void)
-{
-  if (terminal_down_line_hook)
-    (*terminal_down_line_hook) ();
-  else
-    {
-      send_to_terminal (term_dn);
-    }
-}
-
-/* Turn on reverse video if possible. */
-void
-terminal_begin_inverse (void)
-{
-  if (terminal_begin_inverse_hook)
-    (*terminal_begin_inverse_hook) ();
-  else
-    {
-      send_to_terminal (term_invbeg);
-    }
-}
-
-/* Turn off reverse video if possible. */
-void
-terminal_end_inverse (void)
-{
-  if (terminal_end_inverse_hook)
-    (*terminal_end_inverse_hook) ();
-  else
-    {
-      send_to_terminal (term_invend);
-    }
-}
-
-/* Ring the terminal bell.  The bell is run visibly if it both has one and
-   terminal_use_visible_bell_p is non-zero. */
-void
-terminal_ring_bell (void)
-{
-  if (terminal_ring_bell_hook)
-    (*terminal_ring_bell_hook) ();
-  else
-    {
-      if (terminal_has_visible_bell_p && terminal_use_visible_bell_p)
-        send_to_terminal (visible_bell);
-      else
-        send_to_terminal (audible_bell);
-    }
-}
-
-/* At the line START, delete COUNT lines from the terminal display. */
-static void
-terminal_delete_lines (int start, int count)
-{
-  int lines;
-
-  /* Normalize arguments. */
-  if (start < 0)
-    start = 0;
-
-  lines = screenheight - start;
-  terminal_goto_xy (0, start);
-  if (term_DL)
-    tputs (tgoto (term_DL, 0, count), lines, output_character_function);
-  else
-    {
-      while (count--)
-        tputs (term_dl, lines, output_character_function);
-    }
-
-  fflush (stdout);
-}
-
-/* At the line START, insert COUNT lines in the terminal display. */
-static void
-terminal_insert_lines (int start, int count)
-{
-  int lines;
-
-  /* Normalize arguments. */
-  if (start < 0)
-    start = 0;
-
-  lines = screenheight - start;
-  terminal_goto_xy (0, start);
-
-  if (term_AL)
-    tputs (tgoto (term_AL, 0, count), lines, output_character_function);
-  else
-    {
-      while (count--)
-        tputs (term_al, lines, output_character_function);
-    }
-
-  fflush (stdout);
-}
-
-/* Scroll an area of the terminal, starting with the region from START
-   to END, AMOUNT lines.  If AMOUNT is negative, the lines are scrolled
-   towards the top of the screen, else they are scrolled towards the
-   bottom of the screen. */
-void
-terminal_scroll_terminal (int start, int end, int amount)
-{
-  if (!terminal_can_scroll)
-    return;
-
-  /* Any scrolling at all? */
-  if (amount == 0)
-    return;
-
-  if (terminal_scroll_terminal_hook)
-    (*terminal_scroll_terminal_hook) (start, end, amount);
-  else
-    {
-      /* If we are scrolling down, delete AMOUNT lines at END.  Then insert
-         AMOUNT lines at START. */
-      if (amount > 0)
-        {
-          terminal_delete_lines (end, amount);
-          terminal_insert_lines (start, amount);
-        }
-
-      /* If we are scrolling up, delete AMOUNT lines before START.  This
-         actually does the upwards scroll.  Then, insert AMOUNT lines
-         after the already scrolled region (i.e., END - AMOUNT). */
-      if (amount < 0)
-        {
-          int abs_amount = -amount;
-          terminal_delete_lines (start - abs_amount, abs_amount);
-          terminal_insert_lines (end - abs_amount, abs_amount);
-        }
-    }
-}
-
-/* Re-initialize the terminal considering that the TERM/TERMCAP variable
-   has changed. */
-void
-terminal_new_terminal (char *terminal_name)
-{
-  if (terminal_new_terminal_hook)
-    (*terminal_new_terminal_hook) (terminal_name);
-  else
-    {
-      terminal_initialize_terminal (terminal_name);
-    }
-}
-
-/* Set the global variables SCREENWIDTH and SCREENHEIGHT. */
-void
-terminal_get_screen_size (void)
-{
-  if (terminal_get_screen_size_hook)
-    (*terminal_get_screen_size_hook) ();
-  else
-    {
-      screenwidth = screenheight = 0;
-
-#if defined (TIOCGWINSZ)
-      {
-        struct winsize window_size;
-
-        if (ioctl (fileno (stdout), TIOCGWINSZ, &window_size) == 0)
-          {
-            screenwidth = (int) window_size.ws_col;
-            screenheight = (int) window_size.ws_row;
-          }
-      }
-#endif                          /* TIOCGWINSZ */
-
-      /* Environment variable COLUMNS overrides setting of "co". */
-      if (screenwidth <= 0)
-        {
-          char *sw = getenv ("COLUMNS");
-
-          if (sw)
-            screenwidth = atoi (sw);
-
-          if (screenwidth <= 0)
-            screenwidth = tgetnum ("co");
-        }
-
-      /* Environment variable LINES overrides setting of "li". */
-      if (screenheight <= 0)
-        {
-          char *sh = getenv ("LINES");
-
-          if (sh)
-            screenheight = atoi (sh);
-
-          if (screenheight <= 0)
-            screenheight = tgetnum ("li");
-        }
-
-      /* If all else fails, default to 80x24 terminal. */
-      if (screenwidth <= 0)
-        screenwidth = 80;
-
-      if (screenheight <= 0)
-        screenheight = 24;
-    }
-}
-
-/* Initialize the terminal which is known as TERMINAL_NAME.  If this
-   terminal doesn't have cursor addressability, `terminal_is_dumb_p'
-   becomes nonzero.  The variables SCREENHEIGHT and SCREENWIDTH are set
-   to the dimensions that this terminal actually has.  The variable
-   TERMINAL_HAS_META_P becomes nonzero if this terminal supports a Meta
-   key.  Finally, the terminal screen is cleared. */
-void
-terminal_initialize_terminal (char *terminal_name)
-{
-  char *buffer;
-
-  terminal_is_dumb_p = 0;
-
-  if (terminal_initialize_terminal_hook)
-    {
-      (*terminal_initialize_terminal_hook) (terminal_name);
-      return;
-    }
-
-  term_name = terminal_name ? terminal_name : getenv ("TERM");
-  if (!term_name)
-    term_name = "dumb";
-
-  if (!term_string_buffer)
-    term_string_buffer = xmalloc (2048);
-
-  if (!term_buffer)
-    term_buffer = xmalloc (2048);
-
-  buffer = term_string_buffer;
-
-  term_clrpag = term_cr = term_clreol = NULL;
-
-  /* HP-UX 11.x returns 0 for OK --jeff.hull@state.co.us.  */
-  if (tgetent (term_buffer, term_name) < 0)
-    {
-      terminal_is_dumb_p = 1;
-      screenwidth = 80;
-      screenheight = 24;
-      term_cr = "\r";
-      term_up = term_dn = audible_bell = visible_bell = NULL;
-      term_ku = term_kd = term_kl = term_kr = NULL;
-      term_kP = term_kN = NULL;
-      term_kh = term_ke = NULL;
-      term_kD = NULL;
-      return;
-    }
-
-  BC = tgetstr ("pc", &buffer);
-  PC = BC ? *BC : 0;
-
-#if defined (HAVE_TERMIOS_H)
-  {
-    struct termios ti;
-    if (tcgetattr (fileno(stdout), &ti) != -1)
-      ospeed = cfgetospeed (&ti);
-    else
-      ospeed = B9600;
-  }
-#else
-# if defined (TIOCGETP)
-  {
-    struct sgttyb sg;
-
-    if (ioctl (fileno (stdout), TIOCGETP, &sg) != -1)
-      ospeed = sg.sg_ospeed;
-    else
-      ospeed = B9600;
-  }
-# else
-  ospeed = B9600;
-# endif /* !TIOCGETP */
-#endif
-
-  term_cr = tgetstr ("cr", &buffer);
-  term_clreol = tgetstr ("ce", &buffer);
-  term_clrpag = tgetstr ("cl", &buffer);
-  term_goto = tgetstr ("cm", &buffer);
-
-  /* Find out about this terminal's scrolling capability. */
-  term_AL = tgetstr ("AL", &buffer);
-  term_DL = tgetstr ("DL", &buffer);
-  term_al = tgetstr ("al", &buffer);
-  term_dl = tgetstr ("dl", &buffer);
-
-  terminal_can_scroll = ((term_AL || term_al) && (term_DL || term_dl));
-
-  term_invbeg = tgetstr ("mr", &buffer);
-  if (term_invbeg)
-    term_invend = tgetstr ("me", &buffer);
-  else
-    term_invend = NULL;
-
-  if (!term_cr)
-    term_cr =  "\r";
-
-  terminal_get_screen_size ();
-
-  term_up = tgetstr ("up", &buffer);
-  term_dn = tgetstr ("dn", &buffer);
-  visible_bell = tgetstr ("vb", &buffer);
-  terminal_has_visible_bell_p = (visible_bell != NULL);
-  audible_bell = tgetstr ("bl", &buffer);
-  if (!audible_bell)
-    audible_bell = "\007";
-  term_begin_use = tgetstr ("ti", &buffer);
-  term_end_use = tgetstr ("te", &buffer);
-
-  term_keypad_on = tgetstr ("ks", &buffer);
-  term_keypad_off = tgetstr ("ke", &buffer);
-
-  /* Check to see if this terminal has a meta key. */
-  terminal_has_meta_p = (tgetflag ("km") || tgetflag ("MT"));
-  if (terminal_has_meta_p)
-    {
-      term_mm = tgetstr ("mm", &buffer);
-    }
-  else
-    {
-      term_mm = NULL;
-    }
-
-  /* Attempt to find the arrow keys.  */
-  term_ku = tgetstr ("ku", &buffer);
-  term_kd = tgetstr ("kd", &buffer);
-  term_kr = tgetstr ("kr", &buffer);
-  term_kl = tgetstr ("kl", &buffer);
-
-  term_kP = tgetstr ("kP", &buffer);
-  term_kN = tgetstr ("kN", &buffer);
-
-#if defined(INFOKEY)
-  term_kh = tgetstr ("kh", &buffer);
-  term_ke = tgetstr ("@7", &buffer);
-  term_ki = tgetstr ("kI", &buffer);
-  term_kx = tgetstr ("kD", &buffer);
-#endif /* defined(INFOKEY) */
-
-  /* Home and end keys. */
-  term_kh = tgetstr ("kh", &buffer);
-  term_ke = tgetstr ("@7", &buffer);
-
-  term_kD = tgetstr ("kD", &buffer);
-
-  /* If this terminal is not cursor addressable, then it is really dumb. */
-  if (!term_goto)
-    terminal_is_dumb_p = 1;
-}
-
-/* How to read characters from the terminal.  */
-
-#if defined (HAVE_TERMIOS_H)
-struct termios original_termios, ttybuff;
-#else
-#  if defined (HAVE_TERMIO_H)
-/* A buffer containing the terminal mode flags upon entry to info. */
-struct termio original_termio, ttybuff;
-#  else /* !HAVE_TERMIO_H */
-/* Buffers containing the terminal mode flags upon entry to info. */
-int original_tty_flags = 0;
-int original_lmode;
-struct sgttyb ttybuff;
-
-#    if defined(TIOCGETC) && defined(M_XENIX)
-/* SCO 3.2v5.0.2 defines but does not support TIOCGETC.  Gak.  Maybe
-   better fix would be to use Posix termios in preference.  --gildea,
-   1jul99.  */
-#      undef TIOCGETC
-#    endif
-
-#    if defined (TIOCGETC)
-/* A buffer containing the terminal interrupt characters upon entry
-   to Info. */
-struct tchars original_tchars;
-#    endif
-
-#    if defined (TIOCGLTC)
-/* A buffer containing the local terminal mode characters upon entry
-   to Info. */
-struct ltchars original_ltchars;
-#    endif
-#  endif /* !HAVE_TERMIO_H */
-#endif /* !HAVE_TERMIOS_H */
-
-/* Prepare to start using the terminal to read characters singly. */
-void
-terminal_prep_terminal (void)
-{
-  int tty;
-
-  if (terminal_prep_terminal_hook)
-    {
-      (*terminal_prep_terminal_hook) ();
-      return;
-    }
-
-  terminal_begin_using_terminal ();
-
-  tty = fileno (stdin);
-
-#if defined (HAVE_TERMIOS_H)
-  tcgetattr (tty, &original_termios);
-  tcgetattr (tty, &ttybuff);
-#else
-#  if defined (HAVE_TERMIO_H)
-  ioctl (tty, TCGETA, &original_termio);
-  ioctl (tty, TCGETA, &ttybuff);
-#  endif
-#endif
-
-#if defined (HAVE_TERMIOS_H) || defined (HAVE_TERMIO_H)
-  ttybuff.c_iflag &= (~ISTRIP & ~INLCR & ~IGNCR & ~ICRNL & ~IXON);
-/* These output flags are not part of POSIX, so only use them if they
-   are defined.  */
-#ifdef ONLCR
-  ttybuff.c_oflag &= ~ONLCR ;
-#endif
-#ifdef OCRNL
-  ttybuff.c_oflag &= ~OCRNL;
-#endif
-  ttybuff.c_lflag &= (~ICANON & ~ECHO);
-
-  ttybuff.c_cc[VMIN] = 1;
-  ttybuff.c_cc[VTIME] = 0;
-
-  if (ttybuff.c_cc[VINTR] == '\177')
-    ttybuff.c_cc[VINTR] = -1;
-
-  if (ttybuff.c_cc[VQUIT] == '\177')
-    ttybuff.c_cc[VQUIT] = -1;
-
-#ifdef VLNEXT
-  if (ttybuff.c_cc[VLNEXT] == '\026')
-    ttybuff.c_cc[VLNEXT] = -1;
-#endif /* VLNEXT */
-#endif /* TERMIOS or TERMIO */
-
-/* cf. emacs/src/sysdep.c for being sure output is on. */
-#if defined (HAVE_TERMIOS_H)
-  /* linux kernel 2.2.x needs a TCOFF followed by a TCOON to turn output
-     back on if the user presses ^S at the very beginning; just a TCOON
-     doesn't work.  --Kevin Ryde <user42@zip.com.au>, 16jun2000.  */
-  tcsetattr (tty, TCSANOW, &ttybuff);
-#  ifdef TCOON
-  tcflow (tty, TCOOFF);
-  tcflow (tty, TCOON);
-#  endif
-#else
-#  if defined (HAVE_TERMIO_H)
-  ioctl (tty, TCSETA, &ttybuff);
-#    ifdef TCXONC
-  ioctl (tty, TCXONC, 1);
-#    endif
-#  endif
-#endif
-
-#if !defined (HAVE_TERMIOS_H) && !defined (HAVE_TERMIO_H)
-  ioctl (tty, TIOCGETP, &ttybuff);
-
-  if (!original_tty_flags)
-    original_tty_flags = ttybuff.sg_flags;
-
-  /* Make this terminal pass 8 bits around while we are using it. */
-#  if defined (PASS8)
-  ttybuff.sg_flags |= PASS8;
-#  endif /* PASS8 */
-
-#  if defined (TIOCLGET) && defined (LPASS8)
-  {
-    int flags;
-    ioctl (tty, TIOCLGET, &flags);
-    original_lmode = flags;
-    flags |= LPASS8;
-    ioctl (tty, TIOCLSET, &flags);
-  }
-#  endif /* TIOCLGET && LPASS8 */
-
-#  if defined (TIOCGETC)
-  {
-    struct tchars temp;
-
-    ioctl (tty, TIOCGETC, &original_tchars);
-    temp = original_tchars;
-
-    /* C-s and C-q. */
-    temp.t_startc = temp.t_stopc = -1;
-
-    /* Often set to C-d. */
-    temp.t_eofc = -1;
-
-    /* If the a quit or interrupt character conflicts with one of our
-       commands, then make it go away. */
-    if (temp.t_intrc == '\177')
-      temp.t_intrc = -1;
-
-    if (temp.t_quitc == '\177')
-      temp.t_quitc = -1;
-
-    ioctl (tty, TIOCSETC, &temp);
-  }
-#  endif /* TIOCGETC */
-
-#  if defined (TIOCGLTC)
-  {
-    struct ltchars temp;
-
-    ioctl (tty, TIOCGLTC, &original_ltchars);
-    temp = original_ltchars;
-
-    /* Make the interrupt keys go away.  Just enough to make people happy. */
-    temp.t_lnextc = -1;         /* C-v. */
-    temp.t_dsuspc = -1;         /* C-y. */
-    temp.t_flushc = -1;         /* C-o. */
-    ioctl (tty, TIOCSLTC, &temp);
-  }
-#  endif /* TIOCGLTC */
-
-  ttybuff.sg_flags &= ~ECHO;
-  ttybuff.sg_flags |= CBREAK;
-  ioctl (tty, TIOCSETN, &ttybuff);
-#endif /* !HAVE_TERMIOS_H && !HAVE_TERMIO_H */
-}
-
-/* Restore the tty settings back to what they were before we started using
-   this terminal. */
-void
-terminal_unprep_terminal (void)
-{
-  int tty;
-
-  if (terminal_unprep_terminal_hook)
-    {
-      (*terminal_unprep_terminal_hook) ();
-      return;
-    }
-
-  tty = fileno (stdin);
-
-#if defined (HAVE_TERMIOS_H)
-  tcsetattr (tty, TCSANOW, &original_termios);
-#else
-#  if defined (HAVE_TERMIO_H)
-  ioctl (tty, TCSETA, &original_termio);
-#  else /* !HAVE_TERMIO_H */
-  ioctl (tty, TIOCGETP, &ttybuff);
-  ttybuff.sg_flags = original_tty_flags;
-  ioctl (tty, TIOCSETN, &ttybuff);
-
-#  if defined (TIOCGETC)
-  ioctl (tty, TIOCSETC, &original_tchars);
-#  endif /* TIOCGETC */
-
-#  if defined (TIOCGLTC)
-  ioctl (tty, TIOCSLTC, &original_ltchars);
-#  endif /* TIOCGLTC */
-
-#  if defined (TIOCLGET) && defined (LPASS8)
-  ioctl (tty, TIOCLSET, &original_lmode);
-#  endif /* TIOCLGET && LPASS8 */
-
-#  endif /* !HAVE_TERMIO_H */
-#endif /* !HAVE_TERMIOS_H */
-  terminal_end_using_terminal ();
-}
-
-#ifdef __MSDOS__
-# include "pcterm.c"
-#endif

Property changes on: head/contrib/texinfo/info/terminal.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/doc.c
===================================================================
--- head/contrib/texinfo/info/doc.c	(revision 276550)
+++ head/contrib/texinfo/info/doc.c	(nonexistent)
@@ -1,146 +0,0 @@
-/* doc.c -- Generated structure containing function names and doc strings.
-
-   This file was automatically made from various source files with the
-   command `..//info/makedoc'.  DO NOT EDIT THIS FILE, only `..//info/makedoc.c'.
-   Source files groveled to make this file include:
-
-	./session.c
-	./echo-area.c
-	./infodoc.c
-	./m-x.c
-	./indices.c
-	./nodemenu.c
-	./footnotes.c
-	./variables.c
-
-   An entry in the array FUNCTION_DOC_ARRAY is made for each command
-   found in the above files; each entry consists of a function pointer,
-   a string which is the user-visible name of the function,
-   and a string which documents its purpose. */
-
-#include "info.h"
-#include "funs.h"
-
-FUNCTION_DOC function_doc_array[] = {
-
-/* Commands found in "./session.c". */
-   { (VFunction *)info_next_line, "next-line", (FUNCTION_KEYSEQ *)0, "Move down to the next line" },
-   { (VFunction *)info_prev_line, "prev-line", (FUNCTION_KEYSEQ *)0, "Move up to the previous line" },
-   { (VFunction *)info_end_of_line, "end-of-line", (FUNCTION_KEYSEQ *)0, "Move to the end of the line" },
-   { (VFunction *)info_beginning_of_line, "beginning-of-line", (FUNCTION_KEYSEQ *)0, "Move to the start of the line" },
-   { (VFunction *)info_forward_char, "forward-char", (FUNCTION_KEYSEQ *)0, "Move forward a character" },
-   { (VFunction *)info_backward_char, "backward-char", (FUNCTION_KEYSEQ *)0, "Move backward a character" },
-   { (VFunction *)info_forward_word, "forward-word", (FUNCTION_KEYSEQ *)0, "Move forward a word" },
-   { (VFunction *)info_backward_word, "backward-word", (FUNCTION_KEYSEQ *)0, "Move backward a word" },
-   { (VFunction *)info_global_next_node, "global-next-node", (FUNCTION_KEYSEQ *)0, "Move forwards or down through node structure" },
-   { (VFunction *)info_global_prev_node, "global-prev-node", (FUNCTION_KEYSEQ *)0, "Move backwards or up through node structure" },
-   { (VFunction *)info_scroll_forward, "scroll-forward", (FUNCTION_KEYSEQ *)0, "Scroll forward in this window" },
-   { (VFunction *)info_scroll_forward_set_window, "scroll-forward-set-window", (FUNCTION_KEYSEQ *)0, "Scroll forward in this window and set default window size" },
-   { (VFunction *)info_scroll_forward_page_only, "scroll-forward-page-only", (FUNCTION_KEYSEQ *)0, "Scroll forward in this window staying within node" },
-   { (VFunction *)info_scroll_forward_page_only_set_window, "scroll-forward-page-only-set-window", (FUNCTION_KEYSEQ *)0, "Scroll forward in this window staying within node and set default window size" },
-   { (VFunction *)info_scroll_backward, "scroll-backward", (FUNCTION_KEYSEQ *)0, "Scroll backward in this window" },
-   { (VFunction *)info_scroll_backward_set_window, "scroll-backward-set-window", (FUNCTION_KEYSEQ *)0, "Scroll backward in this window and set default window size" },
-   { (VFunction *)info_scroll_backward_page_only, "scroll-backward-page-only", (FUNCTION_KEYSEQ *)0, "Scroll backward in this window staying within node" },
-   { (VFunction *)info_scroll_backward_page_only_set_window, "scroll-backward-page-only-set-window", (FUNCTION_KEYSEQ *)0, "Scroll backward in this window staying within node and set default window size" },
-   { (VFunction *)info_beginning_of_node, "beginning-of-node", (FUNCTION_KEYSEQ *)0, "Move to the start of this node" },
-   { (VFunction *)info_end_of_node, "end-of-node", (FUNCTION_KEYSEQ *)0, "Move to the end of this node" },
-   { (VFunction *)info_down_line, "down-line", (FUNCTION_KEYSEQ *)0, "Scroll down by lines" },
-   { (VFunction *)info_up_line, "up-line", (FUNCTION_KEYSEQ *)0, "Scroll up by lines" },
-   { (VFunction *)info_scroll_half_screen_down, "scroll-half-screen-down", (FUNCTION_KEYSEQ *)0, "Scroll down by half screen size" },
-   { (VFunction *)info_scroll_half_screen_up, "scroll-half-screen-up", (FUNCTION_KEYSEQ *)0, "Scroll up by half screen size" },
-   { (VFunction *)info_next_window, "next-window", (FUNCTION_KEYSEQ *)0, "Select the next window" },
-   { (VFunction *)info_prev_window, "prev-window", (FUNCTION_KEYSEQ *)0, "Select the previous window" },
-   { (VFunction *)info_split_window, "split-window", (FUNCTION_KEYSEQ *)0, "Split the current window" },
-   { (VFunction *)info_delete_window, "delete-window", (FUNCTION_KEYSEQ *)0, "Delete the current window" },
-   { (VFunction *)info_keep_one_window, "keep-one-window", (FUNCTION_KEYSEQ *)0, "Delete all other windows" },
-   { (VFunction *)info_scroll_other_window, "scroll-other-window", (FUNCTION_KEYSEQ *)0, "Scroll the other window" },
-   { (VFunction *)info_scroll_other_window_backward, "scroll-other-window-backward", (FUNCTION_KEYSEQ *)0, "Scroll the other window backward" },
-   { (VFunction *)info_grow_window, "grow-window", (FUNCTION_KEYSEQ *)0, "Grow (or shrink) this window" },
-   { (VFunction *)info_tile_windows, "tile-windows", (FUNCTION_KEYSEQ *)0, "Divide the available screen space among the visible windows" },
-   { (VFunction *)info_toggle_wrap, "toggle-wrap", (FUNCTION_KEYSEQ *)0, "Toggle the state of line wrapping in the current window" },
-   { (VFunction *)info_next_node, "next-node", (FUNCTION_KEYSEQ *)0, "Select the Next node" },
-   { (VFunction *)info_prev_node, "prev-node", (FUNCTION_KEYSEQ *)0, "Select the Prev node" },
-   { (VFunction *)info_up_node, "up-node", (FUNCTION_KEYSEQ *)0, "Select the Up node" },
-   { (VFunction *)info_last_node, "last-node", (FUNCTION_KEYSEQ *)0, "Select the last node in this file" },
-   { (VFunction *)info_first_node, "first-node", (FUNCTION_KEYSEQ *)0, "Select the first node in this file" },
-   { (VFunction *)info_last_menu_item, "last-menu-item", (FUNCTION_KEYSEQ *)0, "Select the last item in this node's menu" },
-   { (VFunction *)info_menu_digit, "menu-digit", (FUNCTION_KEYSEQ *)0, "Select this menu item" },
-   { (VFunction *)info_menu_item, "menu-item", (FUNCTION_KEYSEQ *)0, "Read a menu item and select its node" },
-   { (VFunction *)info_xref_item, "xref-item", (FUNCTION_KEYSEQ *)0, "Read a footnote or cross reference and select its node" },
-   { (VFunction *)info_find_menu, "find-menu", (FUNCTION_KEYSEQ *)0, "Move to the start of this node's menu" },
-   { (VFunction *)info_visit_menu, "visit-menu", (FUNCTION_KEYSEQ *)0, "Visit as many menu items at once as possible" },
-   { (VFunction *)info_goto_node, "goto-node", (FUNCTION_KEYSEQ *)0, "Read a node name and select it" },
-   { (VFunction *)info_menu_sequence, "menu-sequence", (FUNCTION_KEYSEQ *)0, "Read a list of menus starting from dir and follow them" },
-   { (VFunction *)info_goto_invocation_node, "goto-invocation-node", (FUNCTION_KEYSEQ *)0, "Find the node describing program invocation" },
-   { (VFunction *)info_man, "man", (FUNCTION_KEYSEQ *)0, "Read a manpage reference and select it" },
-   { (VFunction *)info_top_node, "top-node", (FUNCTION_KEYSEQ *)0, "Select the node `Top' in this file" },
-   { (VFunction *)info_dir_node, "dir-node", (FUNCTION_KEYSEQ *)0, "Select the node `(dir)'" },
-   { (VFunction *)info_history_node, "history-node", (FUNCTION_KEYSEQ *)0, "Select the most recently selected node" },
-   { (VFunction *)info_kill_node, "kill-node", (FUNCTION_KEYSEQ *)0, "Kill this node" },
-   { (VFunction *)info_view_file, "view-file", (FUNCTION_KEYSEQ *)0, "Read the name of a file and select it" },
-   { (VFunction *)info_print_node, "print-node", (FUNCTION_KEYSEQ *)0, "Pipe the contents of this node through INFO_PRINT_COMMAND" },
-   { (VFunction *)info_search_case_sensitively, "search-case-sensitively", (FUNCTION_KEYSEQ *)0, "Read a string and search for it case-sensitively" },
-   { (VFunction *)info_search, "search", (FUNCTION_KEYSEQ *)0, "Read a string and search for it" },
-   { (VFunction *)info_search_backward, "search-backward", (FUNCTION_KEYSEQ *)0, "Read a string and search backward for it" },
-   { (VFunction *)info_search_next, "search-next", (FUNCTION_KEYSEQ *)0, "Repeat last search in the same direction" },
-   { (VFunction *)info_search_previous, "search-previous", (FUNCTION_KEYSEQ *)0, "Repeat last search in the reverse direction" },
-   { (VFunction *)isearch_forward, "isearch-forward", (FUNCTION_KEYSEQ *)0, "Search interactively for a string as you type it" },
-   { (VFunction *)isearch_backward, "isearch-backward", (FUNCTION_KEYSEQ *)0, "Search interactively for a string as you type it" },
-   { (VFunction *)info_move_to_prev_xref, "move-to-prev-xref", (FUNCTION_KEYSEQ *)0, "Move to the previous cross reference" },
-   { (VFunction *)info_move_to_next_xref, "move-to-next-xref", (FUNCTION_KEYSEQ *)0, "Move to the next cross reference" },
-   { (VFunction *)info_select_reference_this_line, "select-reference-this-line", (FUNCTION_KEYSEQ *)0, "Select reference or menu item appearing on this line" },
-   { (VFunction *)info_abort_key, "abort-key", (FUNCTION_KEYSEQ *)0, "Cancel current operation" },
-   { (VFunction *)info_move_to_window_line, "move-to-window-line", (FUNCTION_KEYSEQ *)0, "Move the cursor to a specific line of the window" },
-   { (VFunction *)info_redraw_display, "redraw-display", (FUNCTION_KEYSEQ *)0, "Redraw the display" },
-   { (VFunction *)info_quit, "quit", (FUNCTION_KEYSEQ *)0, "Quit using Info" },
-   { (VFunction *)info_do_lowercase_version, "do-lowercase-version", (FUNCTION_KEYSEQ *)0, "Run command bound to this key's lowercase variant" },
-   { (VFunction *)info_add_digit_to_numeric_arg, "add-digit-to-numeric-arg", (FUNCTION_KEYSEQ *)0, "Add this digit to the current numeric argument" },
-   { (VFunction *)info_universal_argument, "universal-argument", (FUNCTION_KEYSEQ *)0, "Start (or multiply by 4) the current numeric argument" },
-   { (VFunction *)info_numeric_arg_digit_loop, "numeric-arg-digit-loop", (FUNCTION_KEYSEQ *)0, "Internally used by \\[universal-argument]" },
-/* Commands found in "./echo-area.c". */
-   { (VFunction *)ea_forward, "echo-area-forward", (FUNCTION_KEYSEQ *)0, "Move forward a character" },
-   { (VFunction *)ea_backward, "echo-area-backward", (FUNCTION_KEYSEQ *)0, "Move backward a character" },
-   { (VFunction *)ea_beg_of_line, "echo-area-beg-of-line", (FUNCTION_KEYSEQ *)0, "Move to the start of this line" },
-   { (VFunction *)ea_end_of_line, "echo-area-end-of-line", (FUNCTION_KEYSEQ *)0, "Move to the end of this line" },
-   { (VFunction *)ea_forward_word, "echo-area-forward-word", (FUNCTION_KEYSEQ *)0, "Move forward a word" },
-   { (VFunction *)ea_backward_word, "echo-area-backward-word", (FUNCTION_KEYSEQ *)0, "Move backward a word" },
-   { (VFunction *)ea_delete, "echo-area-delete", (FUNCTION_KEYSEQ *)0, "Delete the character under the cursor" },
-   { (VFunction *)ea_rubout, "echo-area-rubout", (FUNCTION_KEYSEQ *)0, "Delete the character behind the cursor" },
-   { (VFunction *)ea_abort, "echo-area-abort", (FUNCTION_KEYSEQ *)0, "Cancel or quit operation" },
-   { (VFunction *)ea_newline, "echo-area-newline", (FUNCTION_KEYSEQ *)0, "Accept (or force completion of) this line" },
-   { (VFunction *)ea_quoted_insert, "echo-area-quoted-insert", (FUNCTION_KEYSEQ *)0, "Insert next character verbatim" },
-   { (VFunction *)ea_insert, "echo-area-insert", (FUNCTION_KEYSEQ *)0, "Insert this character" },
-   { (VFunction *)ea_tab_insert, "echo-area-tab-insert", (FUNCTION_KEYSEQ *)0, "Insert a TAB character" },
-   { (VFunction *)ea_transpose_chars, "echo-area-transpose-chars", (FUNCTION_KEYSEQ *)0, "Transpose characters at point" },
-   { (VFunction *)ea_yank, "echo-area-yank", (FUNCTION_KEYSEQ *)0, "Yank back the contents of the last kill" },
-   { (VFunction *)ea_yank_pop, "echo-area-yank-pop", (FUNCTION_KEYSEQ *)0, "Yank back a previous kill" },
-   { (VFunction *)ea_kill_line, "echo-area-kill-line", (FUNCTION_KEYSEQ *)0, "Kill to the end of the line" },
-   { (VFunction *)ea_backward_kill_line, "echo-area-backward-kill-line", (FUNCTION_KEYSEQ *)0, "Kill to the beginning of the line" },
-   { (VFunction *)ea_kill_word, "echo-area-kill-word", (FUNCTION_KEYSEQ *)0, "Kill the word following the cursor" },
-   { (VFunction *)ea_backward_kill_word, "echo-area-backward-kill-word", (FUNCTION_KEYSEQ *)0, "Kill the word preceding the cursor" },
-   { (VFunction *)ea_possible_completions, "echo-area-possible-completions", (FUNCTION_KEYSEQ *)0, "List possible completions" },
-   { (VFunction *)ea_complete, "echo-area-complete", (FUNCTION_KEYSEQ *)0, "Insert completion" },
-   { (VFunction *)ea_scroll_completions_window, "echo-area-scroll-completions-window", (FUNCTION_KEYSEQ *)0, "Scroll the completions window" },
-/* Commands found in "./infodoc.c". */
-   { (VFunction *)info_get_help_window, "get-help-window", (FUNCTION_KEYSEQ *)0, "Display help message" },
-   { (VFunction *)info_get_info_help_node, "get-info-help-node", (FUNCTION_KEYSEQ *)0, "Visit Info node `(info)Help'" },
-   { (VFunction *)describe_key, "describe-key", (FUNCTION_KEYSEQ *)0, "Print documentation for KEY" },
-   { (VFunction *)info_where_is, "where-is", (FUNCTION_KEYSEQ *)0, "Show what to type to execute a given command" },
-/* Commands found in "./m-x.c". */
-   { (VFunction *)describe_command, "describe-command", (FUNCTION_KEYSEQ *)0, "Read the name of an Info command and describe it" },
-   { (VFunction *)info_execute_command, "execute-command", (FUNCTION_KEYSEQ *)0, "Read a command name in the echo area and execute it" },
-   { (VFunction *)set_screen_height, "set-screen-height", (FUNCTION_KEYSEQ *)0, "Set the height of the displayed window" },
-/* Commands found in "./indices.c". */
-   { (VFunction *)info_index_search, "index-search", (FUNCTION_KEYSEQ *)0, "Look up a string in the index for this file" },
-   { (VFunction *)info_next_index_match, "next-index-match", (FUNCTION_KEYSEQ *)0, "Go to the next matching index item from the last `\\[index-search]' command" },
-   { (VFunction *)info_index_apropos, "index-apropos", (FUNCTION_KEYSEQ *)0, "Grovel all known info file's indices for a string and build a menu" },
-/* Commands found in "./nodemenu.c". */
-   { (VFunction *)list_visited_nodes, "list-visited-nodes", (FUNCTION_KEYSEQ *)0, "Make a window containing a menu of all of the currently visited nodes" },
-   { (VFunction *)select_visited_node, "select-visited-node", (FUNCTION_KEYSEQ *)0, "Select a node which has been previously visited in a visible window" },
-/* Commands found in "./footnotes.c". */
-   { (VFunction *)info_show_footnotes, "show-footnotes", (FUNCTION_KEYSEQ *)0, "Show the footnotes associated with this node in another window" },
-/* Commands found in "./variables.c". */
-   { (VFunction *)describe_variable, "describe-variable", (FUNCTION_KEYSEQ *)0, "Explain the use of a variable" },
-   { (VFunction *)set_variable, "set-variable", (FUNCTION_KEYSEQ *)0, "Set the value of an Info variable" },
-   { (VFunction *)NULL, (char *)NULL, (FUNCTION_KEYSEQ *)NULL, (char *)NULL }
-};

Property changes on: head/contrib/texinfo/info/doc.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/terminal.h
===================================================================
--- head/contrib/texinfo/info/terminal.h	(revision 276550)
+++ head/contrib/texinfo/info/terminal.h	(nonexistent)
@@ -1,130 +0,0 @@
-/* terminal.h -- The external interface to terminal I/O.
-   $Id: terminal.h,v 1.3 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1993, 1996, 1997, 2001, 2002, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#if !defined (TERMINAL_H)
-#define TERMINAL_H
-
-#include "info.h"
-
-/* For almost every function externally visible from terminal.c, there is
-   a corresponding "hook" function which can be bound in order to replace
-   the functionality of the one found in terminal.c.  This is how we go
-   about implemented X window display. */
-
-/* The width and height of the terminal. */
-extern int screenwidth, screenheight;
-
-/* Non-zero means this terminal can't really do anything. */
-extern int terminal_is_dumb_p;
-
-/* Non-zero means that this terminal has a meta key. */
-extern int terminal_has_meta_p;
-
-/* Non-zero means that this terminal can produce a visible bell. */
-extern int terminal_has_visible_bell_p;
-
-/* Non-zero means to use that visible bell if at all possible. */
-extern int terminal_use_visible_bell_p;
-
-/* Non-zero means that this terminal can scroll lines up and down. */
-extern int terminal_can_scroll;
-
-/* Initialize the terminal which is known as TERMINAL_NAME.  If this terminal
-   doesn't have cursor addressability, TERMINAL_IS_DUMB_P becomes non-zero.
-   The variables SCREENHEIGHT and SCREENWIDTH are set to the dimensions that
-   this terminal actually has.  The variable TERMINAL_HAS_META_P becomes non-
-   zero if this terminal supports a Meta key. */
-extern void terminal_initialize_terminal (char *terminal_name);
-extern VFunction *terminal_initialize_terminal_hook;
-
-/* Return the current screen width and height in the variables
-   SCREENWIDTH and SCREENHEIGHT. */
-extern void terminal_get_screen_size (void);
-extern VFunction *terminal_get_screen_size_hook;
-
-/* Save and restore tty settings. */
-extern void terminal_prep_terminal (void);
-extern void terminal_unprep_terminal (void);
-
-extern VFunction *terminal_prep_terminal_hook;
-extern VFunction *terminal_unprep_terminal_hook;
-
-/* Re-initialize the terminal to TERMINAL_NAME. */
-extern void terminal_new_terminal (char *terminal_name);
-extern VFunction *terminal_new_terminal_hook;
-
-/* Move the cursor to the terminal location of X and Y. */
-extern void terminal_goto_xy (int x, int y);
-extern VFunction *terminal_goto_xy_hook;
-
-/* Print STRING to the terminal at the current position. */
-extern void terminal_put_text (char *string);
-extern VFunction *terminal_put_text_hook;
-
-/* Print NCHARS from STRING to the terminal at the current position. */
-extern void terminal_write_chars (char *string, int nchars);
-extern VFunction *terminal_write_chars_hook;
-
-/* Clear from the current position of the cursor to the end of the line. */
-extern void terminal_clear_to_eol (void);
-extern VFunction *terminal_clear_to_eol_hook;
-
-/* Clear the entire terminal screen. */
-extern void terminal_clear_screen (void);
-extern VFunction *terminal_clear_screen_hook;
-
-/* Move the cursor up one line. */
-extern void terminal_up_line (void);
-extern VFunction *terminal_up_line_hook;
-
-/* Move the cursor down one line. */
-extern void terminal_down_line (void);
-extern VFunction *terminal_down_line_hook;
-
-/* Turn on reverse video if possible. */
-extern void terminal_begin_inverse (void);
-extern VFunction *terminal_begin_inverse_hook;
-
-/* Turn off reverse video if possible. */
-extern void terminal_end_inverse (void);
-extern VFunction *terminal_end_inverse_hook;
-
-/* Scroll an area of the terminal, starting with the region from START
-   to END, AMOUNT lines.  If AMOUNT is negative, the lines are scrolled
-   towards the top of the screen, else they are scrolled towards the
-   bottom of the screen. */
-extern void terminal_scroll_terminal (int start, int end, int amount);
-extern VFunction *terminal_scroll_terminal_hook;
-
-/* Ring the terminal bell.  The bell is run visibly if it both has one and
-   terminal_use_visible_bell_p is non-zero. */
-extern void terminal_ring_bell (void);
-extern VFunction *terminal_ring_bell_hook;
-
-/* The key sequences output by special keys, if this terminal has any. */
-extern char *term_ku, *term_kd, *term_kr, *term_kl;
-extern char *term_kP, *term_kN;
-extern char *term_ke, *term_kh;
-extern char *term_kx, *term_ki;
-extern char *term_kD;
-
-#endif /* !TERMINAL_H */

Property changes on: head/contrib/texinfo/info/terminal.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/search.h
===================================================================
--- head/contrib/texinfo/info/search.h	(revision 276550)
+++ head/contrib/texinfo/info/search.h	(nonexistent)
@@ -1,75 +0,0 @@
-/* search.h -- Structure used to search large bodies of text, with bounds.
-   $Id: search.h,v 1.3 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-/* The search functions take two arguments:
-
-     1) a string to search for, and
-
-     2) a pointer to a SEARCH_BINDING which contains the buffer, start,
-        and end of the search.
-
-   They return a long, which is the offset from the start of the buffer
-   at which the match was found.  An offset of -1 indicates failure. */
-
-#ifndef INFO_SEARCH_H
-#define INFO_SEARCH_H
-
-typedef struct {
-  char *buffer;                 /* The buffer of text to search. */
-  long start;                   /* Offset of the start of the search. */
-  long end;                     /* Offset of the end of the searh. */
-  int flags;                    /* Flags controlling the type of search. */
-} SEARCH_BINDING;
-
-#define S_FoldCase      0x01    /* Set means fold case in searches. */
-#define S_SkipDest      0x02    /* Set means return pointing after the dest. */
-
-SEARCH_BINDING *make_binding (char *buffer, long int start, long int end);
-SEARCH_BINDING *copy_binding (SEARCH_BINDING *binding);
-extern long search_forward (char *string, SEARCH_BINDING *binding);
-extern long search_backward (char *input_string, SEARCH_BINDING *binding);
-extern long search (char *string, SEARCH_BINDING *binding);
-extern int looking_at (char *string, SEARCH_BINDING *binding);
-
-/* Note that STRING_IN_LINE () always returns the offset of the 1st character
-   after the string. */
-extern int string_in_line (char *string, char *line);
-
-/* Function names that start with "skip" are passed a string, and return
-   an offset from the start of that string.  Function names that start
-   with "find" are passed a SEARCH_BINDING, and return an absolute position
-   marker of the item being searched for.  "Find" functions return a value
-   of -1 if the item being looked for couldn't be found. */
-extern int skip_whitespace (char *string);
-extern int skip_non_whitespace (char *string);
-extern int skip_whitespace_and_newlines (char *string);
-extern int skip_line (char *string);
-extern int skip_node_characters (char *string, int newlines_okay);
-extern int skip_node_separator (char *body);
-
-#define DONT_SKIP_NEWLINES 0
-#define SKIP_NEWLINES 1
-
-extern long find_node_separator (SEARCH_BINDING *binding);
-extern long find_tags_table (SEARCH_BINDING *binding);
-extern long find_node_in_binding (char *nodename, SEARCH_BINDING *binding);
-
-#endif /* not INFO_SEARCH_H */

Property changes on: head/contrib/texinfo/info/search.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/search.c
===================================================================
--- head/contrib/texinfo/info/search.c	(revision 276550)
+++ head/contrib/texinfo/info/search.c	(nonexistent)
@@ -1,497 +0,0 @@
-/* search.c -- searching large bodies of text.
-   $Id: search.c,v 1.3 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-
-#include "search.h"
-#include "nodes.h"
-
-/* The search functions take two arguments:
-
-     1) a string to search for, and
-
-     2) a pointer to a SEARCH_BINDING which contains the buffer, start,
-        and end of the search.
-
-   They return a long, which is the offset from the start of the buffer
-   at which the match was found.  An offset of -1 indicates failure. */
-
-/* A function which makes a binding with buffer and bounds. */
-SEARCH_BINDING *
-make_binding (char *buffer, long int start, long int end)
-{
-  SEARCH_BINDING *binding;
-
-  binding = (SEARCH_BINDING *)xmalloc (sizeof (SEARCH_BINDING));
-  binding->buffer = buffer;
-  binding->start = start;
-  binding->end = end;
-  binding->flags = 0;
-
-  return (binding);
-}
-
-/* Make a copy of BINDING without duplicating the data. */
-SEARCH_BINDING *
-copy_binding (SEARCH_BINDING *binding)
-{
-  SEARCH_BINDING *copy;
-
-  copy = make_binding (binding->buffer, binding->start, binding->end);
-  copy->flags = binding->flags;
-  return (copy);
-}
-
-
-/* **************************************************************** */
-/*                                                                  */
-/*                 The Actual Searching Functions                   */
-/*                                                                  */
-/* **************************************************************** */
-
-/* Search forwards or backwards for the text delimited by BINDING.
-   The search is forwards if BINDING->start is greater than BINDING->end. */
-long
-search (char *string, SEARCH_BINDING *binding)
-{
-  long result;
-
-  /* If the search is backwards, then search backwards, otherwise forwards. */
-  if (binding->start > binding->end)
-    result = search_backward (string, binding);
-  else
-    result = search_forward (string, binding);
-
-  return (result);
-}
-
-/* Search forwards for STRING through the text delimited in BINDING. */
-long
-search_forward (char *string, SEARCH_BINDING *binding)
-{
-  register int c, i, len;
-  register char *buff, *end;
-  char *alternate = (char *)NULL;
-
-  len = strlen (string);
-
-  /* We match characters in the search buffer against STRING and ALTERNATE.
-     ALTERNATE is a case reversed version of STRING; this is cheaper than
-     case folding each character before comparison.   Alternate is only
-     used if the case folding bit is turned on in the passed BINDING. */
-
-  if (binding->flags & S_FoldCase)
-    {
-      alternate = xstrdup (string);
-
-      for (i = 0; i < len; i++)
-        {
-          if (islower (alternate[i]))
-            alternate[i] = toupper (alternate[i]);
-          else if (isupper (alternate[i]))
-            alternate[i] = tolower (alternate[i]);
-        }
-    }
-
-  buff = binding->buffer + binding->start;
-  end = binding->buffer + binding->end + 1;
-
-  while (buff < (end - len))
-    {
-      for (i = 0; i < len; i++)
-        {
-          c = buff[i];
-
-          if ((c != string[i]) && (!alternate || c != alternate[i]))
-            break;
-        }
-
-      if (!string[i])
-        {
-          if (alternate)
-            free (alternate);
-          if (binding->flags & S_SkipDest)
-            buff += len;
-          return ((long) (buff - binding->buffer));
-        }
-
-      buff++;
-    }
-
-  if (alternate)
-    free (alternate);
-
-  return ((long) -1);
-}
-
-/* Search for STRING backwards through the text delimited in BINDING. */
-long
-search_backward (char *input_string, SEARCH_BINDING *binding)
-{
-  register int c, i, len;
-  register char *buff, *end;
-  char *string;
-  char *alternate = (char *)NULL;
-
-  len = strlen (input_string);
-
-  /* Reverse the characters in the search string. */
-  string = (char *)xmalloc (1 + len);
-  for (c = 0, i = len - 1; input_string[c]; c++, i--)
-    string[i] = input_string[c];
-
-  string[c] = '\0';
-
-  /* We match characters in the search buffer against STRING and ALTERNATE.
-     ALTERNATE is a case reversed version of STRING; this is cheaper than
-     case folding each character before comparison.   ALTERNATE is only
-     used if the case folding bit is turned on in the passed BINDING. */
-
-  if (binding->flags & S_FoldCase)
-    {
-      alternate = xstrdup (string);
-
-      for (i = 0; i < len; i++)
-        {
-          if (islower (alternate[i]))
-            alternate[i] = toupper (alternate[i]);
-          else if (isupper (alternate[i]))
-            alternate[i] = tolower (alternate[i]);
-        }
-    }
-
-  buff = binding->buffer + binding->start - 1;
-  end = binding->buffer + binding->end;
-
-  while (buff > (end + len))
-    {
-      for (i = 0; i < len; i++)
-        {
-          c = *(buff - i);
-
-          if (c != string[i] && (!alternate || c != alternate[i]))
-            break;
-        }
-
-      if (!string[i])
-        {
-          free (string);
-          if (alternate)
-            free (alternate);
-
-          if (binding->flags & S_SkipDest)
-            buff -= len;
-          return ((long) (1 + (buff - binding->buffer)));
-        }
-
-      buff--;
-    }
-
-  free (string);
-  if (alternate)
-    free (alternate);
-
-  return ((long) -1);
-}
-
-/* Find STRING in LINE, returning the offset of the end of the string.
-   Return an offset of -1 if STRING does not appear in LINE.  The search
-   is bound by the end of the line (i.e., either NEWLINE or 0). */
-int
-string_in_line (char *string, char *line)
-{
-  register int end;
-  SEARCH_BINDING binding;
-
-  /* Find the end of the line. */
-  for (end = 0; line[end] && line[end] != '\n'; end++);
-
-  /* Search for STRING within these confines. */
-  binding.buffer = line;
-  binding.start = 0;
-  binding.end = end;
-  binding.flags = S_FoldCase | S_SkipDest;
-
-  return (search_forward (string, &binding));
-}
-
-/* Return non-zero if STRING is the first text to appear at BINDING. */
-int
-looking_at (char *string, SEARCH_BINDING *binding)
-{
-  long search_end;
-
-  search_end = search (string, binding);
-
-  /* If the string was not found, SEARCH_END is -1.  If the string was found,
-     but not right away, SEARCH_END is != binding->start.  Otherwise, the
-     string was found at binding->start. */
-  return (search_end == binding->start);
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                    Small String Searches                         */
-/*                                                                  */
-/* **************************************************************** */
-
-/* Function names that start with "skip" are passed a string, and return
-   an offset from the start of that string.  Function names that start
-   with "find" are passed a SEARCH_BINDING, and return an absolute position
-   marker of the item being searched for.  "Find" functions return a value
-   of -1 if the item being looked for couldn't be found. */
-
-/* Return the index of the first non-whitespace character in STRING. */
-int
-skip_whitespace (char *string)
-{
-  register int i;
-
-  for (i = 0; string && whitespace (string[i]); i++);
-  return (i);
-}
-
-/* Return the index of the first non-whitespace or newline character in
-   STRING. */
-int
-skip_whitespace_and_newlines (char *string)
-{
-  register int i;
-
-  for (i = 0; string && whitespace_or_newline (string[i]); i++);
-  return (i);
-}
-
-/* Return the index of the first whitespace character in STRING. */
-int
-skip_non_whitespace (char *string)
-{
-  register int i;
-
-  for (i = 0; string && string[i] && !whitespace (string[i]); i++);
-  return (i);
-}
-
-/* Return the index of the first non-node character in STRING.  Note that
-   this function contains quite a bit of hair to ignore periods in some
-   special cases.  This is because we here at GNU ship some info files which
-   contain nodenames that contain periods.  No such nodename can start with
-   a period, or continue with whitespace, newline, or ')' immediately following
-   the period.  If second argument NEWLINES_OKAY is non-zero, newlines should
-   be skipped while parsing out the nodename specification. */
-int
-skip_node_characters (char *string, int newlines_okay)
-{
-  register int c, i = 0;
-  int paren_seen = 0;
-  int paren = 0;
-
-  /* Handle special case.  This is when another function has parsed out the
-     filename component of the node name, and we just want to parse out the
-     nodename proper.  In that case, a period at the start of the nodename
-     indicates an empty nodename. */
-  if (string && *string == '.')
-    return (0);
-
-  if (string && *string == '(')
-    {
-      paren++;
-      paren_seen++;
-      i++;
-    }
-
-  for (; string && (c = string[i]); i++)
-    {
-      if (paren)
-        {
-          if (c == '(')
-            paren++;
-          else if (c == ')')
-            paren--;
-
-          continue;
-        }
-      
-      /* If the character following the close paren is a space or period,
-         then this node name has no more characters associated with it. */
-      if (c == '\t' ||
-          c == ','  ||
-          c == INFO_TAGSEP ||
-          ((!newlines_okay) && (c == '\n')) ||
-          ((paren_seen && string[i - 1] == ')') &&
-           (c == ' ' || c == '.')) ||
-          (c == '.' &&
-           (
-#if 0
-/* This test causes a node name ending in a period, like `This.', not to
-   be found.  The trailing . is stripped.  This occurs in the jargon
-   file (`I see no X here.' is a node name).  */
-           (!string[i + 1]) ||
-#endif
-            (whitespace_or_newline (string[i + 1])) ||
-            (string[i + 1] == ')'))))
-        break;
-    }
-  return (i);
-}
-
-
-/* **************************************************************** */
-/*                                                                  */
-/*                   Searching FILE_BUFFER's                        */
-/*                                                                  */
-/* **************************************************************** */
-
-/* Return the absolute position of the first occurence of a node separator in
-   BINDING-buffer.  The search starts at BINDING->start.  Return -1 if no node
-   separator was found. */
-long
-find_node_separator (SEARCH_BINDING *binding)
-{
-  register long i;
-  char *body;
-
-  body = binding->buffer;
-
-  /* A node is started by [^L]^_[^L]\n.  That is to say, the C-l's are
-     optional, but the DELETE and NEWLINE are not.  This separator holds
-     true for all separated elements in an Info file, including the tags
-     table (if present) and the indirect tags table (if present). */
-  for (i = binding->start; i < binding->end - 1; i++)
-    if (((body[i] == INFO_FF && body[i + 1] == INFO_COOKIE) &&
-         (body[i + 2] == '\n' ||
-          (body[i + 2] == INFO_FF && body[i + 3] == '\n'))) ||
-        ((body[i] == INFO_COOKIE) &&
-         (body[i + 1] == '\n' ||
-          (body[i + 1] == INFO_FF && body[i + 2] == '\n'))))
-      return (i);
-  return (-1);
-}
-
-/* Return the length of the node separator characters that BODY is
-   currently pointing at. */
-int
-skip_node_separator (char *body)
-{
-  register int i;
-
-  i = 0;
-
-  if (body[i] == INFO_FF)
-    i++;
-
-  if (body[i++] != INFO_COOKIE)
-    return (0);
-
-  if (body[i] == INFO_FF)
-    i++;
-
-  if (body[i++] != '\n')
-    return (0);
-
-  return (i);
-}
-
-/* Return the number of characters from STRING to the start of
-   the next line. */
-int
-skip_line (char *string)
-{
-  register int i;
-
-  for (i = 0; string && string[i] && string[i] != '\n'; i++);
-
-  if (string[i] == '\n')
-    i++;
-
-  return (i);
-}
-
-/* Return the absolute position of the beginning of a tags table in this
-   binding starting the search at binding->start. */
-long
-find_tags_table (SEARCH_BINDING *binding)
-{
-  SEARCH_BINDING tmp_search;
-  long position;
-
-  tmp_search.buffer = binding->buffer;
-  tmp_search.start = binding->start;
-  tmp_search.end = binding->end;
-  tmp_search.flags = S_FoldCase;
-
-  while ((position = find_node_separator (&tmp_search)) != -1 )
-    {
-      tmp_search.start = position;
-      tmp_search.start += skip_node_separator (tmp_search.buffer
-          + tmp_search.start);
-
-      if (looking_at (TAGS_TABLE_BEG_LABEL, &tmp_search))
-        return (position);
-    }
-  return (-1);
-}
-
-/* Return the absolute position of the node named NODENAME in BINDING.
-   This is a brute force search, and we wish to avoid it when possible.
-   This function is called when a tag (indirect or otherwise) doesn't
-   really point to the right node.  It returns the absolute position of
-   the separator preceding the node. */
-long
-find_node_in_binding (char *nodename, SEARCH_BINDING *binding)
-{
-  long position;
-  int offset, namelen;
-  SEARCH_BINDING tmp_search;
-
-  namelen = strlen (nodename);
-
-  tmp_search.buffer = binding->buffer;
-  tmp_search.start = binding->start;
-  tmp_search.end = binding->end;
-  tmp_search.flags = 0;
-
-  while ((position = find_node_separator (&tmp_search)) != -1)
-    {
-      tmp_search.start = position;
-      tmp_search.start += skip_node_separator
-        (tmp_search.buffer + tmp_search.start);
-
-      offset = string_in_line
-        (INFO_NODE_LABEL, tmp_search.buffer + tmp_search.start);
-
-      if (offset == -1)
-        continue;
-
-      tmp_search.start += offset;
-      tmp_search.start += skip_whitespace (tmp_search.buffer + tmp_search.start);
-      offset = skip_node_characters
-        (tmp_search.buffer + tmp_search.start, DONT_SKIP_NEWLINES);
-
-      /* Notice that this is an exact match.  You cannot grovel through
-         the buffer with this function looking for random nodes. */
-       if ((offset == namelen) &&
-           (tmp_search.buffer[tmp_search.start] == nodename[0]) &&
-           (strncmp (tmp_search.buffer + tmp_search.start, nodename, offset) == 0))
-         return (position);
-    }
-  return (-1);
-}

Property changes on: head/contrib/texinfo/info/search.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/doc.h
===================================================================
--- head/contrib/texinfo/info/doc.h	(revision 276550)
+++ head/contrib/texinfo/info/doc.h	(nonexistent)
@@ -1,103 +0,0 @@
-/* doc.h -- Structures associating function pointers with documentation.
-   $Id: doc.h,v 1.3 2004/04/11 17:56:45 karl Exp $
-
-   Copyright (C) 1993, 2001, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#if !defined (DOC_H)
-#define DOC_H
-
-#include "info.h" /* for NAMED_FUNCTIONS, VFunction, etc.  */
-
-#if defined (INFOKEY)
-/* For each function, we keep track of the first defined key sequence
-   which invokes that function, for each different map.  This is so that
-   the dynamic documentation generation in infodoc.c (a) doesn't have to
-   search through copious KEYMAP_ENTRYs, and, more importantly, (b) the
-   user and programmer can choose the preferred key sequence that is
-   printed for any given function -- it's just the first one that
-   appears in the user's infokey file or the default keymaps in
-   infomap.c.
-
-   Each FUNCTION_DOC has a linked list of FUNCTION_KEYSEQ structs
-   hanging off it, which are created on startup when the user and/or
-   default keymaps are being parsed.  */
-typedef struct function_keyseq
-{
-  struct function_keyseq *next;
-  struct keymap_entry *map;
-  char *keyseq;
-} FUNCTION_KEYSEQ;
-
-#endif /* INFOKEY */
-
-
-/* An array of FUNCTION_DOC structures is defined in doc.c, which is
-   automagically generated by the makedoc utility, whose job is to scan
-   through the source files for command function declarations and
-   compile a list of all the ones it finds.  This saves tedious
-   housekeeping and avoids errors of omission.  */
-typedef struct
-{
-  VFunction *func;
-#if defined (NAMED_FUNCTIONS)
-  char *func_name;
-#endif /* NAMED_FUNCTIONS */
-#if defined (INFOKEY)
-  FUNCTION_KEYSEQ *keys;
-#endif /* INFOKEY */
-   char *doc;
-} FUNCTION_DOC;
-
-extern FUNCTION_DOC function_doc_array[];
-
-/* Under the old key-binding system, an info command is specified by
-   the pointer to its function.  Under the new INFOKEY binding system, 
-   it is specified by a pointer to the command's FUNCTION_DOC structure,
-   defined in doc.c, from which the pointer to the function can be
-   easily divined using the InfoFunction() extractor.  */
-#if defined(INFOKEY)
-typedef FUNCTION_DOC InfoCommand;
-/* The cast to VFunction * prevents pgcc from complaining about
-   dereferencing a void *.  */
-#define InfoFunction(ic) ((ic) ? (ic)->func : (VFunction *) NULL)
-#define InfoCmd(fn) (&function_doc_array[A_##fn])
-#define DocInfoCmd(fd) ((fd) && (fd)->func ? (fd) : NULL)
-#else /* !INFOKEY */
-typedef VFunction InfoCommand;
-#define InfoFunction(vf) ((vf))
-#define InfoCmd(fn) fn
-#define DocInfoCmd(fd) ((fd)->func)
-#endif /* !INFOKEY */
-
-#include "infomap.h" /* for Keymap.  */
-
-#if defined (NAMED_FUNCTIONS)
-extern char *function_name (InfoCommand *cmd);
-extern InfoCommand *named_function (char *name);
-#endif /* NAMED_FUNCTIONS */
-
-extern char *function_documentation (InfoCommand *cmd);
-extern char *key_documentation (char key, Keymap map);
-extern char *pretty_keyname (unsigned char key);
-extern char *pretty_keyseq (char *keyseq);
-extern char *where_is (Keymap map, InfoCommand *cmd);
-extern char *replace_in_documentation (char *string, int help_is_only_window_p);
-extern void dump_map_to_message_buffer (char *prefix, Keymap map);
-
-#endif /* !DOC_H */

Property changes on: head/contrib/texinfo/info/doc.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/tilde.c
===================================================================
--- head/contrib/texinfo/info/tilde.c	(revision 276550)
+++ head/contrib/texinfo/info/tilde.c	(nonexistent)
@@ -1,342 +0,0 @@
-/* tilde.c -- tilde expansion code (~/foo := $HOME/foo).
-   $Id: tilde.c,v 1.3 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1998, 1999,
-   2002, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-/* Include config.h before doing alloca.  */
-#include "info.h"
-#include "tilde.h"
-
-#if defined (TEST) || defined (STATIC_MALLOC)
-static void *xmalloc (), *xrealloc ();
-#endif /* TEST || STATIC_MALLOC */
-
-/* The default value of tilde_additional_prefixes.  This is set to
-   whitespace preceding a tilde so that simple programs which do not
-   perform any word separation get desired behaviour. */
-static char *default_prefixes[] =
-  { " ~", "\t~", (char *)NULL };
-
-/* The default value of tilde_additional_suffixes.  This is set to
-   whitespace or newline so that simple programs which do not
-   perform any word separation get desired behaviour. */
-static char *default_suffixes[] =
-  { " ", "\n", (char *)NULL };
-
-/* If non-null, this contains the address of a function to call if the
-   standard meaning for expanding a tilde fails.  The function is called
-   with the text (sans tilde, as in "foo"), and returns a malloc()'ed string
-   which is the expansion, or a NULL pointer if there is no expansion. */
-CFunction *tilde_expansion_failure_hook = (CFunction *)NULL;
-
-/* When non-null, this is a NULL terminated array of strings which
-   are duplicates for a tilde prefix.  Bash uses this to expand
-   `=~' and `:~'. */
-char **tilde_additional_prefixes = default_prefixes;
-
-/* When non-null, this is a NULL terminated array of strings which match
-   the end of a username, instead of just "/".  Bash sets this to
-   `:' and `=~'. */
-char **tilde_additional_suffixes = default_suffixes;
-
-/* Find the start of a tilde expansion in STRING, and return the index of
-   the tilde which starts the expansion.  Place the length of the text
-   which identified this tilde starter in LEN, excluding the tilde itself. */
-static int
-tilde_find_prefix (char *string, int *len)
-{
-  register int i, j, string_len;
-  register char **prefixes = tilde_additional_prefixes;
-
-  string_len = strlen (string);
-  *len = 0;
-
-  if (!*string || *string == '~')
-    return (0);
-
-  if (prefixes)
-    {
-      for (i = 0; i < string_len; i++)
-        {
-          for (j = 0; prefixes[j]; j++)
-            {
-              if (strncmp (string + i, prefixes[j], strlen (prefixes[j])) == 0)
-                {
-                  *len = strlen (prefixes[j]) - 1;
-                  return (i + *len);
-                }
-            }
-        }
-    }
-  return (string_len);
-}
-
-/* Find the end of a tilde expansion in STRING, and return the index of
-   the character which ends the tilde definition.  */
-static int
-tilde_find_suffix (char *string)
-{
-  register int i, j, string_len;
-  register char **suffixes = tilde_additional_suffixes;
-
-  string_len = strlen (string);
-
-  for (i = 0; i < string_len; i++)
-    {
-      if (IS_SLASH (string[i]) || !string[i])
-        break;
-
-      for (j = 0; suffixes && suffixes[j]; j++)
-        {
-          if (strncmp (string + i, suffixes[j], strlen (suffixes[j])) == 0)
-            return (i);
-        }
-    }
-  return (i);
-}
-
-/* Return a new string which is the result of tilde expanding STRING. */
-char *
-tilde_expand (char *string)
-{
-  char *result;
-  int result_size, result_index;
-
-  result_size = result_index = 0;
-  result = (char *)NULL;
-
-  /* Scan through STRING expanding tildes as we come to them. */
-  while (1)
-    {
-      register int start, end;
-      char *tilde_word, *expansion;
-      int len;
-
-      /* Make START point to the tilde which starts the expansion. */
-      start = tilde_find_prefix (string, &len);
-
-      /* Copy the skipped text into the result. */
-      if ((result_index + start + 1) > result_size)
-        result = (char *)xrealloc (result, 1 + (result_size += (start + 20)));
-
-      strncpy (result + result_index, string, start);
-      result_index += start;
-
-      /* Advance STRING to the starting tilde. */
-      string += start;
-
-      /* Make END be the index of one after the last character of the
-         username. */
-      end = tilde_find_suffix (string);
-
-      /* If both START and END are zero, we are all done. */
-      if (!start && !end)
-        break;
-
-      /* Expand the entire tilde word, and copy it into RESULT. */
-      tilde_word = (char *)xmalloc (1 + end);
-      strncpy (tilde_word, string, end);
-      tilde_word[end] = '\0';
-      string += end;
-
-      expansion = tilde_expand_word (tilde_word);
-      free (tilde_word);
-
-      len = strlen (expansion);
-      if ((result_index + len + 1) > result_size)
-        result = (char *)xrealloc (result, 1 + (result_size += (len + 20)));
-
-      strcpy (result + result_index, expansion);
-      result_index += len;
-      free (expansion);
-    }
-
-  result[result_index] = '\0';
-
-  return (result);
-}
-
-/* Do the work of tilde expansion on FILENAME.  FILENAME starts with a
-   tilde.  If there is no expansion, call tilde_expansion_failure_hook. */
-char *
-tilde_expand_word (char *filename)
-{
-  char *dirname = filename ? xstrdup (filename) : NULL;
-
-  if (dirname && *dirname == '~')
-    {
-      char *temp_name;
-      if (!dirname[1] || IS_SLASH (dirname[1]))
-        {
-          /* Prepend $HOME to the rest of the string. */
-          char *temp_home = getenv ("HOME");
-
-          /* If there is no HOME variable, look up the directory in
-             the password database. */
-          if (!temp_home)
-            {
-              struct passwd *entry;
-
-              entry = (struct passwd *) getpwuid (getuid ());
-              if (entry)
-                temp_home = entry->pw_dir;
-            }
-
-          temp_name = xmalloc (1 + strlen (&dirname[1])
-                               + (temp_home ? strlen (temp_home) : 0));
-          if (temp_home)
-            strcpy (temp_name, temp_home);
-          else
-            temp_name[0] = 0;
-          strcat (temp_name, &dirname[1]);
-          free (dirname);
-          dirname = xstrdup (temp_name);
-          free (temp_name);
-        }
-      else
-        {
-          struct passwd *user_entry;
-          char *username = xmalloc (257);
-          int i, c;
-
-          for (i = 1; (c = dirname[i]); i++)
-            {
-              if (IS_SLASH (c))
-                break;
-              else
-                username[i - 1] = c;
-            }
-          username[i - 1] = 0;
-
-          if (!(user_entry = (struct passwd *) getpwnam (username)))
-            {
-              /* If the calling program has a special syntax for
-                 expanding tildes, and we couldn't find a standard
-                 expansion, then let them try. */
-              if (tilde_expansion_failure_hook)
-                {
-                  char *expansion = (*tilde_expansion_failure_hook) (username);
-
-                  if (expansion)
-                    {
-                      temp_name = xmalloc (1 + strlen (expansion)
-                                           + strlen (&dirname[i])); 
-                      strcpy (temp_name, expansion);
-                      strcat (temp_name, &dirname[i]);
-                      free (expansion);
-                      goto return_name;
-                    }
-                }
-              /* We shouldn't report errors. */
-            }
-          else
-            {
-              temp_name = xmalloc (1 + strlen (user_entry->pw_dir)
-                                   + strlen (&dirname[i])); 
-              strcpy (temp_name, user_entry->pw_dir);
-              strcat (temp_name, &dirname[i]);
-
-            return_name:
-              free (dirname);
-              dirname = xstrdup (temp_name);
-              free (temp_name);
-            }
-
-          endpwent ();
-          free (username);
-        }
-    }
-  return dirname;
-}
-
-
-#if defined (TEST)
-#undef NULL
-#include <stdio.h>
-
-main (argc, argv)
-     int argc;
-     char **argv;
-{
-  char *result, line[512];
-  int done = 0;
-
-  while (!done)
-    {
-      printf ("~expand: ");
-      fflush (stdout);
-
-      if (!gets (line))
-        strcpy (line, "done");
-
-      if ((strcmp (line, "done") == 0) ||
-          (strcmp (line, "quit") == 0) ||
-          (strcmp (line, "exit") == 0))
-        {
-          done = 1;
-          break;
-        }
-
-      result = tilde_expand (line);
-      printf ("  --> %s\n", result);
-      free (result);
-    }
-  xexit (0);
-}
-
-static void memory_error_and_abort ();
-
-static void *
-xmalloc (bytes)
-     int bytes;
-{
-  void *temp = (void *)malloc (bytes);
-
-  if (!temp)
-    memory_error_and_abort ();
-  return (temp);
-}
-
-static void *
-xrealloc (pointer, bytes)
-     void *pointer;
-     int bytes;
-{
-  void *temp;
-
-  if (!pointer)
-    temp = (char *)malloc (bytes);
-  else
-    temp = (char *)realloc (pointer, bytes);
-
-  if (!temp)
-    memory_error_and_abort ();
-
-  return (temp);
-}
-
-static void
-memory_error_and_abort ()
-{
-  fprintf (stderr, _("readline: Out of virtual memory!\n"));
-  abort ();
-}
-#endif /* TEST */
-

Property changes on: head/contrib/texinfo/info/tilde.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/dir.c
===================================================================
--- head/contrib/texinfo/info/dir.c	(revision 276550)
+++ head/contrib/texinfo/info/dir.c	(nonexistent)
@@ -1,290 +0,0 @@
-/* dir.c -- how to build a special "dir" node from "localdir" files.
-   $Id: dir.c,v 1.3 2004/04/11 17:56:45 karl Exp $
-
-   Copyright (C) 1993, 1997, 1998, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-#include "info-utils.h"
-#include "filesys.h"
-#include "tilde.h"
-
-/* The "dir" node can be built from the contents of a file called "dir",
-   with the addition of the menus of every file named in the array
-   dirs_to_add which are found in INFOPATH. */
-
-static void add_menu_to_file_buffer (char *contents, long int size,
-    FILE_BUFFER *fb);
-static void insert_text_into_fb_at_binding (FILE_BUFFER *fb,
-    SEARCH_BINDING *binding, char *text, int textlen);
-void maybe_build_dir_node (char *dirname);
-
-static char *dirs_to_add[] = {
-  "dir", "localdir", (char *)NULL
-};
-
-
-/* Return zero if the file represented in the stat structure TEST has
-   already been seen, nonzero else.  */
-
-typedef struct
-{
-  unsigned long device;
-  unsigned long inode;
-} dir_file_list_entry_type;
-
-static int
-new_dir_file_p (struct stat *test)
-{
-  static unsigned dir_file_list_len = 0;
-  static dir_file_list_entry_type *dir_file_list = NULL;
-  unsigned i;
-  
-  for (i = 0; i < dir_file_list_len; i++)
-    {
-      dir_file_list_entry_type entry;
-      entry = dir_file_list[i];
-      if (entry.device == test->st_dev && entry.inode == test->st_ino)
-        return 0;
-    }
-  
-  dir_file_list_len++;
-  dir_file_list = xrealloc (dir_file_list, 
-                        dir_file_list_len * sizeof (dir_file_list_entry_type));
-  dir_file_list[dir_file_list_len - 1].device = test->st_dev;
-  dir_file_list[dir_file_list_len - 1].inode = test->st_ino;
-  return 1;
-}
-
-
-void
-maybe_build_dir_node (char *dirname)
-{
-  int path_index, update_tags;
-  char *this_dir;
-  FILE_BUFFER *dir_buffer = info_find_file (dirname);
-
-  /* If there is no "dir" in the current info path, we cannot build one
-     from nothing. */
-  if (!dir_buffer)
-    return;
-
-  /* If this directory has already been built, return now. */
-  if (dir_buffer->flags & N_CannotGC)
-    return;
-
-  /* Initialize the list we use to avoid reading the same dir file twice
-     with the dir file just found.  */
-  new_dir_file_p (&dir_buffer->finfo);
-  
-  path_index = update_tags = 0;
-
-  /* Using each element of the path, check for one of the files in
-     DIRS_TO_ADD.  Do not check for "localdir.info.Z" or anything else.
-     Only files explictly named are eligible.  This is a design decision.
-     There can be an info file name "localdir.info" which contains
-     information on the setting up of "localdir" files. */
-  while ((this_dir = extract_colon_unit (infopath, &path_index)))
-    {
-      register int da_index;
-      char *from_file;
-
-      /* Expand a leading tilde if one is present. */
-      if (*this_dir == '~')
-        {
-          char *tilde_expanded_dirname;
-
-          tilde_expanded_dirname = tilde_expand_word (this_dir);
-          if (tilde_expanded_dirname != this_dir)
-            {
-              free (this_dir);
-              this_dir = tilde_expanded_dirname;
-            }
-        }
-
-      /* For every different file named in DIRS_TO_ADD found in the
-         search path, add that file's menu to our "dir" node. */
-      for (da_index = 0; (from_file = dirs_to_add[da_index]); da_index++)
-        {
-          struct stat finfo;
-          int statable;
-          int namelen = strlen (from_file);
-          char *fullpath = xmalloc (3 + strlen (this_dir) + namelen);
-          
-          strcpy (fullpath, this_dir);
-          if (!IS_SLASH (fullpath[strlen (fullpath) - 1]))
-            strcat (fullpath, "/");
-          strcat (fullpath, from_file);
-
-          statable = (stat (fullpath, &finfo) == 0);
-
-          /* Only add this file if we have not seen it before.  */
-          if (statable && S_ISREG (finfo.st_mode) && new_dir_file_p (&finfo))
-            {
-              long filesize;
-	      int compressed;
-              char *contents = filesys_read_info_file (fullpath, &filesize,
-                                                       &finfo, &compressed);
-              if (contents)
-                {
-                  update_tags++;
-                  add_menu_to_file_buffer (contents, filesize, dir_buffer);
-                  free (contents);
-                }
-            }
-
-          free (fullpath);
-        }
-      free (this_dir);
-    }
-
-  if (update_tags)
-    build_tags_and_nodes (dir_buffer);
-
-  /* Flag that the dir buffer has been built. */
-  dir_buffer->flags |= N_CannotGC;
-}
-
-/* Given CONTENTS and FB (a file buffer), add the menu found in CONTENTS
-   to the menu found in FB->contents.  Second argument SIZE is the total
-   size of CONTENTS. */
-static void
-add_menu_to_file_buffer (char *contents, long int size, FILE_BUFFER *fb)
-{
-  SEARCH_BINDING contents_binding, fb_binding;
-  long contents_offset, fb_offset;
-
-  contents_binding.buffer = contents;
-  contents_binding.start = 0;
-  contents_binding.end = size;
-  contents_binding.flags = S_FoldCase | S_SkipDest;
-
-  fb_binding.buffer = fb->contents;
-  fb_binding.start = 0;
-  fb_binding.end = fb->filesize;
-  fb_binding.flags = S_FoldCase | S_SkipDest;
-
-  /* Move to the start of the menus in CONTENTS and FB. */
-  contents_offset = search_forward (INFO_MENU_LABEL, &contents_binding);
-  fb_offset = search_forward (INFO_MENU_LABEL, &fb_binding);
-
-  /* If there is no menu in CONTENTS, quit now. */
-  if (contents_offset == -1)
-    return;
-
-  /* There is a menu in CONTENTS, and contents_offset points to the first
-     character following the menu starter string.  Skip all whitespace
-     and newline characters. */
-  contents_offset += skip_whitespace_and_newlines (contents + contents_offset);
-
-  /* If there is no menu in FB, make one. */
-  if (fb_offset == -1)
-    {
-      /* Find the start of the second node in this file buffer.  If there
-         is only one node, we will be adding the contents to the end of
-         this node. */
-      fb_offset = find_node_separator (&fb_binding);
-
-      /* If not even a single node separator, give up. */
-      if (fb_offset == -1)
-        return;
-
-      fb_binding.start = fb_offset;
-      fb_binding.start +=
-        skip_node_separator (fb_binding.buffer + fb_binding.start);
-
-      /* Try to find the next node separator. */
-      fb_offset = find_node_separator (&fb_binding);
-
-      /* If found one, consider that the start of the menu.  Otherwise, the
-         start of this menu is the end of the file buffer (i.e., fb->size). */
-      if (fb_offset != -1)
-        fb_binding.start = fb_offset;
-      else
-        fb_binding.start = fb_binding.end;
-
-      insert_text_into_fb_at_binding
-        (fb, &fb_binding, INFO_MENU_LABEL, strlen (INFO_MENU_LABEL));
-
-      fb_binding.buffer = fb->contents;
-      fb_binding.start = 0;
-      fb_binding.end = fb->filesize;
-      fb_offset = search_forward (INFO_MENU_LABEL, &fb_binding);
-      if (fb_offset == -1)
-        abort ();
-    }
-
-  /* CONTENTS_OFFSET and FB_OFFSET point to the starts of the menus that
-     appear in their respective buffers.  Add the remainder of CONTENTS
-     to the end of FB's menu. */
-  fb_binding.start = fb_offset;
-  fb_offset = find_node_separator (&fb_binding);
-  if (fb_offset != -1)
-    fb_binding.start = fb_offset;
-  else
-    fb_binding.start = fb_binding.end;
-
-  /* Leave exactly one blank line between directory entries. */
-  {
-    int num_found = 0;
-
-    while ((fb_binding.start > 0) &&
-           (whitespace_or_newline (fb_binding.buffer[fb_binding.start - 1])))
-      {
-        num_found++;
-        fb_binding.start--;
-      }
-
-    /* Optimize if possible. */
-    if (num_found >= 2)
-      {
-        fb_binding.buffer[fb_binding.start++] = '\n';
-        fb_binding.buffer[fb_binding.start++] = '\n';
-      }
-    else
-      {
-        /* Do it the hard way. */
-        insert_text_into_fb_at_binding (fb, &fb_binding, "\n\n", 2);
-        fb_binding.start += 2;
-      }
-  }
-
-  /* Insert the new menu. */
-  insert_text_into_fb_at_binding
-    (fb, &fb_binding, contents + contents_offset, size - contents_offset);
-}
-
-static void
-insert_text_into_fb_at_binding (FILE_BUFFER *fb,
-    SEARCH_BINDING *binding, char *text, int textlen)
-{
-  char *contents;
-  long start, end;
-
-  start = binding->start;
-  end = fb->filesize;
-
-  contents = (char *)xmalloc (fb->filesize + textlen + 1);
-  memcpy (contents, fb->contents, start);
-  memcpy (contents + start, text, textlen);
-  memcpy (contents + start + textlen, fb->contents + start, end - start);
-  free (fb->contents);
-  fb->contents = contents;
-  fb->filesize += textlen;
-  fb->finfo.st_size = fb->filesize;
-}

Property changes on: head/contrib/texinfo/info/dir.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/signals.c
===================================================================
--- head/contrib/texinfo/info/signals.c	(revision 276550)
+++ head/contrib/texinfo/info/signals.c	(nonexistent)
@@ -1,295 +0,0 @@
-/* signals.c -- install and maintain signal handlers.
-   $Id: signals.c,v 1.7 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Originally written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-#include "signals.h"
-
-void initialize_info_signal_handler (void);
-
-/* **************************************************************** */
-/*                                                                  */
-/*              Pretending That We Have POSIX Signals               */
-/*                                                                  */
-/* **************************************************************** */
-
-#if !defined (HAVE_SIGPROCMASK) && defined (HAVE_SIGSETMASK)
-/* Perform OPERATION on NEWSET, perhaps leaving information in OLDSET. */
-static void
-sigprocmask (int operation, int *newset, int *oldset)
-{
-  switch (operation)
-    {
-    case SIG_UNBLOCK:
-      sigsetmask (sigblock (0) & ~(*newset));
-      break;
-
-    case SIG_BLOCK:
-      *oldset = sigblock (*newset);
-      break;
-
-    case SIG_SETMASK:
-      sigsetmask (*newset);
-      break;
-
-    default:
-      abort ();
-    }
-}
-#endif /* !HAVE_SIGPROCMASK && HAVE_SIGSETMASK */
-
-/* **************************************************************** */
-/*                                                                  */
-/*                  Signal Handling for Info                        */
-/*                                                                  */
-/* **************************************************************** */
-
-#if defined (HAVE_SIGACTION) || defined (HAVE_SIGPROCMASK) ||\
-  defined (HAVE_SIGSETMASK)
-static void
-mask_termsig (sigset_t *set)
-{
-# if defined (SIGTSTP)
-  sigaddset (set, SIGTSTP);
-  sigaddset (set, SIGTTOU);
-  sigaddset (set, SIGTTIN);
-# endif
-# if defined (SIGWINCH)
-  sigaddset (set, SIGWINCH);
-# endif
-#if defined (SIGQUIT)
-  sigaddset (set, SIGQUIT);
-#endif
-#if defined (SIGINT)
-  sigaddset (set, SIGINT);
-#endif
-# if defined (SIGUSR1)
-  sigaddset (set, SIGUSR1);
-# endif
-}
-#endif /* HAVE_SIGACTION || HAVE_SIGPROCMASK || HAVE_SIGSETMASK */
-
-static RETSIGTYPE info_signal_proc (int sig);
-#if defined (HAVE_SIGACTION)
-typedef struct sigaction signal_info;
-signal_info info_signal_handler;
-
-static void
-set_termsig (int sig, signal_info *old)
-{
-  sigaction (sig, &info_signal_handler, old);
-}
-
-static void
-restore_termsig (int sig, const signal_info *saved)
-{
-  sigaction (sig, saved, NULL);
-}
-#else /* !HAVE_SIGACTION */
-typedef RETSIGTYPE (*signal_info) ();
-#define set_termsig(sig, old) (void)(*(old) = signal (sig, info_signal_proc))
-#define restore_termsig(sig, saved) (void)signal (sig, *(saved))
-#define info_signal_handler info_signal_proc
-static int term_conf_busy = 0;
-#endif /* !HAVE_SIGACTION */
-
-static signal_info old_TSTP, old_TTOU, old_TTIN;
-static signal_info old_WINCH, old_INT, old_USR1;
-static signal_info old_QUIT;
-
-void
-initialize_info_signal_handler (void)
-{
-#ifdef SA_NOCLDSTOP
-  /* (Based on info from Paul Eggert found in coreutils.)  Don't use
-     HAVE_SIGACTION to decide whether to use the sa_handler, sa_flags,
-     sa_mask members, as some systems (Solaris 7+) don't define them.  Use
-     SA_NOCLDSTOP instead; it's been part of POSIX.1 since day 1 (in 1988).  */
-  info_signal_handler.sa_handler = info_signal_proc;
-  info_signal_handler.sa_flags = 0;
-  mask_termsig (&info_signal_handler.sa_mask);
-#endif /* SA_NOCLDSTOP */
-
-#if defined (SIGTSTP)
-  set_termsig (SIGTSTP, &old_TSTP);
-  set_termsig (SIGTTOU, &old_TTOU);
-  set_termsig (SIGTTIN, &old_TTIN);
-#endif /* SIGTSTP */
-
-#if defined (SIGWINCH)
-  set_termsig (SIGWINCH, &old_WINCH);
-#endif
-
-#if defined (SIGQUIT)
-  set_termsig (SIGQUIT, &old_QUIT);
-#endif
-
-#if defined (SIGINT)
-  set_termsig (SIGINT, &old_INT);
-#endif
-
-#if defined (SIGUSR1)
-  /* Used by DJGPP to simulate SIGTSTP on Ctrl-Z.  */
-  set_termsig (SIGUSR1, &old_USR1);
-#endif
-}
-
-static void
-redisplay_after_signal (void)
-{
-  terminal_clear_screen ();
-  display_clear_display (the_display);
-  window_mark_chain (windows, W_UpdateWindow);
-  display_update_display (windows);
-  display_cursor_at_point (active_window);
-  fflush (stdout);
-}
-
-static void
-reset_info_window_sizes (void)
-{
-  terminal_goto_xy (0, 0);
-  fflush (stdout);
-  terminal_unprep_terminal ();
-  terminal_get_screen_size ();
-  terminal_prep_terminal ();
-  display_initialize_display (screenwidth, screenheight);
-  window_new_screen_size (screenwidth, screenheight);
-  redisplay_after_signal ();
-}
-
-static RETSIGTYPE
-info_signal_proc (int sig)
-{
-  signal_info *old_signal_handler = NULL;
-
-#if !defined (HAVE_SIGACTION)
-  /* best effort: first increment this counter and later block signals */
-  if (term_conf_busy)
-    return;
-  term_conf_busy++;
-#if defined (HAVE_SIGPROCMASK) || defined (HAVE_SIGSETMASK)
-    {
-      sigset_t nvar, ovar;
-      sigemptyset (&nvar);
-      mask_termsig (&nvar);
-      sigprocmask (SIG_BLOCK, &nvar, &ovar);
-    }
-#endif /* HAVE_SIGPROCMASK || HAVE_SIGSETMASK */
-#endif /* !HAVE_SIGACTION */
-  switch (sig)
-    {
-#if defined (SIGTSTP)
-    case SIGTSTP:
-    case SIGTTOU:
-    case SIGTTIN:
-#endif
-#if defined (SIGQUIT)
-    case SIGQUIT:
-#endif
-#if defined (SIGINT)
-    case SIGINT:
-#endif
-      {
-#if defined (SIGTSTP)
-        if (sig == SIGTSTP)
-          old_signal_handler = &old_TSTP;
-        if (sig == SIGTTOU)
-          old_signal_handler = &old_TTOU;
-        if (sig == SIGTTIN)
-          old_signal_handler = &old_TTIN;
-#endif /* SIGTSTP */
-#if defined (SIGQUIT)
-        if (sig == SIGQUIT)
-          old_signal_handler = &old_QUIT;
-#endif /* SIGQUIT */
-#if defined (SIGINT)
-        if (sig == SIGINT)
-          old_signal_handler = &old_INT;
-#endif /* SIGINT */
-
-        /* For stop signals, restore the terminal IO, leave the cursor
-           at the bottom of the window, and stop us. */
-        terminal_goto_xy (0, screenheight - 1);
-        terminal_clear_to_eol ();
-        fflush (stdout);
-        terminal_unprep_terminal ();
-	restore_termsig (sig, old_signal_handler);
-	UNBLOCK_SIGNAL (sig);
-	kill (getpid (), sig);
-
-        /* The program is returning now.  Restore our signal handler,
-           turn on terminal handling, redraw the screen, and place the
-           cursor where it belongs. */
-        terminal_prep_terminal ();
-	set_termsig (sig, old_signal_handler);
-	/* window size might be changed while sleeping */
-	reset_info_window_sizes ();
-      }
-      break;
-
-#if defined (SIGWINCH) || defined (SIGUSR1)
-#ifdef SIGWINCH
-    case SIGWINCH:
-#endif
-#ifdef SIGUSR1
-    case SIGUSR1:
-#endif
-      {
-	/* Turn off terminal IO, tell our parent that the window has changed,
-	   then reinitialize the terminal and rebuild our windows. */
-#ifdef SIGWINCH
-	if (sig == SIGWINCH)
-	  old_signal_handler = &old_WINCH;
-#endif
-#ifdef SIGUSR1
-	if (sig == SIGUSR1)
-	  old_signal_handler = &old_USR1;
-#endif
-	terminal_goto_xy (0, 0);
-	fflush (stdout);
-	terminal_unprep_terminal (); /* needless? */
-	restore_termsig (sig, old_signal_handler);
-	UNBLOCK_SIGNAL (sig);
-	kill (getpid (), sig);
-
-	/* After our old signal handler returns... */
-	set_termsig (sig, old_signal_handler); /* needless? */
-	terminal_prep_terminal ();
-	reset_info_window_sizes ();
-      }
-      break;
-#endif /* SIGWINCH || SIGUSR1 */
-    }
-#if !defined (HAVE_SIGACTION)
-  /* at this time it is safer to perform unblock after decrement */
-  term_conf_busy--;
-#if defined (HAVE_SIGPROCMASK) || defined (HAVE_SIGSETMASK)
-    {
-      sigset_t nvar, ovar;
-      sigemptyset (&nvar);
-      mask_termsig (&nvar);
-      sigprocmask (SIG_UNBLOCK, &nvar, &ovar);
-    }
-#endif /* HAVE_SIGPROCMASK || HAVE_SIGSETMASK */
-#endif /* !HAVE_SIGACTION */
-}
-/* vim: set sw=2 cino={1s>2sn-s^-se-s: */

Property changes on: head/contrib/texinfo/info/signals.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/nodes.c
===================================================================
--- head/contrib/texinfo/info/nodes.c	(revision 276550)
+++ head/contrib/texinfo/info/nodes.c	(nonexistent)
@@ -1,1263 +0,0 @@
-/* nodes.c -- how to get an Info file and node.
-   $Id: nodes.c,v 1.4 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1993, 1998, 1999, 2000, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Originally written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-
-#include "nodes.h"
-#include "search.h"
-#include "filesys.h"
-#include "info-utils.h"
-
-#if defined (HANDLE_MAN_PAGES)
-#  include "man.h"
-#endif /* HANDLE_MAN_PAGES */
-
-static void forget_info_file (char *filename);
-static void remember_info_file (FILE_BUFFER *file_buffer);
-static void free_file_buffer_tags (FILE_BUFFER *file_buffer);
-static void free_info_tag (TAG *tag);
-static void get_nodes_of_tags_table (FILE_BUFFER *file_buffer,
-    SEARCH_BINDING *buffer_binding);
-static void get_nodes_of_info_file (FILE_BUFFER *file_buffer);
-static void get_tags_of_indirect_tags_table (FILE_BUFFER *file_buffer,
-    SEARCH_BINDING *indirect_binding, SEARCH_BINDING *tags_binding);
-static void info_reload_file_buffer_contents (FILE_BUFFER *fb);
-static char *adjust_nodestart (NODE *node, int min, int max);
-static FILE_BUFFER *info_load_file_internal (char *filename, int get_tags);
-static FILE_BUFFER *info_find_file_internal (char *filename, int get_tags);
-static NODE *info_node_of_file_buffer_tags (FILE_BUFFER *file_buffer,
-    char *nodename);
-
-static long get_node_length (SEARCH_BINDING *binding);
-
-/* Magic number that RMS used to decide how much a tags table pointer could
-   be off by.  I feel that it should be much smaller, like 4.  */
-#define DEFAULT_INFO_FUDGE 1000
-
-/* Passed to *_internal functions.  INFO_GET_TAGS says to do what is
-   neccessary to fill in the nodes or tags arrays in FILE_BUFFER. */
-#define INFO_NO_TAGS  0
-#define INFO_GET_TAGS 1
-
-/* Global variables.  */
-
-/* When non-zero, this is a string describing the recent file error. */
-char *info_recent_file_error = NULL;
-
-/* The list of already loaded nodes. */
-FILE_BUFFER **info_loaded_files = NULL;
-
-/* The number of slots currently allocated to LOADED_FILES. */
-int info_loaded_files_slots = 0;
-
-/* Public functions for node manipulation.  */
-
-/* Used to build `dir' menu from `localdir' files found in INFOPATH. */
-extern void maybe_build_dir_node (char *dirname);
-
-/* Return a pointer to a NODE structure for the Info node (FILENAME)NODENAME.
-   If FILENAME is NULL, `dir' is used.
-   IF NODENAME is NULL, `Top' is used.
-   If the node cannot be found, return NULL. */
-NODE *
-info_get_node (char *filename, char *nodename)
-{
-  NODE *node;
-  FILE_BUFFER *file_buffer = NULL;
-
-  info_recent_file_error = NULL;
-  info_parse_node (nodename, DONT_SKIP_NEWLINES);
-  nodename = NULL;
-
-  if (info_parsed_filename)
-    filename = info_parsed_filename;
-
-  if (info_parsed_nodename)
-    nodename = info_parsed_nodename;
-
-  /* If FILENAME is not specified, it defaults to "dir". */
-  if (!filename)
-    filename = "dir";
-
-  /* If the file to be looked up is "dir", build the contents from all of
-     the "dir"s and "localdir"s found in INFOPATH. */
-  if (is_dir_name (filename))
-    maybe_build_dir_node (filename);
-
-  /* Find the correct info file, or give up.  */
-  file_buffer = info_find_file (filename);
-  if (!file_buffer)
-    {
-      if (filesys_error_number)
-        info_recent_file_error =
-          filesys_error_string (filename, filesys_error_number);
-      return NULL;
-    }
-
-  /* Look for the node.  */
-  node = info_get_node_of_file_buffer (nodename, file_buffer);
-
-  /* If the node not found was "Top", try again with different case.  */
-  if (!node && (nodename == NULL || strcasecmp (nodename, "Top") == 0))
-    {
-      node = info_get_node_of_file_buffer ("Top", file_buffer);
-      if (!node)
-        node = info_get_node_of_file_buffer ("top", file_buffer);
-      if (!node)
-        node = info_get_node_of_file_buffer ("TOP", file_buffer);
-    }
-
-  return node;
-}
-
-/* Return a pointer to a NODE structure for the Info node NODENAME in
-   FILE_BUFFER.  NODENAME can be passed as NULL, in which case the
-   nodename of "Top" is used.  If the node cannot be found, return a
-   NULL pointer. */
-NODE *
-info_get_node_of_file_buffer (char *nodename, FILE_BUFFER *file_buffer)
-{
-  NODE *node = NULL;
-
-  /* If we are unable to find the file, we have to give up.  There isn't
-     anything else we can do. */
-  if (!file_buffer)
-    return NULL;
-
-  /* If the file buffer was gc'ed, reload the contents now. */
-  if (!file_buffer->contents)
-    info_reload_file_buffer_contents (file_buffer);
-
-  /* If NODENAME is not specified, it defaults to "Top". */
-  if (!nodename)
-    nodename = "Top";
-
-  /* If the name of the node that we wish to find is exactly "*", then the
-     node body is the contents of the entire file.  Create and return such
-     a node. */
-  if (strcmp (nodename, "*") == 0)
-    {
-      node = (NODE *)xmalloc (sizeof (NODE));
-      node->filename = file_buffer->fullpath;
-      node->parent   = NULL;
-      node->nodename = xstrdup ("*");
-      node->contents = file_buffer->contents;
-      node->nodelen = file_buffer->filesize;
-      node->flags = 0;
-      node->display_pos = 0;
-    }
-#if defined (HANDLE_MAN_PAGES)
-  /* If the file buffer is the magic one associated with manpages, call
-     the manpage node finding function instead. */
-  else if (file_buffer->flags & N_IsManPage)
-    {
-        node = get_manpage_node (file_buffer, nodename);
-    }
-#endif /* HANDLE_MAN_PAGES */
-  /* If this is the "main" info file, it might contain a tags table.  Search
-     the tags table for an entry which matches the node that we want.  If
-     there is a tags table, get the file which contains this node, but don't
-     bother building a node list for it. */
-  else if (file_buffer->tags)
-    {
-      node = info_node_of_file_buffer_tags (file_buffer, nodename);
-    }
-
-  /* Return the results of our node search. */
-  return node;
-}
-
-/* Locate the file named by FILENAME, and return the information structure
-   describing this file.  The file may appear in our list of loaded files
-   already, or it may not.  If it does not already appear, find the file,
-   and add it to the list of loaded files.  If the file cannot be found,
-   return a NULL FILE_BUFFER *. */
-FILE_BUFFER *
-info_find_file (char *filename)
-{
-  return info_find_file_internal (filename, INFO_GET_TAGS);
-}
-
-/* Load the info file FILENAME, remembering information about it in a
-   file buffer. */
-FILE_BUFFER *
-info_load_file (char *filename)
-{
-  return info_load_file_internal (filename, INFO_GET_TAGS);
-}
-
-
-/* Private functions implementation.  */
-
-/* The workhorse for info_find_file ().  Non-zero 2nd argument says to
-   try to build a tags table (or otherwise glean the nodes) for this
-   file once found.  By default, we build the tags table, but when this
-   function is called by info_get_node () when we already have a valid
-   tags table describing the nodes, it is unnecessary. */
-static FILE_BUFFER *
-info_find_file_internal (char *filename, int get_tags)
-{
-  int i;
-  FILE_BUFFER *file_buffer;
-
-  /* First try to find the file in our list of already loaded files. */
-  if (info_loaded_files)
-    {
-      for (i = 0; (file_buffer = info_loaded_files[i]); i++)
-        if ((FILENAME_CMP (filename, file_buffer->filename) == 0)
-            || (FILENAME_CMP (filename, file_buffer->fullpath) == 0)
-            || (!IS_ABSOLUTE (filename)
-                && FILENAME_CMP (filename,
-                                filename_non_directory (file_buffer->fullpath))
-                    == 0))
-          {
-            struct stat new_info, *old_info;
-
-            /* This file is loaded.  If the filename that we want is
-               specifically "dir", then simply return the file buffer. */
-            if (is_dir_name (filename_non_directory (filename)))
-              return file_buffer;
-
-#if defined (HANDLE_MAN_PAGES)
-            /* Do the same for the magic MANPAGE file. */
-            if (file_buffer->flags & N_IsManPage)
-              return file_buffer;
-#endif /* HANDLE_MAN_PAGES */
-
-            /* The file appears to be already loaded, and is not "dir".  Check
-               to see if it's changed since the last time it was loaded.  */
-            if (stat (file_buffer->fullpath, &new_info) == -1)
-              {
-                filesys_error_number = errno;
-                return NULL;
-              }
-
-            old_info = &file_buffer->finfo;
-
-            if (new_info.st_size != old_info->st_size
-                || new_info.st_mtime != old_info->st_mtime)
-              {
-                /* The file has changed.  Forget that we ever had loaded it
-                   in the first place. */
-                forget_info_file (filename);
-                break;
-              }
-            else
-              {
-                /* The info file exists, and has not changed since the last
-                   time it was loaded.  If the caller requested a nodes list
-                   for this file, and there isn't one here, build the nodes
-                   for this file_buffer.  In any case, return the file_buffer
-                   object. */
-                if (!file_buffer->contents)
-                  {
-                    /* The file's contents have been gc'ed.  Reload it.  */
-                    info_reload_file_buffer_contents (file_buffer);
-                    if (!file_buffer->contents)
-                      return NULL;
-                  }
-
-                if (get_tags && !file_buffer->tags)
-                  build_tags_and_nodes (file_buffer);
-
-                return file_buffer;
-              }
-          }
-    }
-
-  /* The file wasn't loaded.  Try to load it now. */
-#if defined (HANDLE_MAN_PAGES)
-  /* If the name of the file that we want is our special file buffer for
-     Unix manual pages, then create the file buffer, and return it now. */
-  if (strcasecmp (filename, MANPAGE_FILE_BUFFER_NAME) == 0)
-    file_buffer = create_manpage_file_buffer ();
-  else
-#endif /* HANDLE_MAN_PAGES */
-    file_buffer = info_load_file_internal (filename, get_tags);
-
-  /* If the file was loaded, remember the name under which it was found. */
-  if (file_buffer)
-    remember_info_file (file_buffer);
-
-  return file_buffer;
-}
-
-/* The workhorse function for info_load_file ().  Non-zero second argument
-   says to build a list of tags (or nodes) for this file.  This is the
-   default behaviour when info_load_file () is called, but it is not
-   necessary when loading a subfile for which we already have tags. */
-static FILE_BUFFER *
-info_load_file_internal (char *filename, int get_tags)
-{
-  char *fullpath, *contents;
-  long filesize;
-  struct stat finfo;
-  int retcode, compressed;
-  FILE_BUFFER *file_buffer = NULL;
-
-  /* Get the full pathname of this file, as known by the info system.
-     That is to say, search along INFOPATH and expand tildes, etc. */
-  fullpath = info_find_fullpath (filename);
-
-  /* Did we actually find the file? */
-  retcode = stat (fullpath, &finfo);
-
-  /* If the file referenced by the name returned from info_find_fullpath ()
-     doesn't exist, then try again with the last part of the filename
-     appearing in lowercase. */
-  /* This is probably not needed at all on those systems which define
-     FILENAME_CMP to be strcasecmp.  But let's do it anyway, lest some
-     network redirector supports case sensitivity.  */
-  if (retcode < 0)
-    {
-      char *lowered_name;
-      char *tmp_basename;
-
-      lowered_name = xstrdup (filename);
-      tmp_basename = filename_non_directory (lowered_name);
-
-      while (*tmp_basename)
-        {
-          if (isupper (*tmp_basename))
-            *tmp_basename = tolower (*tmp_basename);
-
-          tmp_basename++;
-        }
-
-      fullpath = info_find_fullpath (lowered_name);
-
-      retcode = stat (fullpath, &finfo);
-      free (lowered_name);
-    }
-
-  /* If the file wasn't found, give up, returning a NULL pointer. */
-  if (retcode < 0)
-    {
-      filesys_error_number = errno;
-      return NULL;
-    }
-
-  /* Otherwise, try to load the file. */
-  contents = filesys_read_info_file (fullpath, &filesize, &finfo, &compressed);
-
-  if (!contents)
-    return NULL;
-
-  /* The file was found, and can be read.  Allocate FILE_BUFFER and fill
-     in the various members. */
-  file_buffer = make_file_buffer ();
-  file_buffer->filename = xstrdup (filename);
-  file_buffer->fullpath = xstrdup (fullpath);
-  file_buffer->finfo = finfo;
-  file_buffer->filesize = filesize;
-  file_buffer->contents = contents;
-  if (compressed)
-    file_buffer->flags |= N_IsCompressed;
-
-  /* If requested, build the tags and nodes for this file buffer. */
-  if (get_tags)
-    build_tags_and_nodes (file_buffer);
-
-  return file_buffer;
-}
-
-/* Grovel FILE_BUFFER->contents finding tags and nodes, and filling in the
-   various slots.  This can also be used to rebuild a tag or node table. */
-void
-build_tags_and_nodes (FILE_BUFFER *file_buffer)
-{
-  SEARCH_BINDING binding;
-  long position;
-
-  free_file_buffer_tags (file_buffer);
-  file_buffer->flags &= ~N_HasTagsTable;
-
-  /* See if there is a tags table in this info file. */
-  binding.buffer = file_buffer->contents;
-  binding.start = file_buffer->filesize;
-  binding.end = binding.start - 1000;
-  if (binding.end < 0)
-    binding.end = 0;
-  binding.flags = S_FoldCase;
-
-  position = search_backward (TAGS_TABLE_END_LABEL, &binding);
-
-  /* If there is a tag table, find the start of it, and grovel over it
-     extracting tag information. */
-  if (position != -1)
-    while (1)
-      {
-        long tags_table_begin, tags_table_end;
-
-        binding.end = position;
-        binding.start = binding.end - 5 - strlen (TAGS_TABLE_END_LABEL);
-        if (binding.start < 0)
-          binding.start = 0;
-
-        position = find_node_separator (&binding);
-
-        /* For this test, (and all others here) failure indicates a bogus
-           tags table.  Grovel the file. */
-        if (position == -1)
-          break;
-
-        /* Remember the end of the tags table. */
-        binding.start = position;
-        tags_table_end = binding.start;
-        binding.end = 0;
-
-        /* Locate the start of the tags table. */
-        position = search_backward (TAGS_TABLE_BEG_LABEL, &binding);
-
-        if (position == -1)
-          break;
-
-        binding.end = position;
-        binding.start = binding.end - 5 - strlen (TAGS_TABLE_BEG_LABEL);
-        position = find_node_separator (&binding);
-
-        if (position == -1)
-          break;
-
-        /* The file contains a valid tags table.  Fill the FILE_BUFFER's
-           tags member. */
-        file_buffer->flags |= N_HasTagsTable;
-        tags_table_begin = position;
-
-        /* If this isn't an indirect tags table, just remember the nodes
-           described locally in this tags table.  Note that binding.end
-           is pointing to just after the beginning label. */
-        binding.start = binding.end;
-        binding.end = file_buffer->filesize;
-
-        if (!looking_at (TAGS_TABLE_IS_INDIRECT_LABEL, &binding))
-          {
-            binding.start = tags_table_begin;
-            binding.end = tags_table_end;
-            get_nodes_of_tags_table (file_buffer, &binding);
-            return;
-          }
-        else
-          {
-            /* This is an indirect tags table.  Build TAGS member. */
-            SEARCH_BINDING indirect;
-
-            indirect.start = tags_table_begin;
-            indirect.end = 0;
-            indirect.buffer = binding.buffer;
-            indirect.flags = S_FoldCase;
-
-            position = search_backward (INDIRECT_TAGS_TABLE_LABEL, &indirect);
-
-            if (position == -1)
-              {
-                /* This file is malformed.  Give up. */
-                return;
-              }
-
-            indirect.start = position;
-            indirect.end = tags_table_begin;
-            binding.start = tags_table_begin;
-            binding.end = tags_table_end;
-            get_tags_of_indirect_tags_table (file_buffer, &indirect, &binding);
-            return;
-          }
-      }
-
-  /* This file doesn't contain any kind of tags table.  Grovel the
-     file and build node entries for it. */
-  get_nodes_of_info_file (file_buffer);
-}
-
-/* Search through FILE_BUFFER->contents building an array of TAG *,
-   one entry per each node present in the file.  Store the tags in
-   FILE_BUFFER->tags, and the number of allocated slots in
-   FILE_BUFFER->tags_slots. */
-static void
-get_nodes_of_info_file (FILE_BUFFER *file_buffer)
-{
-  long nodestart;
-  int tags_index = 0;
-  SEARCH_BINDING binding;
-
-  binding.buffer = file_buffer->contents;
-  binding.start = 0;
-  binding.end = file_buffer->filesize;
-  binding.flags = S_FoldCase;
-
-  while ((nodestart = find_node_separator (&binding)) != -1)
-    {
-      int start, end;
-      char *nodeline;
-      TAG *entry;
-      int anchor = 0;
-
-      /* Skip past the characters just found. */
-      binding.start = nodestart;
-      binding.start += skip_node_separator (binding.buffer + binding.start);
-
-      /* Move to the start of the line defining the node. */
-      nodeline = binding.buffer + binding.start;
-
-      /* Find "Node:" */
-      start = string_in_line (INFO_NODE_LABEL, nodeline);
-      /* No Node:.  Maybe it's a Ref:.  */
-      if (start == -1)
-        {
-          start = string_in_line (INFO_REF_LABEL, nodeline);
-          if (start != -1)
-            anchor = 1;
-        }
-
-      /* If not there, this is not the start of a node. */
-      if (start == -1)
-        continue;
-
-      /* Find the start of the nodename. */
-      start += skip_whitespace (nodeline + start);
-
-      /* Find the end of the nodename. */
-      end = start +
-        skip_node_characters (nodeline + start, DONT_SKIP_NEWLINES);
-
-      /* Okay, we have isolated the node name, and we know where the
-         node starts.  Remember this information. */
-      entry = xmalloc (sizeof (TAG));
-      entry->nodename = xmalloc (1 + (end - start));
-      strncpy (entry->nodename, nodeline + start, end - start);
-      entry->nodename[end - start] = 0;
-      entry->nodestart = nodestart;
-      if (anchor)
-        entry->nodelen = 0;
-      else
-        {
-          SEARCH_BINDING node_body;
-
-          node_body.buffer = binding.buffer + binding.start;
-          node_body.start = 0;
-          node_body.end = binding.end - binding.start;
-          node_body.flags = S_FoldCase;
-          entry->nodelen = get_node_length (&node_body);
-        }
-
-      entry->filename = file_buffer->fullpath;
-
-      /* Add this tag to the array of tag structures in this FILE_BUFFER. */
-      add_pointer_to_array (entry, tags_index, file_buffer->tags,
-                            file_buffer->tags_slots, 100, TAG *);
-    }
-}
-
-/* Return the length of the node which starts at BINDING. */
-static long
-get_node_length (SEARCH_BINDING *binding)
-{
-  int i;
-  char *body;
-
-  /* [A node] ends with either a ^_, a ^L, or end of file.  */
-  for (i = binding->start, body = binding->buffer; i < binding->end; i++)
-    {
-      if (body[i] == INFO_FF || body[i] == INFO_COOKIE)
-        break;
-    }
-  return i - binding->start;
-}
-
-/* Build and save the array of nodes in FILE_BUFFER by searching through the
-   contents of BUFFER_BINDING for a tags table, and groveling the contents. */
-static void
-get_nodes_of_tags_table (FILE_BUFFER *file_buffer,
-    SEARCH_BINDING *buffer_binding)
-{
-  int name_offset;
-  SEARCH_BINDING *tmp_search;
-  long position;
-  int tags_index = 0;
-
-  tmp_search = copy_binding (buffer_binding);
-
-  /* Find the start of the tags table. */
-  position = find_tags_table (tmp_search);
-
-  /* If none, we're all done. */
-  if (position == -1)
-    return;
-
-  /* Move to one character before the start of the actual table. */
-  tmp_search->start = position;
-  tmp_search->start += skip_node_separator
-    (tmp_search->buffer + tmp_search->start);
-  tmp_search->start += strlen (TAGS_TABLE_BEG_LABEL);
-  tmp_search->start--;
-
-  /* The tag table consists of lines containing node names and positions.
-     Do each line until we find one that doesn't contain a node name. */
-  while ((position = search_forward ("\n", tmp_search)) != -1)
-    {
-      TAG *entry;
-      char *nodedef;
-      unsigned p;
-      int anchor = 0;
-
-      /* Prepare to skip this line. */
-      tmp_search->start = position;
-      tmp_search->start++;
-
-      /* Skip past informative "(Indirect)" tags table line. */
-      if (!tags_index && looking_at (TAGS_TABLE_IS_INDIRECT_LABEL, tmp_search))
-        continue;
-
-      /* Find the label preceding the node name. */
-      name_offset =
-        string_in_line (INFO_NODE_LABEL, tmp_search->buffer + tmp_search->start);
-
-      /* If no node label, maybe it's an anchor.  */
-      if (name_offset == -1)
-        {
-          name_offset = string_in_line (INFO_REF_LABEL,
-              tmp_search->buffer + tmp_search->start);
-          if (name_offset != -1)
-            anchor = 1;
-        }
-
-      /* If not there, not a defining line, so we must be out of the
-         tags table.  */
-      if (name_offset == -1)
-        break;
-
-      entry = xmalloc (sizeof (TAG));
-
-      /* Find the beginning of the node definition. */
-      tmp_search->start += name_offset;
-      nodedef = tmp_search->buffer + tmp_search->start;
-      nodedef += skip_whitespace (nodedef);
-
-      /* Move past the node's name in this tag to the TAGSEP character. */
-      for (p = 0; nodedef[p] && nodedef[p] != INFO_TAGSEP; p++)
-        ;
-      if (nodedef[p] != INFO_TAGSEP)
-        continue;
-
-      entry->nodename = xmalloc (p + 1);
-      strncpy (entry->nodename, nodedef, p);
-      entry->nodename[p] = 0;
-      p++;
-      entry->nodestart = atol (nodedef + p);
-
-      /* If a node, we don't know the length yet, but if it's an
-         anchor, the length is 0. */
-      entry->nodelen = anchor ? 0 : -1;
-
-      /* The filename of this node is currently known as the same as the
-         name of this file. */
-      entry->filename = file_buffer->fullpath;
-
-      /* Add this node structure to the array of node structures in this
-         FILE_BUFFER. */
-      add_pointer_to_array (entry, tags_index, file_buffer->tags,
-                            file_buffer->tags_slots, 100, TAG *);
-    }
-  free (tmp_search);
-}
-
-/* A structure used only in `get_tags_of_indirect_tags_table' to hold onto
-   an intermediate value. */
-typedef struct {
-  char *filename;
-  long first_byte;
-} SUBFILE;
-
-/* Remember in FILE_BUFFER the nodenames, subfilenames, and offsets within the
-   subfiles of every node which appears in TAGS_BINDING.  The 2nd argument is
-   a binding surrounding the indirect files list. */
-static void
-get_tags_of_indirect_tags_table (FILE_BUFFER *file_buffer,
-    SEARCH_BINDING *indirect_binding, SEARCH_BINDING *tags_binding)
-{
-  int i;
-  SUBFILE **subfiles = NULL;
-  int subfiles_index = 0, subfiles_slots = 0;
-  TAG *entry;
-
-  /* First get the list of tags from the tags table.  Then lookup the
-     associated file in the indirect list for each tag, and update it. */
-  get_nodes_of_tags_table (file_buffer, tags_binding);
-
-  /* We have the list of tags in file_buffer->tags.  Get the list of
-     subfiles from the indirect table. */
-  {
-    char *start, *end, *line;
-    SUBFILE *subfile;
-
-    start = indirect_binding->buffer + indirect_binding->start;
-    end = indirect_binding->buffer + indirect_binding->end;
-    line = start;
-
-    while (line < end)
-      {
-        int colon;
-
-        colon = string_in_line (":", line);
-
-        if (colon == -1)
-          break;
-
-        subfile = (SUBFILE *)xmalloc (sizeof (SUBFILE));
-        subfile->filename = (char *)xmalloc (colon);
-        strncpy (subfile->filename, line, colon - 1);
-        subfile->filename[colon - 1] = 0;
-        subfile->first_byte = (long) atol (line + colon);
-
-        add_pointer_to_array
-          (subfile, subfiles_index, subfiles, subfiles_slots, 10, SUBFILE *);
-
-        while (*line++ != '\n');
-      }
-  }
-
-  /* If we have successfully built the indirect files table, then
-     merge the information in the two tables. */
-  if (!subfiles)
-    {
-      free_file_buffer_tags (file_buffer);
-      return;
-    }
-  else
-    {
-      int tags_index;
-      long header_length;
-      SEARCH_BINDING binding;
-
-      /* Find the length of the header of the file containing the indirect
-         tags table.  This header appears at the start of every file.  We
-         want the absolute position of each node within each subfile, so
-         we subtract the start of the containing subfile from the logical
-         position of the node, and then add the length of the header in. */
-      binding.buffer = file_buffer->contents;
-      binding.start = 0;
-      binding.end = file_buffer->filesize;
-      binding.flags = S_FoldCase;
-
-      header_length = find_node_separator (&binding);
-      if (header_length == -1)
-        header_length = 0;
-
-      /* Build the file buffer's list of subfiles. */
-      {
-        char *containing_dir = xstrdup (file_buffer->fullpath);
-        char *temp = filename_non_directory (containing_dir);
-        int len_containing_dir;
-
-        if (temp > containing_dir)
-          {
-            if (HAVE_DRIVE (file_buffer->fullpath) &&
-                temp == containing_dir + 2)
-              {
-                /* Avoid converting "d:foo" into "d:/foo" below.  */
-                *temp = '.';
-                temp += 2;
-              }
-            temp[-1] = 0;
-          }
-
-        len_containing_dir = strlen (containing_dir);
-
-        for (i = 0; subfiles[i]; i++);
-
-        file_buffer->subfiles = (char **) xmalloc ((1 + i) * sizeof (char *));
-
-        for (i = 0; subfiles[i]; i++)
-          {
-            char *fullpath;
-
-            fullpath = (char *) xmalloc
-              (2 + strlen (subfiles[i]->filename) + len_containing_dir);
-
-            sprintf (fullpath, "%s/%s",
-                     containing_dir, subfiles[i]->filename);
-
-            file_buffer->subfiles[i] = fullpath;
-          }
-        file_buffer->subfiles[i] = NULL;
-        free (containing_dir);
-      }
-
-      /* For each node in the file's tags table, remember the starting
-         position. */
-      for (tags_index = 0; (entry = file_buffer->tags[tags_index]);
-           tags_index++)
-        {
-          for (i = 0;
-               subfiles[i] && entry->nodestart >= subfiles[i]->first_byte;
-               i++);
-
-          /* If the Info file containing the indirect tags table is
-             malformed, then give up. */
-          if (!i)
-            {
-              /* The Info file containing the indirect tags table is
-                 malformed.  Give up. */
-              for (i = 0; subfiles[i]; i++)
-                {
-                  free (subfiles[i]->filename);
-                  free (subfiles[i]);
-                  free (file_buffer->subfiles[i]);
-                }
-              file_buffer->subfiles = NULL;
-              free_file_buffer_tags (file_buffer);
-              return;
-            }
-
-          /* SUBFILES[i] is the index of the first subfile whose logical
-             first byte is greater than the logical offset of this node's
-             starting position.  This means that the subfile directly
-             preceding this one is the one containing the node. */
-
-          entry->filename = file_buffer->subfiles[i - 1];
-          entry->nodestart -= subfiles[i - 1]->first_byte;
-          entry->nodestart += header_length;
-        }
-
-      /* We have successfully built the tags table.  Remember that it
-         was indirect. */
-      file_buffer->flags |= N_TagsIndirect;
-    }
-
-  /* Free the structures assigned to SUBFILES.  Free the names as well
-     as the structures themselves, then finally, the array. */
-  for (i = 0; subfiles[i]; i++)
-    {
-      free (subfiles[i]->filename);
-      free (subfiles[i]);
-    }
-  free (subfiles);
-}
-
-
-/* Return the node that contains TAG in FILE_BUFFER, else
-   (pathologically) NULL.  Called from info_node_of_file_buffer_tags.  */
-static NODE *
-find_node_of_anchor (FILE_BUFFER *file_buffer, TAG *tag)
-{
-  int anchor_pos, node_pos;
-  TAG *node_tag;
-  NODE *node;
-
-  /* Look through the tag list for the anchor.  */
-  for (anchor_pos = 0; file_buffer->tags[anchor_pos]; anchor_pos++)
-    {
-      TAG *t = file_buffer->tags[anchor_pos];
-      if (t->nodestart == tag->nodestart)
-        break;
-    }
-
-  /* Should not happen, because we should always find the anchor.  */
-  if (!file_buffer->tags[anchor_pos])
-    return NULL;
-
-  /* We've found the anchor.  Look backwards in the tag table for the
-     preceding node (we're assuming the tags are given in order),
-     skipping over any preceding anchors.  */
-  for (node_pos = anchor_pos - 1;
-       node_pos >= 0 && file_buffer->tags[node_pos]->nodelen == 0;
-       node_pos--)
-    ;
-
-  /* An info file with an anchor before any nodes is pathological, but
-     it's possible, so don't crash.  */
-  if (node_pos < 0)
-    return NULL;
-
-  /* We have the tag for the node that contained the anchor tag.  */
-  node_tag = file_buffer->tags[node_pos];
-
-  /* Look up the node name in the tag table to get the actual node.
-     This is a recursive call, but it can't recurse again, because we
-     call it with a real node.  */
-  node = info_node_of_file_buffer_tags (file_buffer, node_tag->nodename);
-
-  /* Start displaying the node at the anchor position.  */
-  if (node)
-    { /* The nodestart for real nodes is three characters before the `F'
-         in the `File:' line (a newline, the CTRL-_, and another
-         newline).  The nodestart for anchors is the actual position.
-         But we offset by only 2, rather than 3, because if an anchor is
-         at the beginning of a paragraph, it's nicer for it to end up on
-         the beginning of the first line of the paragraph rather than
-         the blank line before it.  (makeinfo has no way of knowing that
-         a paragraph is going to start, so we can't fix it there.)  */
-      node->display_pos = file_buffer->tags[anchor_pos]->nodestart
-                          - (node_tag->nodestart + 2);
-
-      /* Otherwise an anchor at the end of a node ends up displaying at
-         the end of the last line of the node (way over on the right of
-         the screen), which looks wrong.  */
-      if (node->display_pos >= (unsigned long) node->nodelen)
-        node->display_pos = node->nodelen - 1;
-
-      /* Don't search in the node for the xref text, it's not there.  */
-      node->flags |= N_FromAnchor;
-    }
-
-  return node;
-}
-
-
-/* Return the node from FILE_BUFFER which matches NODENAME by searching
-   the tags table in FILE_BUFFER, or NULL.  */
-static NODE *
-info_node_of_file_buffer_tags (FILE_BUFFER *file_buffer, char *nodename)
-{
-  TAG *tag;
-  int i;
-
-  /* If no tags at all (possibly a misformatted info file), quit.  */
-  if (!file_buffer->tags) {
-    return NULL;
-  }
-
-  for (i = 0; (tag = file_buffer->tags[i]); i++)
-    if (strcmp (nodename, tag->nodename) == 0)
-      {
-        FILE_BUFFER *subfile = info_find_file_internal (tag->filename,
-                                                        INFO_NO_TAGS);
-        if (!subfile)
-          return NULL;
-
-        if (!subfile->contents)
-          {
-            info_reload_file_buffer_contents (subfile);
-            if (!subfile->contents)
-              return NULL;
-          }
-
-        /* If we were able to find this file and load it, then return
-           the node within it. */
-        {
-          NODE *node = xmalloc (sizeof (NODE));
-          node->filename    = subfile->fullpath;
-          node->parent      = NULL;
-          node->nodename    = tag->nodename;
-          node->contents    = subfile->contents + tag->nodestart;
-          node->display_pos = 0;
-          node->flags       = 0;
-
-          if (file_buffer->flags & N_HasTagsTable)
-            {
-              node->flags |= N_HasTagsTable;
-
-              if (file_buffer->flags & N_TagsIndirect)
-                {
-                  node->flags |= N_TagsIndirect;
-                  node->parent = file_buffer->fullpath;
-                }
-            }
-
-          if (subfile->flags & N_IsCompressed)
-            node->flags |= N_IsCompressed;
-
-          /* If TAG->nodelen hasn't been calculated yet, then we aren't
-             in a position to trust the entry pointer.  Adjust things so
-             that ENTRY->nodestart gets the exact address of the start of
-             the node separator which starts this node, and NODE->contents
-             gets the address of the line defining this node.  If we cannot
-             do that, the node isn't really here. */
-          if (tag->nodelen == -1)
-            {
-              int min, max;
-              char *node_sep;
-              SEARCH_BINDING node_body;
-              char *buff_end;
-
-              min = max = DEFAULT_INFO_FUDGE;
-
-              if (tag->nodestart < DEFAULT_INFO_FUDGE)
-                min = tag->nodestart;
-
-              if (DEFAULT_INFO_FUDGE >
-                  (subfile->filesize - tag->nodestart))
-                max = subfile->filesize - tag->nodestart;
-
-              /* NODE_SEP gets the address of the separator which defines
-                 this node, or NULL if the node wasn't found.
-                 NODE->contents is side-effected to point to right after
-                 the separator. */
-              node_sep = adjust_nodestart (node, min, max);
-              if (node_sep == NULL)
-                {
-                  free (node);
-                  return NULL;
-                }
-              /* Readjust tag->nodestart. */
-              tag->nodestart = node_sep - subfile->contents;
-
-              /* Calculate the length of the current node. */
-              buff_end = subfile->contents + subfile->filesize;
-
-              node_body.buffer = node->contents;
-              node_body.start = 0;
-              node_body.end = buff_end - node_body.buffer;
-              node_body.flags = 0;
-              tag->nodelen = get_node_length (&node_body);
-              node->nodelen = tag->nodelen;
-            }
-
-          else if (tag->nodelen == 0) /* anchor, return containing node */
-            {
-              free (node);
-              node = find_node_of_anchor (file_buffer, tag);
-            }
-
-          else
-            {
-              /* Since we know the length of this node, we have already
-                 adjusted tag->nodestart to point to the exact start of
-                 it.  Simply skip the node separator. */
-              node->contents += skip_node_separator (node->contents);
-              node->nodelen = tag->nodelen;
-            }
-
-          return node;
-        }
-      }
-
-  /* There was a tag table for this file, and the node wasn't found.
-     Return NULL, since this file doesn't contain the desired node. */
-  return NULL;
-}
-
-/* Managing file_buffers, nodes, and tags.  */
-
-/* Create a new, empty file buffer. */
-FILE_BUFFER *
-make_file_buffer (void)
-{
-  FILE_BUFFER *file_buffer = xmalloc (sizeof (FILE_BUFFER));
-
-  file_buffer->filename = file_buffer->fullpath = NULL;
-  file_buffer->contents = NULL;
-  file_buffer->tags = NULL;
-  file_buffer->subfiles = NULL;
-  file_buffer->tags_slots = 0;
-  file_buffer->flags = 0;
-
-  return file_buffer;
-}
-
-/* Add FILE_BUFFER to our list of already loaded info files. */
-static void
-remember_info_file (FILE_BUFFER *file_buffer)
-{
-  int i;
-
-  for (i = 0; info_loaded_files && info_loaded_files[i]; i++)
-    ;
-
-  add_pointer_to_array (file_buffer, i, info_loaded_files,
-                        info_loaded_files_slots, 10, FILE_BUFFER *);
-}
-
-/* Forget the contents, tags table, nodes list, and names of FILENAME. */
-static void
-forget_info_file (char *filename)
-{
-  int i;
-  FILE_BUFFER *file_buffer;
-
-  if (!info_loaded_files)
-    return;
-
-  for (i = 0; (file_buffer = info_loaded_files[i]); i++)
-    if (FILENAME_CMP (filename, file_buffer->filename) == 0
-        || FILENAME_CMP (filename, file_buffer->fullpath) == 0)
-      {
-        free (file_buffer->filename);
-        free (file_buffer->fullpath);
-
-        if (file_buffer->contents)
-          free (file_buffer->contents);
-
-        /* free_file_buffer_tags () also kills the subfiles list, since
-           the subfiles list is only of use in conjunction with tags. */
-        free_file_buffer_tags (file_buffer);
-
-        /* Move rest of list down.  */
-        while (info_loaded_files[i + 1])
-          {
-            info_loaded_files[i] = info_loaded_files[i + 1];
-            i++;
-          }
-        info_loaded_files[i] = 0;
-
-        break;
-      }
-}
-
-/* Free the tags (if any) associated with FILE_BUFFER. */
-static void
-free_file_buffer_tags (FILE_BUFFER *file_buffer)
-{
-  int i;
-
-  if (file_buffer->tags)
-    {
-      TAG *tag;
-
-      for (i = 0; (tag = file_buffer->tags[i]); i++)
-        free_info_tag (tag);
-
-      free (file_buffer->tags);
-      file_buffer->tags = NULL;
-      file_buffer->tags_slots = 0;
-    }
-
-  if (file_buffer->subfiles)
-    {
-      for (i = 0; file_buffer->subfiles[i]; i++)
-        free (file_buffer->subfiles[i]);
-
-      free (file_buffer->subfiles);
-      file_buffer->subfiles = NULL;
-    }
-}
-
-/* Free the data associated with TAG, as well as TAG itself. */
-static void
-free_info_tag (TAG *tag)
-{
-  free (tag->nodename);
-
-  /* We don't free tag->filename, because that filename is part of the
-     subfiles list for the containing FILE_BUFFER.  free_info_tags ()
-     will free the subfiles when it is appropriate. */
-
-  free (tag);
-}
-
-/* Load the contents of FILE_BUFFER->contents.  This function is called
-   when a file buffer was loaded, and then in order to conserve memory, the
-   file buffer's contents were freed and the pointer was zero'ed.  Note that
-   the file was already loaded at least once successfully, so the tags and/or
-   nodes members are still correctly filled. */
-static void
-info_reload_file_buffer_contents (FILE_BUFFER *fb)
-{
-  int is_compressed;
-
-#if defined (HANDLE_MAN_PAGES)
-  /* If this is the magic manpage node, don't try to reload, just give up. */
-  if (fb->flags & N_IsManPage)
-    return;
-#endif
-
-  fb->flags &= ~N_IsCompressed;
-
-  /* Let the filesystem do all the work for us. */
-  fb->contents =
-    filesys_read_info_file (fb->fullpath, &(fb->filesize), &(fb->finfo),
-                            &is_compressed);
-  if (is_compressed)
-    fb->flags |= N_IsCompressed;
-}
-
-/* Return the actual starting memory location of NODE, side-effecting
-   NODE->contents.  MIN and MAX are bounds for a search if one is necessary.
-   Because of the way that tags are implemented, the physical nodestart may
-   not actually be where the tag says it is.  If that is the case, but the
-   node was found anyway, set N_UpdateTags in NODE->flags.  If the node is
-   found, return non-zero.  NODE->contents is returned positioned right after
-   the node separator that precedes this node, while the return value is
-   position directly on the separator that precedes this node.  If the node
-   could not be found, return a NULL pointer. */
-static char *
-adjust_nodestart (NODE *node, int min, int max)
-{
-  long position;
-  SEARCH_BINDING node_body;
-
-  /* Define the node body. */
-  node_body.buffer = node->contents;
-  node_body.start = 0;
-  node_body.end = max;
-  node_body.flags = 0;
-
-  /* Try the optimal case first.  Who knows?  This file may actually be
-     formatted (mostly) correctly. */
-  if (node_body.buffer[0] != INFO_COOKIE && min > 2)
-    node_body.buffer -= 3;
-
-  position = find_node_separator (&node_body);
-
-  /* If we found a node start, then check it out. */
-  if (position != -1)
-    {
-      int sep_len;
-
-      sep_len = skip_node_separator (node->contents);
-
-      /* If we managed to skip a node separator, then check for this node
-         being the right one. */
-      if (sep_len != 0)
-        {
-          char *nodedef, *nodestart;
-          int offset;
-
-          nodestart = node_body.buffer + position + sep_len;
-          nodedef = nodestart;
-          offset = string_in_line (INFO_NODE_LABEL, nodedef);
-
-          if (offset != -1)
-            {
-              nodedef += offset;
-              nodedef += skip_whitespace (nodedef);
-              offset = skip_node_characters (nodedef, DONT_SKIP_NEWLINES);
-              if (((unsigned int) offset == strlen (node->nodename)) &&
-                  (strncmp (node->nodename, nodedef, offset) == 0))
-                {
-                  node->contents = nodestart;
-                  return node_body.buffer + position;
-                }
-            }
-        }
-    }
-
-  /* Oh well, I guess we have to try to find it in a larger area. */
-  node_body.buffer = node->contents - min;
-  node_body.start = 0;
-  node_body.end = min + max;
-  node_body.flags = 0;
-
-  position = find_node_in_binding (node->nodename, &node_body);
-
-  /* If the node couldn't be found, we lose big. */
-  if (position == -1)
-    return NULL;
-
-  /* Otherwise, the node was found, but the tags table could need updating
-     (if we used a tag to get here, that is).  Set the flag in NODE->flags. */
-  node->contents = node_body.buffer + position;
-  node->contents += skip_node_separator (node->contents);
-  if (node->flags & N_HasTagsTable)
-    node->flags |= N_UpdateTags;
-  return node_body.buffer + position;
-}

Property changes on: head/contrib/texinfo/info/nodes.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/README
===================================================================
--- head/contrib/texinfo/info/README	(revision 276550)
+++ head/contrib/texinfo/info/README	(nonexistent)
@@ -1,30 +0,0 @@
-$Id: README,v 1.3 2004/04/11 17:56:45 karl Exp $
-texinfo/info/README
-
-  Copyright (C) 2002 Free Software Foundation, Inc.
-
-  Copying and distribution of this file, with or without modification,
-  are permitted in any medium without royalty provided the copyright
-  notice and this notice are preserved.
-
-Info 2.0 is a complete rewrite of the original standalone Info I wrote in
-1987, the first program I wrote for rms.  That program was something like
-my second Unix program ever, and my die-hard machine language coding habits
-tended to show through.  I found the original Info hard to read and
-maintain, and thus decided to write this one.
-
-The rewrite consists of about 12,000 lines of code written in about 12
-days.  I believe this version of Info to be in much better shape than the
-original Info.
-
-Info 2.0 is substantially different from its original standalone
-predecessor.  It appears almost identical to the GNU Emacs version, but has
-the advantages of smaller size, ease of portability, and a built in library
-which can be used in other programs (to get or display documentation from
-Info files, for example).
-
-A full listing of the commands available in Info can be gotten by typing
-`?' while within an Info window.  This produces a node in a window which
-can be viewed just like any Info node.
-
---Brian Fox <bfox@gnu.org>

Property changes on: head/contrib/texinfo/info/README
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/tilde.h
===================================================================
--- head/contrib/texinfo/info/tilde.h	(revision 276550)
+++ head/contrib/texinfo/info/tilde.h	(nonexistent)
@@ -1,54 +0,0 @@
-/* tilde.h: Externally available variables and function in libtilde.a.
-   $Id: tilde.h,v 1.3 2004/04/11 17:56:46 karl Exp $
-
-   This file has appeared in prior works by the Free Software Foundation;
-   thus it carries copyright dates from 1988 through 1993.
-
-   Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#ifndef TILDE_H
-#define TILDE_H
-
-#include "info.h"
-
-/* If non-null, this contains the address of a function to call if the
-   standard meaning for expanding a tilde fails.  The function is called
-   with the text (sans tilde, as in "foo"), and returns a malloc()'ed string
-   which is the expansion, or a NULL pointer if there is no expansion. */
-extern CFunction *tilde_expansion_failure_hook;
-
-/* When non-null, this is a NULL terminated array of strings which
-   are duplicates for a tilde prefix.  Bash uses this to expand
-   `=~' and `:~'. */
-extern char **tilde_additional_prefixes;
-
-/* When non-null, this is a NULL terminated array of strings which match
-   the end of a username, instead of just "/".  Bash sets this to
-   `:' and `=~'. */
-extern char **tilde_additional_suffixes;
-
-/* Return a new string which is the result of tilde expanding STRING. */
-extern char *tilde_expand (char *string);
-
-/* Do the work of tilde expansion on FILENAME.  FILENAME starts with a
-   tilde.  If there is no expansion, call tilde_expansion_failure_hook. */
-extern char *tilde_expand_word (char *filename);
-
-#endif /* not TILDE_H */

Property changes on: head/contrib/texinfo/info/tilde.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/signals.h
===================================================================
--- head/contrib/texinfo/info/signals.h	(revision 276550)
+++ head/contrib/texinfo/info/signals.h	(nonexistent)
@@ -1,96 +0,0 @@
-/* signals.h -- header to include system dependent signal definitions.
-   $Id: signals.h,v 1.2 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1993, 1994, 1995, 1997, 2002, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Originally written by Brian Fox (bfox@ai.mit.edu). */
-
-#ifndef INFO_SIGNALS_H
-#define INFO_SIGNALS_H
-
-#include <sys/types.h>
-#include <signal.h>
-
-/* For sysV68 --phdm@info.ucl.ac.be.  */
-#if !defined (SIGCHLD) && defined (SIGCLD)
-#define SIGCHLD SIGCLD
-#endif
-
-#if !defined (HAVE_SIGPROCMASK) && !defined (sigmask)
-#  define sigmask(x) (1 << ((x)-1))
-#endif /* !HAVE_SIGPROCMASK && !sigmask */
-
-/* Without SA_NOCLDSTOP, sigset_t might end up being undefined even
-   though we have sigprocmask, on older systems, according to Nelson
-   Beebe.  The test is from coreutils/sort.c, via Paul Eggert.  */
-#if !defined (HAVE_SIGPROCMASK) || !defined (SA_NOCLDSTOP)
-#  if !defined (SIG_BLOCK)
-#    define SIG_UNBLOCK 1
-#    define SIG_BLOCK   2
-#    define SIG_SETMASK 3
-#  endif /* SIG_BLOCK */
-
-/* Type of a signal set. */
-#  define sigset_t int
-
-/* Make SET have no signals in it. */
-#  define sigemptyset(set) (*(set) = (sigset_t)0x0)
-
-/* Make SET have the full range of signal specifications possible. */
-#  define sigfillset(set) (*(set) = (sigset_t)0xffffffffff)
-
-/* Add SIG to the contents of SET. */
-#  define sigaddset(set, sig) *(set) |= sigmask (sig)
-
-/* Delete SIG from the contents of SET. */
-#  define sigdelset(set, sig) *(set) &= ~(sigmask (sig))
-
-/* Tell if SET contains SIG. */
-#  define sigismember(set, sig) (*(set) & (sigmask (sig)))
-
-/* Suspend the process until the reception of one of the signals
-   not present in SET. */
-#  define sigsuspend(set) sigpause (*(set))
-#endif /* !HAVE_SIGPROCMASK */
-
-#if defined (HAVE_SIGPROCMASK) || defined (HAVE_SIGSETMASK)
-/* These definitions are used both in POSIX and non-POSIX implementations. */
-
-#define BLOCK_SIGNAL(sig) \
-  do { \
-    sigset_t nvar, ovar; \
-    sigemptyset (&nvar); \
-    sigemptyset (&ovar); \
-    sigaddset (&nvar, sig); \
-    sigprocmask (SIG_BLOCK, &nvar, &ovar); \
-  } while (0)
-
-#define UNBLOCK_SIGNAL(sig) \
-  do { \
-    sigset_t nvar, ovar; \
-    sigemptyset (&ovar); \
-    sigemptyset (&nvar); \
-    sigaddset (&nvar, sig); \
-    sigprocmask (SIG_UNBLOCK, &nvar, &ovar); \
-  } while (0)
-
-#else /* !HAVE_SIGPROCMASK && !HAVE_SIGSETMASK */
-#  define BLOCK_SIGNAL(sig)
-#  define UNBLOCK_SIGNAL(sig)
-#endif /* !HAVE_SIGPROCMASK && !HAVE_SIGSETMASK */
-
-#endif /* not INFO_SIGNALS_H */

Property changes on: head/contrib/texinfo/info/signals.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/footnotes.c
===================================================================
--- head/contrib/texinfo/info/footnotes.c	(revision 276550)
+++ head/contrib/texinfo/info/footnotes.c	(nonexistent)
@@ -1,268 +0,0 @@
-/* footnotes.c -- Some functions for manipulating footnotes.
-   $Id: footnotes.c,v 1.4 2004/04/11 17:56:45 karl Exp $
-
-   Copyright (C) 1993, 1997, 1998, 1999, 2002, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Originally written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-
-/* Nonzero means attempt to show footnotes when displaying a new window. */
-int auto_footnotes_p = 0;
-
-static char *footnote_nodename = "*Footnotes*";
-
-NODE * make_footnotes_node (NODE *node);
-
-#define FOOTNOTE_HEADER_FORMAT \
-   "*** Footnotes appearing in the node `%s' ***\n"
-
-/* Find the window currently showing footnotes. */
-static WINDOW *
-find_footnotes_window (void)
-{
-  WINDOW *win;
-
-  /* Try to find an existing window first. */
-  for (win = windows; win; win = win->next)
-    if (internal_info_node_p (win->node) &&
-        (strcmp (win->node->nodename, footnote_nodename) == 0))
-      break;
-
-  return (win);
-}
-
-/* Manufacture a node containing the footnotes of this node, and
-   return the manufactured node.  If NODE has no footnotes, return a 
-   NULL pointer. */
-NODE *
-make_footnotes_node (NODE *node)
-{
-  NODE *fn_node, *result = (NODE *)NULL;
-  long fn_start;
-
-  /* Make the initial assumption that the footnotes appear as simple
-     text within this windows node. */
-  fn_node = node;
-
-  /* See if this node contains the magic footnote label. */
-  fn_start =
-    info_search_in_node (FOOTNOTE_LABEL, node, 0, (WINDOW *)NULL, 1, 0);
-
-  /* If it doesn't, check to see if it has an associated footnotes node. */
-  if (fn_start == -1)
-    {
-      REFERENCE **refs;
-
-      refs = info_xrefs_of_node (node);
-
-      if (refs)
-        {
-          register int i;
-          char *refname;
-          int reflen = strlen ("-Footnotes") + strlen (node->nodename);
-
-          refname = (char *)xmalloc (reflen + 1);
-
-          strcpy (refname, node->nodename);
-          strcat (refname, "-Footnotes");
-
-          for (i = 0; refs[i]; i++)
-            if ((refs[i]->nodename != (char *)NULL) &&
-                /* Support both the older "foo-Footnotes" and the new
-                   style "foo-Footnote-NN" references.  */
-                (strcmp (refs[i]->nodename, refname) == 0 ||
-                 (strncmp (refs[i]->nodename, refname, reflen - 1) == 0 &&
-                  refs[i]->nodename[reflen - 1] == '-' &&
-                  isdigit (refs[i]->nodename[reflen]))))
-              {
-                char *filename;
-
-                filename = node->parent;
-                if (!filename)
-                  filename = node->filename;
-
-                fn_node = info_get_node (filename, refname);
-
-                if (fn_node)
-                  fn_start = 0;
-
-                break;
-              }
-
-          free (refname);
-          info_free_references (refs);
-        }
-    }
-
-  /* If we never found the start of a footnotes area, quit now. */
-  if (fn_start == -1)
-    return ((NODE *)NULL);
-
-  /* Make the new node. */
-  result = (NODE *)xmalloc (sizeof (NODE));
-  result->flags = 0;
-  result->display_pos = 0;
-
-  /* Get the size of the footnotes appearing within this node. */
-  {
-    char *header;
-    long text_start = fn_start;
-
-    header = (char *)xmalloc
-      (1 + strlen (node->nodename) + strlen (FOOTNOTE_HEADER_FORMAT));
-    sprintf (header, FOOTNOTE_HEADER_FORMAT, node->nodename);
-
-    /* Move the start of the displayed text to right after the first line.
-       This effectively skips either "---- footno...", or "File: foo...". */
-    while (text_start < fn_node->nodelen)
-      if (fn_node->contents[text_start++] == '\n')
-        break;
-  
-    result->nodelen = strlen (header) + fn_node->nodelen - text_start;
-
-    /* Set the contents of this node. */
-    result->contents = (char *)xmalloc (1 + result->nodelen);
-    sprintf (result->contents, "%s", header);
-    memcpy (result->contents + strlen (header),
-            fn_node->contents + text_start, fn_node->nodelen - text_start);
-
-    name_internal_node (result, footnote_nodename);
-    free (header);
-  }
-
-#if defined (NOTDEF)
-  /* If the footnotes were gleaned from the node that we were called with,
-     shorten the calling node's display length. */
-  if (fn_node == node)
-    narrow_node (node, 0, fn_start);
-#endif /* NOTDEF */
-
-  return (result);
-}
-
-/* Create or delete the footnotes window depending on whether footnotes
-   exist in WINDOW's node or not.  Returns FN_FOUND if footnotes were found
-   and displayed.  Returns FN_UNFOUND if there were no footnotes found
-   in WINDOW's node.  Returns FN_UNABLE if there were footnotes, but the
-   window to show them couldn't be made. */
-int
-info_get_or_remove_footnotes (WINDOW *window)
-{
-  WINDOW *fn_win;
-  NODE *new_footnotes;
-
-  fn_win = find_footnotes_window ();
-
-  /* If we are in the footnotes window, change nothing. */
-  if (fn_win == window)
-    return (FN_FOUND);
-
-  /* Try to find footnotes for this window's node. */
-  new_footnotes = make_footnotes_node (window->node);
-
-  /* If there was a window showing footnotes, and there are no footnotes
-     for the current window, delete the old footnote window. */
-  if (fn_win && !new_footnotes)
-    {
-      if (windows->next)
-        info_delete_window_internal (fn_win);
-    }
-
-  /* If there are footnotes for this window's node, but no window around
-     showing footnotes, try to make a new window. */
-  if (new_footnotes && !fn_win)
-    {
-      WINDOW *old_active;
-      WINDOW *last, *win;
-
-      /* Always make this window be the last one appearing in the list.  Find
-         the last window in the chain. */
-      for (win = windows, last = windows; win; last = win, win = win->next);
-
-      /* Try to split this window, and make the split window the one to
-         contain the footnotes. */
-      old_active = active_window;
-      active_window = last;
-      fn_win = window_make_window (new_footnotes);
-      active_window = old_active;
-
-      if (!fn_win)
-        {
-          free (new_footnotes->contents);
-          free (new_footnotes);
-
-          /* If we are hacking automatic footnotes, and there are footnotes
-             but we couldn't display them, print a message to that effect. */
-          if (auto_footnotes_p)
-            inform_in_echo_area ((char *) _("Footnotes could not be displayed"));
-          return (FN_UNABLE);
-        }
-    }
-
-  /* If there are footnotes, and there is a window to display them,
-     make that window be the number of lines appearing in the footnotes. */
-  if (new_footnotes && fn_win)
-    {
-      window_set_node_of_window (fn_win, new_footnotes);
-
-      window_change_window_height
-        (fn_win, fn_win->line_count - fn_win->height);
-
-      remember_window_and_node (fn_win, new_footnotes);
-      add_gcable_pointer (new_footnotes->contents);
-    }
-
-  if (!new_footnotes)
-    return (FN_UNFOUND);
-  else
-    return (FN_FOUND);
-}
-
-/* Show the footnotes associated with this node in another window. */
-DECLARE_INFO_COMMAND (info_show_footnotes,
-   _("Show the footnotes associated with this node in another window"))
-{
-  /* A negative argument means just make the window go away. */
-  if (count < 0)
-    {
-      WINDOW *fn_win = find_footnotes_window ();
-
-      /* If there is an old footnotes window, and it isn't the only window
-         on the screen, delete it. */
-      if (fn_win && windows->next)
-        info_delete_window_internal (fn_win);
-    }
-  else
-    {
-      int result;
-
-      result = info_get_or_remove_footnotes (window);
-
-      switch (result)
-        {
-        case FN_UNFOUND:
-          info_error ((char *) msg_no_foot_node, NULL, NULL);
-          break;
-
-        case FN_UNABLE:
-          info_error ((char *) msg_win_too_small, NULL, NULL);
-          break;
-        }
-    }
-}

Property changes on: head/contrib/texinfo/info/footnotes.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/nodes.h
===================================================================
--- head/contrib/texinfo/info/nodes.h	(revision 276550)
+++ head/contrib/texinfo/info/nodes.h	(nonexistent)
@@ -1,156 +0,0 @@
-/* nodes.h -- How we represent nodes internally.
-   $Id: nodes.h,v 1.3 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#ifndef NODES_H
-#define NODES_H
-
-#include "info.h"
-
-/* User code interface.  */
-
-/* Callers generally only want the node itself.  This structure is used
-   to pass node information around.  None of the information in this
-   structure should ever be directly freed.  The structure itself can
-   be passed to free ().  Note that NODE->parent is non-null if this
-   node's file is a subfile.  In that case, NODE->parent is the logical
-   name of the file containing this node.  Both names are given as full
-   paths, so you might have: node->filename = "/usr/gnu/info/emacs-1",
-   with node->parent = "/usr/gnu/info/emacs". */
-typedef struct {
-  char *filename;               /* The physical file containing this node. */
-  char *parent;                 /* Non-null is the logical file name. */
-  char *nodename;               /* The name of this node. */
-  char *contents;               /* Characters appearing in this node. */
-  long nodelen;                 /* The length of the CONTENTS member. */
-  unsigned long display_pos;    /* Where to display at, if nonzero.  */
-  int flags;                    /* See immediately below. */
-} NODE;
-
-/* Defines that can appear in NODE->flags.  All informative. */
-#define N_HasTagsTable 0x01     /* This node was found through a tags table. */
-#define N_TagsIndirect 0x02     /* The tags table was an indirect one. */
-#define N_UpdateTags   0x04     /* The tags table is out of date. */
-#define N_IsCompressed 0x08     /* The file is compressed on disk. */
-#define N_IsInternal   0x10     /* This node was made by Info. */
-#define N_CannotGC     0x20     /* File buffer cannot be gc'ed. */
-#define N_IsManPage    0x40     /* This node is a manpage. */
-#define N_FromAnchor   0x80     /* Synthesized for an anchor reference. */
-
-/* Internal data structures.  */
-
-/* String constants. */
-#define INFO_FILE_LABEL                 "File:"
-#define INFO_REF_LABEL                  "Ref:"
-#define INFO_NODE_LABEL                 "Node:"
-#define INFO_PREV_LABEL                 "Prev:"
-#define INFO_ALTPREV_LABEL              "Previous:"
-#define INFO_NEXT_LABEL                 "Next:"
-#define INFO_UP_LABEL                   "Up:"
-#define INFO_MENU_LABEL                 "\n* Menu:"
-#define INFO_MENU_ENTRY_LABEL           "\n* "
-#define INFO_XREF_LABEL                 "*Note"
-#define TAGS_TABLE_END_LABEL            "\nEnd Tag Table"
-#define TAGS_TABLE_BEG_LABEL            "Tag Table:\n"
-#define INDIRECT_TAGS_TABLE_LABEL       "Indirect:\n"
-#define TAGS_TABLE_IS_INDIRECT_LABEL    "(Indirect)"
-
-/* Character constants. */
-#define INFO_COOKIE '\037'
-#define INFO_FF     '\014'
-#define INFO_TAGSEP '\177'
-
-/* For each logical file that we have loaded, we keep a list of the names
-   of the nodes that are found in that file.  A pointer to a node in an
-   info file is called a "tag".  For split files, the tag pointer is
-   "indirect"; that is, the pointer also contains the name of the split
-   file where the node can be found.  For non-split files, the filename
-   member in the structure below simply contains the name of the current
-   file.  The following structure describes a single node within a file. */
-typedef struct {
-  char *filename;               /* The file where this node can be found. */
-  char *nodename;               /* The node pointed to by this tag. */
-  long nodestart;               /* The offset of the start of this node. */
-  long nodelen;                 /* The length of this node. */
-} TAG;
-
-/* The following structure is used to remember information about the contents
-   of Info files that we have loaded at least once before.  The FINFO member
-   is present so that we can reload the file if it has been modified since
-   last being loaded.  All of the arrays appearing within this structure
-   are NULL terminated, and each array which can change size has a
-   corresponding SLOTS member which says how many slots have been allocated
-   (with malloc ()) for this array. */
-typedef struct {
-  char *filename;               /* The filename used to find this file. */
-  char *fullpath;               /* The full pathname of this info file. */
-  struct stat finfo;            /* Information about this file. */
-  char *contents;               /* The contents of this particular file. */
-  long filesize;                /* The number of bytes this file expands to. */
-  char **subfiles;              /* If non-null, the list of subfiles. */
-  TAG **tags;                   /* If non-null, the indirect tags table. */
-  int tags_slots;               /* Number of slots allocated for TAGS. */
-  int flags;                    /* Various flags.  Mimics of N_* flags. */
-} FILE_BUFFER;
-
-/* Externally visible functions.  */
-
-/* Array of FILE_BUFFER * which represents the currently loaded info files. */
-extern FILE_BUFFER **info_loaded_files;
-
-/* The number of slots currently allocated to INFO_LOADED_FILES. */
-extern int info_loaded_files_slots;
-
-/* Locate the file named by FILENAME, and return the information structure
-   describing this file.  The file may appear in our list of loaded files
-   already, or it may not.  If it does not already appear, find the file,
-   and add it to the list of loaded files.  If the file cannot be found,
-   return a NULL FILE_BUFFER *. */
-extern FILE_BUFFER *info_find_file (char *filename);
-
-/* Force load the file named FILENAME, and return the information structure
-   describing this file.  Even if the file was already loaded, this loads
-   a new buffer, rebuilds tags and nodes, and returns a new FILE_BUFFER *. */
-extern FILE_BUFFER *info_load_file (char *filename);
-
-/* Return a pointer to a NODE structure for the Info node (FILENAME)NODENAME.
-   FILENAME can be passed as NULL, in which case the filename of "dir" is used.
-   NODENAME can be passed as NULL, in which case the nodename of "Top" is used.
-   If the node cannot be found, return a NULL pointer. */
-extern NODE *info_get_node (char *filename, char *nodename);
-
-/* Return a pointer to a NODE structure for the Info node NODENAME in
-   FILE_BUFFER.  NODENAME can be passed as NULL, in which case the
-   nodename of "Top" is used.  If the node cannot be found, return a
-   NULL pointer. */
-extern NODE *info_get_node_of_file_buffer (char *nodename,
-    FILE_BUFFER *file_buffer);
-
-/* Grovel FILE_BUFFER->contents finding tags and nodes, and filling in the
-   various slots.  This can also be used to rebuild a tag or node table. */
-extern void build_tags_and_nodes (FILE_BUFFER *file_buffer);
-
-/* When non-zero, this is a string describing the most recent file error. */
-extern char *info_recent_file_error;
-
-/* Create a new, empty file buffer. */
-extern FILE_BUFFER *make_file_buffer (void);
-
-#endif /* not NODES_H */

Property changes on: head/contrib/texinfo/info/nodes.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/key.c
===================================================================
--- head/contrib/texinfo/info/key.c	(revision 276550)
+++ head/contrib/texinfo/info/key.c	(nonexistent)
@@ -1,146 +0,0 @@
-/* key.c -- Generated array containing function names.
-
-   This file was automatically made from various source files with the
-   command "..//info/makedoc".  DO NOT EDIT THIS FILE, only "..//info/makedoc.c".
-
-   Source files groveled to make this file include:
-
-	./session.c
-	./echo-area.c
-	./infodoc.c
-	./m-x.c
-	./indices.c
-	./nodemenu.c
-	./footnotes.c
-	./variables.c
-
-   An entry in the array FUNCTION_KEY_ARRAY is made for each command
-   found in the above files; each entry consists of
-   a string which is the user-visible name of the function.  */
-
-#include "key.h"
-#include "funs.h"
-
-FUNCTION_KEY function_key_array[] = {
-
-/* Commands found in "./session.c". */
-   { "next-line", A_info_next_line },
-   { "prev-line", A_info_prev_line },
-   { "end-of-line", A_info_end_of_line },
-   { "beginning-of-line", A_info_beginning_of_line },
-   { "forward-char", A_info_forward_char },
-   { "backward-char", A_info_backward_char },
-   { "forward-word", A_info_forward_word },
-   { "backward-word", A_info_backward_word },
-   { "global-next-node", A_info_global_next_node },
-   { "global-prev-node", A_info_global_prev_node },
-   { "scroll-forward", A_info_scroll_forward },
-   { "scroll-forward-set-window", A_info_scroll_forward_set_window },
-   { "scroll-forward-page-only", A_info_scroll_forward_page_only },
-   { "scroll-forward-page-only-set-window", A_info_scroll_forward_page_only_set_window },
-   { "scroll-backward", A_info_scroll_backward },
-   { "scroll-backward-set-window", A_info_scroll_backward_set_window },
-   { "scroll-backward-page-only", A_info_scroll_backward_page_only },
-   { "scroll-backward-page-only-set-window", A_info_scroll_backward_page_only_set_window },
-   { "beginning-of-node", A_info_beginning_of_node },
-   { "end-of-node", A_info_end_of_node },
-   { "down-line", A_info_down_line },
-   { "up-line", A_info_up_line },
-   { "scroll-half-screen-down", A_info_scroll_half_screen_down },
-   { "scroll-half-screen-up", A_info_scroll_half_screen_up },
-   { "next-window", A_info_next_window },
-   { "prev-window", A_info_prev_window },
-   { "split-window", A_info_split_window },
-   { "delete-window", A_info_delete_window },
-   { "keep-one-window", A_info_keep_one_window },
-   { "scroll-other-window", A_info_scroll_other_window },
-   { "scroll-other-window-backward", A_info_scroll_other_window_backward },
-   { "grow-window", A_info_grow_window },
-   { "tile-windows", A_info_tile_windows },
-   { "toggle-wrap", A_info_toggle_wrap },
-   { "next-node", A_info_next_node },
-   { "prev-node", A_info_prev_node },
-   { "up-node", A_info_up_node },
-   { "last-node", A_info_last_node },
-   { "first-node", A_info_first_node },
-   { "last-menu-item", A_info_last_menu_item },
-   { "menu-digit", A_info_menu_digit },
-   { "menu-item", A_info_menu_item },
-   { "xref-item", A_info_xref_item },
-   { "find-menu", A_info_find_menu },
-   { "visit-menu", A_info_visit_menu },
-   { "goto-node", A_info_goto_node },
-   { "menu-sequence", A_info_menu_sequence },
-   { "goto-invocation-node", A_info_goto_invocation_node },
-   { "man", A_info_man },
-   { "top-node", A_info_top_node },
-   { "dir-node", A_info_dir_node },
-   { "history-node", A_info_history_node },
-   { "kill-node", A_info_kill_node },
-   { "view-file", A_info_view_file },
-   { "print-node", A_info_print_node },
-   { "search-case-sensitively", A_info_search_case_sensitively },
-   { "search", A_info_search },
-   { "search-backward", A_info_search_backward },
-   { "search-next", A_info_search_next },
-   { "search-previous", A_info_search_previous },
-   { "isearch-forward", A_isearch_forward },
-   { "isearch-backward", A_isearch_backward },
-   { "move-to-prev-xref", A_info_move_to_prev_xref },
-   { "move-to-next-xref", A_info_move_to_next_xref },
-   { "select-reference-this-line", A_info_select_reference_this_line },
-   { "abort-key", A_info_abort_key },
-   { "move-to-window-line", A_info_move_to_window_line },
-   { "redraw-display", A_info_redraw_display },
-   { "quit", A_info_quit },
-   { "do-lowercase-version", A_info_do_lowercase_version },
-   { "add-digit-to-numeric-arg", A_info_add_digit_to_numeric_arg },
-   { "universal-argument", A_info_universal_argument },
-   { "numeric-arg-digit-loop", A_info_numeric_arg_digit_loop },
-/* Commands found in "./echo-area.c". */
-   { "echo-area-forward", A_ea_forward },
-   { "echo-area-backward", A_ea_backward },
-   { "echo-area-beg-of-line", A_ea_beg_of_line },
-   { "echo-area-end-of-line", A_ea_end_of_line },
-   { "echo-area-forward-word", A_ea_forward_word },
-   { "echo-area-backward-word", A_ea_backward_word },
-   { "echo-area-delete", A_ea_delete },
-   { "echo-area-rubout", A_ea_rubout },
-   { "echo-area-abort", A_ea_abort },
-   { "echo-area-newline", A_ea_newline },
-   { "echo-area-quoted-insert", A_ea_quoted_insert },
-   { "echo-area-insert", A_ea_insert },
-   { "echo-area-tab-insert", A_ea_tab_insert },
-   { "echo-area-transpose-chars", A_ea_transpose_chars },
-   { "echo-area-yank", A_ea_yank },
-   { "echo-area-yank-pop", A_ea_yank_pop },
-   { "echo-area-kill-line", A_ea_kill_line },
-   { "echo-area-backward-kill-line", A_ea_backward_kill_line },
-   { "echo-area-kill-word", A_ea_kill_word },
-   { "echo-area-backward-kill-word", A_ea_backward_kill_word },
-   { "echo-area-possible-completions", A_ea_possible_completions },
-   { "echo-area-complete", A_ea_complete },
-   { "echo-area-scroll-completions-window", A_ea_scroll_completions_window },
-/* Commands found in "./infodoc.c". */
-   { "get-help-window", A_info_get_help_window },
-   { "get-info-help-node", A_info_get_info_help_node },
-   { "describe-key", A_describe_key },
-   { "where-is", A_info_where_is },
-/* Commands found in "./m-x.c". */
-   { "describe-command", A_describe_command },
-   { "execute-command", A_info_execute_command },
-   { "set-screen-height", A_set_screen_height },
-/* Commands found in "./indices.c". */
-   { "index-search", A_info_index_search },
-   { "next-index-match", A_info_next_index_match },
-   { "index-apropos", A_info_index_apropos },
-/* Commands found in "./nodemenu.c". */
-   { "list-visited-nodes", A_list_visited_nodes },
-   { "select-visited-node", A_select_visited_node },
-/* Commands found in "./footnotes.c". */
-   { "show-footnotes", A_info_show_footnotes },
-/* Commands found in "./variables.c". */
-   { "describe-variable", A_describe_variable },
-   { "set-variable", A_set_variable },
-   { (char *)NULL, 0 }
-};

Property changes on: head/contrib/texinfo/info/key.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/filesys.c
===================================================================
--- head/contrib/texinfo/info/filesys.c	(revision 276550)
+++ head/contrib/texinfo/info/filesys.c	(nonexistent)
@@ -1,711 +0,0 @@
-/* filesys.c -- filesystem specific functions.
-   $Id: filesys.c,v 1.6 2004/07/30 17:17:40 karl Exp $
-
-   Copyright (C) 1993, 1997, 1998, 2000, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-
-#include "tilde.h"
-#include "filesys.h"
-
-/* Local to this file. */
-static char *info_file_in_path (char *filename, char *path);
-static char *lookup_info_filename (char *filename);
-static char *info_absolute_file (char *fname);
-
-static void remember_info_filename (char *filename, char *expansion);
-static void maybe_initialize_infopath (void);
-
-typedef struct
-{
-  char *suffix;
-  char *decompressor;
-} COMPRESSION_ALIST;
-
-static char *info_suffixes[] = {
-  ".info",
-  "-info",
-  "/index",
-  ".inf",       /* 8+3 file on filesystem which supports long file names */
-#ifdef __MSDOS__
-  /* 8+3 file names strike again...  */
-  ".in",        /* for .inz, .igz etc. */
-  ".i",
-#endif
-  "",
-  NULL
-};
-
-static COMPRESSION_ALIST compress_suffixes[] = {
-  { ".gz", "gunzip" },
-  { ".bz2", "bunzip2" },
-  { ".z", "gunzip" },
-  { ".Z", "uncompress" },
-  { ".Y", "unyabba" },
-#ifdef __MSDOS__
-  { "gz", "gunzip" },
-  { "z", "gunzip" },
-#endif
-  { (char *)NULL, (char *)NULL }
-};
-
-/* The path on which we look for info files.  You can initialize this
-   from the environment variable INFOPATH if there is one, or you can
-   call info_add_path () to add paths to the beginning or end of it.
-   You can call zap_infopath () to make the path go away. */
-char *infopath = (char *)NULL;
-static int infopath_size = 0;
-
-/* Expand the filename in PARTIAL to make a real name for this operating
-   system.  This looks in INFO_PATHS in order to find the correct file.
-   If it can't find the file, it returns NULL. */
-static char *local_temp_filename = (char *)NULL;
-static int local_temp_filename_size = 0;
-
-char *
-info_find_fullpath (char *partial)
-{
-  int initial_character;
-  char *temp;
-
-  filesys_error_number = 0;
-
-  maybe_initialize_infopath ();
-
-  if (partial && (initial_character = *partial))
-    {
-      char *expansion;
-
-      expansion = lookup_info_filename (partial);
-
-      if (expansion)
-        return (expansion);
-
-      /* If we have the full path to this file, we still may have to add
-         various extensions to it.  I guess we have to stat this file
-         after all. */
-      if (IS_ABSOLUTE (partial))
-	temp = info_absolute_file (partial);
-      else if (initial_character == '~')
-        {
-          expansion = tilde_expand_word (partial);
-          if (IS_ABSOLUTE (expansion))
-            {
-              temp = info_absolute_file (expansion);
-              free (expansion);
-            }
-          else
-            temp = expansion;
-        }
-      else if (initial_character == '.' &&
-               (IS_SLASH (partial[1]) ||
-		(partial[1] == '.' && IS_SLASH (partial[2]))))
-        {
-          if (local_temp_filename_size < 1024)
-            local_temp_filename = (char *)xrealloc
-              (local_temp_filename, (local_temp_filename_size = 1024));
-#if defined (HAVE_GETCWD)
-          if (!getcwd (local_temp_filename, local_temp_filename_size))
-#else /*  !HAVE_GETCWD */
-          if (!getwd (local_temp_filename))
-#endif /* !HAVE_GETCWD */
-            {
-              filesys_error_number = errno;
-              return (partial);
-            }
-
-          strcat (local_temp_filename, "/");
-          strcat (local_temp_filename, partial);
-	  temp = info_absolute_file (local_temp_filename); /* try extensions */
-	  if (!temp)
-	    partial = local_temp_filename;
-        }
-      else
-        temp = info_file_in_path (partial, infopath);
-
-      if (temp)
-        {
-          remember_info_filename (partial, temp);
-          if (strlen (temp) > (unsigned int) local_temp_filename_size)
-            local_temp_filename = (char *) xrealloc
-              (local_temp_filename,
-               (local_temp_filename_size = (50 + strlen (temp))));
-          strcpy (local_temp_filename, temp);
-          free (temp);
-          return (local_temp_filename);
-        }
-    }
-  return (partial);
-}
-
-/* Scan the list of directories in PATH looking for FILENAME.  If we find
-   one that is a regular file, return it as a new string.  Otherwise, return
-   a NULL pointer. */
-static char *
-info_file_in_path (char *filename, char *path)
-{
-  struct stat finfo;
-  char *temp_dirname;
-  int statable, dirname_index;
-
-  /* Reject ridiculous cases up front, to prevent infinite recursion
-     later on.  E.g., someone might say "info '(.)foo'"...  */
-  if (!*filename || STREQ (filename, ".") || STREQ (filename, ".."))
-    return NULL;
-
-  dirname_index = 0;
-
-  while ((temp_dirname = extract_colon_unit (path, &dirname_index)))
-    {
-      register int i, pre_suffix_length;
-      char *temp;
-
-      /* Expand a leading tilde if one is present. */
-      if (*temp_dirname == '~')
-        {
-          char *expanded_dirname;
-
-          expanded_dirname = tilde_expand_word (temp_dirname);
-          free (temp_dirname);
-          temp_dirname = expanded_dirname;
-        }
-
-      temp = (char *)xmalloc (30 + strlen (temp_dirname) + strlen (filename));
-      strcpy (temp, temp_dirname);
-      if (!IS_SLASH (temp[(strlen (temp)) - 1]))
-        strcat (temp, "/");
-      strcat (temp, filename);
-
-      pre_suffix_length = strlen (temp);
-
-      free (temp_dirname);
-
-      for (i = 0; info_suffixes[i]; i++)
-        {
-          strcpy (temp + pre_suffix_length, info_suffixes[i]);
-
-          statable = (stat (temp, &finfo) == 0);
-
-          /* If we have found a regular file, then use that.  Else, if we
-             have found a directory, look in that directory for this file. */
-          if (statable)
-            {
-              if (S_ISREG (finfo.st_mode))
-                {
-                  return (temp);
-                }
-              else if (S_ISDIR (finfo.st_mode))
-                {
-                  char *newpath, *filename_only, *newtemp;
-
-                  newpath = xstrdup (temp);
-                  filename_only = filename_non_directory (filename);
-                  newtemp = info_file_in_path (filename_only, newpath);
-
-                  free (newpath);
-                  if (newtemp)
-                    {
-                      free (temp);
-                      return (newtemp);
-                    }
-                }
-            }
-          else
-            {
-              /* Add various compression suffixes to the name to see if
-                 the file is present in compressed format. */
-              register int j, pre_compress_suffix_length;
-
-              pre_compress_suffix_length = strlen (temp);
-
-              for (j = 0; compress_suffixes[j].suffix; j++)
-                {
-                  strcpy (temp + pre_compress_suffix_length,
-                          compress_suffixes[j].suffix);
-
-                  statable = (stat (temp, &finfo) == 0);
-                  if (statable && (S_ISREG (finfo.st_mode)))
-                    return (temp);
-                }
-            }
-        }
-      free (temp);
-    }
-  return ((char *)NULL);
-}
-
-/* Assume FNAME is an absolute file name, and check whether it is
-   a regular file.  If it is, return it as a new string; otherwise
-   return a NULL pointer.  We do it by taking the file name apart
-   into its directory and basename parts, and calling info_file_in_path.*/
-static char *
-info_absolute_file (char *fname)
-{
-  char *containing_dir = xstrdup (fname);
-  char *base = filename_non_directory (containing_dir);
-
-  if (base > containing_dir)
-    base[-1] = '\0';
-
-  return info_file_in_path (filename_non_directory (fname), containing_dir);
-}
-
-
-/* Given a string containing units of information separated by the
-   PATH_SEP character, return the next one after IDX, or NULL if there
-   are no more.  Advance IDX to the character after the colon. */
-
-char *
-extract_colon_unit (char *string, int *idx)
-{
-  unsigned int i = (unsigned int) *idx;
-  unsigned int start = i;
-
-  if (!string || i >= strlen (string))
-    return NULL;
-
-  if (!string[i]) /* end of string */
-    return NULL;
-
-  /* Advance to next PATH_SEP.  */
-  while (string[i] && string[i] != PATH_SEP[0])
-    i++;
-
-  {
-    char *value = xmalloc ((i - start) + 1);
-    strncpy (value, &string[start], (i - start));
-    value[i - start] = 0;
-
-    i++; /* move past PATH_SEP */
-    *idx = i;
-    return value;
-  }
-}
-
-/* A structure which associates a filename with its expansion. */
-typedef struct
-{
-  char *filename;
-  char *expansion;
-} FILENAME_LIST;
-
-/* An array of remembered arguments and results. */
-static FILENAME_LIST **names_and_files = (FILENAME_LIST **)NULL;
-static int names_and_files_index = 0;
-static int names_and_files_slots = 0;
-
-/* Find the result for having already called info_find_fullpath () with
-   FILENAME. */
-static char *
-lookup_info_filename (char *filename)
-{
-  if (filename && names_and_files)
-    {
-      register int i;
-      for (i = 0; names_and_files[i]; i++)
-        {
-          if (FILENAME_CMP (names_and_files[i]->filename, filename) == 0)
-            return (names_and_files[i]->expansion);
-        }
-    }
-  return (char *)NULL;;
-}
-
-/* Add a filename and its expansion to our list. */
-static void
-remember_info_filename (char *filename, char *expansion)
-{
-  FILENAME_LIST *new;
-
-  if (names_and_files_index + 2 > names_and_files_slots)
-    {
-      int alloc_size;
-      names_and_files_slots += 10;
-
-      alloc_size = names_and_files_slots * sizeof (FILENAME_LIST *);
-
-      names_and_files =
-        (FILENAME_LIST **) xrealloc (names_and_files, alloc_size);
-    }
-
-  new = (FILENAME_LIST *)xmalloc (sizeof (FILENAME_LIST));
-  new->filename = xstrdup (filename);
-  new->expansion = expansion ? xstrdup (expansion) : (char *)NULL;
-
-  names_and_files[names_and_files_index++] = new;
-  names_and_files[names_and_files_index] = (FILENAME_LIST *)NULL;
-}
-
-static void
-maybe_initialize_infopath (void)
-{
-  if (!infopath_size)
-    {
-      infopath = (char *)
-        xmalloc (infopath_size = (1 + strlen (DEFAULT_INFOPATH)));
-
-      strcpy (infopath, DEFAULT_INFOPATH);
-    }
-}
-
-/* Add PATH to the list of paths found in INFOPATH.  2nd argument says
-   whether to put PATH at the front or end of INFOPATH. */
-void
-info_add_path (char *path, int where)
-{
-  int len;
-
-  if (!infopath)
-    {
-      infopath = (char *)xmalloc (infopath_size = 200 + strlen (path));
-      infopath[0] = '\0';
-    }
-
-  len = strlen (path) + strlen (infopath);
-
-  if (len + 2 >= infopath_size)
-    infopath = (char *)xrealloc (infopath, (infopath_size += (2 * len) + 2));
-
-  if (!*infopath)
-    strcpy (infopath, path);
-  else if (where == INFOPATH_APPEND)
-    {
-      strcat (infopath, PATH_SEP);
-      strcat (infopath, path);
-    }
-  else if (where == INFOPATH_PREPEND)
-    {
-      char *temp = xstrdup (infopath);
-      strcpy (infopath, path);
-      strcat (infopath, PATH_SEP);
-      strcat (infopath, temp);
-      free (temp);
-    }
-}
-
-/* Make INFOPATH have absolutely nothing in it. */
-void
-zap_infopath (void)
-{
-  if (infopath)
-    free (infopath);
-
-  infopath = (char *)NULL;
-  infopath_size = 0;
-}
-
-/* Given a chunk of text and its length, convert all CRLF pairs at every
-   end-of-line into a single Newline character.  Return the length of
-   produced text.
-
-   This is required because the rest of code is too entrenched in having
-   a single newline at each EOL; in particular, searching for various
-   Info headers and cookies can become extremely tricky if that assumption
-   breaks.
-
-   FIXME: this could also support Mac-style text files with a single CR
-   at the EOL, but what about random CR characters in non-Mac files?  Can
-   we afford converting them into newlines as well?  Maybe implement some
-   heuristics here, like in Emacs 20.
-
-   FIXME: is it a good idea to show the EOL type on the modeline?  */
-long
-convert_eols (char *text, long int textlen)
-{
-  register char *s = text;
-  register char *d = text;
-
-  while (textlen--)
-    {
-      if (*s == '\r' && textlen && s[1] == '\n')
-	{
-	  s++;
-	  textlen--;
-	}
-      *d++ = *s++;
-    }
-
-  return (long)(d - text);
-}
-
-/* Read the contents of PATHNAME, returning a buffer with the contents of
-   that file in it, and returning the size of that buffer in FILESIZE.
-   FINFO is a stat struct which has already been filled in by the caller.
-   If the file turns out to be compressed, set IS_COMPRESSED to non-zero.
-   If the file cannot be read, return a NULL pointer. */
-char *
-filesys_read_info_file (char *pathname, long int *filesize,
-    struct stat *finfo, int *is_compressed)
-{
-  long st_size;
-
-  *filesize = filesys_error_number = 0;
-
-  if (compressed_filename_p (pathname))
-    {
-      *is_compressed = 1;
-      return (filesys_read_compressed (pathname, filesize));
-    }
-  else
-    {
-      int descriptor;
-      char *contents;
-
-      *is_compressed = 0;
-      descriptor = open (pathname, O_RDONLY | O_BINARY, 0666);
-
-      /* If the file couldn't be opened, give up. */
-      if (descriptor < 0)
-        {
-          filesys_error_number = errno;
-          return ((char *)NULL);
-        }
-
-      /* Try to read the contents of this file. */
-      st_size = (long) finfo->st_size;
-      contents = (char *)xmalloc (1 + st_size);
-      if ((read (descriptor, contents, st_size)) != st_size)
-        {
-	  filesys_error_number = errno;
-	  close (descriptor);
-	  free (contents);
-	  return ((char *)NULL);
-        }
-
-      close (descriptor);
-
-      /* Convert any DOS-style CRLF EOLs into Unix-style NL.
-	 Seems like a good idea to have even on Unix, in case the Info
-	 files are coming from some Windows system across a network.  */
-      *filesize = convert_eols (contents, st_size);
-
-      /* EOL conversion can shrink the text quite a bit.  We don't
-	 want to waste storage.  */
-      if (*filesize < st_size)
-	contents = (char *)xrealloc (contents, 1 + *filesize);
-      contents[*filesize] = '\0';
-
-      return (contents);
-    }
-}
-
-/* Typically, pipe buffers are 4k. */
-#define BASIC_PIPE_BUFFER (4 * 1024)
-
-/* We use some large multiple of that. */
-#define FILESYS_PIPE_BUFFER_SIZE (16 * BASIC_PIPE_BUFFER)
-
-char *
-filesys_read_compressed (char *pathname, long int *filesize)
-{
-  FILE *stream;
-  char *command, *decompressor;
-  char *contents = (char *)NULL;
-
-  *filesize = filesys_error_number = 0;
-
-  decompressor = filesys_decompressor_for_file (pathname);
-
-  if (!decompressor)
-    return ((char *)NULL);
-
-  command = (char *)xmalloc (15 + strlen (pathname) + strlen (decompressor));
-  /* Explicit .exe suffix makes the diagnostics of `popen'
-     better on systems where COMMAND.COM is the stock shell.  */
-  sprintf (command, "%s%s < %s",
-	   decompressor, STRIP_DOT_EXE ? ".exe" : "", pathname);
-
-#if !defined (BUILDING_LIBRARY)
-  if (info_windows_initialized_p)
-    {
-      char *temp;
-
-      temp = (char *)xmalloc (5 + strlen (command));
-      sprintf (temp, "%s...", command);
-      message_in_echo_area ("%s", temp, NULL);
-      free (temp);
-    }
-#endif /* !BUILDING_LIBRARY */
-
-  stream = popen (command, FOPEN_RBIN);
-  free (command);
-
-  /* Read chunks from this file until there are none left to read. */
-  if (stream)
-    {
-      long offset, size;
-      char *chunk;
-    
-      offset = size = 0;
-      chunk = (char *)xmalloc (FILESYS_PIPE_BUFFER_SIZE);
-
-      while (1)
-        {
-          int bytes_read;
-
-          bytes_read = fread (chunk, 1, FILESYS_PIPE_BUFFER_SIZE, stream);
-
-          if (bytes_read + offset >= size)
-            contents = (char *)xrealloc
-              (contents, size += (2 * FILESYS_PIPE_BUFFER_SIZE));
-
-          memcpy (contents + offset, chunk, bytes_read);
-          offset += bytes_read;
-          if (bytes_read != FILESYS_PIPE_BUFFER_SIZE)
-            break;
-        }
-
-      free (chunk);
-      if (pclose (stream) == -1)
-	{
-	  if (contents)
-	    free (contents);
-	  contents = (char *)NULL;
-	  filesys_error_number = errno;
-	}
-      else
-	{
-	  *filesize = convert_eols (contents, offset);
-	  contents = (char *)xrealloc (contents, 1 + *filesize);
-	  contents[*filesize] = '\0';
-	}
-    }
-  else
-    {
-      filesys_error_number = errno;
-    }
-
-#if !defined (BUILDING_LIBARARY)
-  if (info_windows_initialized_p)
-    unmessage_in_echo_area ();
-#endif /* !BUILDING_LIBRARY */
-  return (contents);
-}
-
-/* Return non-zero if FILENAME belongs to a compressed file. */
-int
-compressed_filename_p (char *filename)
-{
-  char *decompressor;
-
-  /* Find the final extension of this filename, and see if it matches one
-     of our known ones. */
-  decompressor = filesys_decompressor_for_file (filename);
-
-  if (decompressor)
-    return (1);
-  else
-    return (0);
-}
-
-/* Return the command string that would be used to decompress FILENAME. */
-char *
-filesys_decompressor_for_file (char *filename)
-{
-  register int i;
-  char *extension = (char *)NULL;
-
-  /* Find the final extension of FILENAME, and see if it appears in our
-     list of known compression extensions. */
-  for (i = strlen (filename) - 1; i > 0; i--)
-    if (filename[i] == '.')
-      {
-        extension = filename + i;
-        break;
-      }
-
-  if (!extension)
-    return ((char *)NULL);
-
-  for (i = 0; compress_suffixes[i].suffix; i++)
-    if (FILENAME_CMP (extension, compress_suffixes[i].suffix) == 0)
-      return (compress_suffixes[i].decompressor);
-
-#if defined (__MSDOS__)
-  /* If no other suffix matched, allow any extension which ends
-     with `z' to be decompressed by gunzip.  Due to limited 8+3 DOS
-     file namespace, we can expect many such cases, and supporting
-     every weird suffix thus produced would be a pain.  */
-  if (extension[strlen (extension) - 1] == 'z' ||
-      extension[strlen (extension) - 1] == 'Z')
-    return "gunzip";
-#endif
-
-  return ((char *)NULL);
-}
-
-/* The number of the most recent file system error. */
-int filesys_error_number = 0;
-
-/* A function which returns a pointer to a static buffer containing
-   an error message for FILENAME and ERROR_NUM. */
-static char *errmsg_buf = (char *)NULL;
-static int errmsg_buf_size = 0;
-
-char *
-filesys_error_string (char *filename, int error_num)
-{
-  int len;
-  char *result;
-
-  if (error_num == 0)
-    return ((char *)NULL);
-
-  result = strerror (error_num);
-
-  len = 4 + strlen (filename) + strlen (result);
-  if (len >= errmsg_buf_size)
-    errmsg_buf = (char *)xrealloc (errmsg_buf, (errmsg_buf_size = 2 + len));
-
-  sprintf (errmsg_buf, "%s: %s", filename, result);
-  return (errmsg_buf);
-}
-
-
-/* Check for "dir" with all the possible info and compression suffixes,
-   in combination.  */
-
-int
-is_dir_name (char *filename)
-{
-  unsigned i;
-
-  for (i = 0; info_suffixes[i]; i++)
-    {
-      unsigned c;
-      char trydir[50];
-      strcpy (trydir, "dir");
-      strcat (trydir, info_suffixes[i]);
-      
-      if (strcasecmp (filename, trydir) == 0)
-        return 1;
-
-      for (c = 0; compress_suffixes[c].suffix; c++)
-        {
-          char dir_compressed[50]; /* can be short */
-          strcpy (dir_compressed, trydir); 
-          strcat (dir_compressed, compress_suffixes[c].suffix);
-          if (strcasecmp (filename, dir_compressed) == 0)
-            return 1;
-        }
-    }  
-
-  return 0;
-}

Property changes on: head/contrib/texinfo/info/filesys.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/m-x.c
===================================================================
--- head/contrib/texinfo/info/m-x.c	(revision 276550)
+++ head/contrib/texinfo/info/m-x.c	(nonexistent)
@@ -1,214 +0,0 @@
-/* m-x.c -- Meta-x minibuffer reader.
-   $Id: m-x.c,v 1.3 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1993, 1997, 1998, 2001, 2002, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Originally written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-#include "funs.h"
-
-/* **************************************************************** */
-/*                                                                  */
-/*                     Reading Named Commands                       */
-/*                                                                  */
-/* **************************************************************** */
-
-/* Read the name of an Info function in the echo area and return the
-   name.  A return value of NULL indicates that no function name could
-   be read. */
-char *
-read_function_name (char *prompt, WINDOW *window)
-{
-  register int i;
-  char *line;
-  REFERENCE **array = (REFERENCE **)NULL;
-  int array_index = 0, array_slots = 0;
-
-  /* Make an array of REFERENCE which actually contains the names of
-     the functions available in Info. */
-  for (i = 0; function_doc_array[i].func; i++)
-    {
-      REFERENCE *entry;
-
-      entry = (REFERENCE *)xmalloc (sizeof (REFERENCE));
-      entry->label = xstrdup (function_doc_array[i].func_name);
-      entry->nodename = (char *)NULL;
-      entry->filename = (char *)NULL;
-
-      add_pointer_to_array
-        (entry, array_index, array, array_slots, 200, REFERENCE *);
-    }
-
-  line = info_read_completing_in_echo_area (window, prompt, array);
-
-  info_free_references (array);
-
-  if (!echo_area_is_active)
-    window_clear_echo_area ();
-
-  return (line);
-}
-
-DECLARE_INFO_COMMAND (describe_command,
-   _("Read the name of an Info command and describe it"))
-{
-  char *line;
-
-  line = read_function_name ((char *) _("Describe command: "), window);
-
-  if (!line)
-    {
-      info_abort_key (active_window, count, key);
-      return;
-    }
-
-  /* Describe the function named in "LINE". */
-  if (*line)
-    {
-      InfoCommand *cmd = named_function (line);
-
-      if (!cmd)
-        return;
-
-      window_message_in_echo_area ("%s: %s.",
-                                   line, function_documentation (cmd));
-    }
-  free (line);
-}
-
-DECLARE_INFO_COMMAND (info_execute_command,
-   _("Read a command name in the echo area and execute it"))
-{
-  char *line;
-  char *keys;
-  char *prompt;
-
-  prompt = (char *)xmalloc (20);
-
-  keys = where_is (info_keymap, InfoCmd(info_execute_command));
-  /* If the where_is () function thinks that this command doesn't exist,
-     there's something very wrong!  */
-  if (!keys)
-    abort();
-
-  if (info_explicit_arg || count != 1)
-    sprintf (prompt, "%d %s ", count, keys);
-  else
-    sprintf (prompt, "%s ", keys);
-
-  /* Ask the completer to read a reference for us. */
-  line = read_function_name (prompt, window);
-
-  /* User aborted? */
-  if (!line)
-    {
-      info_abort_key (active_window, count, key);
-      return;
-    }
-
-  /* User accepted "default"?  (There is none.) */
-  if (!*line)
-    {
-      free (line);
-      return;
-    }
-
-  /* User wants to execute a named command.  Do it. */
-  {
-    InfoCommand *command;
-
-    if ((active_window != the_echo_area) &&
-        (strncmp (line, "echo-area-", 10) == 0))
-      {
-        free (line);
-        info_error ((char *) _("Cannot execute an `echo-area' command here."),
-            NULL, NULL);
-        return;
-      }
-
-    command = named_function (line);
-    free (line);
-
-    if (!command)
-      return;
-
-    if (InfoFunction(command))
-      (*InfoFunction(command)) (active_window, count, 0);
-    else
-      info_error ((char *) _("Undefined command: %s"), line, NULL);
-  }
-}
-
-/* Okay, now that we have M-x, let the user set the screen height. */
-DECLARE_INFO_COMMAND (set_screen_height,
-  _("Set the height of the displayed window"))
-{
-  int new_height, old_height = screenheight;
-
-  if (info_explicit_arg || count != 1)
-    new_height = count;
-  else
-    {
-      char prompt[80];
-      char *line;
-
-      new_height = screenheight;
-
-      sprintf (prompt, _("Set screen height to (%d): "), new_height);
-
-      line = info_read_in_echo_area (window, prompt);
-
-      /* If the user aborted, do that now. */
-      if (!line)
-        {
-          info_abort_key (active_window, count, 0);
-          return;
-        }
-
-      /* Find out what the new height is supposed to be. */
-      if (*line)
-        new_height = atoi (line);
-
-      /* Clear the echo area if it isn't active. */
-      if (!echo_area_is_active)
-        window_clear_echo_area ();
-
-      free (line);
-    }
-
-  terminal_clear_screen ();
-  display_clear_display (the_display);
-  screenheight = new_height;
-#ifdef SET_SCREEN_SIZE_HELPER
-  SET_SCREEN_SIZE_HELPER;
-#endif
-  if (screenheight == old_height)
-    {
-      /* Display dimensions didn't actually change, so
-	 window_new_screen_size won't do anything, but we've
-	 already cleared the display above.  Undo the damage.  */
-      window_mark_chain (windows, W_UpdateWindow);
-      display_update_display (windows);
-    }
-  else
-    {
-      display_initialize_display (screenwidth, screenheight);
-      window_new_screen_size (screenwidth, screenheight);
-    }
-}

Property changes on: head/contrib/texinfo/info/m-x.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/info.c
===================================================================
--- head/contrib/texinfo/info/info.c	(revision 276550)
+++ head/contrib/texinfo/info/info.c	(nonexistent)
@@ -1,685 +0,0 @@
-/* info.c -- Display nodes of Info files in multiple windows.
-   $Id: info.c,v 1.11 2004/04/11 17:56:45 karl Exp $
-
-   Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-#include "indices.h"
-#include "dribble.h"
-#include "getopt.h"
-#if defined (HANDLE_MAN_PAGES)
-#  include "man.h"
-#endif /* HANDLE_MAN_PAGES */
-
-static char *program_name = "info";
-
-/* Non-zero means search all indices for APROPOS_SEARCH_STRING. */
-static int apropos_p = 0;
-
-/* Variable containing the string to search for when apropos_p is non-zero. */
-static char *apropos_search_string = (char *)NULL;
-
-/* Non-zero means search all indices for INDEX_SEARCH_STRING.  Unlike
-   apropos, this puts the user at the node, running info. */
-static int index_search_p = 0;
-
-/* Non-zero means look for the node which describes the invocation
-   and command-line options of the program, and start the info
-   session at that node.  */
-static int goto_invocation_p = 0;
-
-/* Variable containing the string to search for when index_search_p is
-   non-zero. */
-static char *index_search_string = (char *)NULL;
-
-/* Non-zero means print version info only. */
-static int print_version_p = 0;
-
-/* Non-zero means print a short description of the options. */
-static int print_help_p = 0;
-
-/* Array of the names of nodes that the user specified with "--node" on the
-   command line. */
-static char **user_nodenames = (char **)NULL;
-static int user_nodenames_index = 0;
-static int user_nodenames_slots = 0;
-
-/* String specifying the first file to load.  This string can only be set
-   by the user specifying "--file" on the command line. */
-static char *user_filename = (char *)NULL;
-
-/* String specifying the name of the file to dump nodes to.  This value is
-   filled if the user speficies "--output" on the command line. */
-static char *user_output_filename = (char *)NULL;
-
-/* Non-zero indicates that when "--output" is specified, all of the menu
-   items of the specified nodes (and their subnodes as well) should be
-   dumped in the order encountered.  This basically can print a book. */
-int dump_subnodes = 0;
-
-/* Non-zero means make default keybindings be loosely modeled on vi(1).  */
-int vi_keys_p = 0;
-
-/* Non-zero means don't remove ANSI escape sequences.  */
-int raw_escapes_p = 1;
-
-/* Non-zero means print the absolute location of the file to be loaded.  */
-static int print_where_p = 0;
-
-#ifdef __MSDOS__
-/* Non-zero indicates that screen output should be made 'speech-friendly'.
-   Since on MSDOS the usual behavior is to write directly to the video
-   memory, speech synthesizer software cannot grab the output.  Therefore,
-   we provide a user option which tells us to avoid direct screen output
-   and use stdout instead (which loses the color output).  */
-int speech_friendly = 0;
-#endif
-
-/* Structure describing the options that Info accepts.  We pass this structure
-   to getopt_long ().  If you add or otherwise change this structure, you must
-   also change the string which follows it. */
-#define APROPOS_OPTION 1
-#define DRIBBLE_OPTION 2
-#define RESTORE_OPTION 3
-#define IDXSRCH_OPTION 4
-static struct option long_options[] = {
-  { "apropos", 1, 0, APROPOS_OPTION },
-  { "directory", 1, 0, 'd' },
-  { "dribble", 1, 0, DRIBBLE_OPTION },
-  { "file", 1, 0, 'f' },
-  { "help", 0, &print_help_p, 1 },
-  { "index-search", 1, 0, IDXSRCH_OPTION },
-  { "location", 0, &print_where_p, 1 },
-  { "node", 1, 0, 'n' },
-  { "output", 1, 0, 'o' },
-  { "raw-escapes", 0, &raw_escapes_p, 1 },
-  { "no-raw-escapes", 0, &raw_escapes_p, 0 },
-  { "restore", 1, 0, RESTORE_OPTION },
-  { "show-options", 0, 0, 'O' },
-  { "subnodes", 0, &dump_subnodes, 1 },
-  { "usage", 0, 0, 'O' },
-  { "version", 0, &print_version_p, 1 },
-  { "vi-keys", 0, &vi_keys_p, 1 },
-  { "where", 0, &print_where_p, 1 },
-#ifdef __MSDOS__
-  { "speech-friendly", 0, &speech_friendly, 1 },
-#endif
-  {NULL, 0, NULL, 0}
-};
-
-/* String describing the shorthand versions of the long options found above. */
-#ifdef __MSDOS__
-static char *short_options = "d:n:f:ho:ORswb";
-#else
-static char *short_options = "d:n:f:ho:ORws";
-#endif
-
-/* When non-zero, the Info window system has been initialized. */
-int info_windows_initialized_p = 0;
-
-/* Some "forward" declarations. */
-static void info_short_help (void);
-static void init_messages (void);
-
-
-/* **************************************************************** */
-/*                                                                  */
-/*                Main Entry Point to the Info Program              */
-/*                                                                  */
-/* **************************************************************** */
-
-int
-main (int argc, char **argv)
-{
-  int getopt_long_index;        /* Index returned by getopt_long (). */
-  NODE *initial_node;           /* First node loaded by Info. */
-
-#ifdef HAVE_SETLOCALE
-  /* Set locale via LC_ALL.  */
-  setlocale (LC_ALL, "");
-#endif
-
-#ifdef ENABLE_NLS
-  /* Set the text message domain.  */
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-#endif
-
-  init_messages ();
-
-  while (1)
-    {
-      int option_character;
-
-      option_character = getopt_long
-        (argc, argv, short_options, long_options, &getopt_long_index);
-
-      /* getopt_long returns EOF when there are no more long options. */
-      if (option_character == EOF)
-        break;
-
-      /* If this is a long option, then get the short version of it. */
-      if (option_character == 0 && long_options[getopt_long_index].flag == 0)
-        option_character = long_options[getopt_long_index].val;
-
-      /* Case on the option that we have received. */
-      switch (option_character)
-        {
-        case 0:
-          break;
-
-          /* User wants to add a directory. */
-        case 'd':
-          info_add_path (optarg, INFOPATH_PREPEND);
-          break;
-
-          /* User is specifying a particular node. */
-        case 'n':
-          add_pointer_to_array (optarg, user_nodenames_index, user_nodenames,
-                                user_nodenames_slots, 10, char *);
-          break;
-
-          /* User is specifying a particular Info file. */
-        case 'f':
-          if (user_filename)
-            free (user_filename);
-
-          user_filename = xstrdup (optarg);
-          break;
-
-          /* Treat -h like --help. */
-        case 'h':
-          print_help_p = 1;
-          break;
-
-          /* User is specifying the name of a file to output to. */
-        case 'o':
-          if (user_output_filename)
-            free (user_output_filename);
-          user_output_filename = xstrdup (optarg);
-          break;
-
-         /* User has specified that she wants to find the "Options"
-             or "Invocation" node for the program.  */
-        case 'O':
-          goto_invocation_p = 1;
-          break;
-
-	  /* User has specified that she wants the escape sequences
-	     in man pages to be passed thru unaltered.  */
-        case 'R':
-          raw_escapes_p = 1;
-          break;
-
-          /* User is specifying that she wishes to dump the subnodes of
-             the node that she is dumping. */
-        case 's':
-          dump_subnodes = 1;
-          break;
-
-          /* For compatibility with man, -w is --where.  */
-        case 'w':
-          print_where_p = 1;
-          break;
-
-#ifdef __MSDOS__
-	  /* User wants speech-friendly output.  */
-	case 'b':
-	  speech_friendly = 1;
-	  break;
-#endif /* __MSDOS__ */
-
-          /* User has specified a string to search all indices for. */
-        case APROPOS_OPTION:
-          apropos_p = 1;
-          maybe_free (apropos_search_string);
-          apropos_search_string = xstrdup (optarg);
-          break;
-
-          /* User has specified a dribble file to receive keystrokes. */
-        case DRIBBLE_OPTION:
-          close_dribble_file ();
-          open_dribble_file (optarg);
-          break;
-
-          /* User has specified an alternate input stream. */
-        case RESTORE_OPTION:
-          info_set_input_from_file (optarg);
-          break;
-
-          /* User has specified a string to search all indices for. */
-        case IDXSRCH_OPTION:
-          index_search_p = 1;
-          maybe_free (index_search_string);
-          index_search_string = xstrdup (optarg);
-          break;
-
-        default:
-          fprintf (stderr, _("Try --help for more information.\n"));
-          xexit (1);
-        }
-    }
-
-  /* If the output device is not a terminal, and no output filename has been
-     specified, make user_output_filename be "-", so that the info is written
-     to stdout, and turn on the dumping of subnodes. */
-  if ((!isatty (fileno (stdout))) && (user_output_filename == (char *)NULL))
-    {
-      user_output_filename = xstrdup ("-");
-      dump_subnodes = 1;
-    }
-
-  /* If the user specified --version, then show the version and exit. */
-  if (print_version_p)
-    {
-      printf ("%s (GNU %s) %s\n", program_name, PACKAGE, VERSION);
-      puts ("");
-      puts ("Copyright (C) 2004 Free Software Foundation, Inc.");
-      printf (_("There is NO warranty.  You may redistribute this software\n\
-under the terms of the GNU General Public License.\n\
-For more information about these matters, see the files named COPYING.\n"));
-      xexit (0);
-    }
-
-  /* If the `--help' option was present, show the help and exit. */
-  if (print_help_p)
-    {
-      info_short_help ();
-      xexit (0);
-    }
-
-  /* If the user hasn't specified a path for Info files, default it.
-     Lowest priority is our messy hardwired list in filesys.h.
-     Then comes the user's INFODIR from the Makefile.
-     Highest priority is the environment variable, if set.  */
-  if (!infopath)
-    {
-      char *path_from_env = getenv ("INFOPATH");
-
-      if (path_from_env)
-        {
-          unsigned len = strlen (path_from_env);
-          /* Trailing : on INFOPATH means insert the default path.  */
-          if (len && path_from_env[len - 1] == PATH_SEP[0])
-            {
-              path_from_env[len - 1] = 0;
-              info_add_path (DEFAULT_INFOPATH, INFOPATH_PREPEND);
-            }
-#ifdef INFODIR /* from the Makefile */
-          info_add_path (INFODIR, INFOPATH_PREPEND);
-#endif
-          info_add_path (path_from_env, INFOPATH_PREPEND);
-        }
-      else
-        {
-          info_add_path (DEFAULT_INFOPATH, INFOPATH_PREPEND);
-#ifdef INFODIR /* from the Makefile */
-          info_add_path (INFODIR, INFOPATH_PREPEND);
-#endif
-#ifdef INFODIR2 /* from the Makefile, too */
-#  ifdef INFODIR
-          if (!STREQ (INFODIR, INFODIR2))
-#  endif
-            info_add_path (INFODIR2, INFOPATH_PREPEND);
-#endif
-        }
-    }
-
-  /* If the user specified a particular filename, add the path of that
-     file to the contents of INFOPATH. */
-  if (user_filename)
-    add_file_directory_to_path (user_filename);
-
-  /* If the user wants to search every known index for a given string,
-     do that now, and report the results. */
-  if (apropos_p)
-    {
-      info_apropos (apropos_search_string);
-      xexit (0);
-    }
-
-  /* Get the initial Info node.  It is either "(dir)Top", or what the user
-     specifed with values in user_filename and user_nodenames. */
-  initial_node = info_get_node (user_filename,
-                                user_nodenames ? user_nodenames[0] : 0);
-
-  /* If we couldn't get the initial node, this user is in trouble. */
-  if (!initial_node)
-    {
-      if (info_recent_file_error)
-        info_error (info_recent_file_error, NULL, NULL);
-      else
-        info_error ((char *) msg_cant_find_node,
-                    user_nodenames ? user_nodenames[0] : "Top", NULL);
-      xexit (1);
-    }
-
-  /* Special cases for when the user specifies multiple nodes.  If we
-     are dumping to an output file, dump all of the nodes specified.
-     Otherwise, attempt to create enough windows to handle the nodes
-     that this user wants displayed. */
-  if (user_nodenames_index > 1)
-    {
-      free (initial_node);
-
-      if (print_where_p)
-        printf ("%s\n", user_filename ? user_filename : "unknown?!");
-      else if (user_output_filename)
-        dump_nodes_to_file
-          (user_filename, user_nodenames, user_output_filename, dump_subnodes);
-      else
-        begin_multiple_window_info_session (user_filename, user_nodenames);
-
-      xexit (0);
-    }
-
-  /* If there are arguments remaining, they are the names of menu items
-     in sequential info files starting from the first one loaded.  That
-     file name is either "dir", or the contents of user_filename if one
-     was specified. */
-  {
-    const char *errstr;
-    char *errarg1, *errarg2;
-
-    NODE *new_initial_node = info_follow_menus (initial_node, argv + optind,
-        &errstr, &errarg1, &errarg2);
-
-    if (new_initial_node && new_initial_node != initial_node)
-      initial_node = new_initial_node;
-
-    if (print_where_p)
-      {
-        if (initial_node->parent)
-          printf ("%s\n", initial_node->parent);
-        else if (initial_node->filename
-            && !is_dir_name (filename_non_directory (initial_node->filename)))
-          printf ("%s\n", initial_node->filename);
-        else
-          xexit (1);
-        xexit (0);
-      }
-
-    /* If the user specified that this node should be output, then do that
-       now.  Otherwise, start the Info session with this node.  Or act
-       accordingly if the initial node was not found.  */
-    if (user_output_filename && !goto_invocation_p)
-      {
-        if (!errstr)
-          dump_node_to_file (initial_node, user_output_filename,
-                             dump_subnodes);
-        else
-          info_error ((char *) errstr, errarg1, errarg2);
-      }
-    else
-      {
-
-        if (errstr)
-          begin_info_session_with_error (initial_node, (char *) errstr,
-              errarg1, errarg2);
-        /* If the user specified `--index-search=STRING' or
-           --show-options, start the info session in the node
-           corresponding to what they want. */
-        else if (index_search_p || goto_invocation_p)
-          {
-            int status = 0;
-
-            initialize_info_session (initial_node, 0);
-
-            if (goto_invocation_p
-                || index_entry_exists (windows, index_search_string))
-              {
-                terminal_prep_terminal ();
-                terminal_clear_screen ();
-                info_last_executed_command = (VFunction *)NULL;
-
-                if (index_search_p)
-                  do_info_index_search (windows, 0, index_search_string);
-                else
-                  {
-                    /* If they said "info --show-options foo bar baz",
-                       the last of the arguments is the program whose
-                       options they want to see.  */
-                    char **p = argv + optind;
-                    char *program;
-
-                    if (*p)
-                      {
-                        while (p[1])
-                          p++;
-                        program = xstrdup (*p);
-                      }
-                    else if (user_filename)
-		      /* If there's no command-line arguments to
-			 supply the program name, use the Info file
-			 name (sans extension and leading directories)
-			 instead.  */
-		      program = program_name_from_file_name (user_filename);
-		    else
-		      program = xstrdup ("");
-
-                    info_intuit_options_node (windows, initial_node, program);
-                    free (program);
-                  }
-
-		if (user_output_filename)
-		  {
-		    dump_node_to_file (windows->node, user_output_filename,
-				       dump_subnodes);
-		  }
-		else
-		  info_read_and_dispatch ();
-
-                /* On program exit, leave the cursor at the bottom of the
-                   window, and restore the terminal IO. */
-                terminal_goto_xy (0, screenheight - 1);
-                terminal_clear_to_eol ();
-                fflush (stdout);
-                terminal_unprep_terminal ();
-              }
-            else
-              {
-                fprintf (stderr, _("no index entries found for `%s'\n"),
-                         index_search_string);
-                status = 2;
-              }
-
-            close_dribble_file ();
-            xexit (status);
-          }
-        else
-          begin_info_session (initial_node);
-      }
-
-    xexit (0);
-  }
-
-  return 0; /* Avoid bogus warnings.  */
-}
-
-void
-add_file_directory_to_path (char *filename)
-{
-  char *directory_name = xstrdup (filename);
-  char *temp = filename_non_directory (directory_name);
-
-  if (temp != directory_name)
-    {
-      if (HAVE_DRIVE (directory_name) && temp == directory_name + 2)
-	{
-	  /* The directory of "d:foo" is stored as "d:.", to avoid
-	     mixing it with "d:/" when a slash is appended.  */
-	  *temp = '.';
-	  temp += 2;
-	}
-      temp[-1] = 0;
-      info_add_path (directory_name, INFOPATH_PREPEND);
-    }
-
-  free (directory_name);
-}
-
-
-/* Error handling.  */
-
-/* Non-zero if an error has been signalled. */
-int info_error_was_printed = 0;
-
-/* Non-zero means ring terminal bell on errors. */
-int info_error_rings_bell_p = 1;
-
-/* Print FORMAT with ARG1 and ARG2.  If the window system was initialized,
-   then the message is printed in the echo area.  Otherwise, a message is
-   output to stderr. */
-void
-info_error (char *format, void *arg1, void *arg2)
-{
-  info_error_was_printed = 1;
-
-  if (!info_windows_initialized_p || display_inhibited)
-    {
-      fprintf (stderr, "%s: ", program_name);
-      fprintf (stderr, format, arg1, arg2);
-      fprintf (stderr, "\n");
-      fflush (stderr);
-    }
-  else
-    {
-      if (!echo_area_is_active)
-        {
-          if (info_error_rings_bell_p)
-            terminal_ring_bell ();
-          window_message_in_echo_area (format, arg1, arg2);
-        }
-      else
-        {
-          NODE *temp;
-
-          temp = build_message_node (format, arg1, arg2);
-          if (info_error_rings_bell_p)
-            terminal_ring_bell ();
-          inform_in_echo_area (temp->contents);
-          free (temp->contents);
-          free (temp);
-        }
-    }
-}
-
-
-/* Produce a scaled down description of the available options to Info. */
-static void
-info_short_help (void)
-{
-#ifdef __MSDOS__
-  static const char speech_friendly_string[] = N_("\
-  -b, --speech-friendly        be friendly to speech synthesizers.\n");
-#else
-  static const char speech_friendly_string[] = "";
-#endif
-
-
-  printf (_("\
-Usage: %s [OPTION]... [MENU-ITEM...]\n\
-\n\
-Read documentation in Info format.\n\
-\n\
-Options:\n\
-      --apropos=STRING         look up STRING in all indices of all manuals.\n\
-  -d, --directory=DIR          add DIR to INFOPATH.\n\
-      --dribble=FILENAME       remember user keystrokes in FILENAME.\n\
-  -f, --file=FILENAME          specify Info file to visit.\n\
-  -h, --help                   display this help and exit.\n\
-      --index-search=STRING    go to node pointed by index entry STRING.\n\
-  -n, --node=NODENAME          specify nodes in first visited Info file.\n\
-  -o, --output=FILENAME        output selected nodes to FILENAME.\n\
-  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n\
-      --no-raw-escapes         output escapes as literal text.\n\
-      --restore=FILENAME       read initial keystrokes from FILENAME.\n\
-  -O, --show-options, --usage  go to command-line options node.\n%s\
-      --subnodes               recursively output menu items.\n\
-  -w, --where, --location      print physical location of Info file.\n\
-      --vi-keys                use vi-like and less-like key bindings.\n\
-      --version                display version information and exit.\n\
-\n\
-The first non-option argument, if present, is the menu entry to start from;\n\
-it is searched for in all `dir' files along INFOPATH.\n\
-If it is not present, info merges all `dir' files and shows the result.\n\
-Any remaining arguments are treated as the names of menu\n\
-items relative to the initial node visited.\n\
-\n\
-Examples:\n\
-  info                       show top-level dir menu\n\
-  info emacs                 start at emacs node from top-level dir\n\
-  info emacs buffers         start at buffers node within emacs manual\n\
-  info --show-options emacs  start at node with emacs' command line options\n\
-  info -f ./foo.info         show file ./foo.info, not searching dir\n\
-"),
-  program_name, speech_friendly_string);
-
-  puts (_("\n\
-Email bug reports to bug-texinfo@gnu.org,\n\
-general questions and discussion to help-texinfo@gnu.org.\n\
-Texinfo home page: http://www.gnu.org/software/texinfo/"));
-
-  xexit (0);
-}
-
-
-/* Initialize strings for gettext.  Because gettext doesn't handle N_ or
-   _ within macro definitions, we put shared messages into variables and
-   use them that way.  This also has the advantage that there's only one
-   copy of the strings.  */
-
-const char *msg_cant_find_node;
-const char *msg_cant_file_node;
-const char *msg_cant_find_window;
-const char *msg_cant_find_point;
-const char *msg_cant_kill_last;
-const char *msg_no_menu_node;
-const char *msg_no_foot_node;
-const char *msg_no_xref_node;
-const char *msg_no_pointer;
-const char *msg_unknown_command;
-const char *msg_term_too_dumb;
-const char *msg_at_node_bottom;
-const char *msg_at_node_top;
-const char *msg_one_window;
-const char *msg_win_too_small;
-const char *msg_cant_make_help;
-
-static void
-init_messages (void)
-{
-  msg_cant_find_node   = _("Cannot find node `%s'.");
-  msg_cant_file_node   = _("Cannot find node `(%s)%s'.");
-  msg_cant_find_window = _("Cannot find a window!");
-  msg_cant_find_point  = _("Point doesn't appear within this window's node!");
-  msg_cant_kill_last   = _("Cannot delete the last window.");
-  msg_no_menu_node     = _("No menu in this node.");
-  msg_no_foot_node     = _("No footnotes in this node.");
-  msg_no_xref_node     = _("No cross references in this node.");
-  msg_no_pointer       = _("No `%s' pointer for this node.");
-  msg_unknown_command  = _("Unknown Info command `%c'; try `?' for help.");
-  msg_term_too_dumb    = _("Terminal type `%s' is not smart enough to run Info.");
-  msg_at_node_bottom   = _("You are already at the last page of this node.");
-  msg_at_node_top      = _("You are already at the first page of this node.");
-  msg_one_window       = _("Only one window.");
-  msg_win_too_small    = _("Resulting window would be too small.");
-  msg_cant_make_help   = _("Not enough room for a help window, please delete a window.");
-}

Property changes on: head/contrib/texinfo/info/info.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/footnotes.h
===================================================================
--- head/contrib/texinfo/info/footnotes.h	(revision 276550)
+++ head/contrib/texinfo/info/footnotes.h	(nonexistent)
@@ -1,43 +0,0 @@
-/* footnotes.h -- Some functions for manipulating footnotes.
-   $Id: footnotes.h,v 1.3 2004/04/11 17:56:45 karl Exp $
-
-   Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#ifndef INFO_FOOTNOTES_H
-#define INFO_FOOTNOTES_H
-
-/* Magic string which indicates following text is footnotes. */
-#define FOOTNOTE_LABEL N_("---------- Footnotes ----------")
-
-#define FN_FOUND   0
-#define FN_UNFOUND 1
-#define FN_UNABLE  2
-
-
-/* Create or delete the footnotes window depending on whether footnotes
-   exist in WINDOW's node or not.  Returns FN_FOUND if footnotes were found
-   and displayed.  Returns FN_UNFOUND if there were no footnotes found
-   in WINDOW's node.  Returns FN_UNABLE if there were footnotes, but the
-   window to show them couldn't be made. */
-extern int info_get_or_remove_footnotes (WINDOW *window);
-
-/* Non-zero means attempt to show footnotes when displaying a new window. */
-extern int auto_footnotes_p;
-
-#endif /* not INFO_FOOTNOTES_H */

Property changes on: head/contrib/texinfo/info/footnotes.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/key.h
===================================================================
--- head/contrib/texinfo/info/key.h	(revision 276550)
+++ head/contrib/texinfo/info/key.h	(nonexistent)
@@ -1,35 +0,0 @@
-/* key.h -- Structure associating function names with numeric codes. */
-
-/* This file is part of GNU Info, a program for reading online documentation
-   stored in Info format.
-
-   Copyright (C) 1993 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Andrew Bettison <andrewb@zip.com.au> */
-
-#if !defined (KEY_H)
-#define KEY_H
-
-typedef struct {
-	char *name;
-	unsigned char	code;
-}
-	FUNCTION_KEY;
-
-extern FUNCTION_KEY function_key_array[];
-
-#endif /* !KEY_H */

Property changes on: head/contrib/texinfo/info/key.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/session.c
===================================================================
--- head/contrib/texinfo/info/session.c	(revision 276550)
+++ head/contrib/texinfo/info/session.c	(nonexistent)
@@ -1,5039 +0,0 @@
-/* session.c -- user windowing interface to Info.
-   $Id: session.c,v 1.16 2004/12/14 00:15:36 karl Exp $
-
-   Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-   Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Originally written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-#include "search.h"
-#include <sys/ioctl.h>
-
-#if defined (HAVE_SYS_TIME_H)
-#  include <sys/time.h>
-#  define HAVE_STRUCT_TIMEVAL
-#endif /* HAVE_SYS_TIME_H */
-
-#if defined (HANDLE_MAN_PAGES)
-#  include "man.h"
-#endif
-
-static void info_clear_pending_input (void);
-static void info_set_pending_input (unsigned char key);
-static void info_handle_pointer (char *label, WINDOW *window);
-static void display_info_keyseq (int expecting_future_input);
-char *node_printed_rep (NODE *node);
-
-/* **************************************************************** */
-/*                                                                  */
-/*                   Running an Info Session                        */
-/*                                                                  */
-/* **************************************************************** */
-
-/* The place that we are reading input from. */
-static FILE *info_input_stream = NULL;
-
-/* The last executed command. */
-VFunction *info_last_executed_command = NULL;
-
-/* Becomes non-zero when 'q' is typed to an Info window. */
-int quit_info_immediately = 0;
-
-/* Array of structures describing for each window which nodes have been
-   visited in that window. */
-INFO_WINDOW **info_windows = NULL;
-
-/* Where to add the next window, if we need to add one. */
-static int info_windows_index = 0;
-
-/* Number of slots allocated to `info_windows'. */
-static int info_windows_slots = 0;
-
-void remember_window_and_node (WINDOW *window, NODE *node);
-void forget_window_and_nodes (WINDOW *window);
-void display_startup_message_and_start (void);
-
-/* Begin an info session finding the nodes specified by FILENAME and NODENAMES.
-   For each loaded node, create a new window.  Always split the largest of the
-   available windows. */
-void
-begin_multiple_window_info_session (char *filename, char **nodenames)
-{
-  register int i;
-  WINDOW *window = (WINDOW *)NULL;
-
-  for (i = 0; nodenames[i]; i++)
-    {
-      NODE *node;
-
-      node = info_get_node (filename, nodenames[i]);
-
-      if (!node)
-        break;
-
-      /* If this is the first node, initialize the info session. */
-      if (!window)
-        {
-          initialize_info_session (node, 1);
-          window = active_window;
-        }
-      else
-        {
-          /* Find the largest window in WINDOWS, and make that be the active
-             one.  Then split it and add our window and node to the list
-             of remembered windows and nodes.  Then tile the windows. */
-          WINDOW *win, *largest = NULL;
-          int max_height = 0;
-
-          for (win = windows; win; win = win->next)
-            if (win->height > max_height)
-              {
-                max_height = win->height;
-                largest = win;
-              }
-
-          if (!largest)
-            {
-              display_update_display (windows);
-              info_error ((char *) msg_cant_find_window, NULL, NULL);
-              info_session ();
-              xexit (0);
-            }
-
-          active_window = largest;
-          window = window_make_window (node);
-          if (window)
-            {
-              window_tile_windows (TILE_INTERNALS);
-              remember_window_and_node (window, node);
-            }
-          else
-            {
-              display_update_display (windows);
-              info_error ((char *) msg_win_too_small, NULL, NULL);
-              info_session ();
-              xexit (0);
-            }
-        }
-    }
-  display_startup_message_and_start ();
-}
-
-/* Start an info session with INITIAL_NODE, and an error message in the echo
-   area made from FORMAT and ARG. */
-void
-begin_info_session_with_error (NODE *initial_node, char *format,
-    void *arg1, void *arg2)
-{
-  initialize_info_session (initial_node, 1);
-  info_error (format, arg1, arg2);
-  info_session ();
-}
-
-/* Start an info session with INITIAL_NODE. */
-void
-begin_info_session (NODE *initial_node)
-{
-  initialize_info_session (initial_node, 1);
-  display_startup_message_and_start ();
-}
-
-void
-display_startup_message_and_start (void)
-{
-  char *format;
-
-  format = replace_in_documentation
-    ((char *) _("Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] for menu item."),
-     0);
-
-  window_message_in_echo_area (format, VERSION, NULL);
-  info_session ();
-}
-
-/* Run an info session with an already initialized window and node. */
-void
-info_session (void)
-{
-  display_update_display (windows);
-  info_last_executed_command = NULL;
-  info_read_and_dispatch ();
-  /* On program exit, leave the cursor at the bottom of the window, and
-     restore the terminal I/O. */
-  terminal_goto_xy (0, screenheight - 1);
-  terminal_clear_to_eol ();
-  fflush (stdout);
-  terminal_unprep_terminal ();
-  close_dribble_file ();
-}
-
-/* Here is a window-location dependent event loop.  Called from the
-   functions info_session (), and from read_xxx_in_echo_area (). */
-void
-info_read_and_dispatch (void)
-{
-  unsigned char key;
-  int done;
-  done = 0;
-
-  while (!done && !quit_info_immediately)
-    {
-      int lk = 0;
-
-      /* If we haven't just gone up or down a line, there is no
-         goal column for this window. */
-      if ((info_last_executed_command != (VFunction *) info_next_line) &&
-          (info_last_executed_command != (VFunction *) info_prev_line))
-        active_window->goal_column = -1;
-
-      if (echo_area_is_active)
-        {
-          lk = echo_area_last_command_was_kill;
-          echo_area_prep_read ();
-        }
-
-      if (!info_any_buffered_input_p ())
-        display_update_display (windows);
-
-      display_cursor_at_point (active_window);
-      info_initialize_numeric_arg ();
-
-      initialize_keyseq ();
-      key = info_get_input_char ();
-
-      /* No errors yet.  We just read a character, that's all.  Only clear
-         the echo_area if it is not currently active. */
-      if (!echo_area_is_active)
-        window_clear_echo_area ();
-
-      info_error_was_printed = 0;
-
-      /* Do the selected command. */
-      info_dispatch_on_key (key, active_window->keymap);
-
-      if (echo_area_is_active)
-        {
-          /* Echo area commands that do killing increment the value of
-             ECHO_AREA_LAST_COMMAND_WAS_KILL.  Thus, if there is no
-             change in the value of this variable, the last command
-             executed was not a kill command. */
-          if (lk == echo_area_last_command_was_kill)
-            echo_area_last_command_was_kill = 0;
-
-          if (ea_last_executed_command == (VFunction *) ea_newline ||
-              info_aborted_echo_area)
-            {
-              ea_last_executed_command = (VFunction *)NULL;
-              done = 1;
-            }
-
-          if (info_last_executed_command == (VFunction *) info_quit)
-            quit_info_immediately = 1;
-        }
-      else if (info_last_executed_command == (VFunction *) info_quit)
-        done = 1;
-    }
-}
-
-/* Found in signals.c */
-extern void initialize_info_signal_handler (void );
-
-/* Initialize the first info session by starting the terminal, window,
-   and display systems.  If CLEAR_SCREEN is 0, don't clear the screen.  */
-void
-initialize_info_session (NODE *node, int clear_screen)
-{
-  char *term_name = getenv ("TERM");
-  terminal_initialize_terminal (term_name);
-
-  if (terminal_is_dumb_p)
-    {
-      if (!term_name)
-        term_name = "dumb";
-
-      info_error ((char *) msg_term_too_dumb, term_name, NULL);
-      xexit (1);
-    }
-
-  if (clear_screen)
-    {
-      terminal_prep_terminal ();
-      terminal_clear_screen ();
-    }
-
-  initialize_info_keymaps ();
-  window_initialize_windows (screenwidth, screenheight);
-  initialize_info_signal_handler ();
-  display_initialize_display (screenwidth, screenheight);
-  info_set_node_of_window (0, active_window, node);
-
-  /* Tell the window system how to notify us when a window needs to be
-     asynchronously deleted (e.g., user resizes window very small). */
-  window_deletion_notifier = (VFunction *) forget_window_and_nodes;
-
-  /* If input has not been redirected yet, make it come from unbuffered
-     standard input. */
-  if (!info_input_stream)
-    {
-      setbuf (stdin, NULL);
-      info_input_stream = stdin;
-    }
-
-  info_windows_initialized_p = 1;
-}
-
-/* Tell Info that input is coming from the file FILENAME. */
-void
-info_set_input_from_file (char *filename)
-{
-  FILE *stream;
-
-  /* Input may include binary characters.  */
-  stream = fopen (filename, FOPEN_RBIN);
-
-  if (!stream)
-    return;
-
-  if ((info_input_stream != (FILE *)NULL) &&
-      (info_input_stream != stdin))
-    fclose (info_input_stream);
-
-  info_input_stream = stream;
-
-  if (stream != stdin)
-    display_inhibited = 1;
-}
-
-/* Return the INFO_WINDOW containing WINDOW, or NULL if there isn't one. */
-static INFO_WINDOW *
-get_info_window_of_window (WINDOW *window)
-{
-  register int i;
-  INFO_WINDOW *info_win = (INFO_WINDOW *)NULL;
-
-  for (i = 0; info_windows && (info_win = info_windows[i]); i++)
-    if (info_win->window == window)
-      break;
-
-  return (info_win);
-}
-
-/* Reset the remembered pagetop and point of WINDOW to WINDOW's current
-   values if the window and node are the same as the current one being
-   displayed. */
-void
-set_remembered_pagetop_and_point (WINDOW *window)
-{
-  INFO_WINDOW *info_win;
-
-  info_win = get_info_window_of_window (window);
-
-  if (!info_win)
-    return;
-
-  if (info_win->nodes_index &&
-      (info_win->nodes[info_win->current] == window->node))
-    {
-      info_win->pagetops[info_win->current] = window->pagetop;
-      info_win->points[info_win->current] = window->point;
-    }
-}
-
-void
-remember_window_and_node (WINDOW *window, NODE *node)
-{
-  /* See if we already have this window in our list. */
-  INFO_WINDOW *info_win = get_info_window_of_window (window);
-
-  /* If the window wasn't already on our list, then make a new entry. */
-  if (!info_win)
-    {
-      info_win = (INFO_WINDOW *)xmalloc (sizeof (INFO_WINDOW));
-      info_win->window = window;
-      info_win->nodes = (NODE **)NULL;
-      info_win->pagetops = (int *)NULL;
-      info_win->points = (long *)NULL;
-      info_win->current = 0;
-      info_win->nodes_index = 0;
-      info_win->nodes_slots = 0;
-
-      add_pointer_to_array (info_win, info_windows_index, info_windows,
-                            info_windows_slots, 10, INFO_WINDOW *);
-    }
-
-  /* If this node, the current pagetop, and the current point are the
-     same as the current saved node and pagetop, don't really add this to
-     the list of history nodes.  This may happen only at the very
-     beginning of the program, I'm not sure.  --karl  */
-  if (info_win->nodes
-      && info_win->current >= 0
-      && info_win->nodes[info_win->current]->contents == node->contents
-      && info_win->pagetops[info_win->current] == window->pagetop
-      && info_win->points[info_win->current] == window->point)
-  return;
-
-  /* Remember this node, the currently displayed pagetop, and the current
-     location of point in this window.  Because we are updating pagetops
-     and points as well as nodes, it is more efficient to avoid the
-     add_pointer_to_array macro here. */
-  if (info_win->nodes_index + 2 >= info_win->nodes_slots)
-    {
-      info_win->nodes_slots += 20;
-      info_win->nodes = (NODE **) xrealloc (info_win->nodes,
-                                      info_win->nodes_slots * sizeof (NODE *));
-      info_win->pagetops = (int *) xrealloc (info_win->pagetops,
-                                      info_win->nodes_slots * sizeof (int));
-      info_win->points = (long *) xrealloc (info_win->points,
-                                      info_win->nodes_slots * sizeof (long));
-    }
-
-  info_win->nodes[info_win->nodes_index] = node;
-  info_win->pagetops[info_win->nodes_index] = window->pagetop;
-  info_win->points[info_win->nodes_index] = window->point;
-  info_win->current = info_win->nodes_index++;
-  info_win->nodes[info_win->nodes_index] = NULL;
-  info_win->pagetops[info_win->nodes_index] = 0;
-  info_win->points[info_win->nodes_index] = 0;
-}
-
-#define DEBUG_FORGET_WINDOW_AND_NODES
-#if defined (DEBUG_FORGET_WINDOW_AND_NODES)
-static void
-consistency_check_info_windows (void)
-{
-  register int i;
-
-  for (i = 0; i < info_windows_index; i++)
-    {
-      WINDOW *win;
-
-      for (win = windows; win; win = win->next)
-        if (win == info_windows[i]->window)
-          break;
-
-      if (!win)
-        abort ();
-    }
-}
-#endif /* DEBUG_FORGET_WINDOW_AND_NODES */
-
-/* Remove WINDOW and its associated list of nodes from INFO_WINDOWS. */
-void
-forget_window_and_nodes (WINDOW *window)
-{
-  register int i;
-  INFO_WINDOW *info_win = (INFO_WINDOW *)NULL;
-
-  for (i = 0; info_windows && (info_win = info_windows[i]); i++)
-    if (info_win->window == window)
-      break;
-
-  /* If we found the window to forget, then do so. */
-  if (info_win)
-    {
-      while (i < info_windows_index)
-        {
-          info_windows[i] = info_windows[i + 1];
-          i++;
-        }
-
-      info_windows_index--;
-      info_windows[info_windows_index] = (INFO_WINDOW *)NULL;
-
-      if (info_win->nodes)
-        {
-          /* Free the node structures which held onto internal node contents
-             here.  This doesn't free the contents; we have a garbage collector
-             which does that. */
-          for (i = 0; info_win->nodes[i]; i++)
-            if (internal_info_node_p (info_win->nodes[i]))
-              free (info_win->nodes[i]);
-          free (info_win->nodes);
-
-          maybe_free (info_win->pagetops);
-          maybe_free (info_win->points);
-        }
-
-      free (info_win);
-    }
-#if defined (DEBUG_FORGET_WINDOW_AND_NODES)
-  consistency_check_info_windows ();
-#endif /* DEBUG_FORGET_WINDOW_AND_NODES */
-}
-
-/* Set WINDOW to show NODE.  Remember the new window in our list of Info
-   windows.  If we are doing automatic footnote display, also try to display
-   the footnotes for this window.  If REMEMBER is nonzero, first call
-   set_remembered_pagetop_and_point.  */
-void
-info_set_node_of_window (int remember, WINDOW *window, NODE *node)
-{
-  if (remember)
-    set_remembered_pagetop_and_point (window);
-
-  /* Put this node into the window. */
-  window_set_node_of_window (window, node);
-
-  /* Remember this node and window in our list of info windows. */
-  remember_window_and_node (window, node);
-
-  /* If doing auto-footnote display/undisplay, show the footnotes belonging
-     to this window's node. */
-  if (auto_footnotes_p)
-    info_get_or_remove_footnotes (window);
-}
-
-
-/* **************************************************************** */
-/*                                                                  */
-/*                     Info Movement Commands                       */
-/*                                                                  */
-/* **************************************************************** */
-
-/* Change the pagetop of WINDOW to DESIRED_TOP, perhaps scrolling the screen
-   to do so. */
-void
-set_window_pagetop (WINDOW *window, int desired_top)
-{
-  int point_line, old_pagetop;
-
-  if (desired_top < 0)
-    desired_top = 0;
-  else if (desired_top > window->line_count)
-    desired_top = window->line_count - 1;
-
-  if (window->pagetop == desired_top)
-    return;
-
-  old_pagetop = window->pagetop;
-  window->pagetop = desired_top;
-
-  /* Make sure that point appears in this window. */
-  point_line = window_line_of_point (window);
-  if ((point_line < window->pagetop) ||
-      ((point_line - window->pagetop) > window->height - 1))
-    window->point =
-      window->line_starts[window->pagetop] - window->node->contents;
-
-  window->flags |= W_UpdateWindow;
-
-  /* Find out which direction to scroll, and scroll the window in that
-     direction.  Do this only if there would be a savings in redisplay
-     time.  This is true if the amount to scroll is less than the height
-     of the window, and if the number of lines scrolled would be greater
-     than 10 % of the window's height. */
-  if (old_pagetop < desired_top)
-    {
-      int start, end, amount;
-
-      amount = desired_top - old_pagetop;
-
-      if ((amount >= window->height) ||
-          (((window->height - amount) * 10) < window->height))
-        return;
-
-      start = amount + window->first_row;
-      end = window->height + window->first_row;
-
-      display_scroll_display (start, end, -amount);
-    }
-  else
-    {
-      int start, end, amount;
-
-      amount = old_pagetop - desired_top;
-
-      if ((amount >= window->height) ||
-          (((window->height - amount) * 10) < window->height))
-        return;
-
-      start = window->first_row;
-      end = (window->first_row + window->height) - amount;
-      display_scroll_display (start, end, amount);
-    }
-}
-
-/* Immediately make WINDOW->point visible on the screen, and move the
-   terminal cursor there. */
-static void
-info_show_point (WINDOW *window)
-{
-  int old_pagetop;
-
-  old_pagetop = window->pagetop;
-  window_adjust_pagetop (window);
-  if (old_pagetop != window->pagetop)
-    {
-      int new_pagetop;
-
-      new_pagetop = window->pagetop;
-      window->pagetop = old_pagetop;
-      set_window_pagetop (window, new_pagetop);
-    }
-
-  if (window->flags & W_UpdateWindow)
-    display_update_one_window (window);
-
-  display_cursor_at_point (window);
-}
-
-/* Move WINDOW->point from OLD line index to NEW line index. */
-static void
-move_to_new_line (int old, int new, WINDOW *window)
-{
-  if (old == -1)
-    {
-      info_error ((char *) msg_cant_find_point, NULL, NULL);
-    }
-  else
-    {
-      int goal;
-
-      if (new >= window->line_count || new < 0)
-        return;
-
-      goal = window_get_goal_column (window);
-      window->goal_column = goal;
-
-      window->point = window->line_starts[new] - window->node->contents;
-      window->point += window_chars_to_goal (window->line_starts[new], goal);
-      info_show_point (window);
-    }
-}
-
-/* Move WINDOW's point down to the next line if possible. */
-DECLARE_INFO_COMMAND (info_next_line, _("Move down to the next line"))
-{
-  int old_line, new_line;
-
-  if (count < 0)
-    info_prev_line (window, -count, key);
-  else
-    {
-      old_line = window_line_of_point (window);
-      new_line = old_line + count;
-      move_to_new_line (old_line, new_line, window);
-    }
-}
-
-/* Move WINDOW's point up to the previous line if possible. */
-DECLARE_INFO_COMMAND (info_prev_line, _("Move up to the previous line"))
-{
-  int old_line, new_line;
-
-  if (count < 0)
-    info_next_line (window, -count, key);
-  else
-    {
-      old_line = window_line_of_point (window);
-      new_line = old_line - count;
-      move_to_new_line (old_line, new_line, window);
-    }
-}
-
-/* Move WINDOW's point to the end of the true line. */
-DECLARE_INFO_COMMAND (info_end_of_line, _("Move to the end of the line"))
-{
-  register int point, len;
-  register char *buffer;
-
-  buffer = window->node->contents;
-  len = window->node->nodelen;
-
-  for (point = window->point;
-       (point < len) && (buffer[point] != '\n');
-       point++);
-
-  if (point != window->point)
-    {
-      window->point = point;
-      info_show_point (window);
-    }
-}
-
-/* Move WINDOW's point to the beginning of the true line. */
-DECLARE_INFO_COMMAND (info_beginning_of_line, _("Move to the start of the line"))
-{
-  register int point;
-  register char *buffer;
-
-  buffer = window->node->contents;
-  point = window->point;
-
-  for (; (point) && (buffer[point - 1] != '\n'); point--);
-
-  /* If at a line start already, do nothing. */
-  if (point != window->point)
-    {
-      window->point = point;
-      info_show_point (window);
-    }
-}
-
-/* Move point forward in the node. */
-DECLARE_INFO_COMMAND (info_forward_char, _("Move forward a character"))
-{
-  if (count < 0)
-    info_backward_char (window, -count, key);
-  else
-    {
-      window->point += count;
-
-      if (window->point >= window->node->nodelen)
-        window->point = window->node->nodelen - 1;
-
-      info_show_point (window);
-    }
-}
-
-/* Move point backward in the node. */
-DECLARE_INFO_COMMAND (info_backward_char, _("Move backward a character"))
-{
-  if (count < 0)
-    info_forward_char (window, -count, key);
-  else
-    {
-      window->point -= count;
-
-      if (window->point < 0)
-        window->point = 0;
-
-      info_show_point (window);
-    }
-}
-
-#define alphabetic(c) (islower (c) || isupper (c) || isdigit (c))
-
-/* Move forward a word in this node. */
-DECLARE_INFO_COMMAND (info_forward_word, _("Move forward a word"))
-{
-  long point;
-  char *buffer;
-  int end, c;
-
-  if (count < 0)
-    {
-      info_backward_word (window, -count, key);
-      return;
-    }
-
-  point = window->point;
-  buffer = window->node->contents;
-  end = window->node->nodelen;
-
-  while (count)
-    {
-      if (point + 1 >= end)
-        return;
-
-      /* If we are not in a word, move forward until we are in one.
-         Then, move forward until we hit a non-alphabetic character. */
-      c = buffer[point];
-
-      if (!alphabetic (c))
-        {
-          while (++point < end)
-            {
-              c = buffer[point];
-              if (alphabetic (c))
-                break;
-            }
-        }
-
-      if (point >= end) return;
-
-      while (++point < end)
-        {
-          c = buffer[point];
-          if (!alphabetic (c))
-            break;
-        }
-      --count;
-    }
-  window->point = point;
-  info_show_point (window);
-}
-
-DECLARE_INFO_COMMAND (info_backward_word, _("Move backward a word"))
-{
-  long point;
-  char *buffer;
-  int c;
-
-  if (count < 0)
-    {
-      info_forward_word (window, -count, key);
-      return;
-    }
-
-  buffer = window->node->contents;
-  point = window->point;
-
-  while (count)
-    {
-      if (point == 0)
-        break;
-
-      /* Like info_forward_word (), except that we look at the
-         characters just before point. */
-
-      c = buffer[point - 1];
-
-      if (!alphabetic (c))
-        {
-          while (--point)
-            {
-              c = buffer[point - 1];
-              if (alphabetic (c))
-                break;
-            }
-        }
-
-      while (point)
-        {
-          c = buffer[point - 1];
-          if (!alphabetic (c))
-            break;
-          else
-            --point;
-        }
-      --count;
-    }
-  window->point = point;
-  info_show_point (window);
-}
-
-/* Variable controlling the behaviour of default scrolling when you are
-   already at the bottom of a node.  Possible values are defined in session.h.
-   The meanings are:
-
-   IS_Continuous        Try to get first menu item, or failing that, the
-                        "Next:" pointer, or failing that, the "Up:" and
-                        "Next:" of the up.
-   IS_NextOnly          Try to get "Next:" menu item.
-   IS_PageOnly          Simply give up at the bottom of a node. */
-
-int info_scroll_behaviour = IS_Continuous;
-
-/* Choices used by the completer when reading a value for the user-visible
-   variable "scroll-behaviour". */
-char *info_scroll_choices[] = {
-  "Continuous", "Next Only", "Page Only", (char *)NULL
-};
-
-/* Default window sizes for scrolling commands.  */
-int default_window_size = -1;	/* meaning 1 window-full */
-int default_scroll_size = -1;	/* meaning half screen size */
-
-#define INFO_LABEL_FOUND() \
-  (info_parsed_nodename || (info_parsed_filename \
-                            && !is_dir_name (info_parsed_filename)))
-
-/* Move to 1st menu item, Next, Up/Next, or error in this window. */
-static void
-forward_move_node_structure (WINDOW *window, int behaviour)
-{
-  switch (behaviour)
-    {
-    case IS_PageOnly:
-      info_error ((char *) msg_at_node_bottom, NULL, NULL);
-      break;
-
-    case IS_NextOnly:
-      info_next_label_of_node (window->node);
-      if (!info_parsed_nodename && !info_parsed_filename)
-        info_error ((char *) msg_no_pointer, (char *) _("Next"), NULL);
-      else
-        {
-          window_message_in_echo_area ((char *) _("Following Next node..."),
-              NULL, NULL);
-          info_handle_pointer ("Next", window);
-        }
-      break;
-
-    case IS_Continuous:
-      {
-        /* First things first.  If this node contains a menu, move down
-           into the menu. */
-        {
-          REFERENCE **menu;
-
-          menu = info_menu_of_node (window->node);
-
-          if (menu)
-            {
-              info_free_references (menu);
-              window_message_in_echo_area ((char *) _("Selecting first menu item..."),
-                  NULL, NULL);
-              info_menu_digit (window, 1, '1');
-              return;
-            }
-        }
-
-        /* Okay, this node does not contain a menu.  If it contains a
-           "Next:" pointer, use that. */
-        info_next_label_of_node (window->node);
-        if (INFO_LABEL_FOUND ())
-          {
-            window_message_in_echo_area ((char *) _("Selecting Next node..."),
-                NULL, NULL);
-            info_handle_pointer ("Next", window);
-            return;
-          }
-
-        /* Okay, there wasn't a "Next:" for this node.  Move "Up:" until we
-           can move "Next:".  If that isn't possible, complain that there
-           are no more nodes. */
-        {
-          int up_counter, old_current;
-          INFO_WINDOW *info_win;
-
-          /* Remember the current node and location. */
-          info_win = get_info_window_of_window (window);
-          old_current = info_win->current;
-
-          /* Back up through the "Up:" pointers until we have found a "Next:"
-             that isn't the same as the first menu item found in that node. */
-          up_counter = 0;
-          while (!info_error_was_printed)
-            {
-              info_up_label_of_node (window->node);
-              if (INFO_LABEL_FOUND ())
-                {
-                  info_handle_pointer ("Up", window);
-                  if (info_error_was_printed)
-                    continue;
-
-                  up_counter++;
-
-                  info_next_label_of_node (window->node);
-
-                  /* If no "Next" pointer, keep backing up. */
-                  if (!INFO_LABEL_FOUND ())
-                    continue;
-
-                  /* If this node's first menu item is the same as this node's
-                     Next pointer, keep backing up. */
-                  if (!info_parsed_filename)
-                    {
-                      REFERENCE **menu;
-                      char *next_nodename;
-
-                      /* Remember the name of the Next node, since reading
-                         the menu can overwrite the contents of the
-                         info_parsed_xxx strings. */
-                      next_nodename = xstrdup (info_parsed_nodename);
-
-                      menu = info_menu_of_node (window->node);
-                      if (menu &&
-                          (strcmp
-                           (menu[0]->nodename, next_nodename) == 0))
-                        {
-                          info_free_references (menu);
-                          free (next_nodename);
-                          continue;
-                        }
-                      else
-                        {
-                          /* Restore the world to where it was before
-                             reading the menu contents. */
-                          info_free_references (menu);
-                          free (next_nodename);
-                          info_next_label_of_node (window->node);
-                        }
-                    }
-
-                  /* This node has a "Next" pointer, and it is not the
-                     same as the first menu item found in this node. */
-                  window_message_in_echo_area
-                    ((char *) _("Moving Up %d time(s), then Next."),
-                     (void *) (long) up_counter, NULL);
-
-                  info_handle_pointer ("Next", window);
-                  return;
-                }
-              else
-                {
-                  /* No more "Up" pointers.  Print an error, and call it
-                     quits. */
-                  register int i;
-
-                  for (i = 0; i < up_counter; i++)
-                    {
-                      info_win->nodes_index--;
-                      free (info_win->nodes[info_win->nodes_index]);
-                      info_win->nodes[info_win->nodes_index] = (NODE *)NULL;
-                    }
-                  info_win->current = old_current;
-                  window->node = info_win->nodes[old_current];
-                  window->pagetop = info_win->pagetops[old_current];
-                  window->point = info_win->points[old_current];
-                  recalculate_line_starts (window);
-                  window->flags |= W_UpdateWindow;
-                  info_error ((char *) _("No more nodes within this document."),
-                      NULL, NULL);
-                }
-            }
-        }
-        break;
-      }
-    }
-}
-
-/* Move Prev, Up or error in WINDOW depending on BEHAVIOUR. */
-static void
-backward_move_node_structure (WINDOW *window, int behaviour)
-{
-  switch (behaviour)
-    {
-    case IS_PageOnly:
-      info_error ((char *) msg_at_node_top, NULL, NULL);
-      break;
-
-    case IS_NextOnly:
-      info_prev_label_of_node (window->node);
-      if (!info_parsed_nodename && !info_parsed_filename)
-        info_error ((char *) _("No `Prev' for this node."), NULL, NULL);
-      else
-        {
-          window_message_in_echo_area ((char *) _("Moving Prev in this window."),
-              NULL, NULL);
-          info_handle_pointer ("Prev", window);
-        }
-      break;
-
-    case IS_Continuous:
-      info_prev_label_of_node (window->node);
-
-      if (!info_parsed_nodename && (!info_parsed_filename
-                                    || is_dir_name (info_parsed_filename)))
-        {
-          info_up_label_of_node (window->node);
-          if (!info_parsed_nodename && (!info_parsed_filename
-                                        || is_dir_name (info_parsed_filename)))
-            info_error ((char *)
-                _("No `Prev' or `Up' for this node within this document."),
-                NULL, NULL);
-          else
-            {
-              window_message_in_echo_area ((char *) _("Moving Up in this window."),
-                  NULL, NULL);
-              info_handle_pointer ("Up", window);
-            }
-        }
-      else
-        {
-          REFERENCE **menu;
-          int inhibit_menu_traversing = 0;
-
-          /* Watch out!  If this node's Prev is the same as the Up, then
-             move Up.  Otherwise, we could move Prev, and then to the last
-             menu item in the Prev.  This would cause the user to loop
-             through a subsection of the info file. */
-          if (!info_parsed_filename && info_parsed_nodename)
-            {
-              char *pnode;
-
-              pnode = xstrdup (info_parsed_nodename);
-              info_up_label_of_node (window->node);
-
-              if (!info_parsed_filename && info_parsed_nodename &&
-                  strcmp (info_parsed_nodename, pnode) == 0)
-                {
-                  /* The nodes are the same.  Inhibit moving to the last
-                     menu item. */
-                  free (pnode);
-                  inhibit_menu_traversing = 1;
-                }
-              else
-                {
-                  free (pnode);
-                  info_prev_label_of_node (window->node);
-                }
-            }
-
-          /* Move to the previous node.  If this node now contains a menu,
-             and we have not inhibited movement to it, move to the node
-             corresponding to the last menu item. */
-          window_message_in_echo_area ((char *) _("Moving Prev in this window."),
-              NULL, NULL);
-          info_handle_pointer ("Prev", window);
-
-          if (!inhibit_menu_traversing)
-            {
-              while (!info_error_was_printed &&
-                     (menu = info_menu_of_node (window->node)))
-                {
-                  info_free_references (menu);
-                  window_message_in_echo_area
-                    ((char *) _("Moving to `Prev's last menu item."), NULL, NULL);
-                  info_menu_digit (window, 1, '0');
-                }
-            }
-        }
-      break;
-    }
-}
-
-/* Move continuously forward through the node structure of this info file. */
-DECLARE_INFO_COMMAND (info_global_next_node,
-                      _("Move forwards or down through node structure"))
-{
-  if (count < 0)
-    info_global_prev_node (window, -count, key);
-  else
-    {
-      while (count && !info_error_was_printed)
-        {
-          forward_move_node_structure (window, IS_Continuous);
-          count--;
-        }
-    }
-}
-
-/* Move continuously backward through the node structure of this info file. */
-DECLARE_INFO_COMMAND (info_global_prev_node,
-                      _("Move backwards or up through node structure"))
-{
-  if (count < 0)
-    info_global_next_node (window, -count, key);
-  else
-    {
-      while (count && !info_error_was_printed)
-        {
-          backward_move_node_structure (window, IS_Continuous);
-          count--;
-        }
-    }
-}
-
-static void _scroll_forward(WINDOW *window, int count,
-    unsigned char key, int behaviour);
-static void _scroll_backward(WINDOW *window, int count,
-    unsigned char key, int behaviour);
-
-static void
-_scroll_forward(WINDOW *window, int count, unsigned char key, int behaviour)
-{
-  if (count < 0)
-    _scroll_backward (window, -count, key, behaviour);
-  else
-    {
-      int desired_top;
-
-      /* Without an explicit numeric argument, scroll the bottom two
-         lines to the top of this window,  Or, if at bottom of window,
-         and the chosen behaviour is to scroll through nodes get the
-	 "Next" node for this window. */
-      if (default_window_size > 0)
-        desired_top = window->pagetop + default_window_size;
-      else if (!info_explicit_arg && count == 1)
-        {
-          desired_top = window->pagetop + (window->height - 2);
-
-          /* If there are no more lines to scroll here, error, or get
-             another node, depending on BEHAVIOUR. */
-          if (desired_top > window->line_count)
-            {
-              forward_move_node_structure (window, behaviour);
-              return;
-            }
-        }
-      else
-        desired_top = window->pagetop + count;
-
-      if (desired_top >= window->line_count)
-        desired_top = window->line_count - 2;
-
-      if (window->pagetop > desired_top)
-        return;
-      else
-        set_window_pagetop (window, desired_top);
-    }
-}
-
-static void
-_scroll_backward(WINDOW *window, int count, unsigned char key, int behaviour)
-{
-  if (count < 0)
-    _scroll_forward (window, -count, key, behaviour);
-  else
-    {
-      int desired_top;
-
-      /* Without an explicit numeric argument, scroll the top two lines
-         to the bottom of this window, or, depending on the selected
-	 behaviour, move to the previous, or Up'th node. */
-      if (default_window_size > 0)
-        desired_top = window->pagetop - default_window_size;
-      else if (!info_explicit_arg && count == 1)
-        {
-          desired_top = window->pagetop - (window->height - 2);
-
-          if ((desired_top < 0) && (window->pagetop == 0))
-            {
-              backward_move_node_structure (window, behaviour);
-              return;
-            }
-        }
-      else
-        desired_top = window->pagetop - count;
-
-      if (desired_top < 0)
-        desired_top = 0;
-
-      set_window_pagetop (window, desired_top);
-    }
-}
-
-/* Show the next screen of WINDOW's node. */
-DECLARE_INFO_COMMAND (info_scroll_forward, _("Scroll forward in this window"))
-{
-  _scroll_forward (window, count, key, info_scroll_behaviour);
-}
-
-/* Like info_scroll_forward, but sets default_window_size as a side
-   effect.  */
-DECLARE_INFO_COMMAND (info_scroll_forward_set_window,
-		      _("Scroll forward in this window and set default window size"))
-{
-  if (info_explicit_arg)
-    default_window_size = count;
-  _scroll_forward (window, count, key, info_scroll_behaviour);
-}
-
-/* Show the next screen of WINDOW's node but never advance to next node. */
-DECLARE_INFO_COMMAND (info_scroll_forward_page_only, _("Scroll forward in this window staying within node"))
-{
-  _scroll_forward (window, count, key, IS_PageOnly);
-}
-
-/* Like info_scroll_forward_page_only, but sets default_window_size as a side
-   effect.  */
-DECLARE_INFO_COMMAND (info_scroll_forward_page_only_set_window,
-		      _("Scroll forward in this window staying within node and set default window size"))
-{
-  if (info_explicit_arg)
-    default_window_size = count;
-  _scroll_forward (window, count, key, IS_PageOnly);
-}
-
-/* Show the previous screen of WINDOW's node. */
-DECLARE_INFO_COMMAND (info_scroll_backward, _("Scroll backward in this window"))
-{
-  _scroll_backward (window, count, key, info_scroll_behaviour);
-}
-
-/* Like info_scroll_backward, but sets default_window_size as a side
-   effect.  */
-DECLARE_INFO_COMMAND (info_scroll_backward_set_window,
-		      _("Scroll backward in this window and set default window size"))
-{
-  if (info_explicit_arg)
-    default_window_size = count;
-  _scroll_backward (window, count, key, info_scroll_behaviour);
-}
-
-/* Show the previous screen of WINDOW's node but never move to previous
-   node. */
-DECLARE_INFO_COMMAND (info_scroll_backward_page_only, _("Scroll backward in this window staying within node"))
-{
-  _scroll_backward (window, count, key, IS_PageOnly);
-}
-
-/* Like info_scroll_backward_page_only, but sets default_window_size as a side
-   effect.  */
-DECLARE_INFO_COMMAND (info_scroll_backward_page_only_set_window,
-		      _("Scroll backward in this window staying within node and set default window size"))
-{
-  if (info_explicit_arg)
-    default_window_size = count;
-  _scroll_backward (window, count, key, IS_PageOnly);
-}
-
-/* Move to the beginning of the node. */
-DECLARE_INFO_COMMAND (info_beginning_of_node, _("Move to the start of this node"))
-{
-  window->pagetop = window->point = 0;
-  window->flags |= W_UpdateWindow;
-}
-
-/* Move to the end of the node. */
-DECLARE_INFO_COMMAND (info_end_of_node, _("Move to the end of this node"))
-{
-  window->point = window->node->nodelen - 1;
-  info_show_point (window);
-}
-
-/* Scroll the window forward by N lines.  */
-DECLARE_INFO_COMMAND (info_down_line, _("Scroll down by lines"))
-{
-  if (count < 0)
-    info_up_line (window, -count, key);
-  else
-    {
-      int desired_top = window->pagetop + count;
-
-      if (desired_top >= window->line_count)
-	desired_top = window->line_count - 2;
-
-      if (window->pagetop <= desired_top)
-	set_window_pagetop (window, desired_top);
-    }
-}
-
-/* Scroll the window backward by N lines.  */
-DECLARE_INFO_COMMAND (info_up_line, _("Scroll up by lines"))
-{
-  if (count < 0)
-    info_down_line (window, -count, key);
-  else
-    {
-      int desired_top = window->pagetop - count;
-
-      if (desired_top < 0)
-	desired_top = 0;
-
-      set_window_pagetop (window, desired_top);
-    }
-}
-
-/* Scroll the window forward by N lines and remember N as default for
-   subsequent commands.  */
-DECLARE_INFO_COMMAND (info_scroll_half_screen_down,
-		      _("Scroll down by half screen size"))
-{
-  if (count < 0)
-    info_scroll_half_screen_up (window, -count, key);
-  else
-    {
-      int scroll_size = (the_screen->height + 1) / 2;
-      int desired_top;
-
-      if (info_explicit_arg)
-	default_scroll_size = count;
-      if (default_scroll_size > 0)
-	scroll_size = default_scroll_size;
-
-      desired_top = window->pagetop + scroll_size;
-      if (desired_top >= window->line_count)
-	desired_top = window->line_count - 2;
-
-      if (window->pagetop <= desired_top)
-	set_window_pagetop (window, desired_top);
-    }
-}
-
-/* Scroll the window backward by N lines and remember N as default for
-   subsequent commands.  */
-DECLARE_INFO_COMMAND (info_scroll_half_screen_up,
-		      _("Scroll up by half screen size"))
-{
-  if (count < 0)
-    info_scroll_half_screen_down (window, -count, key);
-  else
-    {
-      int scroll_size = (the_screen->height + 1) / 2;
-      int desired_top;
-
-      if (info_explicit_arg)
-	default_scroll_size = count;
-      if (default_scroll_size > 0)
-	scroll_size = default_scroll_size;
-
-      desired_top = window->pagetop - scroll_size;
-      if (desired_top < 0)
-	desired_top = 0;
-
-      set_window_pagetop (window, desired_top);
-    }
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                 Commands for Manipulating Windows                */
-/*                                                                  */
-/* **************************************************************** */
-
-/* Make the next window in the chain be the active window. */
-DECLARE_INFO_COMMAND (info_next_window, _("Select the next window"))
-{
-  if (count < 0)
-    {
-      info_prev_window (window, -count, key);
-      return;
-    }
-
-  /* If no other window, error now. */
-  if (!windows->next && !echo_area_is_active)
-    {
-      info_error ((char *) msg_one_window, NULL, NULL);
-      return;
-    }
-
-  while (count--)
-    {
-      if (window->next)
-        window = window->next;
-      else
-        {
-          if (window == the_echo_area || !echo_area_is_active)
-            window = windows;
-          else
-            window = the_echo_area;
-        }
-    }
-
-  if (active_window != window)
-    {
-      if (auto_footnotes_p)
-        info_get_or_remove_footnotes (window);
-
-      window->flags |= W_UpdateWindow;
-      active_window = window;
-    }
-}
-
-/* Make the previous window in the chain be the active window. */
-DECLARE_INFO_COMMAND (info_prev_window, _("Select the previous window"))
-{
-  if (count < 0)
-    {
-      info_next_window (window, -count, key);
-      return;
-    }
-
-  /* Only one window? */
-
-  if (!windows->next && !echo_area_is_active)
-    {
-      info_error ((char *) msg_one_window, NULL, NULL);
-      return;
-    }
-
-  while (count--)
-    {
-      /* If we are in the echo area, or if the echo area isn't active and we
-         are in the first window, find the last window in the chain. */
-      if (window == the_echo_area ||
-          (window == windows && !echo_area_is_active))
-        {
-          register WINDOW *win, *last = NULL;
-
-          for (win = windows; win; win = win->next)
-            last = win;
-
-          window = last;
-        }
-      else
-        {
-          if (window == windows)
-            window = the_echo_area;
-          else
-            window = window->prev;
-        }
-    }
-
-  if (active_window != window)
-    {
-      if (auto_footnotes_p)
-        info_get_or_remove_footnotes (window);
-
-      window->flags |= W_UpdateWindow;
-      active_window = window;
-    }
-}
-
-/* Split WINDOW into two windows, both showing the same node.  If we
-   are automatically tiling windows, re-tile after the split. */
-DECLARE_INFO_COMMAND (info_split_window, _("Split the current window"))
-{
-  WINDOW *split, *old_active;
-  int pagetop;
-
-  /* Remember the current pagetop of the window being split.  If it doesn't
-     change, we can scroll its contents around after the split. */
-  pagetop = window->pagetop;
-
-  /* Make the new window. */
-  old_active = active_window;
-  active_window = window;
-  split = window_make_window (window->node);
-  active_window = old_active;
-
-  if (!split)
-    {
-      info_error ((char *) msg_win_too_small, NULL, NULL);
-    }
-  else
-    {
-#if defined (SPLIT_BEFORE_ACTIVE)
-      /* Try to scroll the old window into its new postion. */
-      if (pagetop == window->pagetop)
-        {
-          int start, end, amount;
-
-          start = split->first_row;
-          end = start + window->height;
-          amount = split->height + 1;
-          display_scroll_display (start, end, amount);
-        }
-#else /* !SPLIT_BEFORE_ACTIVE */
-      /* Make sure point still appears in the active window. */
-      info_show_point (window);
-#endif /* !SPLIT_BEFORE_ACTIVE */
-
-      /* If the window just split was one internal to Info, try to display
-         something else in it. */
-      if (internal_info_node_p (split->node))
-        {
-          register int i, j;
-          INFO_WINDOW *iw;
-          NODE *node = (NODE *)NULL;
-          char *filename;
-
-          for (i = 0; (iw = info_windows[i]); i++)
-            {
-              for (j = 0; j < iw->nodes_index; j++)
-                if (!internal_info_node_p (iw->nodes[j]))
-                  {
-                    if (iw->nodes[j]->parent)
-                      filename = iw->nodes[j]->parent;
-                    else
-                      filename = iw->nodes[j]->filename;
-
-                    node = info_get_node (filename, iw->nodes[j]->nodename);
-                    if (node)
-                      {
-                        window_set_node_of_window (split, node);
-                        i = info_windows_index - 1;
-                        break;
-                      }
-                  }
-            }
-        }
-      split->pagetop = window->pagetop;
-
-      if (auto_tiling_p)
-        window_tile_windows (DONT_TILE_INTERNALS);
-      else
-        window_adjust_pagetop (split);
-
-      remember_window_and_node (split, split->node);
-    }
-}
-
-/* Delete WINDOW, forgetting the list of last visited nodes.  If we are
-   automatically displaying footnotes, show or remove the footnotes
-   window.  If we are automatically tiling windows, re-tile after the
-   deletion. */
-DECLARE_INFO_COMMAND (info_delete_window, _("Delete the current window"))
-{
-  if (!windows->next)
-    {
-      info_error ((char *) msg_cant_kill_last, NULL, NULL);
-    }
-  else if (window->flags & W_WindowIsPerm)
-    {
-      info_error ((char *) _("Cannot delete a permanent window"), NULL, NULL);
-    }
-  else
-    {
-      info_delete_window_internal (window);
-
-      if (auto_footnotes_p)
-        info_get_or_remove_footnotes (active_window);
-
-      if (auto_tiling_p)
-        window_tile_windows (DONT_TILE_INTERNALS);
-    }
-}
-
-/* Do the physical deletion of WINDOW, and forget this window and
-   associated nodes. */
-void
-info_delete_window_internal (WINDOW *window)
-{
-  if (windows->next && ((window->flags & W_WindowIsPerm) == 0))
-    {
-      /* We not only delete the window from the display, we forget it from
-         our list of remembered windows. */
-      forget_window_and_nodes (window);
-      window_delete_window (window);
-
-      if (echo_area_is_active)
-        echo_area_inform_of_deleted_window (window);
-    }
-}
-
-/* Just keep WINDOW, deleting all others. */
-DECLARE_INFO_COMMAND (info_keep_one_window, _("Delete all other windows"))
-{
-  int num_deleted;              /* The number of windows we deleted. */
-  int pagetop, start, end;
-
-  /* Remember a few things about this window.  We may be able to speed up
-     redisplay later by scrolling its contents. */
-  pagetop = window->pagetop;
-  start = window->first_row;
-  end = start + window->height;
-
-  num_deleted = 0;
-
-  while (1)
-    {
-      WINDOW *win;
-
-      /* Find an eligible window and delete it.  If no eligible windows
-         are found, we are done.  A window is eligible for deletion if
-         is it not permanent, and it is not WINDOW. */
-      for (win = windows; win; win = win->next)
-        if (win != window && ((win->flags & W_WindowIsPerm) == 0))
-          break;
-
-      if (!win)
-        break;
-
-      info_delete_window_internal (win);
-      num_deleted++;
-    }
-
-  /* Scroll the contents of this window into the right place so that the
-     user doesn't have to wait any longer than necessary for redisplay. */
-  if (num_deleted)
-    {
-      int amount;
-
-      amount = (window->first_row - start);
-      amount -= (window->pagetop - pagetop);
-      display_scroll_display (start, end, amount);
-    }
-
-  window->flags |= W_UpdateWindow;
-}
-
-/* Scroll the "other" window of WINDOW. */
-DECLARE_INFO_COMMAND (info_scroll_other_window, _("Scroll the other window"))
-{
-  WINDOW *other;
-
-  /* If only one window, give up. */
-  if (!windows->next)
-    {
-      info_error ((char *) msg_one_window, NULL, NULL);
-      return;
-    }
-
-  other = window->next;
-
-  if (!other)
-    other = window->prev;
-
-  info_scroll_forward (other, count, key);
-}
-
-/* Scroll the "other" window of WINDOW. */
-DECLARE_INFO_COMMAND (info_scroll_other_window_backward,
-                      _("Scroll the other window backward"))
-{
-  info_scroll_other_window (window, -count, key);
-}
-
-/* Change the size of WINDOW by AMOUNT. */
-DECLARE_INFO_COMMAND (info_grow_window, _("Grow (or shrink) this window"))
-{
-  window_change_window_height (window, count);
-}
-
-/* When non-zero, tiling takes place automatically when info_split_window
-   is called. */
-int auto_tiling_p = 0;
-
-/* Tile all of the visible windows. */
-DECLARE_INFO_COMMAND (info_tile_windows,
-    _("Divide the available screen space among the visible windows"))
-{
-  window_tile_windows (TILE_INTERNALS);
-}
-
-/* Toggle the state of this window's wrapping of lines. */
-DECLARE_INFO_COMMAND (info_toggle_wrap,
-              _("Toggle the state of line wrapping in the current window"))
-{
-  window_toggle_wrap (window);
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                      Info Node Commands                          */
-/*                                                                  */
-/* **************************************************************** */
-
-/* Return (FILENAME)NODENAME for NODE, or just NODENAME if NODE's
-   filename is not set. */
-char *
-node_printed_rep (NODE *node)
-{
-  char *rep;
-
-  if (node->filename)
-    {
-      char *filename
-       = filename_non_directory (node->parent ? node->parent : node->filename);
-      rep = xmalloc (1 + strlen (filename) + 1 + strlen (node->nodename) + 1);
-      sprintf (rep, "(%s)%s", filename, node->nodename);
-    }
-  else
-    rep = node->nodename;
-
-  return rep;
-}
-
-
-/* Using WINDOW for various defaults, select the node referenced by ENTRY
-   in it.  If the node is selected, the window and node are remembered. */
-void
-info_select_reference (WINDOW *window, REFERENCE *entry)
-{
-  NODE *node;
-  char *filename, *nodename, *file_system_error;
-
-  file_system_error = (char *)NULL;
-
-  filename = entry->filename;
-  if (!filename)
-    filename = window->node->parent;
-  if (!filename)
-    filename = window->node->filename;
-
-  if (filename)
-    filename = xstrdup (filename);
-
-  if (entry->nodename)
-    nodename = xstrdup (entry->nodename);
-  else
-    nodename = xstrdup ("Top");
-
-  node = info_get_node (filename, nodename);
-
-  /* Try something a little weird.  If the node couldn't be found, and the
-     reference was of the form "foo::", see if the entry->label can be found
-     as a file, with a node of "Top". */
-  if (!node)
-    {
-      if (info_recent_file_error)
-        file_system_error = xstrdup (info_recent_file_error);
-
-      if (entry->nodename && (strcmp (entry->nodename, entry->label) == 0))
-        {
-          node = info_get_node (entry->label, "Top");
-          if (!node && info_recent_file_error)
-            {
-              maybe_free (file_system_error);
-              file_system_error = xstrdup (info_recent_file_error);
-            }
-        }
-    }
-
-  if (!node)
-    {
-      if (file_system_error)
-        info_error (file_system_error, NULL, NULL);
-      else
-        info_error ((char *) msg_cant_find_node, nodename, NULL);
-    }
-
-  maybe_free (file_system_error);
-  maybe_free (filename);
-  maybe_free (nodename);
-
-  if (node)
-    info_set_node_of_window (1, window, node);
-}
-
-/* Parse the node specification in LINE using WINDOW to default the filename.
-   Select the parsed node in WINDOW and remember it, or error if the node
-   couldn't be found. */
-static void
-info_parse_and_select (char *line, WINDOW *window)
-{
-  REFERENCE entry;
-
-  info_parse_node (line, DONT_SKIP_NEWLINES);
-
-  entry.nodename = info_parsed_nodename;
-  entry.filename = info_parsed_filename;
-  entry.label = "*info-parse-and-select*";
-
-  info_select_reference (window, &entry);
-}
-
-/* Given that the values of INFO_PARSED_FILENAME and INFO_PARSED_NODENAME
-   are previously filled, try to get the node represented by them into
-   WINDOW.  The node should have been pointed to by the LABEL pointer of
-   WINDOW->node. */
-static void
-info_handle_pointer (char *label, WINDOW *window)
-{
-  if (info_parsed_filename || info_parsed_nodename)
-    {
-      char *filename, *nodename;
-      NODE *node;
-
-      filename = nodename = (char *)NULL;
-
-      if (info_parsed_filename)
-        filename = xstrdup (info_parsed_filename);
-      else
-        {
-          if (window->node->parent)
-            filename = xstrdup (window->node->parent);
-          else if (window->node->filename)
-            filename = xstrdup (window->node->filename);
-        }
-
-      if (info_parsed_nodename)
-        nodename = xstrdup (info_parsed_nodename);
-      else
-        nodename = xstrdup ("Top");
-
-      node = info_get_node (filename, nodename);
-
-      if (node)
-        {
-          INFO_WINDOW *info_win;
-
-          info_win = get_info_window_of_window (window);
-          if (info_win)
-            {
-              info_win->pagetops[info_win->current] = window->pagetop;
-              info_win->points[info_win->current] = window->point;
-            }
-          info_set_node_of_window (1, window, node);
-        }
-      else
-        {
-          if (info_recent_file_error)
-            info_error (info_recent_file_error, NULL, NULL);
-          else
-            info_error ((char *) msg_cant_file_node, filename, nodename);
-        }
-
-      free (filename);
-      free (nodename);
-    }
-  else
-    {
-      info_error ((char *) msg_no_pointer, label, NULL);
-    }
-}
-
-/* Make WINDOW display the "Next:" node of the node currently being
-   displayed. */
-DECLARE_INFO_COMMAND (info_next_node, _("Select the Next node"))
-{
-  info_next_label_of_node (window->node);
-  info_handle_pointer ("Next", window);
-}
-
-/* Make WINDOW display the "Prev:" node of the node currently being
-   displayed. */
-DECLARE_INFO_COMMAND (info_prev_node, _("Select the Prev node"))
-{
-  info_prev_label_of_node (window->node);
-  info_handle_pointer ("Prev", window);
-}
-
-/* Make WINDOW display the "Up:" node of the node currently being
-   displayed. */
-DECLARE_INFO_COMMAND (info_up_node, _("Select the Up node"))
-{
-  info_up_label_of_node (window->node);
-  info_handle_pointer ("Up", window);
-}
-
-/* Make WINDOW display the last node of this info file. */
-DECLARE_INFO_COMMAND (info_last_node, _("Select the last node in this file"))
-{
-  register int i;
-  FILE_BUFFER *fb = file_buffer_of_window (window);
-  NODE *node = (NODE *)NULL;
-
-  if (fb && fb->tags)
-    {
-      int last_node_tag_idx = -1;
-
-      /* If no explicit argument, or argument of zero, default to the
-         last node.  */
-      if (count == 0 || (count == 1 && !info_explicit_arg))
-        count = -1;
-      for (i = 0; count && fb->tags[i]; i++)
-        if (fb->tags[i]->nodelen != 0) /* don't count anchor tags */
-          {
-            count--;
-            last_node_tag_idx = i;
-          }
-      if (count > 0)
-        i = last_node_tag_idx + 1;
-      if (i > 0)
-        node = info_get_node (fb->filename, fb->tags[i - 1]->nodename);
-    }
-
-  if (!node)
-    info_error ((char *) _("This window has no additional nodes"), NULL, NULL);
-  else
-    info_set_node_of_window (1, window, node);
-}
-
-/* Make WINDOW display the first node of this info file. */
-DECLARE_INFO_COMMAND (info_first_node, _("Select the first node in this file"))
-{
-  FILE_BUFFER *fb = file_buffer_of_window (window);
-  NODE *node = (NODE *)NULL;
-
-  /* If no explicit argument, or argument of zero, default to the
-     first node.  */
-  if (count == 0)
-    count = 1;
-  if (fb && fb->tags)
-    {
-      register int i;
-      int last_node_tag_idx = -1;
-
-      for (i = 0; count && fb->tags[i]; i++)
-        if (fb->tags[i]->nodelen != 0) /* don't count anchor tags */
-          {
-            count--;
-            last_node_tag_idx = i;
-          }
-      if (count > 0)
-        i = last_node_tag_idx + 1;
-      if (i > 0)
-        node = info_get_node (fb->filename, fb->tags[i - 1]->nodename);
-    }
-
-  if (!node)
-    info_error ((char *) _("This window has no additional nodes"), NULL, NULL);
-  else
-    info_set_node_of_window (1, window, node);
-}
-
-/* Select the last menu item in WINDOW->node. */
-DECLARE_INFO_COMMAND (info_last_menu_item,
-   _("Select the last item in this node's menu"))
-{
-  info_menu_digit (window, 1, '0');
-}
-
-/* Use KEY (a digit) to select the Nth menu item in WINDOW->node. */
-DECLARE_INFO_COMMAND (info_menu_digit, _("Select this menu item"))
-{
-  register int i, item;
-  register REFERENCE **menu;
-
-  menu = info_menu_of_node (window->node);
-
-  if (!menu)
-    {
-      info_error ((char *) msg_no_menu_node, NULL, NULL);
-      return;
-    }
-
-  /* We have the menu.  See if there are this many items in it. */
-  item = key - '0';
-
-  /* Special case.  Item "0" is the last item in this menu. */
-  if (item == 0)
-    for (i = 0; menu[i + 1]; i++);
-  else
-    {
-      for (i = 0; menu[i]; i++)
-        if (i == item - 1)
-          break;
-    }
-
-  if (menu[i])
-    {
-      info_select_reference (window, menu[i]);
-      if (menu[i]->line_number > 0)
-        info_next_line (window, menu[i]->line_number - 1, key);
-    }
-  else
-    info_error ((char *) _("There aren't %d items in this menu."),
-                (void *) (long) item, NULL);
-
-  info_free_references (menu);
-  return;
-}
-
-
-
-/* Return a pointer to the xref in XREF_LIST that is nearest to POS, or
-   NULL if XREF_LIST is empty.  That is, if POS is within any of the
-   given xrefs, return that one.  Otherwise, return the one with the
-   nearest beginning or end.  If there are two that are equidistant,
-   prefer the one forward.  The return is in newly-allocated memory,
-   since the caller frees it.
-   
-   This is called from info_menu_or_ref_item with XREF_LIST being all
-   the xrefs in the node, and POS being point.  The ui function that
-   starts it all off is select-reference-this-line.
-
-   This is not the same logic as in info.el.  Info-get-token prefers
-   searching backwards to searching forwards, and has a hardwired search
-   limit of 200 chars (in Emacs 21.2).  */
-
-static REFERENCE **
-nearest_xref (REFERENCE **xref_list, long int pos)
-{
-  int this_xref;
-  int nearest = -1;
-  long best_delta = -1;
-  
-  for (this_xref = 0; xref_list[this_xref]; this_xref++)
-    {
-      long delta;
-      REFERENCE *xref = xref_list[this_xref];
-      if (xref->start <= pos && pos <= xref->end)
-        { /* POS is within this xref, we're done */
-          nearest = this_xref;
-          break;
-        }
-      
-      /* See how far POS is from this xref.  Take into account the
-         `*Note' that begins the xref, since as far as the user is
-         concerned, that's where it starts.  */
-      delta = MIN (labs (pos - (xref->start - strlen (INFO_XREF_LABEL))),
-                   labs (pos - xref->end));
-      
-      /* It's the <= instead of < that makes us choose the forward xref
-         of POS if two are equidistant.  Of course, because of all the
-         punctuation surrounding xrefs, it's not necessarily obvious
-         where one ends.  */
-      if (delta <= best_delta || best_delta < 0)
-        {
-          nearest = this_xref;
-          best_delta = delta;
-        }
-    }
-  
-  /* Maybe there was no list to search through.  */
-  if (nearest < 0)
-    return NULL;
-  
-  /* Ok, we have a nearest xref, make a list of it.  */
-  {
-    REFERENCE **ret = xmalloc (sizeof (REFERENCE *) * 2);
-    ret[0] = info_copy_reference (xref_list[nearest]);
-    ret[1] = NULL;
-    return ret;
-  }
-}
-
-
-/* Read a menu or followed reference from the user defaulting to the
-   reference found on the current line, and select that node.  The
-   reading is done with completion.  BUILDER is the function used
-   to build the list of references.  ASK_P is non-zero if the user
-   should be prompted, or zero to select the default item. */
-static void
-info_menu_or_ref_item (WINDOW *window, int count,
-    unsigned char key, REFERENCE **(*builder) (NODE *node), int ask_p)
-{
-  char *line;
-  REFERENCE *entry;
-  REFERENCE *defentry = NULL;
-  REFERENCE **menu = (*builder) (window->node);
-
-  if (!menu)
-    {
-      if (builder == info_menu_of_node)
-        info_error ((char *) msg_no_menu_node, NULL, NULL);
-      else
-        info_error ((char *) msg_no_xref_node, NULL, NULL);
-      return;
-    }
-
-  /* Default the selected reference to the one which is on the line that
-     point is in.  */
-  {
-    REFERENCE **refs = NULL;
-    int point_line = window_line_of_point (window);
-
-    if (point_line != -1)
-      {
-        SEARCH_BINDING binding;
-
-        binding.buffer = window->node->contents;
-        binding.start = window->line_starts[point_line] - binding.buffer;
-        if (window->line_starts[point_line + 1])
-          binding.end = window->line_starts[point_line + 1] - binding.buffer;
-        else
-          binding.end = window->node->nodelen;
-        binding.flags = 0;
-
-        if (builder == info_menu_of_node)
-          {
-            if (point_line)
-              {
-                binding.start--;
-                refs = info_menu_items (&binding);
-              }
-          }
-        else
-          {
-#if defined (HANDLE_MAN_PAGES)
-            if (window->node->flags & N_IsManPage)
-              refs = manpage_xrefs_in_binding (window->node, &binding);
-            else
-#endif /* HANDLE_MAN_PAGES */
-              refs = nearest_xref (menu, window->point);
-          }
-
-        if (refs && refs[0])
-          {
-            if (strcmp (refs[0]->label, "Menu") != 0
-                || builder == info_xrefs_of_node)
-              {
-                int which = 0;
-
-                /* For xrefs, find the closest reference to point,
-                   unless we only have one reference (as we will if
-                   we've called nearest_xref above).  It would be better
-                   to have only one piece of code, but the conditions
-                   when we call this are tangled.  */
-                if (builder == info_xrefs_of_node && refs[1])
-                  {
-                    int closest = -1;
-
-                    for (; refs[which]; which++)
-                      {
-                        if (window->point >= refs[which]->start
-                            && window->point <= refs[which]->end)
-                          {
-                            closest = which;
-                            break;
-                          }
-                        else if (window->point < refs[which]->start)
-                          break;
-                      }
-		    if (which > 0)
-		      {
-			if (closest == -1)
-			  which--;
-			else
-			  which = closest;
-		      }
-                  }
-
-                defentry = (REFERENCE *)xmalloc (sizeof (REFERENCE));
-                defentry->label = xstrdup (refs[which]->label);
-                defentry->filename = refs[which]->filename;
-                defentry->nodename = refs[which]->nodename;
-                defentry->line_number = refs[which]->line_number;
-
-                if (defentry->filename)
-                  defentry->filename = xstrdup (defentry->filename);
-                if (defentry->nodename)
-                  defentry->nodename = xstrdup (defentry->nodename);
-              }
-            info_free_references (refs);
-          }
-      }
-  }
-
-  /* If we are going to ask the user a question, do it now. */
-  if (ask_p)
-    {
-      char *prompt;
-
-      /* Build the prompt string. */
-      if (builder == info_menu_of_node)
-        {
-          if (defentry)
-	    {
-	      prompt = xmalloc (strlen (defentry->label)
-				+ strlen (_("Menu item (%s): ")));
-	      sprintf (prompt, _("Menu item (%s): "), defentry->label);
-	    }
-          else
-	    prompt = xstrdup (_("Menu item: "));
-        }
-      else
-        {
-          if (defentry)
-	    {
-	      prompt = xmalloc (strlen (defentry->label)
-				+ strlen (_("Follow xref (%s): ")));
-	      sprintf (prompt, _("Follow xref (%s): "), defentry->label);
-	    }
-          else
-	    prompt = xstrdup (_("Follow xref: "));
-        }
-
-      line = info_read_completing_in_echo_area (window, prompt, menu);
-      free (prompt);
-
-      window = active_window;
-
-      /* User aborts, just quit. */
-      if (!line)
-        {
-          maybe_free (defentry);
-          info_free_references (menu);
-          info_abort_key (window, 0, 0);
-          return;
-        }
-
-      /* If we had a default and the user accepted it, use that. */
-      if (!*line)
-        {
-          free (line);
-          if (defentry)
-            line = xstrdup (defentry->label);
-          else
-            line = (char *)NULL;
-        }
-    }
-  else
-    {
-      /* Not going to ask any questions.  If we have a default entry, use
-         that, otherwise return. */
-      if (!defentry)
-        return;
-      else
-        line = xstrdup (defentry->label);
-    }
-
-  if (line)
-    {
-      /* It is possible that the references have more than a single
-         entry with the same label, and also LINE is down-cased, which
-         complicates matters even more.  Try to be as accurate as we
-         can: if they've chosen the default, use defentry directly. */
-      if (defentry && strcmp (line, defentry->label) == 0)
-        entry = defentry;
-      else
-        /* Find the selected label in the references.  If there are
-           more than one label which matches, find the one that's
-           closest to point.  */
-        {
-          register int i;
-          int best = -1, min_dist = window->node->nodelen;
-          REFERENCE *ref;
-
-          for (i = 0; menu && (ref = menu[i]); i++)
-            {
-              /* Need to use strcasecmp because LINE is downcased
-                 inside info_read_completing_in_echo_area.  */
-              if (strcasecmp (line, ref->label) == 0)
-                {
-                  /* ref->end is more accurate estimate of position
-                     for menus than ref->start.  Go figure.  */
-                  int dist = abs (window->point - ref->end);
-
-                  if (dist < min_dist)
-                    {
-                      min_dist = dist;
-                      best = i;
-                    }
-                }
-            }
-          if (best != -1)
-            entry = menu[best];
-          else
-            entry = (REFERENCE *)NULL;
-        }
-
-      if (!entry && defentry)
-        info_error ((char *) _("The reference disappeared! (%s)."), line, NULL);
-      else
-        {
-          NODE *orig = window->node;
-          info_select_reference (window, entry);
-
-          if (builder == info_xrefs_of_node && window->node != orig
-              && !(window->node->flags & N_FromAnchor))
-            { /* Search for this reference in the node.  */
-              long offset;
-              long start;
-
-              if (window->line_count > 0)
-                start = window->line_starts[1] - window->node->contents;
-              else
-                start = 0;
-
-              offset =
-                info_target_search_node (window->node, entry->label, start);
-
-              if (offset != -1)
-                {
-                  window->point = offset;
-                  window_adjust_pagetop (window);
-                }
-            }
-
-            if (entry->line_number > 0)
-              /* next_line starts at line 1?  Anyway, the -1 makes it
-                 move to the right line.  */
-              info_next_line (window, entry->line_number - 1, key);
-        }
-
-      free (line);
-      if (defentry)
-        {
-          free (defentry->label);
-          maybe_free (defentry->filename);
-          maybe_free (defentry->nodename);
-          free (defentry);
-        }
-    }
-
-  info_free_references (menu);
-
-  if (!info_error_was_printed)
-    window_clear_echo_area ();
-}
-
-/* Read a line (with completion) which is the name of a menu item,
-   and select that item. */
-DECLARE_INFO_COMMAND (info_menu_item, _("Read a menu item and select its node"))
-{
-  info_menu_or_ref_item (window, count, key, info_menu_of_node, 1);
-}
-
-/* Read a line (with completion) which is the name of a reference to
-   follow, and select the node. */
-DECLARE_INFO_COMMAND
-  (info_xref_item, _("Read a footnote or cross reference and select its node"))
-{
-  info_menu_or_ref_item (window, count, key, info_xrefs_of_node, 1);
-}
-
-/* Position the cursor at the start of this node's menu. */
-DECLARE_INFO_COMMAND (info_find_menu, _("Move to the start of this node's menu"))
-{
-  SEARCH_BINDING binding;
-  long position;
-
-  binding.buffer = window->node->contents;
-  binding.start  = 0;
-  binding.end = window->node->nodelen;
-  binding.flags = S_FoldCase | S_SkipDest;
-
-  position = search (INFO_MENU_LABEL, &binding);
-
-  if (position == -1)
-    info_error ((char *) msg_no_menu_node, NULL, NULL);
-  else
-    {
-      window->point = position;
-      window_adjust_pagetop (window);
-      window->flags |= W_UpdateWindow;
-    }
-}
-
-/* Visit as many menu items as is possible, each in a separate window. */
-DECLARE_INFO_COMMAND (info_visit_menu,
-  _("Visit as many menu items at once as possible"))
-{
-  register int i;
-  REFERENCE *entry, **menu;
-
-  menu = info_menu_of_node (window->node);
-
-  if (!menu)
-    info_error ((char *) msg_no_menu_node, NULL, NULL);
-
-  for (i = 0; (!info_error_was_printed) && (entry = menu[i]); i++)
-    {
-      WINDOW *new;
-
-      new = window_make_window (window->node);
-      window_tile_windows (TILE_INTERNALS);
-
-      if (!new)
-        info_error ((char *) msg_win_too_small, NULL, NULL);
-      else
-        {
-          active_window = new;
-          info_select_reference (new, entry);
-        }
-    }
-}
-
-/* Read a line of input which is a node name, and go to that node. */
-DECLARE_INFO_COMMAND (info_goto_node, _("Read a node name and select it"))
-{
-  char *line;
-
-#define GOTO_COMPLETES
-#if defined (GOTO_COMPLETES)
-  /* Build a completion list of all of the known nodes. */
-  {
-    register int fbi, i;
-    FILE_BUFFER *current;
-    REFERENCE **items = (REFERENCE **)NULL;
-    int items_index = 0;
-    int items_slots = 0;
-
-    current = file_buffer_of_window (window);
-
-    for (fbi = 0; info_loaded_files && info_loaded_files[fbi]; fbi++)
-      {
-        FILE_BUFFER *fb;
-        REFERENCE *entry;
-        int this_is_the_current_fb;
-
-        fb = info_loaded_files[fbi];
-        this_is_the_current_fb = (current == fb);
-
-        entry = (REFERENCE *)xmalloc (sizeof (REFERENCE));
-        entry->filename = entry->nodename = (char *)NULL;
-        entry->label = (char *)xmalloc (4 + strlen (fb->filename));
-        sprintf (entry->label, "(%s)*", fb->filename);
-
-        add_pointer_to_array
-          (entry, items_index, items, items_slots, 10, REFERENCE *);
-
-        if (fb->tags)
-          {
-            for (i = 0; fb->tags[i]; i++)
-              {
-                entry = (REFERENCE *)xmalloc (sizeof (REFERENCE));
-                entry->filename = entry->nodename = (char *)NULL;
-		if (this_is_the_current_fb)
-		  entry->label = xstrdup (fb->tags[i]->nodename);
-		else
-		  {
-		    entry->label = (char *) xmalloc
-		      (4 + strlen (fb->filename) +
-		       strlen (fb->tags[i]->nodename));
-		    sprintf (entry->label, "(%s)%s",
-			     fb->filename, fb->tags[i]->nodename);
-		  }
-
-                add_pointer_to_array
-                  (entry, items_index, items, items_slots, 100, REFERENCE *);
-              }
-          }
-      }
-    line = info_read_maybe_completing (window, (char *) _("Goto node: "),
-        items);
-    info_free_references (items);
-  }
-#else /* !GOTO_COMPLETES */
-  line = info_read_in_echo_area (window, (char *) _("Goto node: "));
-#endif /* !GOTO_COMPLETES */
-
-  /* If the user aborted, quit now. */
-  if (!line)
-    {
-      info_abort_key (window, 0, 0);
-      return;
-    }
-
-  canonicalize_whitespace (line);
-
-  if (*line)
-    info_parse_and_select (line, window);
-
-  free (line);
-  if (!info_error_was_printed)
-    window_clear_echo_area ();
-}
-
-/* Follow the menu list in MENUS (list of strings terminated by a NULL
-   entry) from INITIAL_NODE.  If can't continue at any point (no menu or
-   no menu entry for the next item), return the node so far -- that
-   might be INITIAL_NODE itself.  If error, *ERRSTR and *ERRARG[12] will
-   be set to the error message and argument for message, otherwise they
-   will be NULL.  */
-
-NODE *
-info_follow_menus (NODE *initial_node, char **menus,
-    const char **errstr, char **errarg1, char **errarg2)
-{
-  NODE *node = NULL;
-  *errstr = *errarg1 = *errarg2 = NULL;
-
-  for (; *menus; menus++)
-    {
-      static char *first_arg = NULL;
-      REFERENCE **menu;
-      REFERENCE *entry;
-      char *arg = *menus; /* Remember the name of the menu entry we want. */
-
-      /* A leading space is certainly NOT part of a node name.  Most
-	 probably, they typed a space after the separating comma.  The
-	 strings in menus[] have their whitespace canonicalized, so
-	 there's at most one space to ignore.  */
-      if (*arg == ' ')
-	arg++;
-      if (!first_arg)
-        first_arg = arg;
-
-      /* Build and return a list of the menu items in this node. */
-      menu = info_menu_of_node (initial_node);
-
-      /* If no menu item in this node, stop here, but let the user
-         continue to use Info.  Perhaps they wanted this node and didn't
-         realize it. */
-      if (!menu)
-        {
-          if (arg == first_arg)
-            {
-              node = make_manpage_node (first_arg);
-              if (node)
-                goto maybe_got_node;
-            }
-          *errstr = _("No menu in node `%s'.");
-          *errarg1 = node_printed_rep (initial_node);
-          return initial_node;
-        }
-
-      /* Find the specified menu item. */
-      entry = info_get_labeled_reference (arg, menu);
-
-      /* If the item wasn't found, search the list sloppily.  Perhaps this
-         user typed "buffer" when they really meant "Buffers". */
-      if (!entry)
-        {
-          int i;
-          int best_guess = -1;
-
-          for (i = 0; (entry = menu[i]); i++)
-            {
-              if (strcasecmp (entry->label, arg) == 0)
-                break;
-              else
-                if ((best_guess == -1)
-                    && (strncasecmp (entry->label, arg, strlen (arg)) == 0))
-                  best_guess = i;
-            }
-
-          if (!entry && best_guess != -1)
-            entry = menu[best_guess];
-        }
-
-      /* If we still failed to find the reference, start Info with the current
-         node anyway.  It is probably a misspelling. */
-      if (!entry)
-        {
-          if (arg == first_arg)
-            {
-	      /* Maybe they typed "info foo" instead of "info -f foo".  */
-	      node = info_get_node (first_arg, 0);
-	      if (node)
-		add_file_directory_to_path (first_arg);
-	      else
-		node = make_manpage_node (first_arg);
-              if (node)
-                goto maybe_got_node;
-            }
-
-          info_free_references (menu);
-          *errstr = _("No menu item `%s' in node `%s'.");
-          *errarg1 = arg;
-          *errarg2 = node_printed_rep (initial_node);
-          return initial_node;
-        }
-
-      /* We have found the reference that the user specified.  If no
-         filename in this reference, define it. */
-      if (!entry->filename)
-        entry->filename = xstrdup (initial_node->parent ? initial_node->parent
-                                                     : initial_node->filename);
-
-      /* Try to find this node.  */
-      node = info_get_node (entry->filename, entry->nodename);
-      if (!node && arg == first_arg)
-	{
-	  node = make_manpage_node (first_arg);
-	  if (node)
-	    goto maybe_got_node;
-	}
-
-      /* Since we cannot find it, try using the label of the entry as a
-         file, i.e., "(LABEL)Top".  */
-      if (!node && entry->nodename
-          && strcmp (entry->label, entry->nodename) == 0)
-        node = info_get_node (entry->label, "Top");
-
-    maybe_got_node:
-      if (!node)
-        {
-          *errstr = _("Unable to find node referenced by `%s' in `%s'.");
-          *errarg1 = xstrdup (entry->label);
-          *errarg2 = node_printed_rep (initial_node);
-          info_free_references (menu);
-          return initial_node;
-        }
-
-      info_free_references (menu);
-
-      /* Success.  Go round the loop again.  */
-      free (initial_node);
-      initial_node = node;
-    }
-
-  return initial_node;
-}
-
-/* Split STR into individual node names by writing null bytes in wherever
-   there are commas and constructing a list of the resulting pointers.
-   (We can do this since STR has had canonicalize_whitespace called on it.)
-   Return array terminated with NULL.  */
-
-static char **
-split_list_of_nodenames (char *str)
-{
-  unsigned len = 2;
-  char **nodes = xmalloc (len * sizeof (char *));
-
-  nodes[len - 2] = str;
-
-  while (*str++)
-    {
-      if (*str == ',')
-        {
-          *str++ = 0;		/* get past the null byte */
-          len++;
-          nodes = xrealloc (nodes, len * sizeof (char *));
-          nodes[len - 2] = str;
-        }
-    }
-
-  nodes[len - 1] = NULL;
-
-  return nodes;
-}
-
-
-/* Read a line of input which is a sequence of menus (starting from
-   dir), and follow them.  */
-DECLARE_INFO_COMMAND (info_menu_sequence,
-   _("Read a list of menus starting from dir and follow them"))
-{
-  char *line = info_read_in_echo_area (window, (char *) _("Follow menus: "));
-
-  /* If the user aborted, quit now. */
-  if (!line)
-    {
-      info_abort_key (window, 0, 0);
-      return;
-    }
-
-  canonicalize_whitespace (line);
-
-  if (*line)
-    {
-      const char *errstr;
-      char *errarg1, *errarg2;
-      NODE *dir_node = info_get_node (NULL, NULL);
-      char **nodes = split_list_of_nodenames (line);
-      NODE *node = NULL;
-
-      /* If DIR_NODE is NULL, they might be reading a file directly,
-	 like in "info -d . -f ./foo".  Try using "Top" instead.  */
-      if (!dir_node)
-	{
-	  char *file_name = window->node->parent;
-
-	  if (!file_name)
-	    file_name = window->node->filename;
-	  dir_node = info_get_node (file_name, NULL);
-	}
-
-      /* If we still cannot find the starting point, give up.
-	 We cannot allow a NULL pointer inside info_follow_menus.  */
-      if (!dir_node)
-	info_error ((char *) msg_cant_find_node, "Top", NULL);
-      else
-	node = info_follow_menus (dir_node, nodes, &errstr, &errarg1, &errarg2);
-
-      free (nodes);
-      if (!errstr)
-        info_set_node_of_window (1, window, node);
-      else
-        info_error ((char *) errstr, errarg1, errarg2);
-    }
-
-  free (line);
-  if (!info_error_was_printed)
-    window_clear_echo_area ();
-}
-
-/* Search the menu MENU for a (possibly mis-spelled) entry ARG.
-   Return the menu entry, or the best guess for what they meant by ARG,
-   or NULL if there's nothing in this menu seems to fit the bill.
-   If EXACT is non-zero, allow only exact matches.  */
-static REFERENCE *
-entry_in_menu (char *arg, REFERENCE **menu, int exact)
-{
-  REFERENCE *entry;
-
-  /* First, try to find the specified menu item verbatim.  */
-  entry = info_get_labeled_reference (arg, menu);
-
-  /* If the item wasn't found, search the list sloppily.  Perhaps we
-     have "Option Summary", but ARG is "option".  */
-  if (!entry && !exact)
-    {
-      int i;
-      int best_guess = -1;
-
-      for (i = 0; (entry = menu[i]); i++)
-	{
-	  if (strcasecmp (entry->label, arg) == 0)
-	    break;
-	  else
-	    if (strncasecmp (entry->label, arg, strlen (arg)) == 0)
-	      best_guess = i;
-	}
-
-      if (!entry && best_guess != -1)
-	entry = menu[best_guess];
-    }
-
-  return entry;
-}
-
-/* Find the node that is the best candidate to list the PROGRAM's
-   invocation info and its command-line options, by looking for menu
-   items and chains of menu items with characteristic names.  */
-void
-info_intuit_options_node (WINDOW *window, NODE *initial_node, char *program)
-{
-  /* The list of node names typical for GNU manuals where the program
-     usage and specifically the command-line arguments are described.
-     This is pure heuristics.  I gathered these node names by looking
-     at all the Info files I could put my hands on.  If you are
-     looking for evidence to complain to the GNU project about
-     non-uniform style of documentation, here you have your case!  */
-  static const char *invocation_nodes[] = {
-    "%s invocation",
-    "Invoking %s",
-    "Preliminaries",	/* m4 has Invoking under Preliminaries! */
-    "Invocation",
-    "Command Arguments",/* Emacs */
-    "Invoking `%s'",
-    "%s options",
-    "Options",
-    "Option ",		/* e.g. "Option Summary" */
-    "Invoking",
-    "All options",	/* tar, paxutils */
-    "Arguments",
-    "%s cmdline",	/* ar */
-    "%s",		/* last resort */
-    (const char *)0
-  };
-  NODE *node = NULL;
-  REFERENCE **menu;
-  const char **try_node;
-
-  /* We keep looking deeper and deeper in the menu structure until
-     there are no more menus or no menu items from the above list.
-     Some manuals have the invocation node sitting 3 or 4 levels deep
-     in the menu hierarchy...  */
-  for (node = initial_node; node; initial_node = node)
-    {
-      REFERENCE *entry = NULL;
-
-      /* Build and return a list of the menu items in this node. */
-      menu = info_menu_of_node (initial_node);
-
-      /* If no menu item in this node, stop here.  Perhaps this node
-	 is the one they need.  */
-      if (!menu)
-	break;
-
-      /* Look for node names typical for usage nodes in this menu.  */
-      for (try_node = invocation_nodes; *try_node; try_node++)
-	{
-	  char *nodename;
-
-	  nodename = xmalloc (strlen (program) + strlen (*try_node));
-	  sprintf (nodename, *try_node, program);
-	  /* The last resort "%s" is dangerous, so we restrict it
-             to exact matches here.  */
-	  entry = entry_in_menu (nodename, menu,
-				 strcmp (*try_node, "%s") == 0);
-	  free (nodename);
-	  if (entry)
-	    break;
-	}
-
-      if (!entry)
-	break;
-
-      if (!entry->filename)
-	entry->filename = xstrdup (initial_node->parent ? initial_node->parent
-				   : initial_node->filename);
-      /* Try to find this node.  */
-      node = info_get_node (entry->filename, entry->nodename);
-      info_free_references (menu);
-      if (!node)
-	break;
-    }
-
-  /* We've got our best shot at the invocation node.  Now select it.  */
-  if (initial_node)
-    info_set_node_of_window (1, window, initial_node);
-  if (!info_error_was_printed)
-    window_clear_echo_area ();
-}
-
-/* Given a name of an Info file, find the name of the package it
-   describes by removing the leading directories and extensions.  */
-char *
-program_name_from_file_name (char *file_name)
-{
-  int i;
-  char *program_name = xstrdup (filename_non_directory (file_name));
-
-  for (i = strlen (program_name) - 1; i > 0; i--)
-    if (program_name[i] == '.'
-	&& (FILENAME_CMPN (program_name + i, ".info", 5) == 0
-	    || FILENAME_CMPN (program_name + i, ".inf", 4) == 0
-#ifdef __MSDOS__
-	    || FILENAME_CMPN (program_name + i, ".i", 2) == 0
-#endif
-	    || isdigit (program_name[i + 1]))) /* a man page foo.1 */
-      {
-	program_name[i] = 0;
-	break;
-      }
-  return program_name;
-}
-
-DECLARE_INFO_COMMAND (info_goto_invocation_node,
-		      _("Find the node describing program invocation"))
-{
-  const char *invocation_prompt = _("Find Invocation node of [%s]: ");
-  char *program_name, *line;
-  char *default_program_name, *prompt, *file_name;
-  NODE *top_node;
-
-  /* Intuit the name of the program they are likely to want.
-     We use the file name of the current Info file as a hint.  */
-  file_name = window->node->parent ? window->node->parent
-				   : window->node->filename;
-  default_program_name = program_name_from_file_name (file_name);
-
-  prompt = (char *)xmalloc (strlen (default_program_name) +
-			    strlen (invocation_prompt));
-  sprintf (prompt, invocation_prompt, default_program_name);
-  line = info_read_in_echo_area (window, prompt);
-  free (prompt);
-  if (!line)
-    {
-      info_abort_key (window, 0, 0);
-      return;
-    }
-  if (*line)
-    program_name = line;
-  else
-    program_name = default_program_name;
-
-  /* In interactive usage they'd probably expect us to begin looking
-     from the Top node.  */
-  top_node = info_get_node (file_name, NULL);
-  if (!top_node)
-    info_error ((char *) msg_cant_find_node, "Top", NULL);
-
-  info_intuit_options_node (window, top_node, program_name);
-  free (line);
-  free (default_program_name);
-}
-
-#if defined (HANDLE_MAN_PAGES)
-DECLARE_INFO_COMMAND (info_man, _("Read a manpage reference and select it"))
-{
-  char *line;
-
-  line = info_read_in_echo_area (window, (char *) _("Get Manpage: "));
-
-  if (!line)
-    {
-      info_abort_key (window, 0, 0);
-      return;
-    }
-
-  canonicalize_whitespace (line);
-
-  if (*line)
-    {
-      char *goto_command;
-
-      goto_command = (char *)xmalloc
-        (4 + strlen (MANPAGE_FILE_BUFFER_NAME) + strlen (line));
-
-      sprintf (goto_command, "(%s)%s", MANPAGE_FILE_BUFFER_NAME, line);
-
-      info_parse_and_select (goto_command, window);
-      free (goto_command);
-    }
-
-  free (line);
-  if (!info_error_was_printed)
-    window_clear_echo_area ();
-}
-#endif /* HANDLE_MAN_PAGES */
-
-/* Move to the "Top" node in this file. */
-DECLARE_INFO_COMMAND (info_top_node, _("Select the node `Top' in this file"))
-{
-  info_parse_and_select ("Top", window);
-}
-
-/* Move to the node "(dir)Top". */
-DECLARE_INFO_COMMAND (info_dir_node, _("Select the node `(dir)'"))
-{
-  info_parse_and_select ("(dir)Top", window);
-}
-
-
-/* Read the name of a node to kill.  The list of available nodes comes
-   from the nodes appearing in the current window configuration. */
-static char *
-read_nodename_to_kill (WINDOW *window)
-{
-  int iw;
-  char *nodename;
-  INFO_WINDOW *info_win;
-  REFERENCE **menu = NULL;
-  int menu_index = 0, menu_slots = 0;
-  char *default_nodename = xstrdup (active_window->node->nodename);
-  char *prompt = xmalloc (strlen (_("Kill node (%s): ")) + strlen (default_nodename));
-
-  sprintf (prompt, _("Kill node (%s): "), default_nodename);
-
-  for (iw = 0; (info_win = info_windows[iw]); iw++)
-    {
-      REFERENCE *entry = (REFERENCE *)xmalloc (sizeof (REFERENCE));
-      entry->label = xstrdup (info_win->window->node->nodename);
-      entry->filename = entry->nodename = (char *)NULL;
-
-      add_pointer_to_array (entry, menu_index, menu, menu_slots, 10,
-                            REFERENCE *);
-    }
-
-  nodename = info_read_completing_in_echo_area (window, prompt, menu);
-  free (prompt);
-  info_free_references (menu);
-  if (nodename && !*nodename)
-    {
-      free (nodename);
-      nodename = default_nodename;
-    }
-  else
-    free (default_nodename);
-
-  return nodename;
-}
-
-
-/* Delete NODENAME from this window, showing the most
-   recently selected node in this window. */
-static void
-kill_node (WINDOW *window, char *nodename)
-{
-  int iw, i;
-  INFO_WINDOW *info_win;
-  NODE *temp;
-
-  /* If there is no nodename to kill, quit now. */
-  if (!nodename)
-    {
-      info_abort_key (window, 0, 0);
-      return;
-    }
-
-  /* If there is a nodename, find it in our window list. */
-  for (iw = 0; (info_win = info_windows[iw]); iw++)
-    if (strcmp (nodename, info_win->nodes[info_win->current]->nodename) == 0
-	&& info_win->window == window)
-      break;
-
-  if (!info_win)
-    {
-      if (*nodename)
-        info_error ((char *) _("Cannot kill node `%s'"), nodename, NULL);
-      else
-        window_clear_echo_area ();
-
-      return;
-    }
-
-  /* If there are no more nodes left anywhere to view, complain and exit. */
-  if (info_windows_index == 1 && info_windows[0]->nodes_index == 1)
-    {
-      info_error ((char *) _("Cannot kill the last node"), NULL, NULL);
-      return;
-    }
-
-  /* INFO_WIN contains the node that the user wants to stop viewing.  Delete
-     this node from the list of nodes previously shown in this window. */
-  for (i = info_win->current; i < info_win->nodes_index; i++)
-    info_win->nodes[i] = info_win->nodes[i + 1];
-
-  /* There is one less node in this window's history list. */
-  info_win->nodes_index--;
-
-  /* Make this window show the most recent history node. */
-  info_win->current = info_win->nodes_index - 1;
-
-  /* If there aren't any nodes left in this window, steal one from the
-     next window. */
-  if (info_win->current < 0)
-    {
-      INFO_WINDOW *stealer;
-      int which, pagetop;
-      long point;
-
-      if (info_windows[iw + 1])
-        stealer = info_windows[iw + 1];
-      else
-        stealer = info_windows[0];
-
-      /* If the node being displayed in the next window is not the most
-         recently loaded one, get the most recently loaded one. */
-      if ((stealer->nodes_index - 1) != stealer->current)
-        which = stealer->nodes_index - 1;
-
-      /* Else, if there is another node behind the stealers current node,
-         use that one. */
-      else if (stealer->current > 0)
-        which = stealer->current - 1;
-
-      /* Else, just use the node appearing in STEALER's window. */
-      else
-        which = stealer->current;
-
-      /* Copy this node. */
-      {
-        NODE *copy = xmalloc (sizeof (NODE));
-
-        temp = stealer->nodes[which];
-        point = stealer->points[which];
-        pagetop = stealer->pagetops[which];
-
-        copy->filename = temp->filename;
-        copy->parent = temp->parent;
-        copy->nodename = temp->nodename;
-        copy->contents = temp->contents;
-        copy->nodelen = temp->nodelen;
-        copy->flags = temp->flags;
-        copy->display_pos = temp->display_pos;
-
-        temp = copy;
-      }
-
-      window_set_node_of_window (info_win->window, temp);
-      window->point = point;
-      window->pagetop = pagetop;
-      remember_window_and_node (info_win->window, temp);
-    }
-  else
-    {
-      temp = info_win->nodes[info_win->current];
-      temp->display_pos = info_win->points[info_win->current];
-      window_set_node_of_window (info_win->window, temp);
-    }
-
-  if (!info_error_was_printed)
-    window_clear_echo_area ();
-
-  if (auto_footnotes_p)
-    info_get_or_remove_footnotes (window);
-}
-
-/* Kill current node, thus going back one in the node history.  I (karl)
-   do not think this is completely correct yet, because of the
-   window-changing stuff in kill_node, but it's a lot better than the
-   previous implementation, which did not account for nodes being
-   visited twice at all.  */
-DECLARE_INFO_COMMAND (info_history_node,
-                      _("Select the most recently selected node"))
-{
-  kill_node (window, active_window->node->nodename);
-}
-
-/* Kill named node.  */
-DECLARE_INFO_COMMAND (info_kill_node, _("Kill this node"))
-{
-  char *nodename = read_nodename_to_kill (window);
-  kill_node (window, nodename);
-}
-
-
-/* Read the name of a file and select the entire file. */
-DECLARE_INFO_COMMAND (info_view_file, _("Read the name of a file and select it"))
-{
-  char *line;
-
-  line = info_read_in_echo_area (window, (char *) _("Find file: "));
-  if (!line)
-    {
-      info_abort_key (active_window, 1, 0);
-      return;
-    }
-
-  if (*line)
-    {
-      NODE *node;
-
-      node = info_get_node (line, "*");
-      if (!node)
-        {
-          if (info_recent_file_error)
-            info_error (info_recent_file_error, NULL, NULL);
-          else
-            info_error ((char *) _("Cannot find `%s'."), line, NULL);
-        }
-      else
-        info_set_node_of_window (1, window, node);
-
-      free (line);
-    }
-
-  if (!info_error_was_printed)
-    window_clear_echo_area ();
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                 Dumping and Printing Nodes                       */
-/*                                                                  */
-/* **************************************************************** */
-
-#define VERBOSE_NODE_DUMPING
-static void write_node_to_stream (NODE *node, FILE *stream);
-static void dump_node_to_stream (char *filename, char *nodename,
-    FILE *stream, int dump_subnodes);
-static void initialize_dumping (void);
-
-/* Dump the nodes specified by FILENAME and NODENAMES to the file named
-   in OUTPUT_FILENAME.  If DUMP_SUBNODES is non-zero, recursively dump
-   the nodes which appear in the menu of each node dumped. */
-void
-dump_nodes_to_file (char *filename, char **nodenames,
-    char *output_filename, int dump_subnodes)
-{
-  register int i;
-  FILE *output_stream;
-
-  /* Get the stream to print the nodes to.  Special case of an output
-     filename of "-" means to dump the nodes to stdout. */
-  if (strcmp (output_filename, "-") == 0)
-    output_stream = stdout;
-  else
-    output_stream = fopen (output_filename, "w");
-
-  if (!output_stream)
-    {
-      info_error ((char *) _("Could not create output file `%s'."),
-          output_filename, NULL);
-      return;
-    }
-
-  /* Print each node to stream. */
-  initialize_dumping ();
-  for (i = 0; nodenames[i]; i++)
-    dump_node_to_stream (filename, nodenames[i], output_stream, dump_subnodes);
-
-  if (output_stream != stdout)
-    fclose (output_stream);
-
-#if defined (VERBOSE_NODE_DUMPING)
-  info_error ((char *) _("Done."), NULL, NULL);
-#endif /* VERBOSE_NODE_DUMPING */
-}
-
-/* A place to remember already dumped nodes. */
-static char **dumped_already = (char **)NULL;
-static int dumped_already_index = 0;
-static int dumped_already_slots = 0;
-
-static void
-initialize_dumping (void)
-{
-  dumped_already_index = 0;
-}
-
-/* Get and print the node specified by FILENAME and NODENAME to STREAM.
-   If DUMP_SUBNODES is non-zero, recursively dump the nodes which appear
-   in the menu of each node dumped. */
-static void
-dump_node_to_stream (char *filename, char *nodename,
-    FILE *stream, int dump_subnodes)
-{
-  register int i;
-  NODE *node;
-
-  node = info_get_node (filename, nodename);
-
-  if (!node)
-    {
-      if (info_recent_file_error)
-        info_error (info_recent_file_error, NULL, NULL);
-      else
-        {
-          if (filename && *nodename != '(')
-            info_error ((char *) msg_cant_file_node,
-                filename_non_directory (filename),
-                nodename);
-          else
-            info_error ((char *) msg_cant_find_node, nodename, NULL);
-        }
-      return;
-    }
-
-  /* If we have already dumped this node, don't dump it again. */
-  for (i = 0; i < dumped_already_index; i++)
-    if (strcmp (node->nodename, dumped_already[i]) == 0)
-      {
-        free (node);
-        return;
-      }
-  add_pointer_to_array (node->nodename, dumped_already_index, dumped_already,
-                        dumped_already_slots, 50, char *);
-
-#if defined (VERBOSE_NODE_DUMPING)
-  /* Maybe we should print some information about the node being output. */
-  info_error ((char *) _("Writing node %s..."), node_printed_rep (node), NULL);
-#endif /* VERBOSE_NODE_DUMPING */
-
-  write_node_to_stream (node, stream);
-
-  /* If we are dumping subnodes, get the list of menu items in this node,
-     and dump each one recursively. */
-  if (dump_subnodes)
-    {
-      REFERENCE **menu = (REFERENCE **)NULL;
-
-      /* If this node is an Index, do not dump the menu references. */
-      if (string_in_line ("Index", node->nodename) == -1)
-        menu = info_menu_of_node (node);
-
-      if (menu)
-        {
-          for (i = 0; menu[i]; i++)
-            {
-              /* We don't dump Info files which are different than the
-                 current one. */
-              if (!menu[i]->filename)
-                dump_node_to_stream
-                  (filename, menu[i]->nodename, stream, dump_subnodes);
-            }
-          info_free_references (menu);
-        }
-    }
-
-  free (node);
-}
-
-/* Dump NODE to FILENAME.  If DUMP_SUBNODES is non-zero, recursively dump
-   the nodes which appear in the menu of each node dumped. */
-void
-dump_node_to_file (NODE *node, char *filename, int dump_subnodes)
-{
-  FILE *output_stream;
-  char *nodes_filename;
-
-  /* Get the stream to print this node to.  Special case of an output
-     filename of "-" means to dump the nodes to stdout. */
-  if (strcmp (filename, "-") == 0)
-    output_stream = stdout;
-  else
-    output_stream = fopen (filename, "w");
-
-  if (!output_stream)
-    {
-      info_error ((char *) _("Could not create output file `%s'."), filename,
-          NULL);
-      return;
-    }
-
-  if (node->parent)
-    nodes_filename = node->parent;
-  else
-    nodes_filename = node->filename;
-
-  initialize_dumping ();
-  dump_node_to_stream
-    (nodes_filename, node->nodename, output_stream, dump_subnodes);
-
-  if (output_stream != stdout)
-    fclose (output_stream);
-
-#if defined (VERBOSE_NODE_DUMPING)
-  info_error ((char *) _("Done."), NULL, NULL);
-#endif /* VERBOSE_NODE_DUMPING */
-}
-
-#if !defined (DEFAULT_INFO_PRINT_COMMAND)
-#  define DEFAULT_INFO_PRINT_COMMAND "lpr"
-#endif /* !DEFAULT_INFO_PRINT_COMMAND */
-
-DECLARE_INFO_COMMAND (info_print_node,
- _("Pipe the contents of this node through INFO_PRINT_COMMAND"))
-{
-  print_node (window->node);
-}
-
-/* Print NODE on a printer piping it into INFO_PRINT_COMMAND. */
-void
-print_node (NODE *node)
-{
-  FILE *printer_pipe;
-  char *print_command = getenv ("INFO_PRINT_COMMAND");
-  int piping = 0;
-
-  if (!print_command || !*print_command)
-    print_command = DEFAULT_INFO_PRINT_COMMAND;
-
-  /* Note that on MS-DOS/MS-Windows, this MUST open the pipe in the
-     (default) text mode, since the printer drivers there need to see
-     DOS-style CRLF pairs at the end of each line.
-
-     FIXME: if we are to support Mac-style text files, we might need
-     to convert the text here.  */
-
-  /* INFO_PRINT_COMMAND which says ">file" means write to that file.
-     Presumably, the name of the file is the local printer device.  */
-  if (*print_command == '>')
-    printer_pipe = fopen (++print_command, "w");
-  else
-    {
-      printer_pipe = popen (print_command, "w");
-      piping = 1;
-    }
-
-  if (!printer_pipe)
-    {
-      info_error ((char *) _("Cannot open pipe to `%s'."), print_command, NULL);
-      return;
-    }
-
-#if defined (VERBOSE_NODE_DUMPING)
-  /* Maybe we should print some information about the node being output. */
-  info_error ((char *) _("Printing node %s..."), node_printed_rep (node), NULL);
-#endif /* VERBOSE_NODE_DUMPING */
-
-  write_node_to_stream (node, printer_pipe);
-  if (piping)
-    pclose (printer_pipe);
-  else
-    fclose (printer_pipe);
-
-#if defined (VERBOSE_NODE_DUMPING)
-  info_error ((char *) _("Done."), NULL, NULL);
-#endif /* VERBOSE_NODE_DUMPING */
-}
-
-static void
-write_node_to_stream (NODE *node, FILE *stream)
-{
-  fwrite (node->contents, 1, node->nodelen, stream);
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                    Info Searching Commands                       */
-/*                                                                  */
-/* **************************************************************** */
-
-/* Variable controlling the garbage collection of files briefly visited
-   during searches.  Such files are normally gc'ed, unless they were
-   compressed to begin with.  If this variable is non-zero, it says
-   to gc even those file buffer contents which had to be uncompressed. */
-int gc_compressed_files = 0;
-
-static void info_gc_file_buffers (void);
-static void info_search_1 (WINDOW *window, int count,
-    unsigned char key, int case_sensitive, int ask_for_string);
-
-static char *search_string = (char *)NULL;
-static int search_string_size = 0;
-static int isearch_is_active = 0;
-
-static int last_search_direction = 0;
-static int last_search_case_sensitive = 0;
-
-/* Return the file buffer which belongs to WINDOW's node. */
-FILE_BUFFER *
-file_buffer_of_window (WINDOW *window)
-{
-  /* If this window has no node, then it has no file buffer. */
-  if (!window->node)
-    return ((FILE_BUFFER *)NULL);
-
-  if (window->node->parent)
-    return (info_find_file (window->node->parent));
-
-  if (window->node->filename)
-    return (info_find_file (window->node->filename));
-
-  return ((FILE_BUFFER *)NULL);
-}
-
-/* Search for STRING in NODE starting at START.  Return -1 if the string
-   was not found, or the location of the string if it was.  If WINDOW is
-   passed as non-null, set the window's node to be NODE, its point to be
-   the found string, and readjust the window's pagetop.  Final argument
-   DIR says which direction to search in.  If it is positive, search
-   forward, else backwards. */
-long
-info_search_in_node (char *string, NODE *node, long int start,
-    WINDOW *window, int dir, int case_sensitive)
-{
-  SEARCH_BINDING binding;
-  long offset;
-
-  binding.buffer = node->contents;
-  binding.start = start;
-  binding.end = node->nodelen;
-  binding.flags = 0;
-  if (!case_sensitive)
-    binding.flags |= S_FoldCase;
-
-  if (dir < 0)
-    {
-      binding.end = 0;
-      binding.flags |= S_SkipDest;
-    }
-
-  if (binding.start < 0)
-    return (-1);
-
-  /* For incremental searches, we always wish to skip past the string. */
-  if (isearch_is_active)
-    binding.flags |= S_SkipDest;
-
-  offset = search (string, &binding);
-
-  if (offset != -1 && window)
-    {
-      set_remembered_pagetop_and_point (window);
-      if (window->node != node)
-        window_set_node_of_window (window, node);
-      window->point = offset;
-      window_adjust_pagetop (window);
-    }
-  return (offset);
-}
-
-/* Search NODE, looking for the largest possible match of STRING.  Start the
-   search at START.  Return the absolute position of the match, or -1, if
-   no part of the string could be found. */
-long
-info_target_search_node (NODE *node, char *string, long int start)
-{
-  register int i;
-  long offset = 0;
-  char *target;
-
-  target = xstrdup (string);
-  i = strlen (target);
-
-  /* Try repeatedly searching for this string while removing words from
-     the end of it. */
-  while (i)
-    {
-      target[i] = '\0';
-      offset = info_search_in_node (target, node, start, (WINDOW *)NULL, 1, 0);
-
-      if (offset != -1)
-        break;
-
-      /* Delete the last word from TARGET. */
-      for (; i && (!whitespace (target[i]) && (target[i] != ',')); i--);
-    }
-  free (target);
-  return (offset);
-}
-
-/* Search for STRING starting in WINDOW at point.  If the string is found
-   in this node, set point to that position.  Otherwise, get the file buffer
-   associated with WINDOW's node, and search through each node in that file.
-   If the search fails, return non-zero, else zero.  Side-effect window
-   leaving the node and point where the string was found current. */
-static int
-info_search_internal (char *string, WINDOW *window,
-    int dir, int case_sensitive)
-{
-  register int i;
-  FILE_BUFFER *file_buffer;
-  char *initial_nodename;
-  long ret, start = 0;
-
-  file_buffer = file_buffer_of_window (window);
-  initial_nodename = window->node->nodename;
-
-  /* This used to begin from window->point, unless this was a repeated
-     search command.  But invoking search with an argument loses with
-     that logic, since info_last_executed_command is then set to
-     info_add_digit_to_numeric_arg.  I think there's no sense in
-     ``finding'' a string that is already under the cursor, anyway.  */
-  ret = info_search_in_node
-        (string, window->node, window->point + dir, window, dir,
-         case_sensitive);
-
-  if (ret != -1)
-    {
-      /* We won! */
-      if (!echo_area_is_active && !isearch_is_active)
-        window_clear_echo_area ();
-      return (0);
-    }
-
-  /* The string wasn't found in the current node.  Search through the
-     window's file buffer, iff the current node is not "*". */
-  if (!file_buffer || (strcmp (initial_nodename, "*") == 0))
-    return (-1);
-
-  /* If this file has tags, search through every subfile, starting at
-     this node's subfile and node.  Otherwise, search through the
-     file's node list. */
-  if (file_buffer->tags)
-    {
-      register int current_tag = 0, number_of_tags;
-      char *last_subfile;
-      TAG *tag;
-
-      /* Find number of tags and current tag. */
-      last_subfile = (char *)NULL;
-      for (i = 0; file_buffer->tags[i]; i++)
-        if (strcmp (initial_nodename, file_buffer->tags[i]->nodename) == 0)
-          {
-            current_tag = i;
-            last_subfile = file_buffer->tags[i]->filename;
-          }
-
-      number_of_tags = i;
-
-      /* If there is no last_subfile, our tag wasn't found. */
-      if (!last_subfile)
-        return (-1);
-
-      /* Search through subsequent nodes, wrapping around to the top
-         of the info file until we find the string or return to this
-         window's node and point. */
-      while (1)
-        {
-          NODE *node;
-
-          /* Allow C-g to quit the search, failing it if pressed. */
-          return_if_control_g (-1);
-
-          /* Find the next tag that isn't an anchor.  */
-          for (i = current_tag + dir; i != current_tag; i += dir)
-            {
-              if (i < 0)
-                i = number_of_tags - 1;
-              else if (i == number_of_tags)
-                i = 0;
-
-              tag = file_buffer->tags[i];
-              if (tag->nodelen != 0)
-                break;
-            }
-
-          /* If we got past out starting point, bail out.  */
-          if (i == current_tag)
-            return (-1);
-          current_tag = i;
-
-          if (!echo_area_is_active && (last_subfile != tag->filename))
-            {
-              window_message_in_echo_area
-                ((char *) _("Searching subfile %s ..."),
-                 filename_non_directory (tag->filename), NULL);
-
-              last_subfile = tag->filename;
-            }
-
-          node = info_get_node (file_buffer->filename, tag->nodename);
-
-          if (!node)
-            {
-              /* If not doing i-search... */
-              if (!echo_area_is_active)
-                {
-                  if (info_recent_file_error)
-                    info_error (info_recent_file_error, NULL, NULL);
-                  else
-                    info_error ((char *) msg_cant_file_node,
-                                filename_non_directory (file_buffer->filename),
-                                tag->nodename);
-                }
-              return (-1);
-            }
-
-          if (dir < 0)
-            start = tag->nodelen;
-
-          ret =
-            info_search_in_node (string, node, start, window, dir,
-                                 case_sensitive);
-
-          /* Did we find the string in this node? */
-          if (ret != -1)
-            {
-              /* Yes!  We win. */
-              remember_window_and_node (window, node);
-              if (!echo_area_is_active)
-                window_clear_echo_area ();
-              return (0);
-            }
-
-          /* No.  Free this node, and make sure that we haven't passed
-             our starting point. */
-          free (node);
-
-          if (strcmp (initial_nodename, tag->nodename) == 0)
-            return (-1);
-        }
-    }
-  return (-1);
-}
-
-DECLARE_INFO_COMMAND (info_search_case_sensitively,
-                      _("Read a string and search for it case-sensitively"))
-{
-  last_search_direction = count > 0 ? 1 : -1;
-  last_search_case_sensitive = 1;
-  info_search_1 (window, count, key, 1, 1);
-}
-
-DECLARE_INFO_COMMAND (info_search, _("Read a string and search for it"))
-{
-  last_search_direction = count > 0 ? 1 : -1;
-  last_search_case_sensitive = 0;
-  info_search_1 (window, count, key, 0, 1);
-}
-
-DECLARE_INFO_COMMAND (info_search_backward,
-		      _("Read a string and search backward for it"))
-{
-  last_search_direction = count > 0 ? -1 : 1;
-  last_search_case_sensitive = 0;
-  info_search_1 (window, -count, key, 0, 1);
-}
-
-static void
-info_search_1 (WINDOW *window, int count, unsigned char key,
-    int case_sensitive, int ask_for_string)
-{
-  char *line, *prompt;
-  int result, old_pagetop;
-  int direction;
-
-  if (count < 0)
-    {
-      direction = -1;
-      count = -count;
-    }
-  else
-    {
-      direction = 1;
-      if (count == 0)
-        count = 1;	/* for backward compatibility */
-    }
-
-  /* Read a string from the user, defaulting the search to SEARCH_STRING. */
-  if (!search_string)
-    {
-      search_string = (char *)xmalloc (search_string_size = 100);
-      search_string[0] = '\0';
-    }
-
-  if (ask_for_string)
-    {
-      prompt = (char *)xmalloc (strlen (_("%s%sfor string [%s]: "))
-				+ strlen (_("Search backward"))
-				+ strlen (_("Search"))
-				+ strlen (_(" case-sensitively "))
-				+ strlen (_(" "))
-				+ strlen (search_string));
-
-      sprintf (prompt, _("%s%sfor string [%s]: "),
-               direction < 0 ? _("Search backward") : _("Search"),
-               case_sensitive ? _(" case-sensitively ") : _(" "),
-               search_string);
-
-      line = info_read_in_echo_area (window, prompt);
-      free (prompt);
-
-      if (!line)
-        {
-          info_abort_key (window, 0, 0);
-          return;
-        }
-
-      if (*line)
-        {
-          if (strlen (line) + 1 > (unsigned int) search_string_size)
-            search_string = (char *) xrealloc
-              (search_string, (search_string_size += 50 + strlen (line)));
-
-          strcpy (search_string, line);
-          free (line);
-        }
-    }
-
-  /* If the search string includes upper-case letters, make the search
-     case-sensitive.  */
-  if (case_sensitive == 0)
-    for (line = search_string; *line; line++)
-      if (isupper (*line))
-        {
-          case_sensitive = 1;
-          break;
-        }
-
-  old_pagetop = active_window->pagetop;
-  for (result = 0; result == 0 && count--; )
-    result = info_search_internal (search_string,
-                                   active_window, direction, case_sensitive);
-
-  if (result != 0 && !info_error_was_printed)
-    info_error ((char *) _("Search failed."), NULL, NULL);
-  else if (old_pagetop != active_window->pagetop)
-    {
-      int new_pagetop;
-
-      new_pagetop = active_window->pagetop;
-      active_window->pagetop = old_pagetop;
-      set_window_pagetop (active_window, new_pagetop);
-      if (auto_footnotes_p)
-        info_get_or_remove_footnotes (active_window);
-    }
-
-  /* Perhaps free the unreferenced file buffers that were searched, but
-     not retained. */
-  info_gc_file_buffers ();
-}
-
-DECLARE_INFO_COMMAND (info_search_next,
-		      _("Repeat last search in the same direction"))
-{
-  if (!last_search_direction)
-    info_error ((char *) _("No previous search string"), NULL, NULL);
-  else
-    info_search_1 (window, last_search_direction * count,
-		   key, last_search_case_sensitive, 0);
-}
-
-DECLARE_INFO_COMMAND (info_search_previous,
-		      _("Repeat last search in the reverse direction"))
-{
-  if (!last_search_direction)
-    info_error ((char *) _("No previous search string"), NULL, NULL);
-  else
-    info_search_1 (window, -last_search_direction * count,
-		   key, last_search_case_sensitive, 0);
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                      Incremental Searching                       */
-/*                                                                  */
-/* **************************************************************** */
-
-static void incremental_search (WINDOW *window, int count,
-    unsigned char ignore);
-
-DECLARE_INFO_COMMAND (isearch_forward,
-                      _("Search interactively for a string as you type it"))
-{
-  incremental_search (window, count, key);
-}
-
-DECLARE_INFO_COMMAND (isearch_backward,
-                      _("Search interactively for a string as you type it"))
-{
-  incremental_search (window, -count, key);
-}
-
-/* Incrementally search for a string as it is typed. */
-/* The last accepted incremental search string. */
-static char *last_isearch_accepted = (char *)NULL;
-
-/* The current incremental search string. */
-static char *isearch_string = (char *)NULL;
-static int isearch_string_index = 0;
-static int isearch_string_size = 0;
-static unsigned char isearch_terminate_search_key = ESC;
-
-/* Array of search states. */
-static SEARCH_STATE **isearch_states = (SEARCH_STATE **)NULL;
-static int isearch_states_index = 0;
-static int isearch_states_slots = 0;
-
-/* Push the state of this search. */
-static void
-push_isearch (WINDOW *window, int search_index, int direction, int failing)
-{
-  SEARCH_STATE *state;
-
-  state = (SEARCH_STATE *)xmalloc (sizeof (SEARCH_STATE));
-  window_get_state (window, state);
-  state->search_index = search_index;
-  state->direction = direction;
-  state->failing = failing;
-
-  add_pointer_to_array (state, isearch_states_index, isearch_states,
-                        isearch_states_slots, 20, SEARCH_STATE *);
-}
-
-/* Pop the state of this search to WINDOW, SEARCH_INDEX, and DIRECTION. */
-static void
-pop_isearch (WINDOW *window, int *search_index, int *direction, int *failing)
-{
-  SEARCH_STATE *state;
-
-  if (isearch_states_index)
-    {
-      isearch_states_index--;
-      state = isearch_states[isearch_states_index];
-      window_set_state (window, state);
-      *search_index = state->search_index;
-      *direction = state->direction;
-      *failing = state->failing;
-
-      free (state);
-      isearch_states[isearch_states_index] = (SEARCH_STATE *)NULL;
-    }
-}
-
-/* Free the memory used by isearch_states. */
-static void
-free_isearch_states (void)
-{
-  register int i;
-
-  for (i = 0; i < isearch_states_index; i++)
-    {
-      free (isearch_states[i]);
-      isearch_states[i] = (SEARCH_STATE *)NULL;
-    }
-  isearch_states_index = 0;
-}
-
-/* Display the current search in the echo area. */
-static void
-show_isearch_prompt (int dir, unsigned char *string, int failing_p)
-{
-  register int i;
-  const char *prefix;
-  char *prompt, *p_rep;
-  unsigned int prompt_len, p_rep_index, p_rep_size;
-
-  if (dir < 0)
-    prefix = _("I-search backward: ");
-  else
-    prefix = _("I-search: ");
-
-  p_rep_index = p_rep_size = 0;
-  p_rep = (char *)NULL;
-  for (i = 0; string[i]; i++)
-    {
-      char *rep;
-
-      switch (string[i])
-        {
-        case ' ': rep = " "; break;
-        case LFD: rep = "\\n"; break;
-        case TAB: rep = "\\t"; break;
-        default:
-          rep = pretty_keyname (string[i]);
-        }
-      if ((p_rep_index + strlen (rep) + 1) >= p_rep_size)
-        p_rep = (char *)xrealloc (p_rep, p_rep_size += 100);
-
-      strcpy (p_rep + p_rep_index, rep);
-      p_rep_index += strlen (rep);
-    }
-
-  prompt_len = strlen (prefix) + p_rep_index + 1;
-  if (failing_p)
-    prompt_len += strlen (_("Failing "));
-  prompt = xmalloc (prompt_len);
-  sprintf (prompt, "%s%s%s", failing_p ? _("Failing ") : "", prefix,
-           p_rep ? p_rep : "");
-
-  window_message_in_echo_area ("%s", prompt, NULL);
-  maybe_free (p_rep);
-  free (prompt);
-  display_cursor_at_point (active_window);
-}
-
-static void
-incremental_search (WINDOW *window, int count, unsigned char ignore)
-{
-  unsigned char key;
-  int last_search_result, search_result, dir;
-  SEARCH_STATE mystate, orig_state;
-  char *p;
-  int case_sensitive = 0;
-
-  if (count < 0)
-    dir = -1;
-  else
-    dir = 1;
-
-  last_search_result = search_result = 0;
-
-  window_get_state (window, &orig_state);
-
-  isearch_string_index = 0;
-  if (!isearch_string_size)
-    isearch_string = (char *)xmalloc (isearch_string_size = 50);
-
-  /* Show the search string in the echo area. */
-  isearch_string[isearch_string_index] = '\0';
-  show_isearch_prompt (dir, (unsigned char *) isearch_string, search_result);
-
-  isearch_is_active = 1;
-
-  while (isearch_is_active)
-    {
-      VFunction *func = (VFunction *)NULL;
-      int quoted = 0;
-
-      /* If a recent display was interrupted, then do the redisplay now if
-         it is convenient. */
-      if (!info_any_buffered_input_p () && display_was_interrupted_p)
-        {
-          display_update_one_window (window);
-          display_cursor_at_point (active_window);
-        }
-
-      /* Read a character and dispatch on it. */
-      key = info_get_input_char ();
-      window_get_state (window, &mystate);
-
-      if (key == DEL || key == Control ('h'))
-        {
-          /* User wants to delete one level of search? */
-          if (!isearch_states_index)
-            {
-              terminal_ring_bell ();
-              continue;
-            }
-          else
-            {
-              pop_isearch
-                (window, &isearch_string_index, &dir, &search_result);
-              isearch_string[isearch_string_index] = '\0';
-              show_isearch_prompt (dir, (unsigned char *) isearch_string,
-                  search_result);
-              goto after_search;
-            }
-        }
-      else if (key == Control ('q'))
-        {
-          key = info_get_input_char ();
-          quoted = 1;
-        }
-
-      /* We are about to search again, or quit.  Save the current search. */
-      push_isearch (window, isearch_string_index, dir, search_result);
-
-      if (quoted)
-        goto insert_and_search;
-
-      if (!Meta_p (key) || key > 32)
-        {
-          /* If this key is not a keymap, get its associated function,
-             if any.  If it is a keymap, then it's probably ESC from an
-             arrow key, and we handle that case below.  */
-          char type = window->keymap[key].type;
-          func = type == ISFUNC
-                 ? InfoFunction(window->keymap[key].function)
-                 : NULL;  /* function member is a Keymap if ISKMAP */
-
-          if (isprint (key) || (type == ISFUNC && func == NULL))
-            {
-            insert_and_search:
-
-              if (isearch_string_index + 2 >= isearch_string_size)
-                isearch_string = (char *)xrealloc
-                  (isearch_string, isearch_string_size += 100);
-
-              isearch_string[isearch_string_index++] = key;
-              isearch_string[isearch_string_index] = '\0';
-              goto search_now;
-            }
-          else if (func == (VFunction *) isearch_forward
-              || func == (VFunction *) isearch_backward)
-            {
-	      /* If this key invokes an incremental search, then this
-		 means that we will either search again in the same
-		 direction, search again in the reverse direction, or
-		 insert the last search string that was accepted through
-		 incremental searching. */
-              if ((func == (VFunction *) isearch_forward && dir > 0) ||
-                  (func == (VFunction *) isearch_backward && dir < 0))
-                {
-                  /* If the user has typed no characters, then insert the
-                     last successful search into the current search string. */
-                  if (isearch_string_index == 0)
-                    {
-                      /* Of course, there must be something to insert. */
-                      if (last_isearch_accepted)
-                        {
-                          if (strlen ((char *) last_isearch_accepted) + 1
-                              >= (unsigned int) isearch_string_size)
-                            isearch_string = (char *)
-                              xrealloc (isearch_string,
-                                        isearch_string_size += 10 +
-                                        strlen (last_isearch_accepted));
-                          strcpy (isearch_string, last_isearch_accepted);
-                          isearch_string_index = strlen (isearch_string);
-                          goto search_now;
-                        }
-                      else
-                        continue;
-                    }
-                  else
-                    {
-                      /* Search again in the same direction.  This means start
-                         from a new place if the last search was successful. */
-                      if (search_result == 0)
-                        window->point += dir;
-                    }
-                }
-              else
-                {
-                  /* Reverse the direction of the search. */
-                  dir = -dir;
-                }
-            }
-          else if (func == (VFunction *) info_abort_key)
-            {
-              /* If C-g pressed, and the search is failing, pop the search
-                 stack back to the last unfailed search. */
-              if (isearch_states_index && (search_result != 0))
-                {
-                  terminal_ring_bell ();
-                  while (isearch_states_index && (search_result != 0))
-                    pop_isearch
-                      (window, &isearch_string_index, &dir, &search_result);
-                  isearch_string[isearch_string_index] = '\0';
-                  show_isearch_prompt (dir, (unsigned char *) isearch_string,
-                      search_result);
-                  continue;
-                }
-              else
-                goto exit_search;
-            }
-          else
-            goto exit_search;
-        }
-      else
-        {
-        exit_search:
-          /* The character is not printable, or it has a function which is
-             non-null.  Exit the search, remembering the search string.  If
-             the key is not the same as the isearch_terminate_search_key,
-             then push it into pending input. */
-          if (isearch_string_index && func != (VFunction *) info_abort_key)
-            {
-              maybe_free (last_isearch_accepted);
-              last_isearch_accepted = xstrdup (isearch_string);
-            }
-
-	  /* If the key is the isearch_terminate_search_key, but some buffered
-	     input is pending, it is almost invariably because the ESC key is
-	     actually the beginning of an escape sequence, like in case they
-	     pressed an arrow key.  So don't gobble the ESC key, push it back
-	     into pending input.  */
-	  /* FIXME: this seems like a kludge!  We need a more reliable
-	     mechanism to know when ESC is a separate key and when it is
-	     part of an escape sequence.  */
-          if (key != RET  /* Emacs addicts want RET to get lost */
-	      && (key != isearch_terminate_search_key
-		  || info_any_buffered_input_p ()))
-            info_set_pending_input (key);
-
-          if (func == (VFunction *) info_abort_key)
-            {
-              if (isearch_states_index)
-                window_set_state (window, &orig_state);
-            }
-
-          if (!echo_area_is_active)
-            window_clear_echo_area ();
-
-          if (auto_footnotes_p)
-            info_get_or_remove_footnotes (active_window);
-
-          isearch_is_active = 0;
-          continue;
-        }
-
-      /* Search for the contents of isearch_string. */
-    search_now:
-      show_isearch_prompt (dir, (unsigned char *) isearch_string, search_result);
-
-      /* If the search string includes upper-case letters, make the
-         search case-sensitive.  */
-      for (p = isearch_string; *p; p++)
-        if (isupper (*p))
-          {
-            case_sensitive = 1;
-            break;
-          }
-      
-
-      if (search_result == 0)
-        {
-          /* Check to see if the current search string is right here.  If
-             we are looking at it, then don't bother calling the search
-             function. */
-          if (((dir < 0) &&
-	       ((case_sensitive ? strncmp : strncasecmp)
-                            (window->node->contents + window->point,
-                             isearch_string, isearch_string_index) == 0)) ||
-              ((dir > 0) &&
-               ((window->point - isearch_string_index) >= 0) &&
-	       ((case_sensitive ? strncmp : strncasecmp)
-                            (window->node->contents +
-                             (window->point - (isearch_string_index - 1)),
-                             isearch_string, isearch_string_index) == 0)))
-            {
-              if (dir > 0)
-                window->point++;
-            }
-          else
-            search_result = info_search_internal (isearch_string,
-						  window, dir, case_sensitive);
-        }
-
-      /* If this search failed, and we didn't already have a failed search,
-         then ring the terminal bell. */
-      if (search_result != 0 && last_search_result == 0)
-        terminal_ring_bell ();
-
-    after_search:
-      show_isearch_prompt (dir, (unsigned char *) isearch_string, search_result);
-
-      if (search_result == 0)
-        {
-          if ((mystate.node == window->node) &&
-              (mystate.pagetop != window->pagetop))
-            {
-              int newtop = window->pagetop;
-              window->pagetop = mystate.pagetop;
-              set_window_pagetop (window, newtop);
-            }
-          display_update_one_window (window);
-          display_cursor_at_point (window);
-        }
-
-      last_search_result = search_result;
-    }
-
-  /* Free the memory used to remember each search state. */
-  free_isearch_states ();
-
-  /* Perhaps GC some file buffers. */
-  info_gc_file_buffers ();
-
-  /* After searching, leave the window in the correct state. */
-  if (!echo_area_is_active)
-    window_clear_echo_area ();
-}
-
-/* GC some file buffers.  A file buffer can be gc-ed if there we have
-   no nodes in INFO_WINDOWS that reference this file buffer's contents.
-   Garbage collecting a file buffer means to free the file buffers
-   contents. */
-static void
-info_gc_file_buffers (void)
-{
-  register int fb_index, iw_index, i;
-  register FILE_BUFFER *fb;
-  register INFO_WINDOW *iw;
-
-  if (!info_loaded_files)
-    return;
-
-  for (fb_index = 0; (fb = info_loaded_files[fb_index]); fb_index++)
-    {
-      int fb_referenced_p = 0;
-
-      /* If already gc-ed, do nothing. */
-      if (!fb->contents)
-        continue;
-
-      /* If this file had to be uncompressed, check to see if we should
-         gc it.  This means that the user-variable "gc-compressed-files"
-         is non-zero. */
-      if ((fb->flags & N_IsCompressed) && !gc_compressed_files)
-        continue;
-
-      /* If this file's contents are not gc-able, move on. */
-      if (fb->flags & N_CannotGC)
-        continue;
-
-      /* Check each INFO_WINDOW to see if it has any nodes which reference
-         this file. */
-      for (iw_index = 0; (iw = info_windows[iw_index]); iw_index++)
-        {
-          for (i = 0; iw->nodes && iw->nodes[i]; i++)
-            {
-              if ((FILENAME_CMP (fb->fullpath, iw->nodes[i]->filename) == 0) ||
-                  (FILENAME_CMP (fb->filename, iw->nodes[i]->filename) == 0))
-                {
-                  fb_referenced_p = 1;
-                  break;
-                }
-            }
-        }
-
-      /* If this file buffer wasn't referenced, free its contents. */
-      if (!fb_referenced_p)
-        {
-          free (fb->contents);
-          fb->contents = (char *)NULL;
-        }
-    }
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                Traversing and Selecting References               */
-/*                                                                  */
-/* **************************************************************** */
-
-/* Move to the next or previous cross reference in this node. */
-static void
-info_move_to_xref (WINDOW *window, int count, unsigned char key, int dir)
-{
-  long firstmenu, firstxref;
-  long nextmenu, nextxref;
-  long placement = -1;
-  long start = 0;
-  NODE *node = window->node;
-
-  if (dir < 0)
-    start = node->nodelen;
-
-  /* This search is only allowed to fail if there is no menu or cross
-     reference in the current node.  Otherwise, the first menu or xref
-     found is moved to. */
-
-  firstmenu = info_search_in_node
-    (INFO_MENU_ENTRY_LABEL, node, start, (WINDOW *)NULL, dir, 0);
-
-  /* FIRSTMENU may point directly to the line defining the menu.  Skip that
-     and go directly to the first item. */
-
-  if (firstmenu != -1)
-    {
-      char *text = node->contents + firstmenu;
-
-      if (strncmp (text, INFO_MENU_LABEL, strlen (INFO_MENU_LABEL)) == 0)
-        firstmenu = info_search_in_node
-          (INFO_MENU_ENTRY_LABEL, node, firstmenu + dir, (WINDOW *)NULL, dir, 0);
-    }
-
-  firstxref =
-    info_search_in_node (INFO_XREF_LABEL, node, start, (WINDOW *)NULL, dir, 0);
-
-#if defined (HANDLE_MAN_PAGES)
-  if ((firstxref == -1) && (node->flags & N_IsManPage))
-    {
-      firstxref = locate_manpage_xref (node, start, dir);
-    }
-#endif /* HANDLE_MAN_PAGES */
-
-  if (firstmenu == -1 && firstxref == -1)
-    {
-      info_error ((char *) msg_no_xref_node, NULL, NULL);
-      return;
-    }
-
-  /* There is at least one cross reference or menu entry in this node.
-     Try hard to find the next available one. */
-
-  nextmenu = info_search_in_node
-    (INFO_MENU_ENTRY_LABEL, node, window->point + dir, (WINDOW *)NULL, dir, 0);
-
-  nextxref = info_search_in_node
-    (INFO_XREF_LABEL, node, window->point + dir, (WINDOW *)NULL, dir, 0);
-
-#if defined (HANDLE_MAN_PAGES)
-  if ((nextxref == -1) && (node->flags & N_IsManPage) && (firstxref != -1))
-    nextxref = locate_manpage_xref (node, window->point + dir, dir);
-#endif /* HANDLE_MAN_PAGES */
-
-  /* Ignore "Menu:" as a menu item. */
-  if (nextmenu != -1)
-    {
-      char *text = node->contents + nextmenu;
-
-      if (strncmp (text, INFO_MENU_LABEL, strlen (INFO_MENU_LABEL)) == 0)
-        nextmenu = info_search_in_node
-          (INFO_MENU_ENTRY_LABEL, node, nextmenu + dir, (WINDOW *)NULL, dir, 0);
-    }
-
-  /* If there is both a next menu entry, and a next xref entry, choose the
-     one which occurs first.  Otherwise, select the one which actually
-     appears in this node following point. */
-  if (nextmenu != -1 && nextxref != -1)
-    {
-      if (((dir == 1) && (nextmenu < nextxref)) ||
-          ((dir == -1) && (nextmenu > nextxref)))
-        placement = nextmenu + 1;
-      else
-        placement = nextxref;
-    }
-  else if (nextmenu != -1)
-    placement = nextmenu + 1;
-  else if (nextxref != -1)
-    placement = nextxref;
-
-  /* If there was neither a menu or xref entry appearing in this node after
-     point, choose the first menu or xref entry appearing in this node. */
-  if (placement == -1)
-    {
-      if (firstmenu != -1 && firstxref != -1)
-        {
-          if (((dir == 1) && (firstmenu < firstxref)) ||
-              ((dir == -1) && (firstmenu > firstxref)))
-            placement = firstmenu + 1;
-          else
-            placement = firstxref;
-        }
-      else if (firstmenu != -1)
-        placement = firstmenu + 1;
-      else
-        placement = firstxref;
-    }
-  window->point = placement;
-  window_adjust_pagetop (window);
-  window->flags |= W_UpdateWindow;
-}
-
-DECLARE_INFO_COMMAND (info_move_to_prev_xref,
-                      _("Move to the previous cross reference"))
-{
-  if (count < 0)
-    info_move_to_prev_xref (window, -count, key);
-  else
-    info_move_to_xref (window, count, key, -1);
-}
-
-DECLARE_INFO_COMMAND (info_move_to_next_xref,
-                      _("Move to the next cross reference"))
-{
-  if (count < 0)
-    info_move_to_next_xref (window, -count, key);
-  else
-    info_move_to_xref (window, count, key, 1);
-}
-
-/* Select the menu item or reference that appears on this line. */
-DECLARE_INFO_COMMAND (info_select_reference_this_line,
-                      _("Select reference or menu item appearing on this line"))
-{
-  char *line;
-
-  if (window->line_starts)
-    line = window->line_starts[window_line_of_point (window)];
-  else
-    line = "";
-
-  /* If this line contains a menu item, select that one. */
-  if (strncmp ("* ", line, 2) == 0)
-    info_menu_or_ref_item (window, count, key, info_menu_of_node, 0);
-  else
-    info_menu_or_ref_item (window, count, key, info_xrefs_of_node, 0);
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                  Miscellaneous Info Commands                     */
-/*                                                                  */
-/* **************************************************************** */
-
-/* What to do when C-g is pressed in a window. */
-DECLARE_INFO_COMMAND (info_abort_key, _("Cancel current operation"))
-{
-  /* If error printing doesn't oridinarily ring the bell, do it now,
-     since C-g always rings the bell.  Otherwise, let the error printer
-     do it. */
-  if (!info_error_rings_bell_p)
-    terminal_ring_bell ();
-  info_error ((char *) _("Quit"), NULL, NULL);
-
-  info_initialize_numeric_arg ();
-  info_clear_pending_input ();
-  info_last_executed_command = (VFunction *)NULL;
-}
-
-/* Move the cursor to the desired line of the window. */
-DECLARE_INFO_COMMAND (info_move_to_window_line,
-   _("Move the cursor to a specific line of the window"))
-{
-  int line;
-
-  /* With no numeric argument of any kind, default to the center line. */
-  if (!info_explicit_arg && count == 1)
-    line = (window->height / 2) + window->pagetop;
-  else
-    {
-      if (count < 0)
-        line = (window->height + count) + window->pagetop;
-      else
-        line = window->pagetop + count;
-    }
-
-  /* If the line doesn't appear in this window, make it do so. */
-  if ((line - window->pagetop) >= window->height)
-    line = window->pagetop + (window->height - 1);
-
-  /* If the line is too small, make it fit. */
-  if (line < window->pagetop)
-    line = window->pagetop;
-
-  /* If the selected line is past the bottom of the node, force it back. */
-  if (line >= window->line_count)
-    line = window->line_count - 1;
-
-  window->point = (window->line_starts[line] - window->node->contents);
-}
-
-/* Clear the screen and redraw its contents.  Given a numeric argument,
-   move the line the cursor is on to the COUNT'th line of the window. */
-DECLARE_INFO_COMMAND (info_redraw_display, _("Redraw the display"))
-{
-  if ((!info_explicit_arg && count == 1) || echo_area_is_active)
-    {
-      terminal_clear_screen ();
-      display_clear_display (the_display);
-      window_mark_chain (windows, W_UpdateWindow);
-      display_update_display (windows);
-    }
-  else
-    {
-      int desired_line, point_line;
-      int new_pagetop;
-
-      point_line = window_line_of_point (window) - window->pagetop;
-
-      if (count < 0)
-        desired_line = window->height + count;
-      else
-        desired_line = count;
-
-      if (desired_line < 0)
-        desired_line = 0;
-
-      if (desired_line >= window->height)
-        desired_line = window->height - 1;
-
-      if (desired_line == point_line)
-        return;
-
-      new_pagetop = window->pagetop + (point_line - desired_line);
-
-      set_window_pagetop (window, new_pagetop);
-    }
-}
-/* This command does nothing.  It is the fact that a key is bound to it
-   that has meaning.  See the code at the top of info_session (). */
-DECLARE_INFO_COMMAND (info_quit, _("Quit using Info"))
-{}
-
-
-/* **************************************************************** */
-/*                                                                  */
-/*               Reading Keys and Dispatching on Them               */
-/*                                                                  */
-/* **************************************************************** */
-
-/* Declaration only.  Special cased in info_dispatch_on_key ().
-   Doc string is to avoid ugly results with describe_key etc.  */
-DECLARE_INFO_COMMAND (info_do_lowercase_version,
-		      _("Run command bound to this key's lowercase variant"))
-{}
-
-static void
-dispatch_error (char *keyseq)
-{
-  char *rep;
-
-  rep = pretty_keyseq (keyseq);
-
-  if (!echo_area_is_active)
-    info_error ((char *) _("Unknown command (%s)."), rep, NULL);
-  else
-    {
-      char *temp = xmalloc (1 + strlen (rep) + strlen (_("\"%s\" is invalid")));
-      sprintf (temp, _("`%s' is invalid"), rep);
-      terminal_ring_bell ();
-      inform_in_echo_area (temp);
-      free (temp);
-    }
-}
-
-/* Keeping track of key sequences. */
-static char *info_keyseq = (char *)NULL;
-static int info_keyseq_index = 0;
-static int info_keyseq_size = 0;
-static int info_keyseq_displayed_p = 0;
-
-/* Initialize the length of the current key sequence. */
-void
-initialize_keyseq (void)
-{
-  info_keyseq_index = 0;
-  info_keyseq_displayed_p = 0;
-}
-
-/* Add CHARACTER to the current key sequence. */
-void
-add_char_to_keyseq (char character)
-{
-  if (info_keyseq_index + 2 >= info_keyseq_size)
-    info_keyseq = (char *)xrealloc (info_keyseq, info_keyseq_size += 10);
-
-  info_keyseq[info_keyseq_index++] = character;
-  info_keyseq[info_keyseq_index] = '\0';
-}
-
-/* Display the current value of info_keyseq.  If argument EXPECTING is
-   non-zero, input is expected to be read after the key sequence is
-   displayed, so add an additional prompting character to the sequence. */
-static void
-display_info_keyseq (int expecting_future_input)
-{
-  char *rep;
-
-  rep = pretty_keyseq (info_keyseq);
-  if (expecting_future_input)
-    strcat (rep, "-");
-
-  if (echo_area_is_active)
-    inform_in_echo_area (rep);
-  else
-    {
-      window_message_in_echo_area (rep, NULL, NULL);
-      display_cursor_at_point (active_window);
-    }
-  info_keyseq_displayed_p = 1;
-}
-
-/* Called by interactive commands to read a keystroke. */
-unsigned char
-info_get_another_input_char (void)
-{
-  int ready = !info_keyseq_displayed_p; /* ready if new and pending key */
-
-  /* If there isn't any input currently available, then wait a
-     moment looking for input.  If we don't get it fast enough,
-     prompt a little bit with the current key sequence. */
-  if (!info_keyseq_displayed_p)
-    {
-      ready = 1;
-      if (!info_any_buffered_input_p () &&
-          !info_input_pending_p ())
-        {
-#if defined (FD_SET)
-          struct timeval timer;
-          fd_set readfds;
-
-          FD_ZERO (&readfds);
-          FD_SET (fileno (info_input_stream), &readfds);
-          timer.tv_sec = 1;
-          timer.tv_usec = 750;
-          ready = select (fileno(info_input_stream)+1, &readfds, (fd_set *)NULL, (fd_set *)NULL, &timer);
-#else
-          ready = 0;
-#endif /* FD_SET */
-      }
-    }
-
-  if (!ready)
-    display_info_keyseq (1);
-
-  return (info_get_input_char ());
-}
-
-/* Do the command associated with KEY in MAP.  If the associated command is
-   really a keymap, then read another key, and dispatch into that map. */
-void
-info_dispatch_on_key (unsigned char key, Keymap map)
-{
-#if !defined(INFOKEY)
-  if (Meta_p (key) && (!ISO_Latin_p || map[key].function != ea_insert))
-    {
-      if (map[ESC].type == ISKMAP)
-        {
-          map = (Keymap)map[ESC].function;
-          add_char_to_keyseq (ESC);
-          key = UnMeta (key);
-          info_dispatch_on_key (key, map);
-        }
-      else
-        {
-          dispatch_error (info_keyseq);
-        }
-      return;
-    }
-#endif /* INFOKEY */
-
-  switch (map[key].type)
-    {
-    case ISFUNC:
-      {
-        VFunction *func;
-
-        func = InfoFunction(map[key].function);
-        if (func != (VFunction *)NULL)
-          {
-            /* Special case info_do_lowercase_version (). */
-            if (func == (VFunction *) info_do_lowercase_version)
-              {
-#if defined(INFOKEY)
-		unsigned char lowerkey;
-
-		lowerkey = Meta_p(key) ? Meta (tolower (UnMeta (key))) : tolower (key);
-		if (lowerkey == key)
-		  {
-		    add_char_to_keyseq (key);
-		    dispatch_error (info_keyseq);
-		    return;
-		  }
-                info_dispatch_on_key (lowerkey, map);
-#else /* !INFOKEY */
-                info_dispatch_on_key (tolower (key), map);
-#endif /* INFOKEY */
-                return;
-              }
-
-            add_char_to_keyseq (key);
-
-            if (info_keyseq_displayed_p)
-              display_info_keyseq (0);
-
-            {
-              WINDOW *where;
-
-              where = active_window;
-              (*InfoFunction(map[key].function))
-                (active_window, info_numeric_arg * info_numeric_arg_sign, key);
-
-              /* If we have input pending, then the last command was a prefix
-                 command.  Don't change the value of the last function vars.
-                 Otherwise, remember the last command executed in the var
-                 appropriate to the window in which it was executed. */
-              if (!info_input_pending_p ())
-                {
-                  if (where == the_echo_area)
-                    ea_last_executed_command = InfoFunction(map[key].function);
-                  else
-                    info_last_executed_command = InfoFunction(map[key].function);
-                }
-            }
-          }
-        else
-          {
-            add_char_to_keyseq (key);
-            dispatch_error (info_keyseq);
-            return;
-          }
-      }
-      break;
-
-    case ISKMAP:
-      add_char_to_keyseq (key);
-      if (map[key].function != (InfoCommand *)NULL)
-        {
-          unsigned char newkey;
-
-          newkey = info_get_another_input_char ();
-          info_dispatch_on_key (newkey, (Keymap)map[key].function);
-        }
-      else
-        {
-          dispatch_error (info_keyseq);
-          return;
-        }
-      break;
-    }
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                      Numeric Arguments                           */
-/*                                                                  */
-/* **************************************************************** */
-
-/* Handle C-u style numeric args, as well as M--, and M-digits. */
-
-/* Non-zero means that an explicit argument has been passed to this
-   command, as in C-u C-v. */
-int info_explicit_arg = 0;
-
-/* The sign of the numeric argument. */
-int info_numeric_arg_sign = 1;
-
-/* The value of the argument itself. */
-int info_numeric_arg = 1;
-
-/* Add the current digit to the argument in progress. */
-DECLARE_INFO_COMMAND (info_add_digit_to_numeric_arg,
-                      _("Add this digit to the current numeric argument"))
-{
-  info_numeric_arg_digit_loop (window, 0, key);
-}
-
-/* C-u, universal argument.  Multiply the current argument by 4.
-   Read a key.  If the key has nothing to do with arguments, then
-   dispatch on it.  If the key is the abort character then abort. */
-DECLARE_INFO_COMMAND (info_universal_argument,
-                      _("Start (or multiply by 4) the current numeric argument"))
-{
-  info_numeric_arg *= 4;
-  info_numeric_arg_digit_loop (window, 0, 0);
-}
-
-/* Create a default argument. */
-void
-info_initialize_numeric_arg (void)
-{
-  info_numeric_arg = info_numeric_arg_sign = 1;
-  info_explicit_arg = 0;
-}
-
-DECLARE_INFO_COMMAND (info_numeric_arg_digit_loop,
-                      _("Internally used by \\[universal-argument]"))
-{
-  unsigned char pure_key;
-  Keymap keymap = window->keymap;
-
-  while (1)
-    {
-      if (key)
-        pure_key = key;
-      else
-        {
-          if (display_was_interrupted_p && !info_any_buffered_input_p ())
-            display_update_display (windows);
-
-          if (active_window != the_echo_area)
-            display_cursor_at_point (active_window);
-
-          pure_key = key = info_get_another_input_char ();
-
-#if !defined(INFOKEY)
-          if (Meta_p (key))
-            add_char_to_keyseq (ESC);
-
-          add_char_to_keyseq (UnMeta (key));
-#else /* defined(INFOKEY) */
-          add_char_to_keyseq (key);
-#endif /* defined(INFOKEY) */
-        }
-
-#if !defined(INFOKEY)
-      if (Meta_p (key))
-        key = UnMeta (key);
-#endif /* !defined(INFOKEY) */
-
-      if (keymap[key].type == ISFUNC
-          && InfoFunction(keymap[key].function)
-              == (VFunction *) info_universal_argument)
-        {
-          info_numeric_arg *= 4;
-          key = 0;
-          continue;
-        }
-
-#if defined(INFOKEY)
-      if (Meta_p (key))
-        key = UnMeta (key);
-#endif /* !defined(INFOKEY) */
-
-
-      if (isdigit (key))
-        {
-          if (info_explicit_arg)
-            info_numeric_arg = (info_numeric_arg * 10) + (key - '0');
-          else
-            info_numeric_arg = (key - '0');
-          info_explicit_arg = 1;
-        }
-      else
-        {
-          if (key == '-' && !info_explicit_arg)
-            {
-              info_numeric_arg_sign = -1;
-              info_numeric_arg = 1;
-            }
-          else
-            {
-              info_keyseq_index--;
-              info_dispatch_on_key (pure_key, keymap);
-              return;
-            }
-        }
-      key = 0;
-    }
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                      Input Character Buffering                   */
-/*                                                                  */
-/* **************************************************************** */
-
-/* Character waiting to be read next. */
-static int pending_input_character = 0;
-
-/* How to make there be no pending input. */
-static void
-info_clear_pending_input (void)
-{
-  pending_input_character = 0;
-}
-
-/* How to set the pending input character. */
-static void
-info_set_pending_input (unsigned char key)
-{
-  pending_input_character = key;
-}
-
-/* How to see if there is any pending input. */
-unsigned char
-info_input_pending_p (void)
-{
-  return (pending_input_character);
-}
-
-/* Largest number of characters that we can read in advance. */
-#define MAX_INFO_INPUT_BUFFERING 512
-
-static int pop_index = 0, push_index = 0;
-static unsigned char info_input_buffer[MAX_INFO_INPUT_BUFFERING];
-
-/* Add KEY to the buffer of characters to be read. */
-static void
-info_push_typeahead (unsigned char key)
-{
-  /* Flush all pending input in the case of C-g pressed. */
-  if (key == Control ('g'))
-    {
-      push_index = pop_index;
-      info_set_pending_input (Control ('g'));
-    }
-  else
-    {
-      info_input_buffer[push_index++] = key;
-      if ((unsigned int) push_index >= sizeof (info_input_buffer))
-        push_index = 0;
-    }
-}
-
-/* Return the amount of space available in INFO_INPUT_BUFFER for new chars. */
-static int
-info_input_buffer_space_available (void)
-{
-  if (pop_index > push_index)
-    return (pop_index - push_index);
-  else
-    return (sizeof (info_input_buffer) - (push_index - pop_index));
-}
-
-/* Get a key from the buffer of characters to be read.
-   Return the key in KEY.
-   Result is non-zero if there was a key, or 0 if there wasn't. */
-static int
-info_get_key_from_typeahead (unsigned char *key)
-{
-  if (push_index == pop_index)
-    return (0);
-
-  *key = info_input_buffer[pop_index++];
-
-  if ((unsigned int) pop_index >= sizeof (info_input_buffer))
-    pop_index = 0;
-
-  return (1);
-}
-
-int
-info_any_buffered_input_p (void)
-{
-  info_gather_typeahead ();
-  return (push_index != pop_index);
-}
-
-/* If characters are available to be read, then read them and stuff them into
-   info_input_buffer.  Otherwise, do nothing. */
-void
-info_gather_typeahead (void)
-{
-  register int i = 0;
-  int tty, space_avail;
-  long chars_avail;
-  unsigned char input[MAX_INFO_INPUT_BUFFERING];
-
-  tty = fileno (info_input_stream);
-  chars_avail = 0;
-
-  space_avail = info_input_buffer_space_available ();
-
-  /* If we can just find out how many characters there are to read, do so. */
-#if defined (FIONREAD)
-  {
-    ioctl (tty, FIONREAD, &chars_avail);
-
-    if (chars_avail > space_avail)
-      chars_avail = space_avail;
-
-    if (chars_avail)
-      chars_avail = read (tty, &input[0], chars_avail);
-  }
-#else /* !FIONREAD */
-#  if defined (O_NDELAY)
-  {
-    int flags;
-
-    flags = fcntl (tty, F_GETFL, 0);
-
-    fcntl (tty, F_SETFL, (flags | O_NDELAY));
-      chars_avail = read (tty, &input[0], space_avail);
-    fcntl (tty, F_SETFL, flags);
-
-    if (chars_avail == -1)
-      chars_avail = 0;
-  }
-#  else  /* !O_NDELAY */
-#   ifdef __DJGPP__
-  {
-    extern long pc_term_chars_avail (void);
-
-    if (isatty (tty))
-      chars_avail = pc_term_chars_avail ();
-    else
-      {
-	/* We could be more accurate by calling ltell, but we have no idea
-	   whether tty is buffered by stdio functions, and if so, how many
-	   characters are already waiting in the buffer.  So we punt.  */
-	struct stat st;
-
-	if (fstat (tty, &st) < 0)
-	  chars_avail = 1;
-	else
-	  chars_avail = st.st_size;
-      }
-    if (chars_avail > space_avail)
-      chars_avail = space_avail;
-    if (chars_avail)
-      chars_avail = read (tty, &input[0], chars_avail);
-  }
-#   endif/* __DJGPP__ */
-#  endif /* O_NDELAY */
-#endif /* !FIONREAD */
-
-  while (i < chars_avail)
-    {
-      info_push_typeahead (input[i]);
-      i++;
-    }
-}
-
-/* How to read a single character. */
-unsigned char
-info_get_input_char (void)
-{
-  unsigned char keystroke;
-
-  info_gather_typeahead ();
-
-  if (pending_input_character)
-    {
-      keystroke = pending_input_character;
-      pending_input_character = 0;
-    }
-  else if (info_get_key_from_typeahead (&keystroke) == 0)
-    {
-      int rawkey;
-      unsigned char c;
-      int tty = fileno (info_input_stream);
-
-      /* Using stream I/O causes FIONREAD etc to fail to work
-         so unless someone can find a portable way of finding
-         out how many characters are currently buffered, we
-         should stay with away from stream I/O.
-         --Egil Kvaleberg <egilk@sn.no>, January 1997.  */
-#ifdef EINTR
-      /* Keep reading if we got EINTR, so that we don't just exit.
-         --Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>,
-         22 Dec 1997.  */
-      {
-        int n;
-        do
-	  n = read (tty, &c, 1);
-        while (n == -1 && errno == EINTR);
-        rawkey = n == 1 ? c : EOF;
-      }
-#else
-      rawkey = (read (tty, &c, 1) == 1) ? c : EOF;
-#endif
-
-      keystroke = rawkey;
-
-      if (rawkey == EOF)
-        {
-          if (info_input_stream != stdin)
-            {
-              fclose (info_input_stream);
-              info_input_stream = stdin;
-	      tty = fileno (info_input_stream);
-              display_inhibited = 0;
-              display_update_display (windows);
-              display_cursor_at_point (active_window);
-              rawkey = (read (tty, &c, 1) == 1) ? c : EOF;
-              keystroke = rawkey;
-            }
-
-          if (rawkey == EOF)
-            {
-              terminal_unprep_terminal ();
-              close_dribble_file ();
-              xexit (0);
-            }
-        }
-    }
-
-  if (info_dribble_file)
-    dribble (keystroke);
-
-  return keystroke;
-}

Property changes on: head/contrib/texinfo/info/session.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/filesys.h
===================================================================
--- head/contrib/texinfo/info/filesys.h	(revision 276550)
+++ head/contrib/texinfo/info/filesys.h	(nonexistent)
@@ -1,92 +0,0 @@
-/* filesys.h -- external declarations for filesys.c.
-   $Id: filesys.h,v 1.3 2004/04/11 17:56:45 karl Exp $
-
-   Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#ifndef INFO_FILESYS_H
-#define INFO_FILESYS_H
-
-/* The path on which we look for info files.  You can initialize this
-   from the environment variable INFOPATH if there is one, or you can
-   call info_add_path () to add paths to the beginning or end of it. */
-extern char *infopath;
-
-/* Make INFOPATH have absolutely nothing in it. */
-extern void zap_infopath (void);
-
-/* Add PATH to the list of paths found in INFOPATH.  2nd argument says
-   whether to put PATH at the front or end of INFOPATH. */
-extern void info_add_path (char *path, int where);
-
-/* Defines that are passed along with the pathname to info_add_path (). */
-#define INFOPATH_PREPEND 0
-#define INFOPATH_APPEND  1
-
-/* Expand the filename in PARTIAL to make a real name for this operating
-   system.  This looks in INFO_PATHS in order to find the correct file.
-   If it can't find the file, it returns NULL. */
-extern char *info_find_fullpath (char *partial);
-
-/* Given a chunk of text and its length, convert all CRLF pairs at the
-   EOLs into a single Newline character.  Return the length of produced
-   text.  */
-long convert_eols (char *text, long textlen);
-
-/* Read the contents of PATHNAME, returning a buffer with the contents of
-   that file in it, and returning the size of that buffer in FILESIZE.
-   FINFO is a stat struct which has already been filled in by the caller.
-   If the file cannot be read, return a NULL pointer. */
-extern char *filesys_read_info_file (char *pathname, long int *filesize,
-    struct stat *finfo, int *is_compressed);
-
-extern char *filesys_read_compressed (char *pathname, long int *filesize);
-
-/* Return the command string that would be used to decompress FILENAME. */
-extern char *filesys_decompressor_for_file (char *filename);
-extern int compressed_filename_p (char *filename);
-
-/* A function which returns a pointer to a static buffer containing
-   an error message for FILENAME and ERROR_NUM. */
-extern char *filesys_error_string (char *filename, int error_num);
-
-/* The number of the most recent file system error. */
-extern int filesys_error_number;
-
-/* Given a string containing units of information separated by colons,
-   return the next one pointed to by IDX, or NULL if there are no more.
-   Advance IDX to the character after the colon. */
-extern char *extract_colon_unit (char *string, int *idx);
-
-/* Return true if FILENAME is `dir', with a possible compression suffix.  */
-extern int is_dir_name (char *filename);
-
-/* The default value of INFOPATH. */
-#if !defined (DEFAULT_INFOPATH)
-#  define DEFAULT_INFOPATH "/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:."
-#endif /* !DEFAULT_INFOPATH */
-
-#if !defined (S_ISREG) && defined (S_IFREG)
-#  define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-#endif /* !S_ISREG && S_IFREG */
-
-#if !defined (S_ISDIR) && defined (S_IFDIR)
-#  define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif /* !S_ISDIR && S_IFDIR */
-
-#endif /* not INFO_FILESYS_H */

Property changes on: head/contrib/texinfo/info/filesys.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/info.h
===================================================================
--- head/contrib/texinfo/info/info.h	(revision 276550)
+++ head/contrib/texinfo/info/info.h	(nonexistent)
@@ -1,160 +0,0 @@
-/* info.h -- Header file which includes all of the other headers.
-   $Id: info.h,v 1.4 2004/04/11 17:56:45 karl Exp $
-
-   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#ifndef INFO_H
-#define INFO_H
-
-/* We always want these, so why clutter up the compile command?  */
-#define HANDLE_MAN_PAGES
-#define NAMED_FUNCTIONS
-#define INFOKEY
-
-/* System dependencies.  */
-#include "system.h"
-
-/* Some of our other include files use these.  */
-typedef int Function ();
-typedef void VFunction ();
-typedef char *CFunction ();
-
-#include "filesys.h"
-#include "doc.h"
-#include "display.h"
-#include "session.h"
-#include "echo-area.h"
-#include "footnotes.h"
-#include "gc.h"
-
-#define info_toupper(x) (islower (x) ? toupper (x) : x)
-#define info_tolower(x) (isupper (x) ? tolower (x) : x)
-
-#if !defined (whitespace)
-#  define whitespace(c) ((c == ' ') || (c == '\t'))
-#endif /* !whitespace */
-
-#if !defined (whitespace_or_newline)
-#  define whitespace_or_newline(c) (whitespace (c) || (c == '\n'))
-#endif /* !whitespace_or_newline */
-
-/* Add POINTER to the list of pointers found in ARRAY.  SLOTS is the number
-   of slots that have already been allocated.  INDEX is the index into the
-   array where POINTER should be added.  GROW is the number of slots to grow
-   ARRAY by, in the case that it needs growing.  TYPE is a cast of the type
-   of object stored in ARRAY (e.g., NODE_ENTRY *. */
-#define add_pointer_to_array(pointer, idx, array, slots, grow, type) \
-  do { \
-    if (idx + 2 >= slots) \
-      array = (type *)(xrealloc (array, (slots += grow) * sizeof (type))); \
-    array[idx++] = (type)pointer; \
-    array[idx] = (type)NULL; \
-  } while (0)
-
-#define maybe_free(x) do { if (x) free (x); } while (0)
-
-#if !defined (zero_mem) && defined (HAVE_MEMSET)
-#  define zero_mem(mem, length) memset (mem, 0, length)
-#endif /* !zero_mem && HAVE_MEMSET */
-
-#if !defined (zero_mem) && defined (HAVE_BZERO)
-#  define zero_mem(mem, length) bzero (mem, length)
-#endif /* !zero_mem && HAVE_BZERO */
-
-#if !defined (zero_mem)
-#  define zero_mem(mem, length) \
-  do {                                  \
-        register int zi;                \
-        register unsigned char *place;  \
-                                        \
-        place = (unsigned char *)mem;   \
-        for (zi = 0; zi < length; zi++) \
-          place[zi] = 0;                \
-      } while (0)
-#endif /* !zero_mem */
-
-
-/* A structure associating the nodes visited in a particular window. */
-typedef struct {
-  WINDOW *window;               /* The window that this list is attached to. */
-  NODE **nodes;                 /* Array of nodes visited in this window. */
-  int *pagetops;                /* For each node in NODES, the pagetop. */
-  long *points;                 /* For each node in NODES, the point. */
-  int current;                  /* Index in NODES of the current node. */
-  int nodes_index;              /* Index where to add the next node. */
-  int nodes_slots;              /* Number of slots allocated to NODES. */
-} INFO_WINDOW;
-
-/* Array of structures describing for each window which nodes have been
-   visited in that window. */
-extern INFO_WINDOW **info_windows;
-
-/* For handling errors.  If you initialize the window system, you should
-   also set info_windows_initialized_p to non-zero.  It is used by the
-   info_error () function to determine how to format and output errors. */
-extern int info_windows_initialized_p;
-
-/* Non-zero if an error message has been printed. */
-extern int info_error_was_printed;
-
-/* Non-zero means ring terminal bell on errors. */
-extern int info_error_rings_bell_p;
-
-/* Non-zero means default keybindings are loosely modeled on vi(1).  */
-extern int vi_keys_p;
-
-/* Non-zero means don't remove ANSI escape sequences from man pages.  */
-extern int raw_escapes_p;
-
-/* Print FORMAT with ARG1 and ARG2.  If the window system was initialized,
-   then the message is printed in the echo area.  Otherwise, a message is
-   output to stderr. */
-extern void info_error (char *format, void *arg1, void *arg2);
-
-extern void add_file_directory_to_path (char *filename);
-
-/* Error message defines. */
-extern const char *msg_cant_find_node;
-extern const char *msg_cant_file_node;
-extern const char *msg_cant_find_window;
-extern const char *msg_cant_find_point;
-extern const char *msg_cant_kill_last;
-extern const char *msg_no_menu_node;
-extern const char *msg_no_foot_node;
-extern const char *msg_no_xref_node;
-extern const char *msg_no_pointer;
-extern const char *msg_unknown_command;
-extern const char *msg_term_too_dumb;
-extern const char *msg_at_node_bottom;
-extern const char *msg_at_node_top;
-extern const char *msg_one_window;
-extern const char *msg_win_too_small;
-extern const char *msg_cant_make_help;
-
-
-#if defined(INFOKEY)
-/* Found in variables.c. */
-extern void set_variable_to_value (char *name, char *value);
-#endif /* INFOKEY */
-
-/* Found in m-x.c.  */
-extern char *read_function_name (char *prompt, WINDOW *window);
-
-#endif /* !INFO_H */

Property changes on: head/contrib/texinfo/info/info.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/funs.h
===================================================================
--- head/contrib/texinfo/info/funs.h	(revision 276550)
+++ head/contrib/texinfo/info/funs.h	(nonexistent)
@@ -1,243 +0,0 @@
-/* funs.h -- Generated declarations for Info commands. */
-
-#include "info.h"
-
-/* Functions declared in "./session.c". */
-#define A_info_next_line 0
-extern void info_next_line (WINDOW *window, int count, unsigned char key);
-#define A_info_prev_line 1
-extern void info_prev_line (WINDOW *window, int count, unsigned char key);
-#define A_info_end_of_line 2
-extern void info_end_of_line (WINDOW *window, int count, unsigned char key);
-#define A_info_beginning_of_line 3
-extern void info_beginning_of_line (WINDOW *window, int count, unsigned char key);
-#define A_info_forward_char 4
-extern void info_forward_char (WINDOW *window, int count, unsigned char key);
-#define A_info_backward_char 5
-extern void info_backward_char (WINDOW *window, int count, unsigned char key);
-#define A_info_forward_word 6
-extern void info_forward_word (WINDOW *window, int count, unsigned char key);
-#define A_info_backward_word 7
-extern void info_backward_word (WINDOW *window, int count, unsigned char key);
-#define A_info_global_next_node 8
-extern void info_global_next_node (WINDOW *window, int count, unsigned char key);
-#define A_info_global_prev_node 9
-extern void info_global_prev_node (WINDOW *window, int count, unsigned char key);
-#define A_info_scroll_forward 10
-extern void info_scroll_forward (WINDOW *window, int count, unsigned char key);
-#define A_info_scroll_forward_set_window 11
-extern void info_scroll_forward_set_window (WINDOW *window, int count, unsigned char key);
-#define A_info_scroll_forward_page_only 12
-extern void info_scroll_forward_page_only (WINDOW *window, int count, unsigned char key);
-#define A_info_scroll_forward_page_only_set_window 13
-extern void info_scroll_forward_page_only_set_window (WINDOW *window, int count, unsigned char key);
-#define A_info_scroll_backward 14
-extern void info_scroll_backward (WINDOW *window, int count, unsigned char key);
-#define A_info_scroll_backward_set_window 15
-extern void info_scroll_backward_set_window (WINDOW *window, int count, unsigned char key);
-#define A_info_scroll_backward_page_only 16
-extern void info_scroll_backward_page_only (WINDOW *window, int count, unsigned char key);
-#define A_info_scroll_backward_page_only_set_window 17
-extern void info_scroll_backward_page_only_set_window (WINDOW *window, int count, unsigned char key);
-#define A_info_beginning_of_node 18
-extern void info_beginning_of_node (WINDOW *window, int count, unsigned char key);
-#define A_info_end_of_node 19
-extern void info_end_of_node (WINDOW *window, int count, unsigned char key);
-#define A_info_down_line 20
-extern void info_down_line (WINDOW *window, int count, unsigned char key);
-#define A_info_up_line 21
-extern void info_up_line (WINDOW *window, int count, unsigned char key);
-#define A_info_scroll_half_screen_down 22
-extern void info_scroll_half_screen_down (WINDOW *window, int count, unsigned char key);
-#define A_info_scroll_half_screen_up 23
-extern void info_scroll_half_screen_up (WINDOW *window, int count, unsigned char key);
-#define A_info_next_window 24
-extern void info_next_window (WINDOW *window, int count, unsigned char key);
-#define A_info_prev_window 25
-extern void info_prev_window (WINDOW *window, int count, unsigned char key);
-#define A_info_split_window 26
-extern void info_split_window (WINDOW *window, int count, unsigned char key);
-#define A_info_delete_window 27
-extern void info_delete_window (WINDOW *window, int count, unsigned char key);
-#define A_info_keep_one_window 28
-extern void info_keep_one_window (WINDOW *window, int count, unsigned char key);
-#define A_info_scroll_other_window 29
-extern void info_scroll_other_window (WINDOW *window, int count, unsigned char key);
-#define A_info_scroll_other_window_backward 30
-extern void info_scroll_other_window_backward (WINDOW *window, int count, unsigned char key);
-#define A_info_grow_window 31
-extern void info_grow_window (WINDOW *window, int count, unsigned char key);
-#define A_info_tile_windows 32
-extern void info_tile_windows (WINDOW *window, int count, unsigned char key);
-#define A_info_toggle_wrap 33
-extern void info_toggle_wrap (WINDOW *window, int count, unsigned char key);
-#define A_info_next_node 34
-extern void info_next_node (WINDOW *window, int count, unsigned char key);
-#define A_info_prev_node 35
-extern void info_prev_node (WINDOW *window, int count, unsigned char key);
-#define A_info_up_node 36
-extern void info_up_node (WINDOW *window, int count, unsigned char key);
-#define A_info_last_node 37
-extern void info_last_node (WINDOW *window, int count, unsigned char key);
-#define A_info_first_node 38
-extern void info_first_node (WINDOW *window, int count, unsigned char key);
-#define A_info_last_menu_item 39
-extern void info_last_menu_item (WINDOW *window, int count, unsigned char key);
-#define A_info_menu_digit 40
-extern void info_menu_digit (WINDOW *window, int count, unsigned char key);
-#define A_info_menu_item 41
-extern void info_menu_item (WINDOW *window, int count, unsigned char key);
-#define A_info_xref_item 42
-extern void info_xref_item (WINDOW *window, int count, unsigned char key);
-#define A_info_find_menu 43
-extern void info_find_menu (WINDOW *window, int count, unsigned char key);
-#define A_info_visit_menu 44
-extern void info_visit_menu (WINDOW *window, int count, unsigned char key);
-#define A_info_goto_node 45
-extern void info_goto_node (WINDOW *window, int count, unsigned char key);
-#define A_info_menu_sequence 46
-extern void info_menu_sequence (WINDOW *window, int count, unsigned char key);
-#define A_info_goto_invocation_node 47
-extern void info_goto_invocation_node (WINDOW *window, int count, unsigned char key);
-#define A_info_man 48
-extern void info_man (WINDOW *window, int count, unsigned char key);
-#define A_info_top_node 49
-extern void info_top_node (WINDOW *window, int count, unsigned char key);
-#define A_info_dir_node 50
-extern void info_dir_node (WINDOW *window, int count, unsigned char key);
-#define A_info_history_node 51
-extern void info_history_node (WINDOW *window, int count, unsigned char key);
-#define A_info_kill_node 52
-extern void info_kill_node (WINDOW *window, int count, unsigned char key);
-#define A_info_view_file 53
-extern void info_view_file (WINDOW *window, int count, unsigned char key);
-#define A_info_print_node 54
-extern void info_print_node (WINDOW *window, int count, unsigned char key);
-#define A_info_search_case_sensitively 55
-extern void info_search_case_sensitively (WINDOW *window, int count, unsigned char key);
-#define A_info_search 56
-extern void info_search (WINDOW *window, int count, unsigned char key);
-#define A_info_search_backward 57
-extern void info_search_backward (WINDOW *window, int count, unsigned char key);
-#define A_info_search_next 58
-extern void info_search_next (WINDOW *window, int count, unsigned char key);
-#define A_info_search_previous 59
-extern void info_search_previous (WINDOW *window, int count, unsigned char key);
-#define A_isearch_forward 60
-extern void isearch_forward (WINDOW *window, int count, unsigned char key);
-#define A_isearch_backward 61
-extern void isearch_backward (WINDOW *window, int count, unsigned char key);
-#define A_info_move_to_prev_xref 62
-extern void info_move_to_prev_xref (WINDOW *window, int count, unsigned char key);
-#define A_info_move_to_next_xref 63
-extern void info_move_to_next_xref (WINDOW *window, int count, unsigned char key);
-#define A_info_select_reference_this_line 64
-extern void info_select_reference_this_line (WINDOW *window, int count, unsigned char key);
-#define A_info_abort_key 65
-extern void info_abort_key (WINDOW *window, int count, unsigned char key);
-#define A_info_move_to_window_line 66
-extern void info_move_to_window_line (WINDOW *window, int count, unsigned char key);
-#define A_info_redraw_display 67
-extern void info_redraw_display (WINDOW *window, int count, unsigned char key);
-#define A_info_quit 68
-extern void info_quit (WINDOW *window, int count, unsigned char key);
-#define A_info_do_lowercase_version 69
-extern void info_do_lowercase_version (WINDOW *window, int count, unsigned char key);
-#define A_info_add_digit_to_numeric_arg 70
-extern void info_add_digit_to_numeric_arg (WINDOW *window, int count, unsigned char key);
-#define A_info_universal_argument 71
-extern void info_universal_argument (WINDOW *window, int count, unsigned char key);
-#define A_info_numeric_arg_digit_loop 72
-extern void info_numeric_arg_digit_loop (WINDOW *window, int count, unsigned char key);
-
-/* Functions declared in "./echo-area.c". */
-#define A_ea_forward 73
-extern void ea_forward (WINDOW *window, int count, unsigned char key);
-#define A_ea_backward 74
-extern void ea_backward (WINDOW *window, int count, unsigned char key);
-#define A_ea_beg_of_line 75
-extern void ea_beg_of_line (WINDOW *window, int count, unsigned char key);
-#define A_ea_end_of_line 76
-extern void ea_end_of_line (WINDOW *window, int count, unsigned char key);
-#define A_ea_forward_word 77
-extern void ea_forward_word (WINDOW *window, int count, unsigned char key);
-#define A_ea_backward_word 78
-extern void ea_backward_word (WINDOW *window, int count, unsigned char key);
-#define A_ea_delete 79
-extern void ea_delete (WINDOW *window, int count, unsigned char key);
-#define A_ea_rubout 80
-extern void ea_rubout (WINDOW *window, int count, unsigned char key);
-#define A_ea_abort 81
-extern void ea_abort (WINDOW *window, int count, unsigned char key);
-#define A_ea_newline 82
-extern void ea_newline (WINDOW *window, int count, unsigned char key);
-#define A_ea_quoted_insert 83
-extern void ea_quoted_insert (WINDOW *window, int count, unsigned char key);
-#define A_ea_insert 84
-extern void ea_insert (WINDOW *window, int count, unsigned char key);
-#define A_ea_tab_insert 85
-extern void ea_tab_insert (WINDOW *window, int count, unsigned char key);
-#define A_ea_transpose_chars 86
-extern void ea_transpose_chars (WINDOW *window, int count, unsigned char key);
-#define A_ea_yank 87
-extern void ea_yank (WINDOW *window, int count, unsigned char key);
-#define A_ea_yank_pop 88
-extern void ea_yank_pop (WINDOW *window, int count, unsigned char key);
-#define A_ea_kill_line 89
-extern void ea_kill_line (WINDOW *window, int count, unsigned char key);
-#define A_ea_backward_kill_line 90
-extern void ea_backward_kill_line (WINDOW *window, int count, unsigned char key);
-#define A_ea_kill_word 91
-extern void ea_kill_word (WINDOW *window, int count, unsigned char key);
-#define A_ea_backward_kill_word 92
-extern void ea_backward_kill_word (WINDOW *window, int count, unsigned char key);
-#define A_ea_possible_completions 93
-extern void ea_possible_completions (WINDOW *window, int count, unsigned char key);
-#define A_ea_complete 94
-extern void ea_complete (WINDOW *window, int count, unsigned char key);
-#define A_ea_scroll_completions_window 95
-extern void ea_scroll_completions_window (WINDOW *window, int count, unsigned char key);
-
-/* Functions declared in "./infodoc.c". */
-#define A_info_get_help_window 96
-extern void info_get_help_window (WINDOW *window, int count, unsigned char key);
-#define A_info_get_info_help_node 97
-extern void info_get_info_help_node (WINDOW *window, int count, unsigned char key);
-#define A_describe_key 98
-extern void describe_key (WINDOW *window, int count, unsigned char key);
-#define A_info_where_is 99
-extern void info_where_is (WINDOW *window, int count, unsigned char key);
-
-/* Functions declared in "./m-x.c". */
-#define A_describe_command 100
-extern void describe_command (WINDOW *window, int count, unsigned char key);
-#define A_info_execute_command 101
-extern void info_execute_command (WINDOW *window, int count, unsigned char key);
-#define A_set_screen_height 102
-extern void set_screen_height (WINDOW *window, int count, unsigned char key);
-
-/* Functions declared in "./indices.c". */
-#define A_info_index_search 103
-extern void info_index_search (WINDOW *window, int count, unsigned char key);
-#define A_info_next_index_match 104
-extern void info_next_index_match (WINDOW *window, int count, unsigned char key);
-#define A_info_index_apropos 105
-extern void info_index_apropos (WINDOW *window, int count, unsigned char key);
-
-/* Functions declared in "./nodemenu.c". */
-#define A_list_visited_nodes 106
-extern void list_visited_nodes (WINDOW *window, int count, unsigned char key);
-#define A_select_visited_node 107
-extern void select_visited_node (WINDOW *window, int count, unsigned char key);
-
-/* Functions declared in "./footnotes.c". */
-#define A_info_show_footnotes 108
-extern void info_show_footnotes (WINDOW *window, int count, unsigned char key);
-
-/* Functions declared in "./variables.c". */
-#define A_describe_variable 109
-extern void describe_variable (WINDOW *window, int count, unsigned char key);
-#define A_set_variable 110
-extern void set_variable (WINDOW *window, int count, unsigned char key);
-
-#define A_NCOMMANDS 111

Property changes on: head/contrib/texinfo/info/funs.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/infodoc.c
===================================================================
--- head/contrib/texinfo/info/infodoc.c	(revision 276550)
+++ head/contrib/texinfo/info/infodoc.c	(nonexistent)
@@ -1,1200 +0,0 @@
-/* infodoc.c -- functions which build documentation nodes.
-   $Id: infodoc.c,v 1.8 2004/04/11 17:56:45 karl Exp $
-
-   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-#include "funs.h"
-
-/* HELP_NODE_GETS_REGENERATED is always defined now that keys may get
-   rebound, or other changes in the help text may occur.  */
-#define HELP_NODE_GETS_REGENERATED 1
-
-/* The name of the node used in the help window. */
-static char *info_help_nodename = "*Info Help*";
-
-/* A node containing printed key bindings and their documentation. */
-static NODE *internal_info_help_node = (NODE *)NULL;
-
-/* A pointer to the contents of the help node. */
-static char *internal_info_help_node_contents = (char *)NULL;
-
-/* The (more or less) static text which appears in the internal info
-   help node.  The actual key bindings are inserted.  Keep the
-   underlines (****, etc.) in the same N_ call as  the text lines they
-   refer to, so translations can make the number of *'s or -'s match.  */
-#if defined(INFOKEY)
-
-static char *info_internal_help_text[] = {
-  N_("Basic Commands in Info Windows\n\
-******************************\n"),
-  "\n",
-  N_("\\%-10[quit-help]  Quit this help.\n"),
-  N_("\\%-10[quit]  Quit Info altogether.\n"),
-  N_("\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"),
-  "\n",
-  N_("Selecting other nodes:\n\
-----------------------\n"),
-  N_("\\%-10[next-node]  Move to the \"next\" node of this node.\n"),
-  N_("\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"),
-  N_("\\%-10[up-node]  Move \"up\" from this node.\n"),
-  N_("\\%-10[menu-item]  Pick menu item specified by name.\n\
-              Picking a menu item causes another node to be selected.\n"),
-  N_("\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"),
-  N_("\\%-10[history-node]  Move to the last node seen in this window.\n"),
-  N_("\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"),
-  N_("\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this node.\n"),
-  N_("\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"),
-  N_("\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-node] (DIR)'.\n"),
-  N_("\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"),
-  "\n",
-  N_("Moving within a node:\n\
----------------------\n"),
-  N_("\\%-10[beginning-of-node]  Go to the beginning of this node.\n"),
-  N_("\\%-10[end-of-node]  Go to the end of this node.\n"),
-  N_("\\%-10[next-line]  Scroll forward 1 line.\n"),
-  N_("\\%-10[prev-line]  Scroll backward 1 line.\n"),
-  N_("\\%-10[scroll-forward]  Scroll forward a page.\n"),
-  N_("\\%-10[scroll-backward]  Scroll backward a page.\n"),
-  "\n",
-  N_("Other commands:\n\
----------------\n"),
-  N_("\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"),
-  N_("\\%-10[last-menu-item]  Pick last item in node's menu.\n"),
-  N_("\\%-10[index-search]  Search for a specified string in the index entries of this Info\n\
-              file, and select the node referenced by the first entry found.\n"),
-  N_("\\%-10[goto-node]  Move to node specified by name.\n\
-              You may include a filename as well, as in (FILENAME)NODENAME.\n"),
-  N_("\\%-10[search]  Search forward for a specified string\n\
-              and select the node in which the next occurrence is found.\n"),
-  N_("\\%-10[search-backward]  Search backward for a specified string\n\
-              and select the node in which the previous occurrence is found.\n"),
-  NULL
-};
-
-#else /* !INFOKEY */
-
-static char *info_internal_help_text[] = {
-  N_("Basic Commands in Info Windows\n\
-******************************\n"),
-  "\n",
-  N_("  %-10s  Quit this help.\n"),
-  N_("  %-10s  Quit Info altogether.\n"),
-  N_("  %-10s  Invoke the Info tutorial.\n"),
-  "\n",
-  N_("Selecting other nodes:\n\
-----------------------\n",
-  N_("  %-10s  Move to the `next' node of this node.\n"),
-  N_("  %-10s  Move to the `previous' node of this node.\n"),
-  N_("  %-10s  Move `up' from this node.\n"),
-  N_("  %-10s  Pick menu item specified by name.\n"),
-  N_("              Picking a menu item causes another node to be selected.\n"),
-  N_("  %-10s  Follow a cross reference.  Reads name of reference.\n"),
-  N_("  %-10s  Move to the last node seen in this window.\n"),
-  N_("  %-10s  Skip to next hypertext link within this node.\n"),
-  N_("  %-10s  Follow the hypertext link under cursor.\n"),
-  N_("  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"),
-  N_("  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"),
-  "\n",
-  N_("Moving within a node:\n\
----------------------\n"),
-  N_("  %-10s  Scroll forward a page.\n"),
-  N_("  %-10s  Scroll backward a page.\n"),
-  N_("  %-10s  Go to the beginning of this node.\n"),
-  N_("  %-10s  Go to the end of this node.\n"),
-  N_("  %-10s  Scroll forward 1 line.\n"),
-  N_("  %-10s  Scroll backward 1 line.\n"),
-  "\n",
-  N_("Other commands:\n\
----------------\n"),
-  N_("  %-10s  Pick first ... ninth item in node's menu.\n"),
-  N_("  %-10s  Pick last item in node's menu.\n"),
-  N_("  %-10s  Search for a specified string in the index entries of this Info\n"),
-  N_("              file, and select the node referenced by the first entry found.\n"),
-  N_("  %-10s  Move to node specified by name.\n"),
-  N_("              You may include a filename as well, as in (FILENAME)NODENAME.\n"),
-  N_("  %-10s  Search forward for a specified string,\n"),
-  N_("              and select the node in which the next occurrence is found.\n"),
-  N_("  %-10s  Search backward for a specified string\n"),
-  N_("              and select the node in which the next occurrence is found.\n"),
-  NULL
-};
-
-static char *info_help_keys_text[][2] = {
-  { "", "" },
-  { "", "" },
-  { "", "" },
-  { "CTRL-x 0", "CTRL-x 0" },
-  { "q", "q" },
-  { "h", "ESC h" },
-  { "", "" },
-  { "", "" },
-  { "", "" },
-  { "SPC", "SPC" },
-  { "DEL", "b" },
-  { "b", "ESC b" },
-  { "e", "ESC e" },
-  { "ESC 1 SPC", "RET" },
-  { "ESC 1 DEL", "y" },
-  { "", "" },
-  { "", "" },
-  { "", "" },
-  { "n", "CTRL-x n" },
-  { "p", "CTRL-x p" },
-  { "u", "CTRL-x u" },
-  { "m", "ESC m" },
-  { "", "" },
-  { "f", "ESC f" },
-  { "l", "l" },
-  { "TAB", "TAB" },
-  { "RET", "CTRL-x RET" },
-  { "d", "ESC d" },
-  { "t", "ESC t" },
-  { "", "" },
-  { "", "" },
-  { "", "" },
-  { "1-9", "ESC 1-9" },
-  { "0", "ESC 0" },
-  { "i", "CTRL-x i" },
-  { "", "" },
-  { "g", "CTRL-x g" },
-  { "", "" },
-  { "s", "/" },
-  { "", "" },
-  { "ESC - s", "?" },
-  { "", "" },
-  NULL
-};
-
-#endif /* !INFOKEY */
-
-static char *where_is_internal (Keymap map, InfoCommand *cmd);
-
-void
-dump_map_to_message_buffer (char *prefix, Keymap map)
-{
-  register int i;
-  unsigned prefix_len = strlen (prefix);
-  char *new_prefix = (char *)xmalloc (prefix_len + 2);
-
-  strncpy (new_prefix, prefix, prefix_len);
-  new_prefix[prefix_len + 1] = '\0';
-
-  for (i = 0; i < 256; i++)
-    {
-      new_prefix[prefix_len] = i;
-      if (map[i].type == ISKMAP)
-        {
-          dump_map_to_message_buffer (new_prefix, (Keymap)map[i].function);
-        }
-      else if (map[i].function)
-        {
-          register int last;
-          char *doc, *name;
-
-          doc = function_documentation (map[i].function);
-          name = function_name (map[i].function);
-
-          if (!*doc)
-            continue;
-
-          /* Find out if there is a series of identical functions, as in
-             ea_insert (). */
-          for (last = i + 1; last < 256; last++)
-            if ((map[last].type != ISFUNC) ||
-                (map[last].function != map[i].function))
-              break;
-
-          if (last - 1 != i)
-            {
-              printf_to_message_buffer ("%s .. ", pretty_keyseq (new_prefix),
-                  NULL, NULL);
-              new_prefix[prefix_len] = last - 1;
-              printf_to_message_buffer ("%s\t", pretty_keyseq (new_prefix),
-                  NULL, NULL);
-              i = last - 1;
-            }
-          else
-            printf_to_message_buffer ("%s\t", pretty_keyseq (new_prefix),
-                NULL, NULL);
-
-#if defined (NAMED_FUNCTIONS)
-          /* Print the name of the function, and some padding before the
-             documentation string is printed. */
-          {
-            int length_so_far;
-            int desired_doc_start = 40; /* Must be multiple of 8. */
-
-            printf_to_message_buffer ("(%s)", name, NULL, NULL);
-            length_so_far = message_buffer_length_this_line ();
-
-            if ((desired_doc_start + strlen (doc))
-                >= (unsigned int) the_screen->width)
-              printf_to_message_buffer ("\n     ", NULL, NULL, NULL);
-            else
-              {
-                while (length_so_far < desired_doc_start)
-                  {
-                    printf_to_message_buffer ("\t", NULL, NULL, NULL);
-                    length_so_far += character_width ('\t', length_so_far);
-                  }
-              }
-          }
-#endif /* NAMED_FUNCTIONS */
-          printf_to_message_buffer ("%s\n", doc, NULL, NULL);
-        }
-    }
-  free (new_prefix);
-}
-
-/* How to create internal_info_help_node.  HELP_IS_ONLY_WINDOW_P says
-   whether we're going to end up in a second (or more) window of our
-   own, or whether there's only one window and we're going to usurp it.
-   This determines how to quit the help window.  Maybe we should just
-   make q do the right thing in both cases.  */
-
-static void
-create_internal_info_help_node (int help_is_only_window_p)
-{
-  register int i;
-  NODE *node;
-  char *contents = NULL;
-  char *exec_keys;
-
-#ifndef HELP_NODE_GETS_REGENERATED
-  if (internal_info_help_node_contents)
-    contents = internal_info_help_node_contents;
-#endif /* !HELP_NODE_GETS_REGENERATED */
-
-  if (!contents)
-    {
-      int printed_one_mx = 0;
-
-      initialize_message_buffer ();
-
-      for (i = 0; info_internal_help_text[i]; i++)
-        {
-#ifdef INFOKEY
-          printf_to_message_buffer (replace_in_documentation
-              ((char *) _(info_internal_help_text[i]), help_is_only_window_p),
-              NULL, NULL, NULL);
-#else
-          /* Don't translate blank lines, gettext outputs the po file
-             header in that case.  We want a blank line.  */
-          char *msg = *(info_internal_help_text[i])
-                      ? _(info_internal_help_text[i])
-                      : info_internal_help_text[i];
-          char *key = info_help_keys_text[i][vi_keys_p];
-
-          /* If we have only one window (because the window size was too
-             small to split it), CTRL-x 0 doesn't work to `quit' help.  */
-          if (STREQ (key, "CTRL-x 0") && help_is_only_window_p)
-            key = "l";
-
-          printf_to_message_buffer (msg, key, NULL, NULL);
-#endif /* !INFOKEY */
-        }
-
-      printf_to_message_buffer ("---------------------\n\n", NULL, NULL, NULL);
-      printf_to_message_buffer ((char *) _("The current search path is:\n"),
-          NULL, NULL, NULL);
-      printf_to_message_buffer ("  %s\n", infopath, NULL, NULL);
-      printf_to_message_buffer ("---------------------\n\n", NULL, NULL, NULL);
-      printf_to_message_buffer ((char *) _("Commands available in Info windows:\n\n"),
-          NULL, NULL, NULL);
-      dump_map_to_message_buffer ("", info_keymap);
-      printf_to_message_buffer ("---------------------\n\n", NULL, NULL, NULL);
-      printf_to_message_buffer ((char *) _("Commands available in the echo area:\n\n"),
-          NULL, NULL, NULL);
-      dump_map_to_message_buffer ("", echo_area_keymap);
-
-#if defined (NAMED_FUNCTIONS)
-      /* Get a list of commands which have no keystroke equivs. */
-      exec_keys = where_is (info_keymap, InfoCmd(info_execute_command));
-      if (exec_keys)
-        exec_keys = xstrdup (exec_keys);
-      for (i = 0; function_doc_array[i].func; i++)
-        {
-          InfoCommand *cmd = DocInfoCmd(&function_doc_array[i]);
-
-          if (InfoFunction(cmd) != (VFunction *) info_do_lowercase_version
-              && !where_is_internal (info_keymap, cmd)
-              && !where_is_internal (echo_area_keymap, cmd))
-            {
-              if (!printed_one_mx)
-                {
-                  printf_to_message_buffer ("---------------------\n\n",
-                      NULL, NULL, NULL);
-                  if (exec_keys && exec_keys[0])
-                      printf_to_message_buffer
-                        ((char *) _("The following commands can only be invoked via %s:\n\n"),
-                         exec_keys, NULL, NULL);
-                  else
-                      printf_to_message_buffer
-                        ((char *) _("The following commands cannot be invoked at all:\n\n"),
-                         NULL, NULL, NULL);
-                  printed_one_mx = 1;
-                }
-
-              printf_to_message_buffer
-                ("%s %s\n     %s\n",
-                 exec_keys,
-                 function_doc_array[i].func_name,
-                 replace_in_documentation (strlen (function_doc_array[i].doc)
-                   ? (char *) _(function_doc_array[i].doc) : "", 0)
-                );
-
-            }
-        }
-
-      if (printed_one_mx)
-        printf_to_message_buffer ("\n", NULL, NULL, NULL);
-
-      maybe_free (exec_keys);
-#endif /* NAMED_FUNCTIONS */
-
-      printf_to_message_buffer
-        ("%s", replace_in_documentation
-         ((char *) _("--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"), 0),
-         NULL, NULL);
-      node = message_buffer_to_node ();
-      internal_info_help_node_contents = node->contents;
-    }
-  else
-    {
-      /* We already had the right contents, so simply use them. */
-      node = build_message_node ("", 0, 0);
-      free (node->contents);
-      node->contents = contents;
-      node->nodelen = 1 + strlen (contents);
-    }
-
-  internal_info_help_node = node;
-
-  /* Do not GC this node's contents.  It never changes, and we never need
-     to delete it once it is made.  If you change some things (such as
-     placing information about dynamic variables in the help text) then
-     you will need to allow the contents to be gc'd, and you will have to
-     arrange to always regenerate the help node. */
-#if defined (HELP_NODE_GETS_REGENERATED)
-  add_gcable_pointer (internal_info_help_node->contents);
-#endif
-
-  name_internal_node (internal_info_help_node, info_help_nodename);
-
-  /* Even though this is an internal node, we don't want the window
-     system to treat it specially.  So we turn off the internalness
-     of it here. */
-  internal_info_help_node->flags &= ~N_IsInternal;
-}
-
-/* Return a window which is the window showing help in this Info. */
-
-/* If the eligible window's height is >= this, split it to make the help
-   window.  Otherwise display the help window in the current window.  */
-#define HELP_SPLIT_SIZE 24
-
-static WINDOW *
-info_find_or_create_help_window (void)
-{
-  int help_is_only_window_p;
-  WINDOW *eligible = NULL;
-  WINDOW *help_window = get_window_of_node (internal_info_help_node);
-
-  /* If we couldn't find the help window, then make it. */
-  if (!help_window)
-    {
-      WINDOW *window;
-      int max = 0;
-
-      for (window = windows; window; window = window->next)
-        {
-          if (window->height > max)
-            {
-              max = window->height;
-              eligible = window;
-            }
-        }
-
-      if (!eligible)
-        return NULL;
-    }
-#ifndef HELP_NODE_GETS_REGENERATED
-  else
-    /* help window is static, just return it.  */
-    return help_window;
-#endif /* not HELP_NODE_GETS_REGENERATED */
-
-  /* Make sure that we have a node containing the help text.  The
-     argument is false if help will be the only window (so l must be used
-     to quit help), true if help will be one of several visible windows
-     (so CTRL-x 0 must be used to quit help).  */
-  help_is_only_window_p = ((help_window && !windows->next)
-        || (!help_window && eligible->height < HELP_SPLIT_SIZE));
-  create_internal_info_help_node (help_is_only_window_p);
-
-  /* Either use the existing window to display the help node, or create
-     a new window if there was no existing help window. */
-  if (!help_window)
-    { /* Split the largest window into 2 windows, and show the help text
-         in that window. */
-      if (eligible->height >= HELP_SPLIT_SIZE)
-        {
-          active_window = eligible;
-          help_window = window_make_window (internal_info_help_node);
-        }
-      else
-        {
-          set_remembered_pagetop_and_point (active_window);
-          window_set_node_of_window (active_window, internal_info_help_node);
-          help_window = active_window;
-        }
-    }
-  else
-    { /* Case where help node always gets regenerated, and we have an
-         existing window in which to place the node. */
-      if (active_window != help_window)
-        {
-          set_remembered_pagetop_and_point (active_window);
-          active_window = help_window;
-        }
-      window_set_node_of_window (active_window, internal_info_help_node);
-    }
-  remember_window_and_node (help_window, help_window->node);
-  return help_window;
-}
-
-/* Create or move to the help window. */
-DECLARE_INFO_COMMAND (info_get_help_window, _("Display help message"))
-{
-  WINDOW *help_window;
-
-  help_window = info_find_or_create_help_window ();
-  if (help_window)
-    {
-      active_window = help_window;
-      active_window->flags |= W_UpdateWindow;
-    }
-  else
-    {
-      info_error ((char *) msg_cant_make_help, NULL, NULL);
-    }
-}
-
-/* Show the Info help node.  This means that the "info" file is installed
-   where it can easily be found on your system. */
-DECLARE_INFO_COMMAND (info_get_info_help_node, _("Visit Info node `(info)Help'"))
-{
-  NODE *node;
-  char *nodename;
-
-  /* If there is a window on the screen showing the node "(info)Help" or
-     the node "(info)Help-Small-Screen", simply select that window. */
-  {
-    WINDOW *win;
-
-    for (win = windows; win; win = win->next)
-      {
-        if (win->node && win->node->filename &&
-            (strcasecmp
-             (filename_non_directory (win->node->filename), "info") == 0) &&
-            ((strcmp (win->node->nodename, "Help") == 0) ||
-             (strcmp (win->node->nodename, "Help-Small-Screen") == 0)))
-          {
-            active_window = win;
-            return;
-          }
-      }
-  }
-
-  /* If the current window is small, show the small screen help. */
-  if (active_window->height < 24)
-    nodename = "Help-Small-Screen";
-  else
-    nodename = "Help";
-
-  /* Try to get the info file for Info. */
-  node = info_get_node ("Info", nodename);
-
-  if (!node)
-    {
-      if (info_recent_file_error)
-        info_error (info_recent_file_error, NULL, NULL);
-      else
-        info_error ((char *) msg_cant_file_node, "Info", nodename);
-    }
-  else
-    {
-      /* If the current window is very large (greater than 45 lines),
-         then split it and show the help node in another window.
-         Otherwise, use the current window. */
-
-      if (active_window->height > 45)
-        active_window = window_make_window (node);
-      else
-        {
-          set_remembered_pagetop_and_point (active_window);
-          window_set_node_of_window (active_window, node);
-        }
-
-      remember_window_and_node (active_window, node);
-    }
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                   Groveling Info Keymaps and Docs                */
-/*                                                                  */
-/* **************************************************************** */
-
-/* Return the documentation associated with the Info command FUNCTION. */
-char *
-function_documentation (InfoCommand *cmd)
-{
-  char *doc;
-
-#if defined (INFOKEY)
-
-  doc = cmd->doc;
-
-#else /* !INFOKEY */
-
-  register int i;
-
-  for (i = 0; function_doc_array[i].func; i++)
-    if (InfoFunction(cmd) == function_doc_array[i].func)
-      break;
-
-  doc = function_doc_array[i].func ? function_doc_array[i].doc : "";
-
-#endif /* !INFOKEY */
-
-  return replace_in_documentation ((strlen (doc) == 0) ? doc : (char *) _(doc), 0);
-}
-
-#if defined (NAMED_FUNCTIONS)
-/* Return the user-visible name of the function associated with the
-   Info command FUNCTION. */
-char *
-function_name (InfoCommand *cmd)
-{
-#if defined (INFOKEY)
-
-  return cmd->func_name;
-
-#else /* !INFOKEY */
-
-  register int i;
-
-  for (i = 0; function_doc_array[i].func; i++)
-    if (InfoFunction(cmd) == function_doc_array[i].func)
-      break;
-
-  return (function_doc_array[i].func_name);
-
-#endif /* !INFOKEY */
-}
-
-/* Return a pointer to the info command for function NAME. */
-InfoCommand *
-named_function (char *name)
-{
-  register int i;
-
-  for (i = 0; function_doc_array[i].func; i++)
-    if (strcmp (function_doc_array[i].func_name, name) == 0)
-      break;
-
-  return (DocInfoCmd(&function_doc_array[i]));
-}
-#endif /* NAMED_FUNCTIONS */
-
-/* Return the documentation associated with KEY in MAP. */
-char *
-key_documentation (char key, Keymap map)
-{
-  InfoCommand *function = map[key].function;
-
-  if (function)
-    return (function_documentation (function));
-  else
-    return ((char *)NULL);
-}
-
-DECLARE_INFO_COMMAND (describe_key, _("Print documentation for KEY"))
-{
-  char keys[50];
-  unsigned char keystroke;
-  char *k = keys;
-  Keymap map;
-
-  *k = '\0';
-  map = window->keymap;
-
-  for (;;)
-    {
-      message_in_echo_area ((char *) _("Describe key: %s"),
-          pretty_keyseq (keys), NULL);
-      keystroke = info_get_input_char ();
-      unmessage_in_echo_area ();
-
-#if !defined (INFOKEY)
-      if (Meta_p (keystroke))
-        {
-          if (map[ESC].type != ISKMAP)
-            {
-              window_message_in_echo_area
-              (_("ESC %s is undefined."), pretty_keyname (UnMeta (keystroke)));
-              return;
-            }
-
-          *k++ = '\e';
-          keystroke = UnMeta (keystroke);
-          map = (Keymap)map[ESC].function;
-        }
-#endif /* !INFOKEY */
-
-      /* Add the KEYSTROKE to our list. */
-      *k++ = keystroke;
-      *k = '\0';
-
-      if (map[keystroke].function == (InfoCommand *)NULL)
-        {
-          message_in_echo_area ((char *) _("%s is undefined."),
-              pretty_keyseq (keys), NULL);
-          return;
-        }
-      else if (map[keystroke].type == ISKMAP)
-        {
-          map = (Keymap)map[keystroke].function;
-          continue;
-        }
-      else
-        {
-          char *keyname, *message, *fundoc, *funname = "";
-
-#if defined (INFOKEY)
-          /* If the key is bound to do-lowercase-version, but its
-             lower-case variant is undefined, say that this key is
-             also undefined.  This is especially important for unbound
-             edit keys that emit an escape sequence: it's terribly
-             confusing to see a message "Home (do-lowercase-version)"
-             or some such when Home is unbound.  */
-          if (InfoFunction(map[keystroke].function)
-              == (VFunction *) info_do_lowercase_version)
-            {
-              unsigned char lowerkey = Meta_p(keystroke)
-                                       ? Meta (tolower (UnMeta (keystroke)))
-                                       : tolower (keystroke);
-
-              if (map[lowerkey].function == (InfoCommand *)NULL)
-                {
-                  message_in_echo_area ((char *) _("%s is undefined."),
-                                        pretty_keyseq (keys), NULL);
-                  return;
-                }
-            }
-#endif
-
-          keyname = pretty_keyseq (keys);
-
-#if defined (NAMED_FUNCTIONS)
-          funname = function_name (map[keystroke].function);
-#endif /* NAMED_FUNCTIONS */
-
-          fundoc = function_documentation (map[keystroke].function);
-
-          message = (char *)xmalloc
-            (10 + strlen (keyname) + strlen (fundoc) + strlen (funname));
-
-#if defined (NAMED_FUNCTIONS)
-          sprintf (message, "%s (%s): %s.", keyname, funname, fundoc);
-#else
-          sprintf (message, _("%s is defined to %s."), keyname, fundoc);
-#endif /* !NAMED_FUNCTIONS */
-
-          window_message_in_echo_area ("%s", message, NULL);
-          free (message);
-          break;
-        }
-    }
-}
-
-/* Return the pretty printable name of a single character. */
-char *
-pretty_keyname (unsigned char key)
-{
-  static char rep_buffer[30];
-  char *rep;
-
-  if (Meta_p (key))
-    {
-      char temp[20];
-
-      rep = pretty_keyname (UnMeta (key));
-
-#if defined (INFOKEY)
-      sprintf (temp, "M-%s", rep);
-#else /* !INFOKEY */
-      sprintf (temp, "ESC %s", rep);
-#endif /* !INFOKEY */
-      strcpy (rep_buffer, temp);
-      rep = rep_buffer;
-    }
-  else if (Control_p (key))
-    {
-      switch (key)
-        {
-        case '\n': rep = "LFD"; break;
-        case '\t': rep = "TAB"; break;
-        case '\r': rep = "RET"; break;
-        case ESC:  rep = "ESC"; break;
-
-        default:
-          sprintf (rep_buffer, "C-%c", UnControl (key));
-          rep = rep_buffer;
-        }
-    }
-  else
-    {
-      switch (key)
-        {
-        case ' ': rep = "SPC"; break;
-        case DEL: rep = "DEL"; break;
-        default:
-          rep_buffer[0] = key;
-          rep_buffer[1] = '\0';
-          rep = rep_buffer;
-        }
-    }
-  return (rep);
-}
-
-/* Return the pretty printable string which represents KEYSEQ. */
-
-static void pretty_keyseq_internal (char *keyseq, char *rep);
-
-char *
-pretty_keyseq (char *keyseq)
-{
-  static char keyseq_rep[200];
-
-  keyseq_rep[0] = '\0';
-  if (*keyseq)
-    pretty_keyseq_internal (keyseq, keyseq_rep);
-  return (keyseq_rep);
-}
-
-static void
-pretty_keyseq_internal (char *keyseq, char *rep)
-{
-  if (term_kP && strncmp(keyseq, term_kP, strlen(term_kP)) == 0)
-    {
-      strcpy(rep, "PgUp");
-      keyseq += strlen(term_kP);
-    }
-  else if (term_kN && strncmp(keyseq, term_kN, strlen(term_kN)) == 0)
-    {
-      strcpy(rep, "PgDn");
-      keyseq += strlen(term_kN);
-    }
-#if defined(INFOKEY)
-  else if (term_kh && strncmp(keyseq, term_kh, strlen(term_kh)) == 0)
-    {
-      strcpy(rep, "Home");
-      keyseq += strlen(term_kh);
-    }
-  else if (term_ke && strncmp(keyseq, term_ke, strlen(term_ke)) == 0)
-    {
-      strcpy(rep, "End");
-      keyseq += strlen(term_ke);
-    }
-  else if (term_ki && strncmp(keyseq, term_ki, strlen(term_ki)) == 0)
-    {
-      strcpy(rep, "INS");
-      keyseq += strlen(term_ki);
-    }
-  else if (term_kx && strncmp(keyseq, term_kx, strlen(term_kx)) == 0)
-    {
-      strcpy(rep, "DEL");
-      keyseq += strlen(term_kx);
-    }
-#endif /* INFOKEY */
-  else if (term_ku && strncmp(keyseq, term_ku, strlen(term_ku)) == 0)
-    {
-      strcpy(rep, "Up");
-      keyseq += strlen(term_ku);
-    }
-  else if (term_kd && strncmp(keyseq, term_kd, strlen(term_kd)) == 0)
-    {
-      strcpy(rep, "Down");
-      keyseq += strlen(term_kd);
-    }
-  else if (term_kl && strncmp(keyseq, term_kl, strlen(term_kl)) == 0)
-    {
-      strcpy(rep, "Left");
-      keyseq += strlen(term_kl);
-    }
-  else if (term_kr && strncmp(keyseq, term_kr, strlen(term_kr)) == 0)
-    {
-      strcpy(rep, "Right");
-      keyseq += strlen(term_kr);
-    }
-  else
-    {
-      strcpy (rep, pretty_keyname (keyseq[0]));
-      keyseq++;
-    }
-  if (*keyseq)
-    {
-      strcat (rep, " ");
-      pretty_keyseq_internal (keyseq, rep + strlen(rep));
-    }
-}
-
-/* Return a pointer to the last character in s that is found in f. */
-static char *
-strrpbrk (const char *s, const char *f)
-{
-  register const char *e = s + strlen(s);
-  register const char *t;
-
-  while (e-- != s)
-    {
-      for (t = f; *t; t++)
-        if (*e == *t)
-          return (char *)e;
-    }
-  return NULL;
-}
-
-/* Replace the names of functions with the key that invokes them. */
-char *
-replace_in_documentation (char *string, int help_is_only_window_p)
-{
-  unsigned reslen = strlen (string);
-  register int i, start, next;
-  static char *result = (char *)NULL;
-
-  maybe_free (result);
-  result = (char *)xmalloc (1 + reslen);
-
-  i = next = start = 0;
-
-  /* Skip to the beginning of a replaceable function. */
-  for (i = start; string[i]; i++)
-    {
-      int j = i + 1;
-
-      /* Is this the start of a replaceable function name? */
-      if (string[i] == '\\')
-        {
-          char *fmt = NULL;
-          unsigned min = 0;
-          unsigned max = 0;
-
-          if(string[j] == '%')
-            {
-              if (string[++j] == '-')
-                j++;
-              if (isdigit(string[j]))
-                {
-                  min = atoi(string + j);
-                  while (isdigit(string[j]))
-                    j++;
-                  if (string[j] == '.' && isdigit(string[j + 1]))
-                    {
-                      j += 1;
-                      max = atoi(string + j);
-                      while (isdigit(string[j]))
-                        j++;
-                    }
-                  fmt = (char *)xmalloc (j - i + 2);
-                  strncpy (fmt, string + i + 1, j - i);
-                  fmt[j - i - 1] = 's';
-                  fmt[j - i] = '\0';
-                }
-              else
-                j = i + 1;
-            }
-          if (string[j] == '[')
-            {
-              unsigned arg = 0;
-              char *argstr = NULL;
-              char *rep_name, *fun_name, *rep;
-              InfoCommand *command;
-              char *repstr = NULL;
-              unsigned replen;
-
-              /* Copy in the old text. */
-              strncpy (result + next, string + start, i - start);
-              next += (i - start);
-              start = j + 1;
-
-              /* Look for an optional numeric arg. */
-              i = start;
-              if (isdigit(string[i])
-                  || (string[i] == '-' && isdigit(string[i + 1])) )
-                {
-                  arg = atoi(string + i);
-                  if (string[i] == '-')
-                    i++;
-                  while (isdigit(string[i]))
-                    i++;
-                }
-              start = i;
-
-              /* Move to the end of the function name. */
-              for (i = start; string[i] && (string[i] != ']'); i++);
-
-              rep_name = (char *)xmalloc (1 + i - start);
-              strncpy (rep_name, string + start, i - start);
-              rep_name[i - start] = '\0';
-
-            /* If we have only one window (because the window size was too
-               small to split it), we have to quit help by going back one
-               noew in the history list, not deleting the window.  */
-              if (strcmp (rep_name, "quit-help") == 0)
-                fun_name = help_is_only_window_p ? "history-node"
-                                                 : "delete-window";
-              else
-                fun_name = rep_name;
-
-              /* Find a key which invokes this function in the info_keymap. */
-              command = named_function (fun_name);
-
-              free (rep_name);
-
-              /* If the internal documentation string fails, there is a
-                 serious problem with the associated command's documentation.
-                 We croak so that it can be fixed immediately. */
-              if (!command)
-                abort ();
-
-              if (arg)
-                {
-                  char *argrep, *p;
-
-                  argrep = where_is (info_keymap, InfoCmd(info_add_digit_to_numeric_arg));
-                  p = argrep ? strrpbrk (argrep, "0123456789-") : NULL;
-                  if (p)
-                    {
-                      argstr = (char *)xmalloc (p - argrep + 21);
-                      strncpy (argstr, argrep, p - argrep);
-                      sprintf (argstr + (p - argrep), "%d", arg);
-                    }
-                  else
-                    command = NULL;
-                }
-              rep = command ? where_is (info_keymap, command) : NULL;
-              if (!rep)
-                rep = "N/A";
-              replen = (argstr ? strlen (argstr) : 0) + strlen (rep) + 1;
-              repstr = (char *)xmalloc (replen);
-              repstr[0] = '\0';
-              if (argstr)
-                {
-                  strcat(repstr, argstr);
-                  strcat(repstr, " ");
-                  free (argstr);
-                }
-              strcat(repstr, rep);
-
-              if (fmt)
-                {
-                  if (replen > max)
-                    replen = max;
-                  if (replen < min)
-                    replen = min;
-                }
-              if (next + replen > reslen)
-                {
-                  reslen = next + replen + 1;
-                  result = (char *)xrealloc (result, reslen + 1);
-                }
-
-              if (fmt)
-                  sprintf (result + next, fmt, repstr);
-              else
-                  strcpy (result + next, repstr);
-
-              next = strlen (result);
-              free (repstr);
-
-              start = i;
-              if (string[i])
-                start++;
-            }
-
-          maybe_free (fmt);
-        }
-    }
-  strcpy (result + next, string + start);
-  return (result);
-}
-
-/* Return a string of characters which could be typed from the keymap
-   MAP to invoke FUNCTION. */
-static char *where_is_rep = (char *)NULL;
-static int where_is_rep_index = 0;
-static int where_is_rep_size = 0;
-
-char *
-where_is (Keymap map, InfoCommand *cmd)
-{
-  char *rep;
-
-  if (!where_is_rep_size)
-    where_is_rep = (char *)xmalloc (where_is_rep_size = 100);
-  where_is_rep_index = 0;
-
-  rep = where_is_internal (map, cmd);
-
-  /* If it couldn't be found, return "M-x Foo" (or equivalent). */
-  if (!rep)
-    {
-      char *name;
-
-      name = function_name (cmd);
-      if (!name)
-        return NULL; /* no such function */
-
-      rep = where_is_internal (map, InfoCmd(info_execute_command));
-      if (!rep)
-        return ""; /* function exists but can't be got to by user */
-
-      sprintf (where_is_rep, "%s %s", rep, name);
-
-      rep = where_is_rep;
-    }
-  return (rep);
-}
-
-/* Return the printed rep of the keystrokes that invoke FUNCTION,
-   as found in MAP, or NULL. */
-static char *
-where_is_internal (Keymap map, InfoCommand *cmd)
-{
-#if defined(INFOKEY)
-
-  register FUNCTION_KEYSEQ *k;
-
-  for (k = cmd->keys; k; k = k->next)
-    if (k->map == map)
-      return pretty_keyseq (k->keyseq);
-
-  return NULL;
-
-#else /* !INFOKEY */
-  /* There is a bug in that create_internal_info_help_node calls
-     where_is_internal without setting where_is_rep_index to zero.  This
-     was found by Mandrake and reported by Thierry Vignaud
-     <tvignaud@mandrakesoft.com> around April 24, 2002.
-
-     I think the best fix is to make where_is_rep_index another
-     parameter to this recursively-called function, instead of a static
-     variable.  But this [!INFOKEY] branch of the code is not enabled
-     any more, so let's just skip the whole thing.  --karl, 28sep02.  */
-  register int i;
-
-  /* If the function is directly invokable in MAP, return the representation
-     of that keystroke. */
-  for (i = 0; i < 256; i++)
-    if ((map[i].type == ISFUNC) && map[i].function == cmd)
-      {
-        sprintf (where_is_rep + where_is_rep_index, "%s", pretty_keyname (i));
-        return (where_is_rep);
-      }
-
-  /* Okay, search subsequent maps for this function. */
-  for (i = 0; i < 256; i++)
-    {
-      if (map[i].type == ISKMAP)
-        {
-          int saved_index = where_is_rep_index;
-          char *rep;
-
-          sprintf (where_is_rep + where_is_rep_index, "%s ",
-                   pretty_keyname (i));
-
-          where_is_rep_index = strlen (where_is_rep);
-          rep = where_is_internal ((Keymap)map[i].function, cmd);
-
-          if (rep)
-            return (where_is_rep);
-
-          where_is_rep_index = saved_index;
-        }
-    }
-
-  return NULL;
-
-#endif /* INFOKEY */
-}
-
-DECLARE_INFO_COMMAND (info_where_is,
-   _("Show what to type to execute a given command"))
-{
-  char *command_name;
-
-  command_name = read_function_name ((char *) _("Where is command: "), window);
-
-  if (!command_name)
-    {
-      info_abort_key (active_window, count, key);
-      return;
-    }
-
-  if (*command_name)
-    {
-      InfoCommand *command;
-
-      command = named_function (command_name);
-
-      if (command)
-        {
-          char *location;
-
-          location = where_is (active_window->keymap, command);
-
-          if (!location || !location[0])
-            {
-              info_error ((char *) _("`%s' is not on any keys"),
-                  command_name, NULL);
-            }
-          else
-            {
-              if (strstr (location, function_name (command)))
-                window_message_in_echo_area
-                  ((char *) _("%s can only be invoked via %s."),
-                   command_name, location);
-              else
-                window_message_in_echo_area
-                  ((char *) _("%s can be invoked via %s."),
-                   command_name, location);
-            }
-        }
-      else
-        info_error ((char *) _("There is no function named `%s'"),
-            command_name, NULL);
-    }
-
-  free (command_name);
-}

Property changes on: head/contrib/texinfo/info/infodoc.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/session.h
===================================================================
--- head/contrib/texinfo/info/session.h	(revision 276550)
+++ head/contrib/texinfo/info/session.h	(nonexistent)
@@ -1,237 +0,0 @@
-/* session.h -- Functions found in session.c.
-   $Id: session.h,v 1.3 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1993, 1998, 1999, 2001, 2002, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#ifndef SESSION_H
-#define SESSION_H
-
-#include "info.h"
-#include "dribble.h"
-
-/* All commands that can be invoked from within info_session () receive
-   arguments in the same way.  This simple define declares the header
-   of a function named NAME, with associated documentation DOC.  The
-   documentation string is groveled out of the source files by the
-   utility program `makedoc', which is also responsible for making
-   the documentation/function-pointer maps. */
-#define DECLARE_INFO_COMMAND(name, doc) \
-void name (WINDOW *window, int count, unsigned char key)
-
-/* Variables found in session.h. */
-extern VFunction *info_last_executed_command;
-
-/* Variable controlling the garbage collection of files briefly visited
-   during searches.  Such files are normally gc'ed, unless they were
-   compressed to begin with.  If this variable is non-zero, it says
-   to gc even those file buffer contents which had to be uncompressed. */
-extern int gc_compressed_files;
-
-/* When non-zero, tiling takes place automatically when info_split_window
-   is called. */
-extern int auto_tiling_p;
-
-/* Variable controlling the behaviour of default scrolling when you are
-   already at the bottom of a node. */
-extern int info_scroll_behaviour;
-extern char *info_scroll_choices[];
-
-/* Values for info_scroll_behaviour. */
-#define IS_Continuous 0 /* Try to get first menu item, or failing that, the
-                           "Next:" pointer, or failing that, the "Up:" and
-                           "Next:" of the up. */
-#define IS_NextOnly   1 /* Try to get "Next:" menu item. */
-#define IS_PageOnly   2 /* Simply give up at the bottom of a node. */
-
-/* Utility functions found in session.c */
-extern void info_dispatch_on_key (unsigned char key, Keymap map);
-extern unsigned char info_get_input_char (void);
-extern unsigned char info_get_another_input_char (void);
-extern unsigned char info_input_pending_p (void);
-extern void remember_window_and_node (WINDOW *window, NODE *node);
-extern void set_remembered_pagetop_and_point (WINDOW *window);
-extern void set_window_pagetop (WINDOW *window, int desired_top);
-extern void info_set_node_of_window (int remember, WINDOW *window,
-    NODE *node);
-extern void initialize_keyseq (void);
-extern void add_char_to_keyseq (char character);
-extern void info_gather_typeahead (void);
-extern FILE_BUFFER *file_buffer_of_window (WINDOW *window);
-extern long info_search_in_node (char *string, NODE *node,
-    long int start, WINDOW *window, int dir, int case_sensitive);
-extern long info_target_search_node (NODE *node, char *string,
-    long int start);
-extern void info_select_reference (WINDOW *window, REFERENCE *entry);
-extern int info_any_buffered_input_p (void);
-extern void print_node (NODE *node);
-extern void dump_node_to_file (NODE *node, char *filename,
-    int dump_subnodes);
-extern void dump_nodes_to_file (char *filename, char **nodenames,
-    char *output_filename, int dump_subnodes);
-extern char *program_name_from_file_name (char *file_name);
-
-/* Do the physical deletion of WINDOW, and forget this window and
-   associated nodes. */
-extern void info_delete_window_internal (WINDOW *window);
-
-/* Tell Info that input is coming from the file FILENAME. */
-extern void info_set_input_from_file (char *filename);
-
-#define return_if_control_g(val) \
-  do { \
-    info_gather_typeahead (); \
-    if (info_input_pending_p () == Control ('g')) \
-      return (val); \
-  } while (0)
-
-/* The names of the functions that run an info session. */
-
-/* Starting an info session. */
-extern void begin_multiple_window_info_session (char *filename,
-    char **nodenames);
-extern void begin_info_session (NODE *initial_node);
-extern void begin_info_session_with_error (NODE *initial_node,
-    char *format, void *arg1, void *arg2);
-extern void info_session (void);
-extern void initialize_info_session (NODE *node, int clear_screen);
-extern void info_read_and_dispatch (void);
-extern void info_intuit_options_node (WINDOW *window,
-    NODE *initial_node, char *program);
-
-/* Moving the point within a node. */
-extern void info_next_line (WINDOW *window, int count, unsigned char key);
-extern void info_prev_line (WINDOW *window, int count, unsigned char key);
-extern void info_end_of_line (WINDOW *window, int count, unsigned char key);
-extern void info_beginning_of_line (WINDOW *window, int count, unsigned char key);
-extern void info_forward_char (WINDOW *window, int count, unsigned char key);
-extern void info_backward_char (WINDOW *window, int count, unsigned char key);
-extern void info_forward_word (WINDOW *window, int count, unsigned char key);
-extern void info_backward_word (WINDOW *window, int count, unsigned char key);
-extern void info_beginning_of_node (WINDOW *window, int count, unsigned char key);
-extern void info_end_of_node (WINDOW *window, int count, unsigned char key);
-extern void info_move_to_prev_xref (WINDOW *window, int count, unsigned char key);
-extern void info_move_to_next_xref (WINDOW *window, int count, unsigned char key);
-
-/* Scrolling text within a window. */
-extern void info_scroll_forward (WINDOW *window, int count, unsigned char key);
-extern void info_scroll_backward (WINDOW *window, int count, unsigned char key);
-extern void info_redraw_display (WINDOW *window, int count, unsigned char key);
-extern void info_toggle_wrap (WINDOW *window, int count, unsigned char key);
-extern void info_move_to_window_line (WINDOW *window, int count,
-    unsigned char key);
-extern void info_up_line (WINDOW *window, int count, unsigned char key);
-extern void info_down_line (WINDOW *window, int count, unsigned char key);
-extern void info_scroll_half_screen_down (WINDOW *window, int count,
-    unsigned char key);
-extern void info_scroll_half_screen_up (WINDOW *window, int count,
-    unsigned char key);
-extern void info_scroll_forward_set_window (WINDOW *window, int count,
-    unsigned char key);
-extern void info_scroll_forward_page_only (WINDOW *window, int count,
-    unsigned char key);
-extern void info_scroll_forward_page_only_set_window (WINDOW *window, int count,
-    unsigned char key);
-extern void info_scroll_backward_set_window (WINDOW *window, int count,
-    unsigned char key);
-extern void info_scroll_backward_page_only (WINDOW *window, int count,
-    unsigned char key);
-extern void info_scroll_backward_page_only_set_window (WINDOW *window, int count,
-    unsigned char key);
-extern void info_scroll_other_window_backward (WINDOW *window, int count,
-    unsigned char key);
-
-/* Manipulating multiple windows. */
-extern void info_split_window (WINDOW *window, int count, unsigned char key);
-extern void info_delete_window (WINDOW *window, int count, unsigned char key);
-extern void info_keep_one_window (WINDOW *window, int count, unsigned char key);
-extern void info_grow_window (WINDOW *window, int count, unsigned char key);
-extern void info_scroll_other_window (WINDOW *window, int count,
-    unsigned char key);
-extern void info_tile_windows (WINDOW *window, int count, unsigned char key);
-extern void info_next_window (WINDOW *window, int count, unsigned char key);
-extern void info_prev_window (WINDOW *window, int count, unsigned char key);
-
-/* Selecting nodes. */
-extern void info_next_node (WINDOW *window, int count, unsigned char key);
-extern void info_prev_node (WINDOW *window, int count, unsigned char key);
-extern void info_up_node (WINDOW *window, int count, unsigned char key);
-extern void info_last_node (WINDOW *window, int count, unsigned char key);
-extern void info_first_node (WINDOW *window, int count, unsigned char key);
-extern void info_history_node (WINDOW *window, int count, unsigned char key);
-extern void info_goto_node (WINDOW *window, int count, unsigned char key);
-extern void info_goto_invocation_node (WINDOW *window, int count,
-    unsigned char key);
-extern void info_top_node (WINDOW *window, int count, unsigned char key);
-extern void info_dir_node (WINDOW *window, int count, unsigned char key);
-extern void info_global_next_node (WINDOW *window, int count, unsigned char key);
-extern void info_global_prev_node (WINDOW *window, int count, unsigned char key);
-extern void info_kill_node (WINDOW *window, int count, unsigned char key);
-extern void info_view_file (WINDOW *window, int count, unsigned char key);
-extern void info_menu_sequence (WINDOW *window, int count, unsigned char key);
-extern NODE *info_follow_menus (NODE *initial_node, char **menus,
-    const char **errstr, char **errarg1, char **errarg2);
-extern void info_man (WINDOW *window, int count, unsigned char key);
-extern void list_visited_nodes (WINDOW *window, int count, unsigned char key);
-extern void select_visited_node (WINDOW *window, int count, unsigned char key);
-
-/* Selecting cross references. */
-extern void info_menu_digit (WINDOW *window, int count, unsigned char key);
-extern void info_menu_item (WINDOW *window, int count, unsigned char key);
-extern void info_xref_item (WINDOW *window, int count, unsigned char key);
-extern void info_find_menu (WINDOW *window, int count, unsigned char key);
-extern void info_select_reference_this_line (WINDOW *window, int count,
-    unsigned char key);
-extern void info_last_menu_item (WINDOW *window, int count, unsigned char key);
-extern void info_visit_menu (WINDOW *window, int count, unsigned char key);
-
-/* Hacking numeric arguments. */
-extern int info_explicit_arg, info_numeric_arg, info_numeric_arg_sign;
-
-extern void info_add_digit_to_numeric_arg (WINDOW *window, int count,
-    unsigned char key);
-extern void info_universal_argument (WINDOW *window, int count,
-    unsigned char key);
-extern void info_initialize_numeric_arg (void);
-extern void info_numeric_arg_digit_loop (WINDOW *window, int count,
-    unsigned char key);
-
-/* Searching commands. */
-extern void info_search (WINDOW *window, int count, unsigned char key);
-extern void isearch_forward (WINDOW *window, int count, unsigned char key);
-extern void isearch_backward (WINDOW *window, int count, unsigned char key);
-extern void info_search_case_sensitively (WINDOW *window, int count,
-    unsigned char key);
-extern void info_search_backward (WINDOW *window, int count, unsigned char key);
-extern void info_search_next (WINDOW *window, int count, unsigned char key);
-extern void info_search_previous (WINDOW *window, int count, unsigned char key);
-
-/* Dumping and printing nodes. */
-extern void info_print_node (WINDOW *window, int count, unsigned char key);
-
-/* Footnotes.  */
-extern void info_show_footnotes (WINDOW *window, int count, unsigned char key);
-
-/* Miscellaneous commands. */
-extern void info_abort_key (WINDOW *window, int count, unsigned char key);
-extern void info_quit (WINDOW *window, int count, unsigned char key);
-extern void info_do_lowercase_version (WINDOW *window, int count,
-    unsigned char key);
-
-#endif /* not SESSION_H */

Property changes on: head/contrib/texinfo/info/session.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/window.c
===================================================================
--- head/contrib/texinfo/info/window.c	(revision 276550)
+++ head/contrib/texinfo/info/window.c	(nonexistent)
@@ -1,1554 +0,0 @@
-/* window.c -- windows in Info.
-   $Id: window.c,v 1.4 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1993, 1997, 1998, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-#include "nodes.h"
-#include "window.h"
-#include "display.h"
-#include "info-utils.h"
-#include "infomap.h"
-
-/* The window which describes the screen. */
-WINDOW *the_screen = NULL;
-
-/* The window which describes the echo area. */
-WINDOW *the_echo_area = NULL;
-
-/* The list of windows in Info. */
-WINDOW *windows = NULL;
-
-/* Pointer to the active window in WINDOW_LIST. */
-WINDOW *active_window = NULL;
-
-/* The size of the echo area in Info.  It never changes, irregardless of the
-   size of the screen. */
-#define ECHO_AREA_HEIGHT 1
-
-/* Macro returns the amount of space that the echo area truly requires relative
-   to the entire screen. */
-#define echo_area_required (1 + the_echo_area->height)
-
-/* Initalize the window system by creating THE_SCREEN and THE_ECHO_AREA.
-   Create the first window ever.
-   You pass the dimensions of the total screen size. */
-void
-window_initialize_windows (int width, int height)
-{
-  the_screen = xmalloc (sizeof (WINDOW));
-  the_echo_area = xmalloc (sizeof (WINDOW));
-  windows = xmalloc (sizeof (WINDOW));
-  active_window = windows;
-
-  zero_mem (the_screen, sizeof (WINDOW));
-  zero_mem (the_echo_area, sizeof (WINDOW));
-  zero_mem (active_window, sizeof (WINDOW));
-
-  /* None of these windows has a goal column yet. */
-  the_echo_area->goal_column = -1;
-  active_window->goal_column = -1;
-  the_screen->goal_column = -1;
-
-  /* The active and echo_area windows are visible.
-     The echo_area is permanent.
-     The screen is permanent. */
-  active_window->flags = W_WindowVisible;
-  the_echo_area->flags = W_WindowIsPerm | W_InhibitMode | W_WindowVisible;
-  the_screen->flags    = W_WindowIsPerm;
-
-  /* The height of the echo area never changes.  It is statically set right
-     here, and it must be at least 1 line for display.  The size of the
-     initial window cannot be the same size as the screen, since the screen
-     includes the echo area.  So, we make the height of the initial window
-     equal to the screen's displayable region minus the height of the echo
-     area. */
-  the_echo_area->height = ECHO_AREA_HEIGHT;
-  active_window->height = the_screen->height - 1 - the_echo_area->height;
-  window_new_screen_size (width, height);
-
-  /* The echo area uses a different keymap than normal info windows. */
-  the_echo_area->keymap = echo_area_keymap;
-  active_window->keymap = info_keymap;
-}
-
-/* Given that the size of the screen has changed to WIDTH and HEIGHT
-   from whatever it was before (found in the_screen->height, ->width),
-   change the size (and possibly location) of each window in the screen.
-   If a window would become too small, call the function DELETER on it,
-   after deleting the window from our chain of windows.  If DELETER is NULL,
-   nothing extra is done.  The last window can never be deleted, but it can
-   become invisible. */
-
-/* If non-null, a function to call with WINDOW as argument when the function
-   window_new_screen_size () has deleted WINDOW. */
-VFunction *window_deletion_notifier = NULL;
-
-void
-window_new_screen_size (int width, int height)
-{
-  register WINDOW *win;
-  int delta_height, delta_each, delta_leftover;
-  int numwins;
-
-  /* If no change, do nothing. */
-  if (width == the_screen->width && height == the_screen->height)
-    return;
-
-  /* If the new window height is too small, make it be zero. */
-  if (height < (WINDOW_MIN_SIZE + the_echo_area->height))
-    height = 0;
-  if (width < 0)
-    width = 0;
-
-  /* Find out how many windows will change. */
-  for (numwins = 0, win = windows; win; win = win->next, numwins++);
-
-  /* See if some windows will need to be deleted.  This is the case if
-     the screen is getting smaller, and the available space divided by
-     the number of windows is less than WINDOW_MIN_SIZE.  In that case,
-     delete some windows and try again until there is either enough
-     space to divy up among the windows, or until there is only one
-     window left. */
-  while ((height - echo_area_required) / numwins <= WINDOW_MIN_SIZE)
-    {
-      /* If only one window, make the size of it be zero, and return
-         immediately. */
-      if (!windows->next)
-        {
-          windows->height = 0;
-          maybe_free (windows->line_starts);
-          windows->line_starts = NULL;
-          windows->line_count = 0;
-          break;
-        }
-
-      /* If we have some temporary windows, delete one of them. */
-      for (win = windows; win; win = win->next)
-        if (win->flags & W_TempWindow)
-          break;
-
-      /* Otherwise, delete the first window, and try again. */
-      if (!win)
-        win = windows;
-
-      if (window_deletion_notifier)
-        (*window_deletion_notifier) (win);
-
-      window_delete_window (win);
-      numwins--;
-    }
-
-  /* The screen has changed height and width. */
-  delta_height = height - the_screen->height;   /* This is how much. */
-  the_screen->height = height;                  /* This is the new height. */
-  the_screen->width = width;                    /* This is the new width. */
-
-  /* Set the start of the echo area. */
-  the_echo_area->first_row = height - the_echo_area->height;
-  the_echo_area->width = width;
-
-  /* Check to see if the screen can really be changed this way. */
-  if ((!windows->next) && ((windows->height == 0) && (delta_height < 0)))
-    return;
-
-  /* Divide the change in height among the available windows. */
-  delta_each = delta_height / numwins;
-  delta_leftover = delta_height - (delta_each * numwins);
-
-  /* Change the height of each window in the chain by delta_each.  Change
-     the height of the last window in the chain by delta_each and by the
-     leftover amount of change.  Change the width of each window to be
-     WIDTH. */
-  for (win = windows; win; win = win->next)
-    {
-      if ((win->width != width) && ((win->flags & W_InhibitMode) == 0))
-        {
-          win->width = width;
-          maybe_free (win->modeline);
-          win->modeline = xmalloc (1 + width);
-        }
-
-      win->height += delta_each;
-
-      /* If the previous height of this window was zero, it was the only
-         window, and it was not visible.  Thus we need to compensate for
-         the echo_area. */
-      if (win->height == delta_each)
-        win->height -= (1 + the_echo_area->height);
-
-      /* If this is not the first window in the chain, then change the
-         first row of it.  We cannot just add delta_each to the first row,
-         since this window's first row is the sum of the collective increases
-         that have gone before it.  So we just add one to the location of the
-         previous window's modeline. */
-      if (win->prev)
-        win->first_row = (win->prev->first_row + win->prev->height) + 1;
-
-      /* The last window in the chain gets the extra space (or shrinkage). */
-      if (!win->next)
-        win->height += delta_leftover;
-
-      if (win->node)
-        recalculate_line_starts (win);
-
-      win->flags |= W_UpdateWindow;
-    }
-
-  /* If the screen got smaller, check over the windows just shrunk to
-     keep them within bounds.  Some of the windows may have gotten smaller
-     than WINDOW_MIN_HEIGHT in which case some of the other windows are
-     larger than the available display space in the screen.  Because of our
-     intial test above, we know that there is enough space for all of the
-     windows. */
-  if ((delta_each < 0) && ((windows->height != 0) && windows->next))
-    {
-      int avail;
-
-      avail = the_screen->height - (numwins + the_echo_area->height);
-      win = windows;
-
-      while (win)
-        {
-          if ((win->height < WINDOW_MIN_HEIGHT) ||
-              (win->height > avail))
-            {
-              WINDOW *lastwin = NULL;
-
-              /* Split the space among the available windows. */
-              delta_each = avail / numwins;
-              delta_leftover = avail - (delta_each * numwins);
-
-              for (win = windows; win; win = win->next)
-                {
-                  lastwin = win;
-                  if (win->prev)
-                    win->first_row =
-                      (win->prev->first_row + win->prev->height) + 1;
-                  win->height = delta_each;
-                }
-
-              /* Give the leftover space (if any) to the last window. */
-              lastwin->height += delta_leftover;
-              break;
-            }
-          else
-            win= win->next;
-        }
-    }
-}
-
-/* Make a new window showing NODE, and return that window structure.
-   If NODE is passed as NULL, then show the node showing in the active
-   window.  If the window could not be made return a NULL pointer.  The
-   active window is not changed.*/
-WINDOW *
-window_make_window (NODE *node)
-{
-  WINDOW *window;
-
-  if (!node)
-    node = active_window->node;
-
-  /* If there isn't enough room to make another window, return now. */
-  if ((active_window->height / 2) < WINDOW_MIN_SIZE)
-    return (NULL);
-
-  /* Make and initialize the new window.
-     The fudging about with -1 and +1 is because the following window in the
-     chain cannot start at window->height, since that is where the modeline
-     for the previous window is displayed.  The inverse adjustment is made
-     in window_delete_window (). */
-  window = xmalloc (sizeof (WINDOW));
-  window->width = the_screen->width;
-  window->height = (active_window->height / 2) - 1;
-#if defined (SPLIT_BEFORE_ACTIVE)
-  window->first_row = active_window->first_row;
-#else
-  window->first_row = active_window->first_row +
-    (active_window->height - window->height);
-#endif
-  window->keymap = info_keymap;
-  window->goal_column = -1;
-  window->modeline = xmalloc (1 + window->width);
-  window->line_starts = NULL;
-  window->flags = W_UpdateWindow | W_WindowVisible;
-  window_set_node_of_window (window, node);
-
-  /* Adjust the height of the old active window. */
-  active_window->height -= (window->height + 1);
-#if defined (SPLIT_BEFORE_ACTIVE)
-  active_window->first_row += (window->height + 1);
-#endif
-  active_window->flags |= W_UpdateWindow;
-
-  /* Readjust the new and old windows so that their modelines and contents
-     will be displayed correctly. */
-#if defined (NOTDEF)
-  /* We don't have to do this for WINDOW since window_set_node_of_window ()
-     already did. */
-  window_adjust_pagetop (window);
-  window_make_modeline (window);
-#endif /* NOTDEF */
-
-  /* We do have to readjust the existing active window. */
-  window_adjust_pagetop (active_window);
-  window_make_modeline (active_window);
-
-#if defined (SPLIT_BEFORE_ACTIVE)
-  /* This window is just before the active one.  The active window gets
-     bumped down one.  The active window is not changed. */
-  window->next = active_window;
-
-  window->prev = active_window->prev;
-  active_window->prev = window;
-
-  if (window->prev)
-    window->prev->next = window;
-  else
-    windows = window;
-#else
-  /* This window is just after the active one.  Which window is active is
-     not changed. */
-  window->prev = active_window;
-  window->next = active_window->next;
-  active_window->next = window;
-  if (window->next)
-    window->next->prev = window;
-#endif /* !SPLIT_BEFORE_ACTIVE */
-  return (window);
-}
-
-/* These useful macros make it possible to read the code in
-   window_change_window_height (). */
-#define grow_me_shrinking_next(me, next, diff) \
-  do { \
-    me->height += diff; \
-    next->height -= diff; \
-    next->first_row += diff; \
-    window_adjust_pagetop (next); \
-  } while (0)
-
-#define grow_me_shrinking_prev(me, prev, diff) \
-  do { \
-    me->height += diff; \
-    prev->height -= diff; \
-    me->first_row -=diff; \
-    window_adjust_pagetop (prev); \
-  } while (0)
-
-#define shrink_me_growing_next(me, next, diff) \
-  do { \
-    me->height -= diff; \
-    next->height += diff; \
-    next->first_row -= diff; \
-    window_adjust_pagetop (next); \
-  } while (0)
-
-#define shrink_me_growing_prev(me, prev, diff) \
-  do { \
-    me->height -= diff; \
-    prev->height += diff; \
-    me->first_row += diff; \
-    window_adjust_pagetop (prev); \
-  } while (0)
-
-/* Change the height of WINDOW by AMOUNT.  This also automagically adjusts
-   the previous and next windows in the chain.  If there is only one user
-   window, then no change takes place. */
-void
-window_change_window_height (WINDOW *window, int amount)
-{
-  register WINDOW *win, *prev, *next;
-
-  /* If there is only one window, or if the amount of change is zero,
-     return immediately. */
-  if (!windows->next || amount == 0)
-    return;
-
-  /* Find this window in our chain. */
-  for (win = windows; win; win = win->next)
-    if (win == window)
-      break;
-
-  /* If the window is isolated (i.e., doesn't appear in our window list,
-     then quit now. */
-  if (!win)
-    return;
-
-  /* Change the height of this window by AMOUNT, if that is possible.
-     It can be impossible if there isn't enough available room on the
-     screen, or if the resultant window would be too small. */
-
-    prev = window->prev;
-    next = window->next;
-
-  /* WINDOW decreasing in size? */
-  if (amount < 0)
-    {
-      int abs_amount = -amount; /* It is easier to deal with this way. */
-
-      /* If the resultant window would be too small, stop here. */
-      if ((window->height - abs_amount) < WINDOW_MIN_HEIGHT)
-        return;
-
-      /* If we have two neighboring windows, choose the smaller one to get
-         larger. */
-      if (next && prev)
-        {
-          if (prev->height < next->height)
-            shrink_me_growing_prev (window, prev, abs_amount);
-          else
-            shrink_me_growing_next (window, next, abs_amount);
-        }
-      else if (next)
-        shrink_me_growing_next (window, next, abs_amount);
-      else
-        shrink_me_growing_prev (window, prev, abs_amount);
-    }
-
-  /* WINDOW increasing in size? */
-  if (amount > 0)
-    {
-      int total_avail, next_avail = 0, prev_avail = 0;
-
-      if (next)
-        next_avail = next->height - WINDOW_MIN_SIZE;
-
-      if (prev)
-        prev_avail = prev->height - WINDOW_MIN_SIZE;
-
-      total_avail = next_avail + prev_avail;
-
-      /* If there isn't enough space available to grow this window, give up. */
-      if (amount > total_avail)
-        return;
-
-      /* If there aren't two neighboring windows, or if one of the neighbors
-         is larger than the other one by at least AMOUNT, grow that one. */
-      if ((next && !prev) || ((next_avail - amount) >= prev_avail))
-        grow_me_shrinking_next (window, next, amount);
-      else if ((prev && !next) || ((prev_avail - amount) >= next_avail))
-        grow_me_shrinking_prev (window, prev, amount);
-      else
-        {
-          int change;
-
-          /* This window has two neighbors.  They both must be shrunk in to
-             make enough space for WINDOW to grow.  Make them both the same
-             size. */
-          if (prev_avail > next_avail)
-            {
-              change = prev_avail - next_avail;
-              grow_me_shrinking_prev (window, prev, change);
-              amount -= change;
-            }
-          else
-            {
-              change = next_avail - prev_avail;
-              grow_me_shrinking_next (window, next, change);
-              amount -= change;
-            }
-
-          /* Both neighbors are the same size.  Split the difference in
-             AMOUNT between them. */
-          while (amount)
-            {
-              window->height++;
-              amount--;
-
-              /* Odd numbers grow next, even grow prev. */
-              if (amount & 1)
-                {
-                  prev->height--;
-                  window->first_row--;
-                }
-              else
-                {
-                  next->height--;
-                  next->first_row++;
-                }
-            }
-          window_adjust_pagetop (prev);
-          window_adjust_pagetop (next);
-        }
-    }
-  if (prev)
-    prev->flags |= W_UpdateWindow;
-
-  if (next)
-    next->flags |= W_UpdateWindow;
-
-  window->flags |= W_UpdateWindow;
-  window_adjust_pagetop (window);
-}
-
-/* Tile all of the windows currently displayed in the global variable
-   WINDOWS.  If argument STYLE is TILE_INTERNALS, tile windows displaying
-   internal nodes as well, otherwise do not change the height of such
-   windows. */
-void
-window_tile_windows (int style)
-{
-  WINDOW *win, *last_adjusted;
-  int numwins, avail, per_win_height, leftover;
-  int do_internals;
-
-  numwins = avail = 0;
-  do_internals = (style == TILE_INTERNALS);
-
-  for (win = windows; win; win = win->next)
-    if (do_internals || !win->node ||
-        (win->node->flags & N_IsInternal) == 0)
-      {
-        avail += win->height;
-        numwins++;
-      }
-
-  if (numwins <= 1 || !the_screen->height)
-    return;
-
-  /* Find the size for each window.  Divide the size of the usable portion
-     of the screen by the number of windows. */
-  per_win_height = avail / numwins;
-  leftover = avail - (per_win_height * numwins);
-
-  last_adjusted = NULL;
-  for (win = windows; win; win = win->next)
-    {
-      if (do_internals || !win->node ||
-          (win->node->flags & N_IsInternal) == 0)
-        {
-          last_adjusted = win;
-          win->height = per_win_height;
-        }
-    }
-
-  if (last_adjusted)
-    last_adjusted->height += leftover;
-
-  /* Readjust the first_row of every window in the chain. */
-  for (win = windows; win; win = win->next)
-    {
-      if (win->prev)
-        win->first_row = win->prev->first_row + win->prev->height + 1;
-
-      window_adjust_pagetop (win);
-      win->flags |= W_UpdateWindow;
-    }
-}
-
-/* Toggle the state of line wrapping in WINDOW.  This can do a bit of fancy
-   redisplay. */
-void
-window_toggle_wrap (WINDOW *window)
-{
-  if (window->flags & W_NoWrap)
-    window->flags &= ~W_NoWrap;
-  else
-    window->flags |= W_NoWrap;
-
-  if (window != the_echo_area)
-    {
-      char **old_starts;
-      int old_lines, old_pagetop;
-
-      old_starts = window->line_starts;
-      old_lines = window->line_count;
-      old_pagetop = window->pagetop;
-
-      calculate_line_starts (window);
-
-      /* Make sure that point appears within this window. */
-      window_adjust_pagetop (window);
-
-      /* If the pagetop hasn't changed maybe we can do some scrolling now
-         to speed up the display.  Many of the line starts will be the same,
-         so scrolling here is a very good optimization.*/
-      if (old_pagetop == window->pagetop)
-        display_scroll_line_starts
-          (window, old_pagetop, old_starts, old_lines);
-      maybe_free (old_starts);
-    }
-  window->flags |= W_UpdateWindow;
-}
-
-/* Set WINDOW to display NODE. */
-void
-window_set_node_of_window (WINDOW *window, NODE *node)
-{
-  window->node = node;
-  window->pagetop = 0;
-  window->point = 0;
-  recalculate_line_starts (window);
-  window->flags |= W_UpdateWindow;
-  /* The display_pos member is nonzero if we're displaying an anchor.  */
-  window->point = node ? node->display_pos : 0;
-  window_adjust_pagetop (window);
-  window_make_modeline (window);
-}
-
-/* Delete WINDOW from the list of known windows.  If this window was the
-   active window, make the next window in the chain be the active window.
-   If the active window is the next or previous window, choose that window
-   as the recipient of the extra space.  Otherwise, prefer the next window. */
-void
-window_delete_window (WINDOW *window)
-{
-  WINDOW *next, *prev, *window_to_fix;
-
-  next = window->next;
-  prev = window->prev;
-
-  /* You cannot delete the only window or a permanent window. */
-  if ((!next && !prev) || (window->flags & W_WindowIsPerm))
-    return;
-
-  if (next)
-    next->prev = prev;
-
-  if (!prev)
-    windows = next;
-  else
-    prev->next = next;
-
-  if (window->line_starts)
-    free (window->line_starts);
-
-  if (window->modeline)
-    free (window->modeline);
-
-  if (window == active_window)
-    {
-      /* If there isn't a next window, then there must be a previous one,
-         since we cannot delete the last window.  If there is a next window,
-         prefer to use that as the active window. */
-      if (next)
-        active_window = next;
-      else
-        active_window = prev;
-    }
-
-  if (next && active_window == next)
-    window_to_fix = next;
-  else if (prev && active_window == prev)
-    window_to_fix = prev;
-  else if (next)
-    window_to_fix = next;
-  else if (prev)
-    window_to_fix = prev;
-  else
-    window_to_fix = windows;
-    
-  if (window_to_fix->first_row > window->first_row)
-    {
-      int diff;
-
-      /* Try to adjust the visible part of the node so that as little
-         text as possible has to move. */
-      diff = window_to_fix->first_row - window->first_row;
-      window_to_fix->first_row = window->first_row;
-
-      window_to_fix->pagetop -= diff;
-      if (window_to_fix->pagetop < 0)
-        window_to_fix->pagetop = 0;
-    }
-
-  /* The `+ 1' is to offset the difference between the first_row locations.
-     See the code in window_make_window (). */
-  window_to_fix->height += window->height + 1;
-  window_to_fix->flags |= W_UpdateWindow;
-
-  free (window);
-}
-
-/* For every window in CHAIN, set the flags member to have FLAG set. */
-void
-window_mark_chain (WINDOW *chain, int flag)
-{
-  register WINDOW *win;
-
-  for (win = chain; win; win = win->next)
-    win->flags |= flag;
-}
-
-/* For every window in CHAIN, clear the flags member of FLAG. */
-void
-window_unmark_chain (WINDOW *chain, int flag)
-{
-  register WINDOW *win;
-
-  for (win = chain; win; win = win->next)
-    win->flags &= ~flag;
-}
-
-/* Return the number of characters it takes to display CHARACTER on the
-   screen at HPOS. */
-int
-character_width (int character, int hpos)
-{
-  int printable_limit = 127;
-  int width = 1;
-
-  if (ISO_Latin_p)
-    printable_limit = 255;
-
-  if (character > printable_limit)
-    width = 3;
-  else if (iscntrl (character))
-    {
-      switch (character)
-        {
-        case '\r':
-        case '\n':
-          width = the_screen->width - hpos;
-          break;
-        case '\t':
-          width = ((hpos + 8) & 0xf8) - hpos;
-          break;
-        default:
-          width = 2;
-        }
-    }
-  else if (character == DEL)
-    width = 2;
-
-  return (width);
-}
-
-/* Return the number of characters it takes to display STRING on the screen
-   at HPOS. */
-int
-string_width (char *string, int hpos)
-{
-  register int i, width, this_char_width;
-
-  for (width = 0, i = 0; string[i]; i++)
-    {
-      /* Support ANSI escape sequences for -R.  */
-      if (raw_escapes_p
-	  && string[i] == '\033'
-	  && string[i+1] == '['
-	  && isdigit (string[i+2])
-	  && (string[i+3] == 'm'
-	      || (isdigit (string[i+3]) && string[i+4] == 'm')))
-	{
-	  while (string[i] != 'm')
-	    i++;
-	  this_char_width = 0;
-	}
-      else
-	this_char_width = character_width (string[i], hpos);
-      width += this_char_width;
-      hpos += this_char_width;
-    }
-  return (width);
-}
-
-/* Quickly guess the approximate number of lines that NODE would
-   take to display.  This really only counts carriage returns. */
-int
-window_physical_lines (NODE *node)
-{
-  register int i, lines;
-  char *contents;
-
-  if (!node)
-    return (0);
-
-  contents = node->contents;
-  for (i = 0, lines = 1; i < node->nodelen; i++)
-    if (contents[i] == '\n')
-      lines++;
-
-  return (lines);
-}
-
-/* Calculate a list of line starts for the node belonging to WINDOW.  The line
-   starts are pointers to the actual text within WINDOW->NODE. */
-void
-calculate_line_starts (WINDOW *window)
-{
-  register int i, hpos;
-  char **line_starts = NULL;
-  int line_starts_index = 0, line_starts_slots = 0;
-  int bump_index;
-  NODE *node;
-
-  window->line_starts = NULL;
-  window->line_count = 0;
-  node = window->node;
-
-  if (!node)
-    return;
-
-  /* Grovel the node starting at the top, and for each line calculate the
-     width of the characters appearing in that line.  Add each line start
-     to our array. */
-  i = 0;
-  hpos = 0;
-  bump_index = 0;
-
-  while (i < node->nodelen)
-    {
-      char *line = node->contents + i;
-      unsigned int cwidth, c;
-
-      add_pointer_to_array (line, line_starts_index, line_starts,
-                            line_starts_slots, 100, char *);
-      if (bump_index)
-        {
-          i++;
-          bump_index = 0;
-        }
-
-      while (1)
-        {
-	  /* The cast to unsigned char is for 8-bit characters, which
-	     could be passed as negative integers to character_width
-	     and wreak havoc on some naive implementations of iscntrl.  */
-          c = (unsigned char) node->contents[i];
-
-	  /* Support ANSI escape sequences for -R.  */
-	  if (raw_escapes_p
-	      && c == '\033'
-	      && node->contents[i+1] == '['
-	      && isdigit (node->contents[i+2]))
-	    {
-	      if (node->contents[i+3] == 'm')
-		{
-		  i += 3;
-		  cwidth = 0;
-		}
-	      else if (isdigit (node->contents[i+3])
-		       && node->contents[i+4] == 'm')
-		{
-		  i += 4;
-		  cwidth = 0;
-		}
-	      else
-		cwidth = character_width (c, hpos);
-	    }
-	  else
-	    cwidth = character_width (c, hpos);
-
-          /* If this character fits within this line, just do the next one. */
-          if ((hpos + cwidth) < (unsigned int) window->width)
-            {
-              i++;
-              hpos += cwidth;
-              continue;
-            }
-          else
-            {
-              /* If this character would position the cursor at the start of
-                 the next printed screen line, then do the next line. */
-              if (c == '\n' || c == '\r' || c == '\t')
-                {
-                  i++;
-                  hpos = 0;
-                  break;
-                }
-              else
-                {
-                  /* This character passes the window width border.  Postion
-                     the cursor after the printed character, but remember this
-                     line start as where this character is.  A bit tricky. */
-
-                  /* If this window doesn't wrap lines, proceed to the next
-                     physical line here. */
-                  if (window->flags & W_NoWrap)
-                    {
-                      hpos = 0;
-                      while (i < node->nodelen && node->contents[i] != '\n')
-                        i++;
-
-                      if (node->contents[i] == '\n')
-                        i++;
-                    }
-                  else
-                    {
-                      hpos = the_screen->width - hpos;
-                      bump_index++;
-                    }
-                  break;
-                }
-            }
-        }
-    }
-  window->line_starts = line_starts;
-  window->line_count = line_starts_index;
-}
-
-/* Given WINDOW, recalculate the line starts for the node it displays. */
-void
-recalculate_line_starts (WINDOW *window)
-{
-  maybe_free (window->line_starts);
-  calculate_line_starts (window);
-}
-
-/* Global variable control redisplay of scrolled windows.  If non-zero, it
-   is the desired number of lines to scroll the window in order to make
-   point visible.  A user might set this to 1 for smooth scrolling.  If
-   set to zero, the line containing point is centered within the window. */
-int window_scroll_step = 0;
-
-/* Adjust the pagetop of WINDOW such that the cursor point will be visible. */
-void
-window_adjust_pagetop (WINDOW *window)
-{
-  register int line = 0;
-  char *contents;
-
-  if (!window->node)
-    return;
-
-  contents = window->node->contents;
-
-  /* Find the first printed line start which is after WINDOW->point. */
-  for (line = 0; line < window->line_count; line++)
-    {
-      char *line_start;
-
-      line_start = window->line_starts[line];
-
-      if ((line_start - contents) > window->point)
-        break;
-    }
-
-  /* The line index preceding the line start which is past point is the
-     one containing point. */
-  line--;
-
-  /* If this line appears in the current displayable page, do nothing.
-     Otherwise, adjust the top of the page to make this line visible. */
-  if ((line < window->pagetop) ||
-      (line - window->pagetop > (window->height - 1)))
-    {
-      /* The user-settable variable "scroll-step" is used to attempt
-         to make point visible, iff it is non-zero.  If that variable
-         is zero, then the line containing point is centered within
-         the window. */
-      if (window_scroll_step < window->height)
-        {
-          if ((line < window->pagetop) &&
-              ((window->pagetop - window_scroll_step) <= line))
-            window->pagetop -= window_scroll_step;
-          else if ((line - window->pagetop > (window->height - 1)) &&
-                   ((line - (window->pagetop + window_scroll_step)
-                     < window->height)))
-            window->pagetop += window_scroll_step;
-          else
-            window->pagetop = line - ((window->height - 1) / 2);
-        }
-      else
-        window->pagetop = line - ((window->height - 1) / 2);
-
-      if (window->pagetop < 0)
-        window->pagetop = 0;
-      window->flags |= W_UpdateWindow;
-    }
-}
-
-/* Return the index of the line containing point. */
-int
-window_line_of_point (WINDOW *window)
-{
-  register int i, start = 0;
-
-  /* Try to optimize.  Check to see if point is past the pagetop for
-     this window, and if so, start searching forward from there. */
-  if ((window->pagetop > -1 && window->pagetop < window->line_count) &&
-      (window->line_starts[window->pagetop] - window->node->contents)
-      <= window->point)
-    start = window->pagetop;
-
-  for (i = start; i < window->line_count; i++)
-    {
-      if ((window->line_starts[i] - window->node->contents) > window->point)
-        break;
-    }
-
-  return (i - 1);
-}
-
-/* Get and return the goal column for this window. */
-int
-window_get_goal_column (WINDOW *window)
-{
-  if (!window->node)
-    return (-1);
-
-  if (window->goal_column != -1)
-    return (window->goal_column);
-
-  /* Okay, do the work.  Find the printed offset of the cursor
-     in this window. */
-  return (window_get_cursor_column (window));
-}
-
-/* Get and return the printed column offset of the cursor in this window. */
-int
-window_get_cursor_column (WINDOW *window)
-{
-  int i, hpos, end;
-  char *line;
-
-  i = window_line_of_point (window);
-
-  if (i < 0)
-    return (-1);
-
-  line = window->line_starts[i];
-  end = window->point - (line - window->node->contents);
-
-  for (hpos = 0, i = 0; i < end; i++)
-    {
-      /* Support ANSI escape sequences for -R.  */
-      if (raw_escapes_p
-	  && line[i] == '\033'
-	  && line[i+1] == '['
-	  && isdigit (line[i+2]))
-	{
-	  if (line[i+3] == 'm')
-	    i += 3;
-	  else if (isdigit (line[i+3]) && line[i+4] == 'm')
-	    i += 4;
-	  else
-	    hpos += character_width (line[i], hpos);
-	}
-      else
-	hpos += character_width (line[i], hpos);
-    }
-
-  return (hpos);
-}
-
-/* Count the number of characters in LINE that precede the printed column
-   offset of GOAL. */
-int
-window_chars_to_goal (char *line, int goal)
-{
-  register int i, check = 0, hpos;
-
-  for (hpos = 0, i = 0; line[i] != '\n'; i++)
-    {
-      /* Support ANSI escape sequences for -R.  */
-      if (raw_escapes_p
-	  && line[i] == '\033'
-	  && line[i+1] == '['
-	  && isdigit (line[i+2])
-	  && (line[i+3] == 'm'
-	      || (isdigit (line[i+3]) && line[i+4] == 'm')))
-	while (line[i] != 'm')
-	  i++;
-      else
-	check = hpos + character_width (line[i], hpos);
-
-      if (check > goal)
-        break;
-
-      hpos = check;
-    }
-  return (i);
-}
-
-/* Create a modeline for WINDOW, and store it in window->modeline. */
-void
-window_make_modeline (WINDOW *window)
-{
-  register int i;
-  char *modeline;
-  char location_indicator[4];
-  int lines_remaining;
-
-  /* Only make modelines for those windows which have one. */
-  if (window->flags & W_InhibitMode)
-    return;
-
-  /* Find the number of lines actually displayed in this window. */
-  lines_remaining = window->line_count - window->pagetop;
-
-  if (window->pagetop == 0)
-    {
-      if (lines_remaining <= window->height)
-        strcpy (location_indicator, "All");
-      else
-        strcpy (location_indicator, "Top");
-    }
-  else
-    {
-      if (lines_remaining <= window->height)
-        strcpy (location_indicator, "Bot");
-      else
-        {
-          float pt, lc;
-          int percentage;
-
-          pt = (float)window->pagetop;
-          lc = (float)window->line_count;
-
-          percentage = 100 * (pt / lc);
-
-          sprintf (location_indicator, "%2d%%", percentage);
-        }
-    }
-
-  /* Calculate the maximum size of the information to stick in MODELINE. */
-  {
-    int modeline_len = 0;
-    char *parent = NULL, *filename = "*no file*";
-    char *nodename = "*no node*";
-    const char *update_message = NULL;
-    NODE *node = window->node;
-
-    if (node)
-      {
-        if (node->nodename)
-          nodename = node->nodename;
-
-        if (node->parent)
-          {
-            parent = filename_non_directory (node->parent);
-            modeline_len += strlen ("Subfile: ") + strlen (node->filename);
-          }
-
-        if (node->filename)
-          filename = filename_non_directory (node->filename);
-
-        if (node->flags & N_UpdateTags)
-          update_message = _("--*** Tags out of Date ***");
-      }
-
-    if (update_message)
-      modeline_len += strlen (update_message);
-    modeline_len += strlen (filename);
-    modeline_len += strlen (nodename);
-    modeline_len += 4;          /* strlen (location_indicator). */
-
-    /* 10 for the decimal representation of the number of lines in this
-       node, and the remainder of the text that can appear in the line. */
-    modeline_len += 10 + strlen (_("-----Info: (), lines ----, "));
-    modeline_len += window->width;
-
-    modeline = xmalloc (1 + modeline_len);
-
-    /* Special internal windows have no filename. */
-    if (!parent && !*filename)
-      sprintf (modeline, _("-%s---Info: %s, %d lines --%s--"),
-               (window->flags & W_NoWrap) ? "$" : "-",
-               nodename, window->line_count, location_indicator);
-    else
-      sprintf (modeline, _("-%s%s-Info: (%s)%s, %d lines --%s--"),
-               (window->flags & W_NoWrap) ? "$" : "-",
-               (node && (node->flags & N_IsCompressed)) ? "zz" : "--",
-               parent ? parent : filename,
-               nodename, window->line_count, location_indicator);
-
-    if (parent)
-      sprintf (modeline + strlen (modeline), _(" Subfile: %s"), filename);
-
-    if (update_message)
-      sprintf (modeline + strlen (modeline), "%s", update_message);
-
-    i = strlen (modeline);
-
-    if (i >= window->width)
-      modeline[window->width] = '\0';
-    else
-      {
-        while (i < window->width)
-          modeline[i++] = '-';
-        modeline[i] = '\0';
-      }
-
-    strcpy (window->modeline, modeline);
-    free (modeline);
-  }
-}
-
-/* Make WINDOW start displaying at PERCENT percentage of its node. */
-void
-window_goto_percentage (WINDOW *window, int percent)
-{
-  int desired_line;
-
-  if (!percent)
-    desired_line = 0;
-  else
-    desired_line =
-      (int) ((float)window->line_count * ((float)percent / 100.0));
-
-  window->pagetop = desired_line;
-  window->point =
-    window->line_starts[window->pagetop] - window->node->contents;
-  window->flags |= W_UpdateWindow;
-  window_make_modeline (window);
-}
-
-/* Get the state of WINDOW, and save it in STATE. */
-void
-window_get_state (WINDOW *window, SEARCH_STATE *state)
-{
-  state->node = window->node;
-  state->pagetop = window->pagetop;
-  state->point = window->point;
-}
-
-/* Set the node, pagetop, and point of WINDOW. */
-void
-window_set_state (WINDOW *window, SEARCH_STATE *state)
-{
-  if (window->node != state->node)
-    window_set_node_of_window (window, state->node);
-  window->pagetop = state->pagetop;
-  window->point = state->point;
-}
-
-
-/* Manipulating home-made nodes.  */
-
-/* A place to buffer echo area messages. */
-static NODE *echo_area_node = NULL;
-
-/* Make the node of the_echo_area be an empty one. */
-static void
-free_echo_area (void)
-{
-  if (echo_area_node)
-    {
-      maybe_free (echo_area_node->contents);
-      free (echo_area_node);
-    }
-
-  echo_area_node = NULL;
-  window_set_node_of_window (the_echo_area, echo_area_node);
-}
-  
-/* Clear the echo area, removing any message that is already present.
-   The echo area is cleared immediately. */
-void
-window_clear_echo_area (void)
-{
-  free_echo_area ();
-  display_update_one_window (the_echo_area);
-}
-
-/* Make a message appear in the echo area, built from FORMAT, ARG1 and ARG2.
-   The arguments are treated similar to printf () arguments, but not all of
-   printf () hair is present.  The message appears immediately.  If there was
-   already a message appearing in the echo area, it is removed. */
-void
-window_message_in_echo_area (char *format, void *arg1, void *arg2)
-{
-  free_echo_area ();
-  echo_area_node = build_message_node (format, arg1, arg2);
-  window_set_node_of_window (the_echo_area, echo_area_node);
-  display_update_one_window (the_echo_area);
-}
-
-/* Place a temporary message in the echo area built from FORMAT, ARG1
-   and ARG2.  The message appears immediately, but does not destroy
-   any existing message.  A future call to unmessage_in_echo_area ()
-   restores the old contents. */
-static NODE **old_echo_area_nodes = NULL;
-static int old_echo_area_nodes_index = 0;
-static int old_echo_area_nodes_slots = 0;
-
-void
-message_in_echo_area (char *format, void *arg1, void *arg2)
-{
-  if (echo_area_node)
-    {
-      add_pointer_to_array (echo_area_node, old_echo_area_nodes_index,
-                            old_echo_area_nodes, old_echo_area_nodes_slots,
-                            4, NODE *);
-    }
-  echo_area_node = NULL;
-  window_message_in_echo_area (format, arg1, arg2);
-}
-
-void
-unmessage_in_echo_area (void)
-{
-  free_echo_area ();
-
-  if (old_echo_area_nodes_index)
-    echo_area_node = old_echo_area_nodes[--old_echo_area_nodes_index];
-
-  window_set_node_of_window (the_echo_area, echo_area_node);
-  display_update_one_window (the_echo_area);
-}
-
-/* A place to build a message. */
-static char *message_buffer = NULL;
-static int message_buffer_index = 0;
-static int message_buffer_size = 0;
-
-/* Ensure that there is enough space to stuff LENGTH characters into
-   MESSAGE_BUFFER. */
-static void
-message_buffer_resize (int length)
-{
-  if (!message_buffer)
-    {
-      message_buffer_size = length + 1;
-      message_buffer = xmalloc (message_buffer_size);
-      message_buffer_index = 0;
-    }
-
-  while (message_buffer_size <= message_buffer_index + length)
-    message_buffer = (char *)
-      xrealloc (message_buffer,
-                message_buffer_size += 100 + (2 * length));
-}
-
-/* Format MESSAGE_BUFFER with the results of printing FORMAT with ARG1 and
-   ARG2. */
-static void
-build_message_buffer (char *format, void *arg1, void *arg2, void *arg3)
-{
-  register int i, len;
-  void *args[3];
-  int arg_index = 0;
-
-  args[0] = arg1;
-  args[1] = arg2;
-  args[2] = arg3;
-
-  len = strlen (format);
-
-  message_buffer_resize (len);
-
-  for (i = 0; format[i]; i++)
-    {
-      if (format[i] != '%')
-        {
-          message_buffer[message_buffer_index++] = format[i];
-          len--;
-        }
-      else
-        {
-          char c;
-          char *fmt_start = format + i;
-          char *fmt;
-          int fmt_len, formatted_len;
-	  int paramed = 0;
-
-	format_again:
-          i++;
-          while (format[i] && strchr ("-. +0123456789", format[i]))
-            i++;
-          c = format[i];
-
-          if (c == '\0')
-            abort ();
-
-	  if (c == '$') {
-	    /* position parameter parameter */
-	    /* better to use bprintf from bfox's metahtml? */
-	    arg_index = atoi(fmt_start + 1) - 1;
-	    if (arg_index < 0)
-	      arg_index = 0;
-	    if (arg_index >= 2)
-	      arg_index = 1;
-	    paramed = 1;
-	    goto format_again;
-	  }
-
-          fmt_len = format + i - fmt_start + 1;
-          fmt = (char *) xmalloc (fmt_len + 1);
-          strncpy (fmt, fmt_start, fmt_len);
-          fmt[fmt_len] = '\0';
-
-	  if (paramed) {
-	    /* removed positioned parameter */
-	    char *p;
-	    for (p = fmt + 1; *p && *p != '$'; p++) {
-	      ;
-	    }
-	    strcpy(fmt + 1, p + 1);
-	  }
-
-          /* If we have "%-98s", maybe 98 calls for a longer string.  */
-          if (fmt_len > 2)
-            {
-              int j;
-
-              for (j = fmt_len - 2; j >= 0; j--)
-                if (isdigit (fmt[j]) || fmt[j] == '$')
-                  break;
-
-              formatted_len = atoi (fmt + j);
-            }
-          else
-            formatted_len = c == 's' ? 0 : 1; /* %s can produce empty string */
-
-          switch (c)
-            {
-            case '%':           /* Insert a percent sign. */
-              message_buffer_resize (len + formatted_len);
-              sprintf
-                (message_buffer + message_buffer_index, fmt, "%");
-              message_buffer_index += formatted_len;
-              break;
-
-            case 's':           /* Insert the current arg as a string. */
-              {
-                char *string;
-                int string_len;
-
-                string = (char *)args[arg_index++];
-                string_len = strlen (string);
-
-                if (formatted_len > string_len)
-                  string_len = formatted_len;
-                message_buffer_resize (len + string_len);
-                sprintf
-                  (message_buffer + message_buffer_index, fmt, string);
-                message_buffer_index += string_len;
-              }
-              break;
-
-            case 'd':           /* Insert the current arg as an integer. */
-              {
-                long long_val;
-                int integer;
-
-                long_val = (long)args[arg_index++];
-                integer = (int)long_val;
-
-                message_buffer_resize (len + formatted_len > 32
-                                       ? formatted_len : 32);
-                sprintf
-                  (message_buffer + message_buffer_index, fmt, integer);
-                message_buffer_index = strlen (message_buffer);
-              }
-              break;
-
-            case 'c':           /* Insert the current arg as a character. */
-              {
-                long long_val;
-                int character;
-
-                long_val = (long)args[arg_index++];
-                character = (int)long_val;
-
-                message_buffer_resize (len + formatted_len);
-                sprintf
-                  (message_buffer + message_buffer_index, fmt, character);
-                message_buffer_index += formatted_len;
-              }
-              break;
-
-            default:
-              abort ();
-            }
-          free (fmt);
-        }
-    }
-  message_buffer[message_buffer_index] = '\0';
-}
-
-/* Build a new node which has FORMAT printed with ARG1 and ARG2 as the
-   contents. */
-NODE *
-build_message_node (char *format, void *arg1, void *arg2)
-{
-  NODE *node;
-
-  message_buffer_index = 0;
-  build_message_buffer (format, arg1, arg2, 0);
-
-  node = message_buffer_to_node ();
-  return (node);
-}
-
-/* Convert the contents of the message buffer to a node. */
-NODE *
-message_buffer_to_node (void)
-{
-  NODE *node;
-
-  node = xmalloc (sizeof (NODE));
-  node->filename = NULL;
-  node->parent = NULL;
-  node->nodename = NULL;
-  node->flags = 0;
-  node->display_pos =0;
-
-  /* Make sure that this buffer ends with a newline. */
-  node->nodelen = 1 + strlen (message_buffer);
-  node->contents = xmalloc (1 + node->nodelen);
-  strcpy (node->contents, message_buffer);
-  node->contents[node->nodelen - 1] = '\n';
-  node->contents[node->nodelen] = '\0';
-  return (node);
-}
-
-/* Useful functions can be called from outside of window.c. */
-void
-initialize_message_buffer (void)
-{
-  message_buffer_index = 0;
-}
-
-/* Print FORMAT with ARG1,2 to the end of the current message buffer. */
-void
-printf_to_message_buffer (char *format, void *arg1, void *arg2, void *arg3)
-{
-  build_message_buffer (format, arg1, arg2, arg3);
-}
-
-/* Return the current horizontal position of the "cursor" on the most
-   recently output message buffer line. */
-int
-message_buffer_length_this_line (void)
-{
-  register int i;
-
-  if (!message_buffer_index)
-    return (0);
-
-  for (i = message_buffer_index; i && message_buffer[i - 1] != '\n'; i--);
-
-  return (string_width (message_buffer + i, 0));
-}
-
-/* Pad STRING to COUNT characters by inserting blanks. */
-int
-pad_to (int count, char *string)
-{
-  register int i;
-
-  i = strlen (string);
-
-  if (i >= count)
-    string[i++] = ' ';
-  else
-    {
-      while (i < count)
-        string[i++] = ' ';
-    }
-  string[i] = '\0';
-
-  return (i);
-}

Property changes on: head/contrib/texinfo/info/window.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/window.h
===================================================================
--- head/contrib/texinfo/info/window.h	(revision 276550)
+++ head/contrib/texinfo/info/window.h	(nonexistent)
@@ -1,241 +0,0 @@
-/* window.h -- Structure and flags used in manipulating Info windows.
-   $Id: window.h,v 1.3 2004/04/11 17:56:46 karl Exp $
-
-   This file is part of GNU Info, a program for reading online documentation
-   stored in Info format.
-
-   Copyright (C) 1993, 1997, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#ifndef INFO_WINDOW_H
-#define INFO_WINDOW_H
-
-#include "infomap.h"
-#include "nodes.h"
-
-/* Smallest number of visible lines in a window.  The actual height is
-   always one more than this number because each window has a modeline. */
-#define WINDOW_MIN_HEIGHT 2
-
-/* Smallest number of screen lines that can be used to fully present a
-   window.  This number includes the modeline of the window. */
-#define WINDOW_MIN_SIZE (WINDOW_MIN_HEIGHT + 1)
-
-/* The exact same elements are used within the WINDOW_STATE structure and a
-   subsection of the WINDOW structure.  We could define a structure which
-   contains this elements, and include that structure in each of WINDOW_STATE
-   and WINDOW.  But that would lead references in the code such as
-   window->state->node which we would like to avoid.  Instead, we #define the
-   elements here, and simply include the define in both data structures. Thus,
-   if you need to change window state information, here is where you would
-   do it.  NB> The last element does NOT end with a semi-colon. */
-#define WINDOW_STATE_DECL \
-   NODE *node;          /* The node displayed in this window. */ \
-   int pagetop;         /* LINE_STARTS[PAGETOP] is first line in WINDOW. */ \
-   long point           /* Offset within NODE of the cursor position. */
-
-/* Structure which defines a window.  Windows are doubly linked, next
-   and prev. The list of windows is kept on WINDOWS.  The structure member
-   window->height is the total height of the window.  The position location
-   (0, window->height + window->first_row) is the first character of this
-   windows modeline.  The number of lines that can be displayed in a window
-   is equal to window->height - 1. */
-typedef struct window_struct
-{
-  struct window_struct *next;      /* Next window in this chain. */
-  struct window_struct *prev;      /* Previous window in this chain. */
-  int width;            /* Width of this window. */
-  int height;           /* Height of this window. */
-  int first_row;        /* Offset of the first line in the_screen. */
-  int goal_column;      /* The column we would like the cursor to appear in. */
-  Keymap keymap;        /* Keymap used to read commands in this window. */
-  WINDOW_STATE_DECL;    /* Node, pagetop and point. */
-  char *modeline;       /* Calculated text of the modeline for this window. */
-  char **line_starts;   /* Array of printed line starts for this node. */
-  int line_count;       /* Number of lines appearing in LINE_STARTS. */
-  int flags;            /* See below for details. */
-} WINDOW;
-
-typedef struct {
-  WINDOW_STATE_DECL;            /* What gets saved. */
-} WINDOW_STATE;
-
-/* Structure defining the current state of an incremental search. */
-typedef struct {
-  WINDOW_STATE_DECL;    /* The node, pagetop and point. */
-  int search_index;     /* Offset of the last char in the search string. */
-  int direction;        /* The direction that this search is heading in. */
-  int failing;          /* Whether or not this search failed. */
-} SEARCH_STATE;
-
-#define W_UpdateWindow  0x01    /* WINDOW needs updating. */
-#define W_WindowIsPerm  0x02    /* This WINDOW is a permanent object. */
-#define W_WindowVisible 0x04    /* This WINDOW is currently visible. */
-#define W_InhibitMode   0x08    /* This WINDOW has no modeline. */
-#define W_NoWrap        0x10    /* Lines do not wrap in this window. */
-#define W_InputWindow   0x20    /* Window accepts input. */
-#define W_TempWindow    0x40    /* Window is less important. */
-
-extern WINDOW *windows;         /* List of visible Info windows. */
-extern WINDOW *active_window;   /* The currently active window. */
-extern WINDOW *the_screen;      /* The Info screen is just another window. */
-extern WINDOW *the_echo_area;   /* THE_ECHO_AREA is a window in THE_SCREEN. */
-
-/* Global variable control redisplay of scrolled windows.  If non-zero, it
-   is the desired number of lines to scroll the window in order to make
-   point visible.  A user might set this to 1 for smooth scrolling.  If
-   set to zero, the line containing point is centered within the window. */
-extern int window_scroll_step;
-
- /* Make the modeline member for WINDOW. */
-extern void window_make_modeline (WINDOW *window);
-
-/* Initalize the window system by creating THE_SCREEN and THE_ECHO_AREA.
-   Create the first window ever, and make it permanent.
-   You pass WIDTH and HEIGHT; the dimensions of the total screen size. */
-extern void window_initialize_windows (int width, int height);
-
-/* Make a new window showing NODE, and return that window structure.
-   The new window is made to be the active window.  If NODE is passed
-   as NULL, then show the node showing in the active window.  If the
-   window could not be made return a NULL pointer.  The active window
-   is not changed.*/
-extern WINDOW *window_make_window (NODE *node);
-
-/* Delete WINDOW from the list of known windows.  If this window was the
-   active window, make the next window in the chain be the active window,
-   or the previous window in the chain if there is no next window. */
-extern void window_delete_window (WINDOW *window);
-
-/* A function to call when the screen changes size, and some windows have
-   to get deleted.  The function is called with the window to be deleted
-   as an argument, and it can't do anything about the window getting deleted;
-   it can only clean up dangling references to that window. */
-extern VFunction *window_deletion_notifier;
-
-/* Set WINDOW to display NODE. */
-extern void window_set_node_of_window (WINDOW *window, NODE *node);
-
-/* Tell the window system that the size of the screen has changed.  This
-   causes lots of interesting things to happen.  The permanent windows
-   are resized, as well as every visible window.  You pass WIDTH and HEIGHT;
-   the dimensions of the total screen size. */
-extern void window_new_screen_size (int width, int height);
-
-/* Change the height of WINDOW by AMOUNT.  This also automagically adjusts
-   the previous and next windows in the chain.  If there is only one user
-   window, then no change takes place. */
-extern void window_change_window_height (WINDOW *window, int amount);
-
-/* Adjust the pagetop of WINDOW such that the cursor point will be visible. */
-extern void window_adjust_pagetop (WINDOW *window);
-
-/* Tile all of the windows currently displayed in the global variable
-   WINDOWS.  If argument DO_INTERNALS is non-zero, tile windows displaying
-   internal nodes as well. */
-#define DONT_TILE_INTERNALS 0
-#define TILE_INTERNALS      1
-extern void window_tile_windows (int style);
-
-/* Toggle the state of line wrapping in WINDOW.  This can do a bit of fancy
-   redisplay. */
-extern void window_toggle_wrap (WINDOW *window);
-
-/* For every window in CHAIN, set the flags member to have FLAG set. */
-extern void window_mark_chain (WINDOW *chain, int flag);
-
-/* For every window in CHAIN, clear the flags member of FLAG. */
-extern void window_unmark_chain (WINDOW *chain, int flag);
-
-/* Make WINDOW start displaying at PERCENT percentage of its node. */
-extern void window_goto_percentage (WINDOW *window, int percent);
-
-/* Build a new node which has FORMAT printed with ARG1 and ARG2 as the
-   contents. */
-extern NODE *build_message_node (char *format, void *arg1, void *arg2);
-
-/* Useful functions can be called from outside of window.c. */
-extern void initialize_message_buffer (void);
-
-/* Print FORMAT with ARG1,2 to the end of the current message buffer. */
-extern void printf_to_message_buffer (char *format, void *arg1, void *arg2,
-    void *arg3);
-
-/* Convert the contents of the message buffer to a node. */
-extern NODE *message_buffer_to_node (void);
-
-/* Return the length of the most recently printed line in message buffer. */
-extern int message_buffer_length_this_line (void);
-
-/* Pad STRING to COUNT characters by inserting blanks. */
-extern int pad_to (int count, char *string);
-
-/* Make a message appear in the echo area, built from FORMAT, ARG1 and ARG2.
-   The arguments are treated similar to printf () arguments, but not all of
-   printf () hair is present.  The message appears immediately.  If there was
-   already a message appearing in the echo area, it is removed. */
-extern void window_message_in_echo_area (char *format, void *arg1, void *arg2);
-
-/* Place a temporary message in the echo area built from FORMAT, ARG1
-   and ARG2.  The message appears immediately, but does not destroy
-   any existing message.  A future call to unmessage_in_echo_area ()
-   restores the old contents. */
-extern void message_in_echo_area (char *format, void *arg1, void *arg2);
-extern void unmessage_in_echo_area (void);
-
-/* Clear the echo area, removing any message that is already present.
-   The echo area is cleared immediately. */
-extern void window_clear_echo_area (void);
-
-/* Quickly guess the approximate number of lines to that NODE would
-   take to display.  This really only counts carriage returns. */
-extern int window_physical_lines (NODE *node);
-
-/* Calculate a list of line starts for the node belonging to WINDOW.  The line
-   starts are pointers to the actual text within WINDOW->NODE. */
-extern void calculate_line_starts (WINDOW *window);
-
-/* Given WINDOW, recalculate the line starts for the node it displays. */
-extern void recalculate_line_starts (WINDOW *window);
-
-/* Return the number of characters it takes to display CHARACTER on the
-   screen at HPOS. */
-extern int character_width (int character, int hpos);
-
-/* Return the number of characters it takes to display STRING on the
-   screen at HPOS. */
-extern int string_width (char *string, int hpos);
-
-/* Return the index of the line containing point. */
-extern int window_line_of_point (WINDOW *window);
-
-/* Get and return the goal column for this window. */
-extern int window_get_goal_column (WINDOW *window);
-
-/* Get and return the printed column offset of the cursor in this window. */
-extern int window_get_cursor_column (WINDOW *window);
-
-/* Get and Set the node, pagetop, and point of WINDOW. */
-extern void window_get_state (WINDOW *window, SEARCH_STATE *state);
-extern void window_set_state (WINDOW *window, SEARCH_STATE *state);
-
-/* Count the number of characters in LINE that precede the printed column
-   offset of GOAL. */
-extern int window_chars_to_goal (char *line, int goal);
-
-#endif /* not INFO_WINDOW_H */

Property changes on: head/contrib/texinfo/info/window.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/indices.c
===================================================================
--- head/contrib/texinfo/info/indices.c	(revision 276550)
+++ head/contrib/texinfo/info/indices.c	(nonexistent)
@@ -1,735 +0,0 @@
-/* indices.c -- deal with an Info file index.
-   $Id: indices.c,v 1.5 2004/04/11 17:56:45 karl Exp $
-
-   Copyright (C) 1993, 1997, 1998, 1999, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Originally written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-#include "indices.h"
-
-/* User-visible variable controls the output of info-index-next. */
-int show_index_match = 1;
-
-/* In the Info sense, an index is a menu.  This variable holds the last
-   parsed index. */
-static REFERENCE **index_index = (REFERENCE **)NULL;
-
-/* The offset of the most recently selected index element. */
-static int index_offset = 0;
-
-/* Variable which holds the last string searched for. */
-static char *index_search = (char *)NULL;
-
-/* A couple of "globals" describing where the initial index was found. */
-static char *initial_index_filename = (char *)NULL;
-static char *initial_index_nodename = (char *)NULL;
-
-/* A structure associating index names with index offset ranges. */
-typedef struct {
-  char *name;                   /* The nodename of this index. */
-  int first;                    /* The index in our list of the first entry. */
-  int last;                     /* The index in our list of the last entry. */
-} INDEX_NAME_ASSOC;
-
-/* An array associating index nodenames with index offset ranges. */
-static INDEX_NAME_ASSOC **index_nodenames = (INDEX_NAME_ASSOC **)NULL;
-static int index_nodenames_index = 0;
-static int index_nodenames_slots = 0;
-
-/* Add the name of NODE, and the range of the associated index elements
-   (passed in ARRAY) to index_nodenames. */
-static void
-add_index_to_index_nodenames (REFERENCE **array, NODE *node)
-{
-  register int i, last;
-  INDEX_NAME_ASSOC *assoc;
-
-  for (last = 0; array[last + 1]; last++);
-  assoc = (INDEX_NAME_ASSOC *)xmalloc (sizeof (INDEX_NAME_ASSOC));
-  assoc->name = xstrdup (node->nodename);
-
-  if (!index_nodenames_index)
-    {
-      assoc->first = 0;
-      assoc->last = last;
-    }
-  else
-    {
-      for (i = 0; index_nodenames[i + 1]; i++);
-      assoc->first = 1 + index_nodenames[i]->last;
-      assoc->last = assoc->first + last;
-    }
-  add_pointer_to_array
-    (assoc, index_nodenames_index, index_nodenames, index_nodenames_slots,
-     10, INDEX_NAME_ASSOC *);
-}
-
-/* Find and return the indices of WINDOW's file.  The indices are defined
-   as the first node in the file containing the word "Index" and any
-   immediately following nodes whose names also contain "Index".  All such
-   indices are concatenated and the result returned.  If WINDOW's info file
-   doesn't have any indices, a NULL pointer is returned. */
-REFERENCE **
-info_indices_of_window (WINDOW *window)
-{
-  FILE_BUFFER *fb;
-
-  fb = file_buffer_of_window (window);
-
-  return (info_indices_of_file_buffer (fb));
-}
-
-REFERENCE **
-info_indices_of_file_buffer (FILE_BUFFER *file_buffer)
-{
-  register int i;
-  REFERENCE **result = (REFERENCE **)NULL;
-
-  /* No file buffer, no indices. */
-  if (!file_buffer)
-    return ((REFERENCE **)NULL);
-
-  /* Reset globals describing where the index was found. */
-  maybe_free (initial_index_filename);
-  maybe_free (initial_index_nodename);
-  initial_index_filename = (char *)NULL;
-  initial_index_nodename = (char *)NULL;
-
-  if (index_nodenames)
-    {
-      for (i = 0; index_nodenames[i]; i++)
-        {
-          free (index_nodenames[i]->name);
-          free (index_nodenames[i]);
-        }
-
-      index_nodenames_index = 0;
-      index_nodenames[0] = (INDEX_NAME_ASSOC *)NULL;
-    }
-
-  /* Grovel the names of the nodes found in this file. */
-  if (file_buffer->tags)
-    {
-      TAG *tag;
-
-      for (i = 0; (tag = file_buffer->tags[i]); i++)
-        {
-          if (string_in_line ("Index", tag->nodename) != -1)
-            {
-              NODE *node;
-              REFERENCE **menu;
-
-              /* Found one.  Get its menu. */
-              node = info_get_node (tag->filename, tag->nodename);
-              if (!node)
-                continue;
-
-              /* Remember the filename and nodename of this index. */
-              initial_index_filename = xstrdup (file_buffer->filename);
-              initial_index_nodename = xstrdup (tag->nodename);
-
-              menu = info_menu_of_node (node);
-
-              /* If we have a menu, add this index's nodename and range
-                 to our list of index_nodenames. */
-              if (menu)
-                {
-                  add_index_to_index_nodenames (menu, node);
-
-                  /* Concatenate the references found so far. */
-                  result = info_concatenate_references (result, menu);
-                }
-              free (node);
-            }
-        }
-    }
-
-  /* If there is a result, clean it up so that every entry has a filename. */
-  for (i = 0; result && result[i]; i++)
-    if (!result[i]->filename)
-      result[i]->filename = xstrdup (file_buffer->filename);
-
-  return (result);
-}
-
-DECLARE_INFO_COMMAND (info_index_search,
-   _("Look up a string in the index for this file"))
-{
-  do_info_index_search (window, count, 0);
-}
-
-/* Look up SEARCH_STRING in the index for this file.  If SEARCH_STRING
-   is NULL, prompt user for input.  */ 
-void
-do_info_index_search (WINDOW *window, int count, char *search_string)
-{
-  FILE_BUFFER *fb;
-  char *line;
-
-  /* Reset the index offset, since this is not the info-index-next command. */
-  index_offset = 0;
-
-  /* The user is selecting a new search string, so flush the old one. */
-  maybe_free (index_search);
-  index_search = (char *)NULL;
-
-  /* If this window's file is not the same as the one that we last built an
-     index for, build and remember an index now. */
-  fb = file_buffer_of_window (window);
-  if (!initial_index_filename ||
-      (FILENAME_CMP (initial_index_filename, fb->filename) != 0))
-    {
-      info_free_references (index_index);
-      window_message_in_echo_area ((char *) _("Finding index entries..."),
-          NULL, NULL);
-      index_index = info_indices_of_file_buffer (fb);
-    }
-
-  /* If there is no index, quit now. */
-  if (!index_index)
-    {
-      info_error ((char *) _("No indices found."), NULL, NULL);
-      return;
-    }
-
-  /* Okay, there is an index.  Look for SEARCH_STRING, or, if it is
-     empty, prompt for one.  */
-  if (search_string && *search_string)
-    line = xstrdup (search_string);
-  else
-    {
-      line = info_read_maybe_completing (window, (char *) _("Index entry: "),
-                                         index_index);
-      window = active_window;
-
-      /* User aborted? */
-      if (!line)
-        {
-          info_abort_key (active_window, 1, 0);
-          return;
-        }
-
-      /* Empty line means move to the Index node. */
-      if (!*line)
-        {
-          free (line);
-
-          if (initial_index_filename && initial_index_nodename)
-            {
-              NODE *node;
-
-              node = info_get_node (initial_index_filename,
-                                    initial_index_nodename);
-              set_remembered_pagetop_and_point (window);
-              window_set_node_of_window (window, node);
-              remember_window_and_node (window, node);
-              window_clear_echo_area ();
-              return;
-            }
-        }
-    }
-
-  /* The user typed either a completed index label, or a partial string.
-     Find an exact match, or, failing that, the first index entry containing
-     the partial string.  So, we just call info_next_index_match () with minor
-     manipulation of INDEX_OFFSET. */
-  {
-    int old_offset;
-
-    /* Start the search right after/before this index. */
-    if (count < 0)
-      {
-        register int i;
-        for (i = 0; index_index[i]; i++);
-        index_offset = i;
-      }
-    else
-      index_offset = -1;
-
-    old_offset = index_offset;
-
-    /* The "last" string searched for is this one. */
-    index_search = line;
-
-    /* Find it, or error. */
-    info_next_index_match (window, count, 0);
-
-    /* If the search failed, return the index offset to where it belongs. */
-    if (index_offset == old_offset)
-      index_offset = 0;
-  }
-}
-
-int
-index_entry_exists (WINDOW *window, char *string)
-{
-  register int i;
-  FILE_BUFFER *fb;
-
-  /* If there is no previous search string, the user hasn't built an index
-     yet. */
-  if (!string)
-    return 0;
-
-  fb = file_buffer_of_window (window);
-  if (!initial_index_filename
-      || (FILENAME_CMP (initial_index_filename, fb->filename) != 0))
-    {
-      info_free_references (index_index);
-      index_index = info_indices_of_file_buffer (fb);
-    }
-
-  /* If there is no index, that is an error. */
-  if (!index_index)
-    return 0;
-
-  for (i = 0; (i > -1) && (index_index[i]); i++)
-    if (strcmp (string, index_index[i]->label) == 0)
-      break;
-
-  /* If that failed, look for the next substring match. */
-  if ((i < 0) || (!index_index[i]))
-    {
-      for (i = 0; (i > -1) && (index_index[i]); i++)
-        if (string_in_line (string, index_index[i]->label) != -1)
-          break;
-
-      if ((i > -1) && (index_index[i]))
-        string_in_line (string, index_index[i]->label);
-    }
-
-  /* If that failed, return 0. */
-  if ((i < 0) || (!index_index[i]))
-    return 0;
-
-  return 1;
-}
-
-DECLARE_INFO_COMMAND (info_next_index_match,
- _("Go to the next matching index item from the last `\\[index-search]' command"))
-{
-  register int i;
-  int partial, dir;
-  NODE *node;
-
-  /* If there is no previous search string, the user hasn't built an index
-     yet. */
-  if (!index_search)
-    {
-      info_error ((char *) _("No previous index search string."), NULL, NULL);
-      return;
-    }
-
-  /* If there is no index, that is an error. */
-  if (!index_index)
-    {
-      info_error ((char *) _("No index entries."), NULL, NULL);
-      return;
-    }
-
-  /* The direction of this search is controlled by the value of the
-     numeric argument. */
-  if (count < 0)
-    dir = -1;
-  else
-    dir = 1;
-
-  /* Search for the next occurence of index_search.  First try to find
-     an exact match. */
-  partial = 0;
-
-  for (i = index_offset + dir; (i > -1) && (index_index[i]); i += dir)
-    if (strcmp (index_search, index_index[i]->label) == 0)
-      break;
-
-  /* If that failed, look for the next substring match. */
-  if ((i < 0) || (!index_index[i]))
-    {
-      for (i = index_offset + dir; (i > -1) && (index_index[i]); i += dir)
-        if (string_in_line (index_search, index_index[i]->label) != -1)
-          break;
-
-      if ((i > -1) && (index_index[i]))
-        partial = string_in_line (index_search, index_index[i]->label);
-    }
-
-  /* If that failed, print an error. */
-  if ((i < 0) || (!index_index[i]))
-    {
-      info_error ((char *) _("No %sindex entries containing `%s'."),
-                  index_offset > 0 ? (char *) _("more ") : "", index_search);
-      return;
-    }
-
-  /* Okay, we found the next one.  Move the offset to the current entry. */
-  index_offset = i;
-
-  /* Report to the user on what we have found. */
-  {
-    register int j;
-    const char *name = _("CAN'T SEE THIS");
-    char *match;
-
-    for (j = 0; index_nodenames[j]; j++)
-      {
-        if ((i >= index_nodenames[j]->first) &&
-            (i <= index_nodenames[j]->last))
-          {
-            name = index_nodenames[j]->name;
-            break;
-          }
-      }
-
-    /* If we had a partial match, indicate to the user which part of the
-       string matched. */
-    match = xstrdup (index_index[i]->label);
-
-    if (partial && show_index_match)
-      {
-        int k, ls, start, upper;
-
-        ls = strlen (index_search);
-        start = partial - ls;
-        upper = isupper (match[start]) ? 1 : 0;
-
-        for (k = 0; k < ls; k++)
-          if (upper)
-            match[k + start] = info_tolower (match[k + start]);
-          else
-            match[k + start] = info_toupper (match[k + start]);
-      }
-
-    {
-      char *format;
-
-      format = replace_in_documentation
-        ((char *) _("Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"),
-         0);
-
-      window_message_in_echo_area (format, match, (char *) name);
-    }
-
-    free (match);
-  }
-
-  /* Select the node corresponding to this index entry. */
-  node = info_get_node (index_index[i]->filename, index_index[i]->nodename);
-
-  if (!node)
-    {
-      info_error ((char *) msg_cant_file_node,
-                  index_index[i]->filename, index_index[i]->nodename);
-      return;
-    }
-
-  info_set_node_of_window (1, window, node);
-
-  /* Try to find an occurence of LABEL in this node. */
-  {
-    long start, loc;
-
-    start = window->line_starts[1] - window->node->contents;
-    loc = info_target_search_node (node, index_index[i]->label, start);
-
-    if (loc != -1)
-      {
-        window->point = loc;
-        window_adjust_pagetop (window);
-      }
-  }
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                 Info APROPOS: Search every known index.          */
-/*                                                                  */
-/* **************************************************************** */
-
-/* For every menu item in DIR, search the indices of that file for
-   SEARCH_STRING. */
-REFERENCE **
-apropos_in_all_indices (char *search_string, int inform)
-{
-  register int i, dir_index;
-  REFERENCE **all_indices = (REFERENCE **)NULL;
-  REFERENCE **dir_menu = (REFERENCE **)NULL;
-  NODE *dir_node;
-
-  dir_node = info_get_node ("dir", "Top");
-  if (dir_node)
-    dir_menu = info_menu_of_node (dir_node);
-
-  if (!dir_menu)
-    return NULL;
-
-  /* For every menu item in DIR, get the associated node's file buffer and
-     read the indices of that file buffer.  Gather all of the indices into
-     one large one. */
-  for (dir_index = 0; dir_menu[dir_index]; dir_index++)
-    {
-      REFERENCE **this_index, *this_item;
-      NODE *this_node;
-      FILE_BUFFER *this_fb;
-      int dir_node_duplicated = 0;
-
-      this_item = dir_menu[dir_index];
-
-      if (!this_item->filename)
-        {
-	  dir_node_duplicated = 1;
-          if (dir_node->parent)
-            this_item->filename = xstrdup (dir_node->parent);
-          else
-            this_item->filename = xstrdup (dir_node->filename);
-        }
-
-      /* Find this node.  If we cannot find it, try using the label of the
-         entry as a file (i.e., "(LABEL)Top"). */
-      this_node = info_get_node (this_item->filename, this_item->nodename);
-
-      if (!this_node && this_item->nodename &&
-          (strcmp (this_item->label, this_item->nodename) == 0))
-        this_node = info_get_node (this_item->label, "Top");
-
-      if (!this_node)
-	{
-	  if (dir_node_duplicated)
-	    free (this_item->filename);
-	  continue;
-	}
-
-      /* Get the file buffer associated with this node. */
-      {
-        char *files_name;
-
-        files_name = this_node->parent;
-        if (!files_name)
-          files_name = this_node->filename;
-
-        this_fb = info_find_file (files_name);
-
-	/* If we already scanned this file, don't do that again.
-	   In addition to being faster, this also avoids having
-	   multiple identical entries in the *Apropos* menu.  */
-	for (i = 0; i < dir_index; i++)
-	  if (FILENAME_CMP (this_fb->filename, dir_menu[i]->filename) == 0)
-	    break;
-	if (i < dir_index)
-	  {
-	    if (dir_node_duplicated)
-	      free (this_item->filename);
-	    continue;
-	  }
-
-        if (this_fb && inform)
-          message_in_echo_area ((char *) _("Scanning indices of `%s'..."),
-              files_name, NULL);
-
-        this_index = info_indices_of_file_buffer (this_fb);
-        free (this_node);
-
-        if (this_fb && inform)
-          unmessage_in_echo_area ();
-      }
-
-      if (this_index)
-        {
-          /* Remember the filename which contains this set of references. */
-          for (i = 0; this_index && this_index[i]; i++)
-            if (!this_index[i]->filename)
-              this_index[i]->filename = xstrdup (this_fb->filename);
-
-          /* Concatenate with the other indices.  */
-          all_indices = info_concatenate_references (all_indices, this_index);
-        }
-    }
-
-  info_free_references (dir_menu);
-
-  /* Build a list of the references which contain SEARCH_STRING. */
-  if (all_indices)
-    {
-      REFERENCE *entry, **apropos_list = (REFERENCE **)NULL;
-      int apropos_list_index = 0;
-      int apropos_list_slots = 0;
-
-      for (i = 0; (entry = all_indices[i]); i++)
-        {
-          if (string_in_line (search_string, entry->label) != -1)
-            {
-              add_pointer_to_array
-                (entry, apropos_list_index, apropos_list, apropos_list_slots,
-                 100, REFERENCE *);
-            }
-          else
-            {
-              maybe_free (entry->label);
-              maybe_free (entry->filename);
-              maybe_free (entry->nodename);
-              free (entry);
-            }
-        }
-
-      free (all_indices);
-      all_indices = apropos_list;
-    }
-  return (all_indices);
-}
-
-#define APROPOS_NONE \
-   N_("No available info files have `%s' in their indices.")
-
-void
-info_apropos (char *string)
-{
-  REFERENCE **apropos_list;
-
-  apropos_list = apropos_in_all_indices (string, 0);
-
-  if (!apropos_list)
-    info_error ((char *) _(APROPOS_NONE), string, NULL);
-  else
-    {
-      register int i;
-      REFERENCE *entry;
-
-      for (i = 0; (entry = apropos_list[i]); i++)
-        fprintf (stdout, "\"(%s)%s\" -- %s\n",
-                 entry->filename, entry->nodename, entry->label);
-    }
-  info_free_references (apropos_list);
-}
-
-static char *apropos_list_nodename = "*Apropos*";
-
-DECLARE_INFO_COMMAND (info_index_apropos,
-   _("Grovel all known info file's indices for a string and build a menu"))
-{
-  char *line;
-
-  line = info_read_in_echo_area (window, (char *) _("Index apropos: "));
-
-  window = active_window;
-
-  /* User aborted? */
-  if (!line)
-    {
-      info_abort_key (window, 1, 1);
-      return;
-    }
-
-  /* User typed something? */
-  if (*line)
-    {
-      REFERENCE **apropos_list;
-      NODE *apropos_node;
-
-      apropos_list = apropos_in_all_indices (line, 1);
-
-      if (!apropos_list)
-        info_error ((char *) _(APROPOS_NONE), line, NULL);
-      else
-        {
-          register int i;
-          char *line_buffer;
-
-          initialize_message_buffer ();
-          printf_to_message_buffer
-            ((char *) _("\n* Menu: Nodes whose indices contain `%s':\n"),
-             line, NULL, NULL);
-          line_buffer = (char *)xmalloc (500);
-
-          for (i = 0; apropos_list[i]; i++)
-            {
-              int len;
-	      /* The label might be identical to that of another index
-		 entry in another Info file.  Therefore, we make the file
-		 name part of the menu entry, to make them all distinct.  */
-              sprintf (line_buffer, "* %s [%s]: ",
-		       apropos_list[i]->label, apropos_list[i]->filename);
-              len = pad_to (40, line_buffer);
-              sprintf (line_buffer + len, "(%s)%s.",
-                       apropos_list[i]->filename, apropos_list[i]->nodename);
-              printf_to_message_buffer ("%s\n", line_buffer, NULL, NULL);
-            }
-          free (line_buffer);
-        }
-
-      apropos_node = message_buffer_to_node ();
-      add_gcable_pointer (apropos_node->contents);
-      name_internal_node (apropos_node, apropos_list_nodename);
-
-      /* Even though this is an internal node, we don't want the window
-         system to treat it specially.  So we turn off the internalness
-         of it here. */
-      apropos_node->flags &= ~N_IsInternal;
-
-      /* Find/Create a window to contain this node. */
-      {
-        WINDOW *new;
-        NODE *node;
-
-        set_remembered_pagetop_and_point (window);
-
-        /* If a window is visible and showing an apropos list already,
-           re-use it. */
-        for (new = windows; new; new = new->next)
-          {
-            node = new->node;
-
-            if (internal_info_node_p (node) &&
-                (strcmp (node->nodename, apropos_list_nodename) == 0))
-              break;
-          }
-
-        /* If we couldn't find an existing window, try to use the next window
-           in the chain. */
-        if (!new && window->next)
-          new = window->next;
-
-        /* If we still don't have a window, make a new one to contain
-           the list. */
-        if (!new)
-          {
-            WINDOW *old_active;
-
-            old_active = active_window;
-            active_window = window;
-            new = window_make_window ((NODE *)NULL);
-            active_window = old_active;
-          }
-
-        /* If we couldn't make a new window, use this one. */
-        if (!new)
-          new = window;
-
-        /* Lines do not wrap in this window. */
-        new->flags |= W_NoWrap;
-
-        window_set_node_of_window (new, apropos_node);
-        remember_window_and_node (new, apropos_node);
-        active_window = new;
-      }
-      info_free_references (apropos_list);
-    }
-  free (line);
-
-  if (!info_error_was_printed)
-    window_clear_echo_area ();
-}

Property changes on: head/contrib/texinfo/info/indices.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/gc.h
===================================================================
--- head/contrib/texinfo/info/gc.h	(revision 276550)
+++ head/contrib/texinfo/info/gc.h	(nonexistent)
@@ -1,37 +0,0 @@
-/* gc.h -- Functions for garbage collecting unused node contents.
-   $Id: gc.h,v 1.3 2004/04/11 17:56:45 karl Exp $
-
-   This file is part of GNU Info, a program for reading online documentation
-   stored in Info format.
-
-   Copyright (C) 1993, 1997, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#ifndef INFO_GC_H
-#define INFO_GC_H
-
-/* Add POINTER to the list of garbage collectible pointers.  A pointer
-   is not actually garbage collected until no info window contains a node
-   whose contents member is equal to the pointer. */
-extern void add_gcable_pointer (char *pointer);
-
-/* Grovel the list of info windows and gc-able pointers finding those
-   node->contents which are collectible, and free them. */
-extern void gc_pointers (void);
-
-#endif /* not INFO_GC_H */

Property changes on: head/contrib/texinfo/info/gc.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/gc.c
===================================================================
--- head/contrib/texinfo/info/gc.c	(revision 276550)
+++ head/contrib/texinfo/info/gc.c	(nonexistent)
@@ -1,92 +0,0 @@
-/* gc.c -- Functions to remember and garbage collect unused node contents.
-   $Id: gc.c,v 1.3 2004/04/11 17:56:45 karl Exp $
-
-   Copyright (C) 1993, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#include "info.h"
-
-/* Array of pointers to the contents of gc-able nodes.  A pointer on this
-   list can be garbage collected when no info window contains a node whose
-   contents member match the pointer. */
-static char **gcable_pointers = (char **)NULL;
-static int gcable_pointers_index = 0;
-static int gcable_pointers_slots = 0;
-
-/* Add POINTER to the list of garbage collectible pointers.  A pointer
-   is not actually garbage collected until no info window contains a node
-   whose contents member is equal to the pointer. */
-void
-add_gcable_pointer (char *pointer)
-{
-  gc_pointers ();
-  add_pointer_to_array (pointer, gcable_pointers_index, gcable_pointers,
-			gcable_pointers_slots, 10, char *);
-}
-
-/* Grovel the list of info windows and gc-able pointers finding those
-   node->contents which are collectible, and free them. */
-void
-gc_pointers (void)
-{
-  register int i, j, k;
-  INFO_WINDOW *iw;
-  char **new = (char **)NULL;
-  int new_index = 0;
-  int new_slots = 0;
-
-  if (!info_windows || !gcable_pointers_index)
-    return;
-
-  for (i = 0; (iw = info_windows[i]); i++)
-    {
-      for (j = 0; j < iw->nodes_index; j++)
-	{
-	  NODE *node = iw->nodes[j];
-
-	  /* If this node->contents appears in our list of gcable_pointers,
-	     it is not gc-able, so save it. */
-	  for (k = 0; k < gcable_pointers_index; k++)
-	    if (gcable_pointers[k] == node->contents)
-	      {
-		add_pointer_to_array
-		  (node->contents, new_index, new, new_slots, 10, char *);
-		break;
-	      }
-	}
-    }
-
-  /* We have gathered all of the pointers which need to be saved.  Free any
-     of the original pointers which do not appear in the new list. */
-  for (i = 0; i < gcable_pointers_index; i++)
-    {
-      for (j = 0; j < new_index; j++)
-	if (gcable_pointers[i] == new[j])
-	  break;
-
-      /* If we got all the way through the new list, then the old pointer
-	 can be garbage collected. */
-      if (new && !new[j])
-	free (gcable_pointers[i]);
-    }
-
-  free (gcable_pointers);
-  gcable_pointers = new;
-  gcable_pointers_slots = new_slots;
-  gcable_pointers_index = new_index;
-}

Property changes on: head/contrib/texinfo/info/gc.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/info/indices.h
===================================================================
--- head/contrib/texinfo/info/indices.h	(revision 276550)
+++ head/contrib/texinfo/info/indices.h	(nonexistent)
@@ -1,45 +0,0 @@
-/* indices.h -- Functions defined in indices.c.
-   $Id: indices.h,v 1.3 2004/04/11 17:56:45 karl Exp $
-
-   This file is part of GNU Info, a program for reading online documentation
-   stored in Info format.
-
-   Copyright (C) 1993, 1997, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#ifndef INFO_INDICES_H
-#define INFO_INDICES_H
-
-/* User-visible variable controls the output of info-index-next. */
-extern int show_index_match;
-
-extern REFERENCE **info_indices_of_window (WINDOW *window);
-extern REFERENCE **info_indices_of_file_buffer (FILE_BUFFER *file_buffer);
-extern void info_apropos (char *string);
-
-/* For every menu item in DIR, search the indices of that file for STRING. */
-REFERENCE **apropos_in_all_indices (char *search_string, int inform);
-
-/* User visible functions declared in indices.c. */
-extern void info_index_search (WINDOW *window, int count, unsigned char key);
-extern void info_next_index_match (WINDOW *window, int count, unsigned char key);
-extern void info_index_apropos (WINDOW *window, int count, unsigned char key);
-extern void do_info_index_search (WINDOW *window, int count, char *search_string);
-extern int index_entry_exists (WINDOW *window, char *string);
-
-#endif /* not INFO_INDICES_H */

Property changes on: head/contrib/texinfo/info/indices.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/FREEBSD-upgrade
===================================================================
--- head/contrib/texinfo/FREEBSD-upgrade	(revision 276550)
+++ head/contrib/texinfo/FREEBSD-upgrade	(nonexistent)
@@ -1,42 +0,0 @@
-# ex:ts=8
-$FreeBSD$
-
-GNU Texinfo 4.8
-	originals can be found at: ftp://ftp.gnu.org/gnu/texinfo/
-
-
-For the import of Texinfo many files and directories were pruned by:
-
-	tar -X FREEBSD-Xlist -xyf texinfo-4.8.tar.bz2
-
-
-To reduce the size of import, and to make it so the changes from 3.12
-to 4.8 are easy to determine, the 4.8 directory structure was munged
-before import:
-
-	cd texinfo-4.8
-	mv config.in config.h.in
-
-
-Then imported by:
-
-	cvs import -m 'Import of stripped down GNU texinfo 4.8' \
-		src/contrib/texinfo FSF v4_8
-
-After the import, a separate extraction of texinfo was GNU configured
-in the "normal" way.  The resulting config.h file should be compared
-with src/contrib/texinfo/config.h, and src/contrib/texinfo/config.h
-updated as needed.
-
-To make local changes to texinfo, simply patch and commit to the main
-branch (aka HEAD).  Never make local changes on the vendor (FSF) branch.
-
-All local changes should be submitted to the FSF for inclusion in the
-next vendor release.
-
-ru@FreeBSD.org
-23-May-2005
-
-NOTE: The upstream fix to util/texindex.c which fixes CVE-2005-3011 
-(FreeBSD-SA-06:01.texindex) causes temporary files to not be removed
-when handling very large inputs.  FreeBSD's fix works.

Property changes on: head/contrib/texinfo/FREEBSD-upgrade
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/xref.h
===================================================================
--- head/contrib/texinfo/makeinfo/xref.h	(revision 276550)
+++ head/contrib/texinfo/makeinfo/xref.h	(nonexistent)
@@ -1,30 +0,0 @@
-/* xref.h -- declarations for the cross references.
-   $Id: xref.h,v 1.1 2004/04/11 17:56:47 karl Exp $
-
-   Copyright (C) 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef XREF_H
-#define XREF_H
-
-enum reftype
-{
-  menu_reference, followed_reference
-};
-
-extern char *get_xref_token (int expand);
-
-#endif /* not XREF_H */

Property changes on: head/contrib/texinfo/makeinfo/xref.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/multi.h
===================================================================
--- head/contrib/texinfo/makeinfo/multi.h	(revision 276550)
+++ head/contrib/texinfo/makeinfo/multi.h	(nonexistent)
@@ -1,28 +0,0 @@
-/* multi.h -- declarations for multi.c.
-   $Id: multi.h,v 1.1 2004/04/11 17:56:47 karl Exp $
-
-   Copyright (C) 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-   */
-
-#ifndef MULTI_H
-#define MULTI_H
-
-extern void do_multitable (void);
-extern void end_multitable (void);
-extern int multitable_item (void);
-
-#endif /* !MULTI_H */

Property changes on: head/contrib/texinfo/makeinfo/multi.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/float.c
===================================================================
--- head/contrib/texinfo/makeinfo/float.c	(revision 276550)
+++ head/contrib/texinfo/makeinfo/float.c	(nonexistent)
@@ -1,430 +0,0 @@
-/* float.c -- float environment functions.
-   $Id: float.c,v 1.8 2004/07/05 22:23:22 karl Exp $
-
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Originally written by Alper Ersoy <dirt@gtk.org>.  */
-
-#include "system.h"
-#include "makeinfo.h"
-#include "cmds.h"
-#include "files.h"
-#include "float.h"
-#include "html.h"
-#include "sectioning.h"
-#include "xml.h"
-
-static FLOAT_ELT *float_stack = NULL;
-
-void
-add_new_float (char *id, char *title, char *shorttitle,
-    char *type, char *position)
-{
-  FLOAT_ELT *new = xmalloc (sizeof (FLOAT_ELT));
-  unsigned long num_len;
-
-  new->id = id;
-  new->type = type;
-  new->title = title;
-  new->shorttitle = shorttitle;
-  new->position = position;
-  new->title_used = 0;
-  new->defining_line = line_number - 1;
-
-  new->number = current_chapter_number ();
-  /* Append dot if not @unnumbered.  */
-  num_len = strlen (new->number);
-  if (num_len > 0)
-    {
-      new->number = xrealloc (new->number, num_len + 1 + 1);
-      new->number[num_len] = '.';
-      new->number[num_len+1] = '\0';
-    }
-
-  { /* Append the current float number.  */
-    unsigned len = strlen (new->number) + 21;  /* that's 64 bits */
-    char *s = xmalloc (len + 1);
-
-    sprintf (s, "%s%d", new->number,
-                count_floats_of_type_in_chapter (text_expansion (type),
-                                                 new->number) + 1); 
-    free (new->number);
-    new->number = xstrdup (s);
-  }
-
-  /* Plain text output needs sectioning number and its title,
-     when listing floats.  */
-  if (!html && !xml && no_headers)
-    {
-      new->section = current_sectioning_number ();
-      if (strlen (new->section) == 0)
-        new->section_name = current_sectioning_name ();
-      else
-        new->section_name = "";
-    }
-
-  new->next = float_stack;
-  float_stack = new;
-}
-
-int
-count_floats_of_type_in_chapter (char *type, char *chapter)
-{
-  int i = 0;
-  int l = strlen (chapter);
-  FLOAT_ELT *temp = float_stack;
-
-  while (temp && strncmp (temp->number, chapter, l) == 0)
-    {
-      if (strlen (temp->id) > 0 && STREQ (text_expansion (temp->type), type))
-        i++;
-      temp = temp->next;
-    }
-
-  return i;
-}
-
-char *
-current_float_title (void)
-{
-  return float_stack->title;
-}
-
-char *
-current_float_shorttitle (void)
-{
-  return float_stack->shorttitle;
-}
-
-char *
-current_float_type (void)
-{
-  return float_stack->type;
-}
-
-char *
-current_float_position (void)
-{
-  return float_stack->position;
-}
-
-char *
-current_float_number (void)
-{
-  return float_stack->number;
-}
-
-char *
-current_float_id (void)
-{
-  return float_stack->id;
-}
-
-char *
-get_float_ref (char *id)
-{
-  FLOAT_ELT *temp = float_stack;
-
-  while (temp)
-    {
-      if (STREQ (id, temp->id))
-        {
-          char *s = xmalloc (strlen (temp->type) + strlen (temp->number) + 2);
-          sprintf (s, "%s %s", temp->type, temp->number);
-          return s;
-        }
-      temp = temp->next;
-    }
-
-  return NULL;
-}
-
-static int
-float_type_exists (char *check_type)
-{
-  /* Check if the requested float_type exists in the floats stack.  */
-  FLOAT_ELT *temp;
-
-  for (temp = float_stack; temp; temp = temp->next)
-    if (STREQ (temp->type, check_type) && temp->id && *temp->id)
-      return 1;
-
-  return 0;
-}
-
-void
-cm_listoffloats (void)
-{
-  char *float_type;
-  get_rest_of_line (1, &float_type);
-
-  /* get_rest_of_line increments the line number by one,
-     so to make warnings/errors point to the correct line,
-     we decrement the line_number again.  */
-  if (!handling_delayed_writes)
-    line_number--;
-
-  if (handling_delayed_writes && !float_type_exists (float_type))
-    warning (_("Requested float type `%s' not previously used"), float_type);
-
-  if (xml)
-    {
-      xml_insert_element_with_attribute (LISTOFFLOATS, START,
-          "type=\"%s\"", text_expansion (float_type));
-      xml_insert_element (LISTOFFLOATS, END);
-    }
-  else if (!handling_delayed_writes)
-    {
-      int command_len = sizeof ("@ ") + strlen (command) + strlen (float_type);
-      char *list_command = xmalloc (command_len + 1);
-
-      /* These are for the text following @listoffloats command.
-         Handling them with delayed writes is too late.  */
-      close_paragraph ();
-      cm_noindent ();
-
-      sprintf (list_command, "@%s %s", command, float_type);
-      register_delayed_write (list_command);
-      free (list_command);
-    }
-  else if (float_type_exists (float_type))
-    {
-      FLOAT_ELT *temp = (FLOAT_ELT *) reverse_list
-        ((GENERIC_LIST *) float_stack);
-      FLOAT_ELT *new_start = temp;
-
-      if (html)
-        insert_string ("<ul class=\"listoffloats\">\n");
-      else
-        {
-          if (!no_headers)
-            insert_string ("* Menu:\n\n");
-        }
-
-      while (temp)
-        {
-          if (strlen (temp->id) > 0 && STREQ (float_type, temp->type))
-            {
-              if (html)
-                {
-                  /* A bit of space for HTML reabality.  */
-                  insert_string ("  ");
-                  add_html_block_elt ("<li>");
-
-                  /* Simply relying on @ref command doesn't work here, because
-                     commas in the caption may confuse the argument parsing.  */
-                  add_word ("<a href=\"");
-                  add_anchor_name (temp->id, 1);
-                  add_word ("\">");
-
-                  if (strlen (float_type) > 0)
-                    execute_string ("%s", float_type);
-
-                  if (strlen (temp->id) > 0)
-                    {
-                      if (strlen (float_type) > 0)
-                        add_char (' ');
-
-                      add_word (temp->number);
-                    }
-
-                  if (strlen (temp->title) > 0)
-                    {
-                      if (strlen (float_type) > 0
-                          || strlen (temp->id) > 0)
-                        insert_string (": ");
-
-                      execute_string ("%s", temp->title);
-                    }
-
-                  add_word ("</a>");
-
-                  add_html_block_elt ("</li>\n");
-                }
-              else
-                {
-                  char *entry;
-                  char *raw_entry;
-                  char *title = expansion (temp->title, 0);
-
-                  int len;
-                  int aux_chars_len; /* these are asterisk, colon, etc.  */
-                  int column_width; /* width of the first column in menus.  */
-                  int number_len; /* length of Figure X.Y: etc.   */
-                  int i = 0;
-
-                  /* Chosen widths are to match what @printindex produces.  */
-                  if (no_headers)
-                    {
-                      column_width = 43;
-                      /* We have only one auxiliary character, NULL.  */
-                      aux_chars_len = sizeof ("");
-                    }
-                  else
-                    {
-                      column_width = 37;
-                      /* We'll be adding an asterisk, followed by a space
-                         and then a colon after the title, to construct a
-                         proper menu item.  */
-                      aux_chars_len = sizeof ("* :");
-                    }
-
-                  /* Allocate enough space for possible expansion later.  */
-                  raw_entry = (char *) xmalloc (strlen (float_type)
-                      + strlen (temp->number) + strlen (title)
-                      + sizeof (":  "));
-
-                  sprintf (raw_entry, "%s %s", float_type, temp->number);
-
-                  if (strlen (title) > 0)
-                    strcat (raw_entry, ": ");
-
-                  number_len = strlen (raw_entry);
-
-                  len = strlen (title) + strlen (raw_entry);
-
-                  /* If we have a @shortcaption, try it if @caption is
-                     too long to fit on a line.  */
-                  if (len + aux_chars_len > column_width
-                      && strlen (temp->shorttitle) > 0)
-                    title = expansion (temp->shorttitle, 0);
-
-                  strcat (raw_entry, title);
-                  len = strlen (raw_entry);
-
-                  if (len + aux_chars_len > column_width)
-                    { /* Shorten long titles by looking for a space before
-                         column_width - strlen (" ...").  */
-                      /* -1 is for NULL, which is already in aux_chars_len.  */
-                      aux_chars_len += sizeof ("...") - 1;
-                      len = column_width - aux_chars_len;
-                      while (raw_entry[len] != ' ' && len >= 0)
-                        len--;
-
-                      /* Advance to the whitespace.  */
-                      len++;
-
-                      /* If we are at the end of, say, Figure X.Y:, but
-                         we have a title, then this means title does not
-                         contain any whitespaces.  Or it may be that we
-                         went as far as the beginning.  Just print as much
-                         as possible of the title.  */
-                      if (len == 0
-                          || (len == number_len && strlen (title) > 0))
-                        len = column_width - sizeof ("...");
-
-                      /* Break here.  */
-                      raw_entry[len] = 0;
-
-                      entry = xmalloc (len + aux_chars_len);
-
-                      if (!no_headers)
-                        strcpy (entry, "* ");
-                      else
-                        entry[0] = 0;
-
-                      strcat (entry, raw_entry);
-                      strcat (entry, "...");
-
-                      if (!no_headers)
-                        strcat (entry, ":");
-                    }
-                  else
-                    {
-                      entry = xmalloc (len + aux_chars_len);
-
-                      if (!no_headers)
-                        strcpy (entry, "* ");
-                      else
-                        entry[0] = 0;
-
-                      strcat (entry, raw_entry);
-
-                      if (!no_headers)
-                        strcat (entry, ":");
-                    }
-
-                  insert_string (entry);
-
-                  i = strlen (entry);
-                  /* We insert space chars until ``column_width + four spaces''
-                     is reached, to make the layout the same with what we produce
-                     for @printindex.  This is of course not obligatory, though
-                     easier on the eye.  -1 is for NULL.  */
-                  while (i < column_width + sizeof ("    ") - 1)
-                    {
-                      insert (' ');
-                      i++;
-                    }
-
-                  if (no_headers)
-                    {
-                      if (strlen (temp->section) > 0)
-                        { /* We got your number.  */
-                          insert_string ((char *) _("See "));
-                          insert_string (temp->section);
-                        }
-                      else
-                        { /* Sigh, @float in an @unnumbered. :-\  */
-                          insert_string ("\n          ");
-                          insert_string ((char *) _("See "));
-                          insert_string ("``");
-                          insert_string (expansion (temp->section_name, 0));
-                          insert_string ("''");
-                        }
-                    }
-                  else
-                    insert_string (temp->id);
-
-                  insert_string (".\n");
-
-                  free (entry);
-                  free (title);
-                }
-            }
-          temp = temp->next;
-        }
-
-      if (html)
-        {
-          inhibit_paragraph_indentation = 1;
-          insert_string ("</ul>\n\n");
-        }
-      else
-        insert ('\n');
-
-      /* Retain the original order of float stack.  */
-      temp = new_start;
-      float_stack = (FLOAT_ELT *) reverse_list ((GENERIC_LIST *) temp);
-    }
-
-  free (float_type);
-  /* Re-increment the line number, because get_rest_of_line
-     left us looking at the next line after the command.  */
-  line_number++;
-}
-
-int
-current_float_used_title (void)
-{
-	return float_stack->title_used;
-}
-
-void current_float_set_title_used (void)
-{
-	float_stack->title_used = 1;
-}

Property changes on: head/contrib/texinfo/makeinfo/float.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/index.c
===================================================================
--- head/contrib/texinfo/makeinfo/index.c	(revision 276550)
+++ head/contrib/texinfo/makeinfo/index.c	(nonexistent)
@@ -1,964 +0,0 @@
-/* index.c -- indexing for Texinfo.
-   $Id: index.c,v 1.17 2004/11/30 02:03:23 karl Exp $
-
-   Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation,
-   Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "system.h"
-#include "files.h"
-#include "footnote.h"
-#include "html.h"
-#include "index.h"
-#include "lang.h"
-#include "macro.h"
-#include "sectioning.h"
-#include "toc.h"
-#include "xml.h"
-
-INDEX_ALIST **name_index_alist = NULL;
-
-/* An array of pointers.  Each one is for a different index.  The
-   "synindex" command changes which array slot is pointed to by a
-   given "index". */
-INDEX_ELT **the_indices = NULL;
-
-/* The number of defined indices. */
-int defined_indices = 0;
-
-/* This is the order of the index.  */
-int index_counter = 0;
-
-/* Stuff for defining commands on the fly. */
-COMMAND **user_command_array = NULL;
-int user_command_array_len = 0;
-
-/* How to compare index entries for sorting.  May be set to strcoll.  */
-int (*index_compare_fn) (const char *a, const char *b) = strcasecmp;
-
-/* Function to compare index entries for sorting.  (Calls
-   `index_compare_fn' above.)  */
-int index_element_compare (const void *element1, const void *element2);
-
-/* Find which element in the known list of indices has this name.
-   Returns -1 if NAME isn't found. */
-static int
-find_index_offset (char *name)
-{
-  int i;
-  for (i = 0; i < defined_indices; i++)
-    if (name_index_alist[i] && STREQ (name, name_index_alist[i]->name))
-      return i;
-  return -1;
-}
-
-/* Return a pointer to the entry of (name . index) for this name.
-   Return NULL if the index doesn't exist. */
-static INDEX_ALIST *
-find_index (char *name)
-{
-  int offset = find_index_offset (name);
-  if (offset > -1)
-    return name_index_alist[offset];
-  else
-    return NULL;
-}
-
-/* User-defined commands, which happens only from user-defined indexes.
-   Used to initialize the builtin indices, too.  */
-static void
-define_user_command (char *name, COMMAND_FUNCTION (*proc), int needs_braces_p)
-{
-  int slot = user_command_array_len;
-  user_command_array_len++;
-
-  if (!user_command_array)
-    user_command_array = xmalloc (1 * sizeof (COMMAND *));
-
-  user_command_array = xrealloc (user_command_array,
-                            (1 + user_command_array_len) * sizeof (COMMAND *));
-
-  user_command_array[slot] = xmalloc (sizeof (COMMAND));
-  user_command_array[slot]->name = xstrdup (name);
-  user_command_array[slot]->proc = proc;
-  user_command_array[slot]->argument_in_braces = needs_braces_p;
-}
-
-/* Please release me, let me go... */
-static void
-free_index (INDEX_ELT *index)
-{
-  INDEX_ELT *temp;
-
-  while ((temp = index))
-    {
-      free (temp->entry);
-      free (temp->entry_text);
-      /* Do not free the node, because we already freed the tag table,
-         which freed all the node names.  */
-      /* free (temp->node); */
-      index = index->next;
-      free (temp);
-    }
-}
-
-/* Flush an index by name.  This will delete the list of entries that
-   would be written by a @printindex command for this index. */
-static void
-undefindex (char *name)
-{
-  int i;
-  int which = find_index_offset (name);
-
-  /* The index might have already been freed if this was the target of
-     an @synindex.  */
-  if (which < 0 || !name_index_alist[which])
-    return;
-
-  i = name_index_alist[which]->read_index;
-
-  free_index (the_indices[i]);
-  the_indices[i] = NULL;
-
-  free (name_index_alist[which]->name);
-  free (name_index_alist[which]);
-  name_index_alist[which] = NULL;
-}
-
-/* Add the arguments to the current index command to the index NAME.  */
-static void
-index_add_arg (char *name)
-{
-  int which;
-  char *index_entry;
-  INDEX_ALIST *tem;
-
-  tem = find_index (name);
-
-  which = tem ? tem->write_index : -1;
-
-  if (macro_expansion_output_stream && !executing_string)
-    append_to_expansion_output (input_text_offset + 1);
-
-  get_rest_of_line (0, &index_entry);
-  ignore_blank_line ();
-
-  if (macro_expansion_output_stream && !executing_string)
-    {
-      char *index_line = xmalloc (strlen (index_entry) + 2);
-      sprintf (index_line, "%s\n", index_entry);
-      me_execute_string_keep_state (index_line, NULL);
-      free (index_line);
-    }
-
-  if (which < 0)
-    {
-      line_error (_("Unknown index `%s'"), name);
-      free (index_entry);
-    }
-  else
-    {
-      INDEX_ELT *new = xmalloc (sizeof (INDEX_ELT));
-
-      index_counter++;
-
-      /* Get output line number updated before doing anything.  */
-      if (!html && !xml)
-        flush_output ();
-
-      new->next = the_indices[which];
-      new->entry = NULL;
-      new->entry_text = index_entry;
-      /* Since footnotes are handled at the very end of the document,
-         node name in the non-split HTML outputs always show the last
-         node.  We artificially make it ``Footnotes''.  */
-      if (html && !splitting && already_outputting_pending_notes)
-        new->node = xstrdup (_("Footnotes"));
-      else
-        new->node = current_node ? current_node : xstrdup ("");
-      if (!html && !xml && no_headers)
-        {
-          new->section = current_sectioning_number ();
-          if (strlen (new->section) == 0)
-            new->section_name = current_sectioning_name ();
-          else
-            new->section_name = "";
-        }
-      else
-        {
-          new->section = NULL;
-          new->section_name = NULL;
-        }
-      new->code = tem->code;
-      new->defining_line = line_number - 1;
-      new->output_line = no_headers ? output_line_number : node_line_number;
-      /* We need to make a copy since input_filename may point to
-         something that goes away, for example, inside a macro.
-         (see the findexerr test).  */
-      new->defining_file = xstrdup (input_filename);
-
-      if (html && splitting)
-        {
-          if (current_output_filename && *current_output_filename)
-            new->output_file = filename_part (current_output_filename);
-          else
-            new->output_file = xstrdup ("");
-        }
-      else
-        new->output_file = NULL;        
-
-      new->entry_number = index_counter;
-      the_indices[which] = new;
-
-#if 0
-      /* The index breaks if there are colons in the entry.
-         -- This is true, but it's too painful to force changing index
-         entries to use `colon', and too confusing for users.  The real
-         fix is to change Info support to support arbitrary characters
-         in node names, and we're not ready to do that.  --karl,
-         19mar02.  */
-      if (strchr (new->entry_text, ':'))
-        warning (_("Info cannot handle `:' in index entry `%s'"),
-                 new->entry_text);
-#endif
-
-      if (html)
-        {
-          /* Anchor.  */
-          int removed_empty_elt = 0;
-
-          /* We must put the anchor outside the <dl> and <ul> blocks.  */
-          if (rollback_empty_tag ("dl"))
-            removed_empty_elt = 1;
-          else if (rollback_empty_tag ("ul"))
-            removed_empty_elt = 2;
-
-          add_word ("<a name=\"index-");
-          add_escaped_anchor_name (index_entry, 0);
-          add_word_args ("-%d\"></a>", index_counter);
-
-          if (removed_empty_elt == 1)
-            add_html_block_elt_args ("\n<dl>");
-          else if (removed_empty_elt == 2)
-            add_html_block_elt_args ("\n<ul>");
-        }
-    }
-
-  if (xml)
-    xml_insert_indexterm (index_entry, name);
-}
-
-/* The function which user defined index commands call. */
-static void
-gen_index (void)
-{
-  char *name = xstrdup (command);
-  if (strlen (name) >= strlen ("index"))
-    name[strlen (name) - strlen ("index")] = 0;
-  index_add_arg (name);
-  free (name);
-}
-
-/* Define an index known as NAME.  We assign the slot number.
-   If CODE is nonzero, make this a code index. */
-static void
-defindex (char *name, int code)
-{
-  int i, slot;
-
-  /* If it already exists, flush it. */
-  undefindex (name);
-
-  /* Try to find an empty slot. */
-  slot = -1;
-  for (i = 0; i < defined_indices; i++)
-    if (!name_index_alist[i])
-      {
-        slot = i;
-        break;
-      }
-
-  if (slot < 0)
-    { /* No such luck.  Make space for another index. */
-      slot = defined_indices;
-      defined_indices++;
-
-      name_index_alist = (INDEX_ALIST **)
-        xrealloc (name_index_alist, (1 + defined_indices)
-                                    * sizeof (INDEX_ALIST *));
-      the_indices = (INDEX_ELT **)
-        xrealloc (the_indices, (1 + defined_indices) * sizeof (INDEX_ELT *));
-    }
-
-  /* We have a slot.  Start assigning. */
-  name_index_alist[slot] = xmalloc (sizeof (INDEX_ALIST));
-  name_index_alist[slot]->name = xstrdup (name);
-  name_index_alist[slot]->read_index = slot;
-  name_index_alist[slot]->write_index = slot;
-  name_index_alist[slot]->code = code;
-
-  the_indices[slot] = NULL;
-}
-
-/* Define an index NAME, implicitly @code if CODE is nonzero.  */
-static void
-top_defindex (char *name, int code)
-{
-  char *temp;
-
-  temp = xmalloc (1 + strlen (name) + strlen ("index"));
-  sprintf (temp, "%sindex", name);
-  define_user_command (temp, gen_index, 0);
-  defindex (name, code);
-  free (temp);
-}
-
-/* Set up predefined indices.  */
-void
-init_indices (void)
-{
-  int i;
-
-  /* Create the default data structures. */
-
-  /* Initialize data space. */
-  if (!the_indices)
-    {
-      the_indices = xmalloc ((1 + defined_indices) * sizeof (INDEX_ELT *));
-      the_indices[defined_indices] = NULL;
-
-      name_index_alist = xmalloc ((1 + defined_indices)
-                                  * sizeof (INDEX_ALIST *));
-      name_index_alist[defined_indices] = NULL;
-    }
-
-  /* If there were existing indices, get rid of them now. */
-  for (i = 0; i < defined_indices; i++)
-    {
-      if (name_index_alist[i])
-        { /* Suppose we're called with two input files, and the first
-             does a @synindex pg cp.  Then, when we get here to start
-             the second file, the "pg" element won't get freed by
-             undefindex (because it's pointing to "cp").  So free it
-             here; otherwise, when we try to define the pg index again
-             just below, it will still point to cp.  */
-          undefindex (name_index_alist[i]->name);
-
-          /* undefindex sets all this to null in some cases.  */
-          if (name_index_alist[i])
-            {
-              free (name_index_alist[i]->name);
-              free (name_index_alist[i]);
-              name_index_alist[i] = NULL;
-            }
-        }
-    }
-
-  /* Add the default indices. */
-  top_defindex ("cp", 0);           /* cp is the only non-code index.  */
-  top_defindex ("fn", 1);
-  top_defindex ("ky", 1);
-  top_defindex ("pg", 1);
-  top_defindex ("tp", 1);
-  top_defindex ("vr", 1);
-}
-
-/* Given an index name, return the offset in the_indices of this index,
-   or -1 if there is no such index. */
-static int
-translate_index (char *name)
-{
-  INDEX_ALIST *which = find_index (name);
-
-  if (which)
-    return which->read_index;
-  else
-    return -1;
-}
-
-/* Return the index list which belongs to NAME. */
-INDEX_ELT *
-index_list (char *name)
-{
-  int which = translate_index (name);
-  if (which < 0)
-    return (INDEX_ELT *) -1;
-  else
-    return the_indices[which];
-}
-
-/* Define a new index command.  Arg is name of index. */
-static void
-gen_defindex (int code)
-{
-  char *name;
-  get_rest_of_line (0, &name);
-
-  if (find_index (name))
-    {
-      line_error (_("Index `%s' already exists"), name);
-    }
-  else
-    {
-      char *temp = xmalloc (strlen (name) + sizeof ("index"));
-      sprintf (temp, "%sindex", name);
-      define_user_command (temp, gen_index, 0);
-      defindex (name, code);
-      free (temp);
-    }
-
-  free (name);
-}
-
-void
-cm_defindex (void)
-{
-  gen_defindex (0);
-}
-
-void
-cm_defcodeindex (void)
-{
-  gen_defindex (1);
-}
-
-/* Expects 2 args, on the same line.  Both are index abbreviations.
-   Make the first one be a synonym for the second one, i.e. make the
-   first one have the same index as the second one. */
-void
-cm_synindex (void)
-{
-  int source, target;
-  char *abbrev1, *abbrev2;
-
-  skip_whitespace ();
-  get_until_in_line (0, " ", &abbrev1);
-  target = find_index_offset (abbrev1);
-  skip_whitespace ();
-  get_until_in_line (0, " ", &abbrev2);
-  source = find_index_offset (abbrev2);
-  if (source < 0 || target < 0)
-    {
-      line_error (_("Unknown index `%s' and/or `%s' in @synindex"),
-                  abbrev1, abbrev2);
-    }
-  else
-    {
-      if (xml && !docbook)
-        xml_synindex (abbrev1, abbrev2);
-      else
-        name_index_alist[target]->write_index
-          = name_index_alist[source]->write_index;
-    }
-
-  free (abbrev1);
-  free (abbrev2);
-}
-
-void
-cm_pindex (void)                    /* Pinhead index. */
-{
-  index_add_arg ("pg");
-}
-
-void
-cm_vindex (void)                    /* Variable index. */
-{
-  index_add_arg ("vr");
-}
-
-void
-cm_kindex (void)                    /* Key index. */
-{
-  index_add_arg ("ky");
-}
-
-void
-cm_cindex (void)                    /* Concept index. */
-{
-  index_add_arg ("cp");
-}
-
-void
-cm_findex (void)                    /* Function index. */
-{
-  index_add_arg ("fn");
-}
-
-void
-cm_tindex (void)                    /* Data Type index. */
-{
-  index_add_arg ("tp");
-}
-
-int
-index_element_compare (const void *element1, const void *element2)
-{
-  INDEX_ELT **elt1 = (INDEX_ELT **) element1;
-  INDEX_ELT **elt2 = (INDEX_ELT **) element2;
-
-  return index_compare_fn ((*elt1)->entry, (*elt2)->entry);
-}
-
-/* Force all index entries to be unique. */
-static void
-make_index_entries_unique (INDEX_ELT **array, int count)
-{
-  int i, j;
-  INDEX_ELT **copy;
-  int counter = 1;
-
-  copy = xmalloc ((1 + count) * sizeof (INDEX_ELT *));
-
-  for (i = 0, j = 0; i < count; i++)
-    {
-      if (i == (count - 1)
-          || array[i]->node != array[i + 1]->node
-          || !STREQ (array[i]->entry, array[i + 1]->entry))
-        copy[j++] = array[i];
-      else
-        {
-          free (array[i]->entry);
-          free (array[i]->entry_text);
-          free (array[i]);
-        }
-    }
-  copy[j] = NULL;
-
-  /* Now COPY contains only unique entries.  Duplicated entries in the
-     original array have been freed.  Replace the current array with
-     the copy, fixing the NEXT pointers. */
-  for (i = 0; copy[i]; i++)
-    {
-      copy[i]->next = copy[i + 1];
-
-      /* Fix entry names which are the same.  They point to different nodes,
-         so we make the entry name unique. */
-      if (copy[i+1]
-          && STREQ (copy[i]->entry, copy[i + 1]->entry)
-          && !html)
-        {
-          char *new_entry_name;
-
-          new_entry_name = xmalloc (10 + strlen (copy[i]->entry));
-          sprintf (new_entry_name, "%s <%d>", copy[i]->entry, counter);
-          free (copy[i]->entry);
-          copy[i]->entry = new_entry_name;
-          counter++;
-        }
-      else
-        counter = 1;
-
-      array[i] = copy[i];
-    }
-  array[i] = NULL;
-
-  /* Free the storage used only by COPY. */
-  free (copy);
-}
-
-
-/* Sort the index passed in INDEX, returning an array of pointers to
-   elements.  The array is terminated with a NULL pointer.  */
-
-static INDEX_ELT **
-sort_index (INDEX_ELT *index)
-{
-  INDEX_ELT **array;
-  INDEX_ELT *temp;
-  int count = 0;
-  int save_line_number = line_number;
-  char *save_input_filename = input_filename;
-  int save_html = html;
-
-  /* Pretend we are in non-HTML mode, for the purpose of getting the
-     expanded index entry that lacks any markup and other HTML escape
-     characters which could produce a wrong sort order.  */
-  /* fixme: html: this still causes some markup, such as non-ASCII
-     characters @AE{} etc., to sort incorrectly.  */
-  html = 0;
-
-  for (temp = index, count = 0; temp; temp = temp->next, count++)
-    ;
-  /* We have the length, now we can allocate an array. */
-  array = xmalloc ((count + 1) * sizeof (INDEX_ELT *));
-
-  for (temp = index, count = 0; temp; temp = temp->next, count++)
-    {
-      /* Allocate new memory for the return array, since parts of the
-         original INDEX get freed.  Otherwise, if the document calls
-         @printindex twice on the same index, with duplicate entries,
-         we'll have garbage the second time.  There are cleaner ways to
-         deal, but this will suffice for now.  */
-      array[count] = xmalloc (sizeof (INDEX_ELT));
-      *(array[count]) = *(temp);  /* struct assignment, hope it's ok */
-
-      /* Adjust next pointers to use the new memory.  */
-      if (count > 0)
-        array[count-1]->next = array[count];
-
-      /* Set line number and input filename to the source line for this
-         index entry, as this expansion finds any errors.  */
-      line_number = array[count]->defining_line;
-      input_filename = array[count]->defining_file;
-
-      /* If this particular entry should be printed as a "code" index,
-         then expand it as @code{entry}, i.e., as in fixed-width font.  */
-      array[count]->entry = expansion (temp->entry_text, array[count]->code);
-    }
-  array[count] = NULL;    /* terminate the array. */
-
-  line_number = save_line_number;
-  input_filename = save_input_filename;
-  html = save_html;
-
-#ifdef HAVE_STRCOLL
-  /* This is not perfect.  We should set (then restore) the locale to the
-     documentlanguage, so strcoll operates according to the document's
-     locale, not the user's.  For now, I'm just going to assume that
-     those few new documents which use @documentlanguage will be
-     processed in the appropriate locale.  In any case, don't use
-     strcoll in the C (aka POSIX) locale, that is the ASCII ordering.  */
-  if (language_code != en)
-    {
-      char *lang_env = getenv ("LANG");
-      if (lang_env && !STREQ (lang_env, "C") && !STREQ (lang_env, "POSIX"))
-        index_compare_fn = strcoll;
-    }
-#endif /* HAVE_STRCOLL */
-
-  /* Sort the array. */
-  qsort (array, count, sizeof (INDEX_ELT *), index_element_compare);
-
-  /* Remove duplicate entries.  */
-  make_index_entries_unique (array, count);
-
-  /* Replace the original index with the sorted one, in case the
-     document wants to print it again.  If the index wasn't empty.  */
-  if (index)
-    *index = **array;
-
-  return array;
-}
-
-static void
-insert_index_output_line_no (int line_number, int output_line_number_len)
-{
-  int last_column;
-  int str_size = output_line_number_len + strlen (_("(line )"))
-    + sizeof (NULL);
-  char *out_line_no_str = (char *) xmalloc (str_size + 1);
-
-  /* Do not translate ``(line NNN)'' below for !no_headers case (Info output),
-     because it's something like the ``* Menu'' strings.  For plaintext output
-     it should be translated though.  */
-  sprintf (out_line_no_str,
-      no_headers ? _("(line %*d)") : "(line %*d)",
-      output_line_number_len, line_number);
-
-  {
-    int i = output_paragraph_offset; 
-    while (0 < i && output_paragraph[i-1] != '\n')
-      i--;
-    last_column = output_paragraph_offset - i;
-  }
-
-  if (last_column + strlen (out_line_no_str) > fill_column)
-    {
-      insert ('\n');
-      last_column = 0;
-    }
-
-  while (last_column + strlen (out_line_no_str) < fill_column)
-    {
-      insert (' ');
-      last_column++;
-    }
-
-  insert_string (out_line_no_str);
-  insert ('\n');
-
-  free (out_line_no_str);
-}
-
-/* Nonzero means that we are in the middle of printing an index. */
-int printing_index = 0;
-
-/* Takes one arg, a short name of an index to print.
-   Outputs a menu of the sorted elements of the index. */
-void
-cm_printindex (void)
-{
-  char *index_name;
-  get_rest_of_line (0, &index_name);
-
-  /* get_rest_of_line increments the line number by one,
-     so to make warnings/errors point to the correct line,
-     we decrement the line_number again.  */
-  if (!handling_delayed_writes)
-    line_number--;
-
-  if (xml && !docbook)
-    {
-      xml_insert_element (PRINTINDEX, START);
-      insert_string (index_name);
-      xml_insert_element (PRINTINDEX, END);
-    }
-  else if (!handling_delayed_writes)
-    {
-      int command_len = sizeof ("@ ") + strlen (command) + strlen (index_name);
-      char *index_command = xmalloc (command_len + 1);
-
-      close_paragraph ();
-      if (docbook)
-        xml_begin_index ();
-
-      sprintf (index_command, "@%s %s", command, index_name);
-      register_delayed_write (index_command);
-      free (index_command);
-    }
-  else
-    {
-      int item;
-      INDEX_ELT *index;
-      INDEX_ELT *last_index = 0;
-      INDEX_ELT **array;
-      unsigned line_length;
-      char *line;
-      int saved_inhibit_paragraph_indentation = inhibit_paragraph_indentation;
-      int saved_filling_enabled = filling_enabled;
-      int saved_line_number = line_number;
-      char *saved_input_filename = input_filename;
-      unsigned output_line_number_len;
-
-      index = index_list (index_name);
-      if (index == (INDEX_ELT *)-1)
-        {
-          line_error (_("Unknown index `%s' in @printindex"), index_name);
-          free (index_name);
-          return;
-        }
-
-      /* Do this before sorting, so execute_string is in the good environment */
-      if (xml && docbook)
-        xml_begin_index ();
-
-      /* Do this before sorting, so execute_string in index_element_compare
-         will give the same results as when we actually print.  */
-      printing_index = 1;
-      filling_enabled = 0;
-      inhibit_paragraph_indentation = 1;
-      xml_sort_index = 1;
-      array = sort_index (index);
-      xml_sort_index = 0;
-      close_paragraph ();
-      if (html)
-        add_html_block_elt_args ("<ul class=\"index-%s\" compact>",
-                                 index_name);
-      else if (!no_headers && !docbook)
-        { /* Info.  Add magic cookie for info readers (to treat this
-             menu differently), and the usual start-of-menu.  */
-          add_char ('\0');
-          add_word ("\010[index");
-          add_char ('\0');
-          add_word ("\010]\n");
-          add_word ("* Menu:\n\n");
-        }
-
-      me_inhibit_expansion++;
-
-      /* This will probably be enough.  */
-      line_length = 100;
-      line = xmalloc (line_length);
-
-      {
-        char *max_output_line_number = (char *) xmalloc (25 * sizeof (char));
-
-        if (no_headers)
-          sprintf (max_output_line_number, "%d", output_line_number);
-        else
-          {
-            INDEX_ELT *tmp_entry = index;
-            unsigned tmp = 0;
-            for (tmp_entry = index; tmp_entry; tmp_entry = tmp_entry->next)
-              tmp = tmp_entry->output_line > tmp ? tmp_entry->output_line : tmp;
-            sprintf (max_output_line_number, "%d", tmp);
-          }
-
-        output_line_number_len = strlen (max_output_line_number);
-        free (max_output_line_number);
-      }
-
-      for (item = 0; (index = array[item]); item++)
-        {
-          /* A pathological document might have an index entry outside of any
-             node.  Don't crash; try using the section name instead.  */
-          char *index_node = index->node;
-
-          line_number = index->defining_line;
-          input_filename = index->defining_file;
-
-          if ((!index_node || !*index_node) && html)
-            index_node = toc_find_section_of_node (index_node);
-
-          if (!index_node || !*index_node)
-            {
-              line_error (_("Entry for index `%s' outside of any node"),
-                          index_name);
-              if (html || !no_headers)
-                index_node = (char *) _("(outside of any node)");
-            }
-
-          if (html)
-            {
-              /* For HTML, we need to expand and HTML-escape the
-                 original entry text, at the same time.  Consider
-                 @cindex J@"urgen.  We want J&uuml;urgen.  We can't
-                 expand and then escape since we'll end up with
-                 J&amp;uuml;rgen.  We can't escape and then expand
-                 because then `expansion' will see J@&quot;urgen, and
-                 @&quot;urgen is not a command.  */
-              char *html_entry =
-                maybe_escaped_expansion (index->entry_text, index->code, 1);
-
-              add_html_block_elt_args ("\n<li><a href=\"%s#index-",
-                  (splitting && index->output_file) ? index->output_file : "");
-              add_escaped_anchor_name (index->entry_text, 0);
-              add_word_args ("-%d\">%s</a>: ", index->entry_number,
-                  html_entry);
-              free (html_entry);
-
-              add_word ("<a href=\"");
-              if (index->node && *index->node)
-                {
-                  /* Ensure any non-macros in the node name are expanded.  */
-                  char *expanded_index;
-
-                  in_fixed_width_font++;
-                  expanded_index = expansion (index_node, 0);
-                  in_fixed_width_font--;
-                  add_anchor_name (expanded_index, 1);
-		  expanded_index = escape_string (expanded_index);
-                  add_word_args ("\">%s</a>", expanded_index);
-                  free (expanded_index);
-                }
-              else if (STREQ (index_node, _("(outside of any node)")))
-                {
-                  add_anchor_name (index_node, 1);
-                  add_word_args ("\">%s</a>", index_node);
-                }
-              else
-                /* If we use the section instead of the (missing) node, then
-                   index_node already includes all we need except the #.  */
-                add_word_args ("#%s</a>", index_node);
-
-              add_html_block_elt ("</li>");
-            }
-          else if (xml && docbook)
-            {
-              /* In the DocBook case, the expanded index entry is not
-                 good for us, since it was expanded for non-DocBook mode
-                 inside sort_index.  So we send the original entry text
-                 to be used with execute_string.  */
-              xml_insert_indexentry (index->entry_text, index_node);
-            }
-          else
-            {
-              unsigned new_length = strlen (index->entry);
-
-              if (new_length < 50) /* minimum length used below */
-                new_length = 50;
-              new_length += strlen (index_node) + 7; /* * : .\n\0 */
-
-              if (new_length > line_length)
-                {
-                  line_length = new_length;
-                  line = xrealloc (line, line_length);
-                }
-              /* Print the entry, nicely formatted.  We've already
-                 expanded any commands in index->entry, including any
-                 implicit @code.  Thus, can't call execute_string, since
-                 @@ has turned into @. */
-              if (!no_headers)
-                {
-                  sprintf (line, "* %-37s  ", index->entry);
-                  line[2 + strlen (index->entry)] = ':';
-                  insert_string (line);
-                  /* Make sure any non-macros in the node name are expanded.  */
-                  in_fixed_width_font++;
-                  execute_string ("%s. ", index_node);
-                  insert_index_output_line_no (index->output_line,
-                      output_line_number_len);
-                  in_fixed_width_font--;
-                }
-              else
-                {
-                  /* With --no-headers, the @node lines are gone, so
-                     there's little sense in referring to them in the
-                     index.  Instead, output the number or name of the
-                     section that corresponds to that node.  */
-                  sprintf (line, "%-*s ", number_sections ? 46 : 1, index->entry);
-                  line[strlen (index->entry)] = ':';
-                  insert_string (line);
-
-                  if (strlen (index->section) > 0)
-                    { /* We got your number.  */
-                      insert_string ((char *) _("See "));
-                      insert_string (index->section);
-                    }
-                  else
-                    { /* Sigh, index in an @unnumbered. :-\  */
-                      insert_string ("\n          ");
-                      insert_string ((char *) _("See "));
-                      insert_string ("``");
-                      insert_string (expansion (index->section_name, 0));
-                      insert_string ("''");
-                    }
-
-                  insert_string (". ");
-                  insert_index_output_line_no (index->output_line,
-                      output_line_number_len);
-                }
-            }
-
-          /* Prevent `output_paragraph' from growing to the size of the
-             whole index.  */
-          flush_output ();
-          last_index = index;
-        }
-
-      free (line);
-
-      me_inhibit_expansion--;
-      printing_index = 0;
-
-      close_single_paragraph ();
-      filling_enabled = saved_filling_enabled;
-      inhibit_paragraph_indentation = saved_inhibit_paragraph_indentation;
-      input_filename = saved_input_filename;
-      line_number = saved_line_number;
-
-      if (html)
-        add_html_block_elt ("</ul>");
-      else if (xml && docbook)
-        xml_end_index ();
-    }
-
-  free (index_name);
-  /* Re-increment the line number, because get_rest_of_line
-     left us looking at the next line after the command.  */
-  line_number++;
-}

Property changes on: head/contrib/texinfo/makeinfo/index.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/float.h
===================================================================
--- head/contrib/texinfo/makeinfo/float.h	(revision 276550)
+++ head/contrib/texinfo/makeinfo/float.h	(nonexistent)
@@ -1,56 +0,0 @@
-/* float.h -- declarations for the float environment.
-   $Id: float.h,v 1.5 2004/04/11 17:56:47 karl Exp $
-
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Alper Ersoy <dirt@gtk.org>.  */
-
-#ifndef FLOAT_H
-#define FLOAT_H
-
-typedef struct float_elt
-{
-  struct float_elt *next;
-  char *id;
-  char *type;
-  char *title;
-  char *shorttitle;
-  char *position;
-  char *number;
-  char *section;
-  char *section_name;
-  short title_used;
-  int defining_line;
-} FLOAT_ELT;
-
-extern void add_new_float (char *id, char *title, char *shorttitle,
-    char *type, char *position);
-extern void current_float_set_title_used (void);
-
-/* Information retrieval about the current float env.  */
-extern char *current_float_id (void);
-extern char *current_float_title (void);
-extern char *current_float_shorttitle (void);
-extern char *current_float_type (void);
-extern char *current_float_position (void);
-extern char *current_float_number (void);
-extern char *get_float_ref (char *id);
-
-extern int count_floats_of_type_in_chapter (char *type, char *chapter);
-extern int current_float_used_title (void);
-
-#endif /* not FLOAT_H */

Property changes on: head/contrib/texinfo/makeinfo/float.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/insertion.c
===================================================================
--- head/contrib/texinfo/makeinfo/insertion.c	(revision 276550)
+++ head/contrib/texinfo/makeinfo/insertion.c	(nonexistent)
@@ -1,2376 +0,0 @@
-/* insertion.c -- insertions for Texinfo.
-   $Id: insertion.c,v 1.55 2004/11/11 18:34:28 karl Exp $
-
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "system.h"
-#include "cmds.h"
-#include "defun.h"
-#include "float.h"
-#include "html.h"
-#include "insertion.h"
-#include "macro.h"
-#include "makeinfo.h"
-#include "multi.h"
-#include "xml.h"
-
-/* Must match list in insertion.h.  */
-static char *insertion_type_names[] =
-{ 
-  "cartouche", "copying", "defcv", "deffn", "defivar", "defmac",
-  "defmethod", "defop", "defopt", "defspec", "deftp", "deftypecv",
-  "deftypefn", "deftypefun", "deftypeivar", "deftypemethod",
-  "deftypeop", "deftypevar", "deftypevr", "defun", "defvar", "defvr",
-  "detailmenu", "direntry", "display", "documentdescription",
-  "enumerate", "example", "float", "flushleft", "flushright", "format",
-  "ftable", "group", "ifclear", "ifdocbook", "ifhtml", "ifinfo",
-  "ifnotdocbook", "ifnothtml", "ifnotinfo", "ifnotplaintext", "ifnottex",
-  "ifnotxml", "ifplaintext", "ifset", "iftex", "ifxml", "itemize", "lisp",
-  "menu", "multitable", "quotation", "rawdocbook", "rawhtml", "rawtex",
-  "rawxml", "smalldisplay", "smallexample", "smallformat", "smalllisp",
-  "verbatim", "table", "tex", "vtable", "titlepage", "bad_type"
-};
-
-/* All nested environments.  */
-INSERTION_ELT *insertion_stack = NULL;
-
-/* How deeply we're nested.  */
-int insertion_level = 0;
-
-/* Set to 1 if we've processed (commentary) text in a @menu that
-   wasn't part of a menu item.  */
-int had_menu_commentary;
-
-/* How to examine menu lines.  */
-int in_detailmenu = 0;
-
-/* Whether to examine menu lines.  */
-int in_menu = 0;
-
-/* Set to 1 if <p> is written in normal context. 
-   Used for menu and itemize. */
-int in_paragraph = 0;
-
-/* Since an insertion is already in the stack before we reach the switch
-   statement, we cannot use is_in_insertion_of_type (always returns true.) Also
-   making it return the level found, and comparing it with the current level is
-   no use, due to the order of stack.  */
-static int float_active = 0;
-
-/* Unsetting escape_html blindly causes text inside @html/etc. to be escaped if
-   used within a rmacro.  */
-static int raw_output_block = 0;
-
-/* Non-zero if a <dl> element has a <dt> element in it.  We use this when
-   deciding whether to insert a <br> or not.  */
-static int html_deflist_has_term = 0;
-
-void
-init_insertion_stack (void)
-{
-  insertion_stack = NULL;
-}
-
-/* Return the type of the current insertion. */
-static enum insertion_type
-current_insertion_type (void)
-{
-  return insertion_level ? insertion_stack->insertion : bad_type;
-}
-
-/* Return the string which is the function to wrap around items, or NULL
-   if we're not in an environment where @item is ok.  */
-static char *
-current_item_function (void)
-{
-  int done = 0;
-  INSERTION_ELT *elt = insertion_stack;
-
-  /* Skip down through the stack until we find an insertion with an
-     itemize function defined, i.e., skip conditionals, @cartouche, etc.  */
-  while (!done && elt)
-    {
-      switch (elt->insertion)
-        {
-        /* This list should match the one in cm_item.  */
-        case ifclear:
-        case ifhtml:
-        case ifinfo:
-        case ifnothtml:
-        case ifnotinfo:
-        case ifnotplaintext:
-        case ifnottex:
-	case ifnotxml:
-        case ifplaintext:
-        case ifset:
-        case iftex:
-	case ifxml:
-        case rawdocbook:
-        case rawhtml:
-        case rawxml:
-        case rawtex:
-        case tex:
-        case cartouche:
-          elt = elt->next;
-          break;
-      
-        default:
-          done = 1;
-        }
-    }
-
-  /* item_function usually gets assigned the empty string.  */
-  return done && (*elt->item_function) ? elt->item_function : NULL;
-}
-
-/* Parse the item marker function off the input.  If result is just "@",
-   change it to "@ ", since "@" by itself is not a command.  This makes
-   "@ ", "@\t", and "@\n" all the same, but their default meanings are
-   the same anyway, and let's not worry about supporting redefining them.  */
-static char *
-get_item_function (void)
-{
-  char *item_function;
-  char *item_loc;
-  
-  get_rest_of_line (0, &item_function);
-
-  /* If the document erroneously says
-       @itemize @bullet @item foobar
-     it's nicer to give an error up front than repeat `@bullet expected
-     braces' until we get a segmentation fault.  */
-  item_loc = strstr (item_function, "@item");
-  if (item_loc)
-    {
-      line_error (_("@item not allowed in argument to @itemize"));
-      *item_loc = 0;
-    }
-
-  /* If we hit the end of text in get_rest_of_line, backing up
-     input pointer will cause the last character of the last line
-     be pushed back onto the input, which is wrong.  */
-  if (input_text_offset < input_text_length)
-    backup_input_pointer ();
-
-  if (STREQ (item_function, "@"))
-    {
-      free (item_function);
-      item_function = xstrdup ("@ ");
-    }
-
-  return item_function;
-}
-
- /* Push the state of the current insertion on the stack. */
-static void
-push_insertion (enum insertion_type type, char *item_function)
-{
-  INSERTION_ELT *new = xmalloc (sizeof (INSERTION_ELT));
-
-  new->item_function = item_function;
-  new->filling_enabled = filling_enabled;
-  new->indented_fill = indented_fill;
-  new->insertion = type;
-  new->line_number = line_number;
-  new->filename = xstrdup (input_filename);
-  new->inhibited = inhibit_paragraph_indentation;
-  new->in_fixed_width_font = in_fixed_width_font;
-  new->next = insertion_stack;
-  insertion_stack = new;
-  insertion_level++;
-}
-
- /* Pop the value on top of the insertion stack into the
-    global variables. */
-void
-pop_insertion (void)
-{
-  INSERTION_ELT *temp = insertion_stack;
-
-  if (temp == NULL)
-    return;
-
-  in_fixed_width_font = temp->in_fixed_width_font;
-  inhibit_paragraph_indentation = temp->inhibited;
-  filling_enabled = temp->filling_enabled;
-  indented_fill = temp->indented_fill;
-  free_and_clear (&(temp->item_function));
-  free_and_clear (&(temp->filename));
-  insertion_stack = insertion_stack->next;
-  free (temp);
-  insertion_level--;
-}
-
- /* Return a pointer to the print name of this
-    enumerated type. */
-static const char *
-insertion_type_pname (enum insertion_type type)
-{
-  if ((int) type < (int) bad_type)
-  {
-    if (type == rawdocbook)
-      return "docbook";
-    else if (type == rawhtml)
-      return "html";
-    else if (type == rawxml)
-      return "xml";
-    else if (type == rawtex)
-      return "tex";
-    else
-      return insertion_type_names[(int) type];
-  }
-  else
-    return _("Broken-Type in insertion_type_pname");
-}
-
-/* Return the insertion_type associated with NAME.
-   If the type is not one of the known ones, return BAD_TYPE. */
-enum insertion_type
-find_type_from_name (char *name)
-{
-  int index = 0;
-  while (index < (int) bad_type)
-    {
-      if (STREQ (name, insertion_type_names[index]))
-        return (enum insertion_type) index;
-      if (index == rawdocbook && STREQ (name, "docbook"))
-        return rawdocbook;
-      if (index == rawhtml && STREQ (name, "html"))
-        return rawhtml;
-      if (index == rawxml && STREQ (name, "xml"))
-        return rawxml;
-      if (index == rawtex && STREQ (name, "tex"))
-        return rawtex;
-      index++;
-    }
-  return bad_type;
-}
-
-/* Simple function to query insertion_stack to see if we are inside a given
-   insertion type. */
-int
-is_in_insertion_of_type (int type)
-{
-  INSERTION_ELT *temp = insertion_stack;
-
-  if (!insertion_level)
-    return 0;
-
-  while (temp)
-    {
-      if (temp->insertion == type)
-        return 1;
-      temp = temp->next;
-    }
-
-  return 0;
-}
-
-
-static int
-defun_insertion (enum insertion_type type)
-{
-  return 0
-     || (type == defcv)
-     || (type == deffn)
-     || (type == defivar)
-     || (type == defmac)
-     || (type == defmethod)
-     || (type == defop)
-     || (type == defopt)
-     || (type == defspec)
-     || (type == deftp)
-     || (type == deftypecv)
-     || (type == deftypefn)
-     || (type == deftypefun)
-     || (type == deftypeivar)
-     || (type == deftypemethod)
-     || (type == deftypeop)
-     || (type == deftypevar)
-     || (type == deftypevr)
-     || (type == defun)
-     || (type == defvar)
-     || (type == defvr)
-  ;
-}
-
-/* MAX_NS is the maximum nesting level for enumerations.  I picked 100
-   which seemed reasonable.  This doesn't control the number of items,
-   just the number of nested lists. */
-#define max_stack_depth 100
-#define ENUM_DIGITS 1
-#define ENUM_ALPHA  2
-typedef struct {
-  int enumtype;
-  int enumval;
-} DIGIT_ALPHA;
-
-DIGIT_ALPHA enumstack[max_stack_depth];
-int enumstack_offset = 0;
-int current_enumval = 1;
-int current_enumtype = ENUM_DIGITS;
-char *enumeration_arg = NULL;
-
-static void
-start_enumerating (int at, int type)
-{
-  if ((enumstack_offset + 1) == max_stack_depth)
-    {
-      line_error (_("Enumeration stack overflow"));
-      return;
-    }
-  enumstack[enumstack_offset].enumtype = current_enumtype;
-  enumstack[enumstack_offset].enumval = current_enumval;
-  enumstack_offset++;
-  current_enumval = at;
-  current_enumtype = type;
-}
-
-static void
-stop_enumerating (void)
-{
-  --enumstack_offset;
-  if (enumstack_offset < 0)
-    enumstack_offset = 0;
-
-  current_enumval = enumstack[enumstack_offset].enumval;
-  current_enumtype = enumstack[enumstack_offset].enumtype;
-}
-
-/* Place a letter or digits into the output stream. */
-static void
-enumerate_item (void)
-{
-  char temp[10];
-
-  if (current_enumtype == ENUM_ALPHA)
-    {
-      if (current_enumval == ('z' + 1) || current_enumval == ('Z' + 1))
-        {
-          current_enumval = ((current_enumval - 1) == 'z' ? 'a' : 'A');
-          warning (_("lettering overflow, restarting at %c"), current_enumval);
-        }
-      sprintf (temp, "%c. ", current_enumval);
-    }
-  else
-    sprintf (temp, "%d. ", current_enumval);
-
-  indent (output_column += (current_indent - strlen (temp)));
-  add_word (temp);
-  current_enumval++;
-}
-
-static void
-enum_html (void)
-{
-  char type;
-  int start;
-
-  if (isdigit (*enumeration_arg))
-    {
-      type = '1';
-      start = atoi (enumeration_arg);
-    }
-  else if (isupper (*enumeration_arg))
-    {
-      type = 'A';
-      start = *enumeration_arg - 'A' + 1;
-    }
-  else
-    {
-      type = 'a';
-      start = *enumeration_arg - 'a' + 1;
-    }
-
-  add_html_block_elt_args ("<ol type=%c start=%d>\n", type, start);
-}
-
-/* Conditionally parse based on the current command name. */
-void
-command_name_condition (void)
-{
-  char *discarder = xmalloc (8 + strlen (command));
-
-  sprintf (discarder, "\n%cend %s", COMMAND_PREFIX, command);
-  discard_until (discarder);
-  discard_until ("\n");
-
-  free (discarder);
-}
-
-/* This is where the work for all the "insertion" style
-   commands is done.  A huge switch statement handles the
-   various setups, and generic code is on both sides. */
-void
-begin_insertion (enum insertion_type type)
-{
-  int no_discard = 0;
-
-  if (defun_insertion (type))
-    {
-      push_insertion (type, xstrdup (""));
-      no_discard++;
-    }
-  else
-    {
-      push_insertion (type, get_item_function ());
-    }
-
-  switch (type)
-    {
-    case menu:
-      if (!no_headers)
-        close_paragraph ();
-
-      filling_enabled = no_indent = 0;
-      inhibit_paragraph_indentation = 1;
-
-      if (html)
-        {
-          had_menu_commentary = 1;
-        }
-      else if (!no_headers && !xml)
-        add_word ("* Menu:\n");
-
-      if (xml)
-        xml_insert_element (MENU, START);
-      else
-        in_fixed_width_font++;
-
-      next_menu_item_number = 1;
-      in_menu++;
-      no_discard++;
-      break;
-
-    case detailmenu:
-      if (!in_menu)
-        {
-          if (!no_headers)
-            close_paragraph ();
-
-          filling_enabled = no_indent = 0;
-          inhibit_paragraph_indentation = 1;
-
-          no_discard++;
-        }
-
-      if (xml)
-        {
-          xml_insert_element (DETAILMENU, START);
-          skip_whitespace_and_newlines();
-        }
-      else
-        in_fixed_width_font++;
-
-      in_detailmenu++;
-      break;
-
-    case direntry:
-      close_single_paragraph ();
-      filling_enabled = no_indent = 0;
-      inhibit_paragraph_indentation = 1;
-      insert_string ("START-INFO-DIR-ENTRY\n");
-      break;
-
-    case documentdescription:
-      {
-        char *desc;
-        int start_of_end;
-        int save_fixed_width;
-
-        discard_until ("\n"); /* ignore the @documentdescription line */
-        start_of_end = get_until ("\n@end documentdescription", &desc);
-        save_fixed_width = in_fixed_width_font;
-
-        in_fixed_width_font = 0;
-        document_description = expansion (desc, 0);
-        free (desc);
-
-        in_fixed_width_font = save_fixed_width;
-        input_text_offset = start_of_end; /* go back to the @end to match */
-      }
-      break;
-
-    case copying:
-        /* Save the copying text away for @insertcopying,
-           typically used on the back of the @titlepage (for TeX) and
-           the Top node (for info/html).  */
-      if (input_text[input_text_offset] != '\n')
-        discard_until ("\n"); /* ignore remainder of @copying line */
-
-        input_text_offset = get_until ("\n@end copying", &copying_text);
-        canon_white (copying_text);
-
-      /* For info, output the copying text right away, so it will end up
-         in the header of the Info file, before the first node, and thus
-         get copied automatically to all the split files.  For xml, also
-         output it right away since xml output is never split.
-         For html, we output it specifically in html_output_head. 
-         For plain text, there's no way to hide it, so the author must
-          use @insertcopying in the desired location.  */
-      if (docbook)
-	{
-	  if (!xml_in_bookinfo)
-	    {
-	      xml_insert_element (BOOKINFO, START);
-	      xml_in_bookinfo = 1;
-	    }
-          xml_insert_element (LEGALNOTICE, START);
-	}
-
-      if (!html && !no_headers)
-        cm_insert_copying ();
-
-      if (docbook)
-        xml_insert_element (LEGALNOTICE, END);
-
-      break;
-
-    case quotation:
-      /* @quotation does filling (@display doesn't).  */
-      if (html)
-        add_html_block_elt ("<blockquote>\n");
-      else
-        {
-          /* with close_single_paragraph, we get no blank line above
-             within @copying.  */
-          close_paragraph ();
-          last_char_was_newline = no_indent = 0;
-          indented_fill = filling_enabled = 1;
-          inhibit_paragraph_indentation = 1;
-        }
-      current_indent += default_indentation_increment;
-      if (xml)
-        xml_insert_quotation (insertion_stack->item_function, START);
-      else if (strlen(insertion_stack->item_function))
-        execute_string ("@b{%s:} ", insertion_stack->item_function);
-      break;
-
-    case example:
-    case smallexample:
-    case lisp:
-    case smalllisp:
-      in_fixed_width_font++;
-      /* fall through */
-
-      /* Like @example but no fixed width font. */
-    case display:
-    case smalldisplay:
-      /* Like @display but without indentation. */
-    case smallformat:
-    case format:
-      close_single_paragraph ();
-      inhibit_paragraph_indentation = 1;
-      filling_enabled = 0;
-      last_char_was_newline = 0;
-
-      if (html)
-        /* Kludge alert: if <pre> is followed by a newline, IE3,
-           mozilla, maybe others render an extra blank line before the
-           pre-formatted block.  So don't output a newline.  */
-        add_html_block_elt_args ("<pre class=\"%s\">", command);
-
-      if (type != format && type != smallformat)
-        {
-          current_indent += example_indentation_increment;
-          if (html)
-            {
-              /* Since we didn't put \n after <pre>, we need to insert
-                 the indentation by hand.  */
-              int i;
-              for (i = current_indent; i > 0; i--)
-                add_char (' ');
-            }
-        }
-      break;
-
-    case multitable:
-      do_multitable ();
-      break;
-
-    case table:
-    case ftable:
-    case vtable:
-    case itemize:
-      close_single_paragraph ();
-      current_indent += default_indentation_increment;
-      filling_enabled = indented_fill = 1;
-#if defined (INDENT_PARAGRAPHS_IN_TABLE)
-      inhibit_paragraph_indentation = 0;
-#else
-      inhibit_paragraph_indentation = 1;
-#endif /* !INDENT_PARAGRAPHS_IN_TABLE */
-
-      /* Make things work for losers who forget the itemize syntax. */
-      if (type == itemize)
-        {
-          if (!(*insertion_stack->item_function))
-            {
-              free (insertion_stack->item_function);
-              insertion_stack->item_function = xstrdup ("@bullet");
-            }
-        }
-
-      if (!*insertion_stack->item_function)
-        {
-          line_error (_("%s requires an argument: the formatter for %citem"),
-                      insertion_type_pname (type), COMMAND_PREFIX);
-        }
-
-      if (html)
-        {
-          if (type == itemize)
-            {
-              add_html_block_elt ("<ul>\n");
-              in_paragraph = 0;
-            }
-          else
-            { /* We are just starting, so this <dl>
-                 has no <dt> children yet.  */
-              html_deflist_has_term = 0;
-              add_html_block_elt ("<dl>\n");
-            }
-        }
-      if (xml)
-        xml_begin_table (type, insertion_stack->item_function);
-
-      while (input_text[input_text_offset] == '\n'
-          && input_text[input_text_offset+1] == '\n')
-        {
-          line_number++;
-          input_text_offset++;
-        }
-
-      break;
-
-    case enumerate:
-      close_single_paragraph ();
-      no_indent = 0;
-#if defined (INDENT_PARAGRAPHS_IN_TABLE)
-      inhibit_paragraph_indentation = 0;
-#else
-      inhibit_paragraph_indentation = 1;
-#endif /* !INDENT_PARAGRAPHS_IN_TABLE */
-
-      current_indent += default_indentation_increment;
-      filling_enabled = indented_fill = 1;
-
-      if (html)
-        {
-          enum_html ();
-          in_paragraph = 0;
-        }
-
-      if (xml)
-        xml_begin_enumerate (enumeration_arg);
-      
-      if (isdigit (*enumeration_arg))
-        start_enumerating (atoi (enumeration_arg), ENUM_DIGITS);
-      else
-        start_enumerating (*enumeration_arg, ENUM_ALPHA);
-      break;
-
-      /* @group produces no output in info. */
-    case group:
-      /* Only close the paragraph if we are not inside of an
-         @example-like environment. */
-      if (xml)
-        xml_insert_element (GROUP, START);
-      else if (!insertion_stack->next
-          || (insertion_stack->next->insertion != display
-              && insertion_stack->next->insertion != smalldisplay
-              && insertion_stack->next->insertion != example
-              && insertion_stack->next->insertion != smallexample
-              && insertion_stack->next->insertion != lisp
-              && insertion_stack->next->insertion != smalllisp
-              && insertion_stack->next->insertion != format
-              && insertion_stack->next->insertion != smallformat
-              && insertion_stack->next->insertion != flushleft
-              && insertion_stack->next->insertion != flushright))
-        close_single_paragraph ();
-      break;
-
-    case cartouche:
-      if (html)
-	add_html_block_elt ("<p><table class=\"cartouche\" summary=\"cartouche\" border=\"1\"><tr><td>\n");
-      if (in_menu)
-        no_discard++;
-      break;
-
-    case floatenv:
-      /* Cannot nest floats, so complain.  */
-      if (float_active)
-        {
-          line_error (_("%cfloat environments cannot be nested"), COMMAND_PREFIX);
-          pop_insertion ();
-          break;
-        }
-
-      float_active++;
-
-      { /* Collect data about this float.  */
-        /* Example: @float [FLOATTYPE][,XREFLABEL][,POSITION] */
-        char floattype[200] = "";
-        char xreflabel[200] = "";
-        char position[200]  = "";
-        char *text;
-        char *caption;
-        char *shortcaption;
-        int start_of_end;
-        int save_line_number = line_number;
-        int save_input_text_offset = input_text_offset;
-        int i;
-
-        if (strlen (insertion_stack->item_function) > 0)
-          {
-            int i = 0, t = 0, c = 0;
-            while (insertion_stack->item_function[i])
-              {
-                if (insertion_stack->item_function[i] == ',')
-                  {
-                    switch (t)
-                      {
-                      case 0:
-                        floattype[c] = '\0';
-                        break;
-                      case 1:
-                        xreflabel[c] = '\0';
-                        break;
-                      case 2:
-                        position[c] = '\0';
-                        break;
-                      }
-                    c = 0;
-                    t++;
-                    i++;
-                    continue;
-                  }
-
-                switch (t)
-                  {
-                  case 0:
-                    floattype[c] = insertion_stack->item_function[i];
-                    break;
-                  case 1:
-                    xreflabel[c] = insertion_stack->item_function[i];
-                    break;
-                  case 2:
-                    position[c] = insertion_stack->item_function[i];
-                    break;
-                  }
-                c++;
-                i++;
-              }
-          }
-
-        skip_whitespace_and_newlines ();
-
-        start_of_end = get_until ("\n@end float", &text);
-
-        /* Get also the @caption.  */
-        i = search_forward_until_pos ("\n@caption{",
-            save_input_text_offset, start_of_end);
-        if (i > -1)
-          {
-            input_text_offset = i + sizeof ("\n@caption{") - 1;
-            get_until_in_braces ("\n@end float", &caption);
-            input_text_offset = save_input_text_offset;
-          }
-        else
-          caption = "";
-
-        /* ... and the @shortcaption.  */
-        i = search_forward_until_pos ("\n@shortcaption{",
-            save_input_text_offset, start_of_end);
-        if (i > -1)
-          {
-            input_text_offset = i + sizeof ("\n@shortcaption{") - 1;
-            get_until_in_braces ("\n@end float", &shortcaption);
-            input_text_offset = save_input_text_offset;
-          }
-        else
-          shortcaption = "";
-
-        canon_white (xreflabel);
-        canon_white (floattype);
-        canon_white (position);
-        canon_white (caption);
-        canon_white (shortcaption);
-
-        add_new_float (xstrdup (xreflabel),
-            xstrdup (caption), xstrdup (shortcaption),
-            xstrdup (floattype), xstrdup (position));
-
-        /* Move to the start of the @float so the contents get processed as
-           usual.  */
-        input_text_offset = save_input_text_offset;
-        line_number = save_line_number;
-      }
-
-      if (html)
-        add_html_block_elt ("<div class=\"float\">\n");
-      else if (docbook)
-        xml_insert_element (FLOAT, START);
-      else if (xml)
-        {
-          xml_insert_element_with_attribute (FLOAT, START,
-              "name=\"%s\"", current_float_id ());
-
-          xml_insert_element (FLOATTYPE, START);
-          execute_string ("%s", current_float_type ());
-          xml_insert_element (FLOATTYPE, END);
-
-          xml_insert_element (FLOATPOS, START);
-          execute_string ("%s", current_float_position ());
-          xml_insert_element (FLOATPOS, END);
-        }
-      else
-        { /* Info */
-          close_single_paragraph ();
-          inhibit_paragraph_indentation = 1;
-        }
-
-      /* Anchor now.  Note that XML documents get their
-         anchors with <float name="anchor"> tag.  */
-      if ((!xml || docbook) && strlen (current_float_id ()) > 0)
-        execute_string ("@anchor{%s}", current_float_id ());
-
-      break;
-
-      /* Insertions that are no-ops in info, but do something in TeX. */
-    case ifclear:
-    case ifdocbook:
-    case ifhtml:
-    case ifinfo:
-    case ifnotdocbook:
-    case ifnothtml:
-    case ifnotinfo:
-    case ifnotplaintext:
-    case ifnottex:
-    case ifnotxml:
-    case ifplaintext:
-    case ifset:
-    case iftex:
-    case ifxml:
-    case rawtex:
-      if (in_menu)
-        no_discard++;
-      break;
-
-    case rawdocbook:
-    case rawhtml:
-    case rawxml:
-      raw_output_block++;
-
-      if (raw_output_block > 0)
-        {
-          xml_no_para = 1;
-          escape_html = 0;
-          xml_keep_space++;
-        }
-
-      {
-        /* Some deuglification for improved readability.  */
-        extern int xml_in_para;
-        if (xml && !xml_in_para && xml_indentation_increment > 0)
-          add_char ('\n');
-      }
-
-      break;
-
-    case defcv:
-    case deffn:
-    case defivar:
-    case defmac:
-    case defmethod:
-    case defop:
-    case defopt:
-    case defspec:
-    case deftp:
-    case deftypecv:
-    case deftypefn:
-    case deftypefun:
-    case deftypeivar:
-    case deftypemethod:
-    case deftypeop:
-    case deftypevar:
-    case deftypevr:
-    case defun:
-    case defvar:
-    case defvr:
-      inhibit_paragraph_indentation = 1;
-      filling_enabled = indented_fill = 1;
-      current_indent += default_indentation_increment;
-      no_indent = 0;
-      if (xml)
-	xml_begin_definition ();
-      break;
-
-    case flushleft:
-      close_single_paragraph ();
-      inhibit_paragraph_indentation = 1;
-      filling_enabled = indented_fill = no_indent = 0;
-      if (html)
-        add_html_block_elt ("<div align=\"left\">");
-      break;
-
-    case flushright:
-      close_single_paragraph ();
-      filling_enabled = indented_fill = no_indent = 0;
-      inhibit_paragraph_indentation = 1;
-      force_flush_right++;
-      if (html)
-        add_html_block_elt ("<div align=\"right\">");
-      break;
-
-    case titlepage:
-      xml_insert_element (TITLEPAGE, START);
-      break;
-
-    default:
-      line_error ("begin_insertion internal error: type=%d", type);
-    }
-
-  if (!no_discard)
-    discard_until ("\n");
-}
-
-/* Try to end the insertion with the specified TYPE.  With a value of
-   `bad_type', TYPE gets translated to match the value currently on top
-   of the stack.  Otherwise, if TYPE doesn't match the top of the
-   insertion stack, give error. */
-static void
-end_insertion (int type)
-{
-  int temp_type;
-
-  if (!insertion_level)
-    return;
-
-  temp_type = current_insertion_type ();
-
-  if (type == bad_type)
-    type = temp_type;
-
-  if (type != temp_type)
-    {
-      line_error
-        (_("`@end' expected `%s', but saw `%s'"),
-         insertion_type_pname (temp_type), insertion_type_pname (type));
-      return;
-    }
-
-  pop_insertion ();
-
-  if (xml)
-    {
-      switch (type)
-        {
-        case ifinfo:
-        case documentdescription:       
-          break;
-        case quotation:
-          xml_insert_quotation ("", END);
-          break;
-        case example:
-          xml_insert_element (EXAMPLE, END);
-          if (docbook && current_insertion_type () == floatenv)
-            xml_insert_element (FLOATEXAMPLE, END);
-          break;
-        case smallexample:
-          xml_insert_element (SMALLEXAMPLE, END);
-          if (docbook && current_insertion_type () == floatenv)
-            xml_insert_element (FLOATEXAMPLE, END);
-          break;
-        case lisp:
-          xml_insert_element (LISP, END);
-          if (docbook && current_insertion_type () == floatenv)
-            xml_insert_element (FLOATEXAMPLE, END);
-          break;
-        case smalllisp:
-          xml_insert_element (SMALLLISP, END);
-          if (docbook && current_insertion_type () == floatenv)
-            xml_insert_element (FLOATEXAMPLE, END);
-          break;
-        case cartouche:
-          xml_insert_element (CARTOUCHE, END);
-          break;
-        case format:
-	  if (docbook && xml_in_bookinfo && xml_in_abstract)
-	    {
-	      xml_insert_element (ABSTRACT, END);
-	      xml_in_abstract = 0;
-	    }
-	  else
-	    xml_insert_element (FORMAT, END);
-          break;
-        case smallformat:
-          xml_insert_element (SMALLFORMAT, END);
-          break;
-        case display:
-          xml_insert_element (DISPLAY, END);
-          break;
-        case smalldisplay:
-          xml_insert_element (SMALLDISPLAY, END);
-          break;
-        case table:
-        case ftable:
-        case vtable:      
-        case itemize:
-          xml_end_table (type);
-          break;
-        case enumerate:
-          xml_end_enumerate ();
-          break;
-        case group:
-          xml_insert_element (GROUP, END);
-          break;
-	case titlepage:
-	  xml_insert_element (TITLEPAGE, END);
-	  break;
-        }
-    }
-  switch (type)
-    {
-      /* Insertions which have no effect on paragraph formatting. */
-    case copying:
-      line_number--;
-      break;
-
-    case ifclear:
-    case ifdocbook:
-    case ifinfo:
-    case ifhtml:
-    case ifnotdocbook:
-    case ifnothtml:
-    case ifnotinfo:
-    case ifnotplaintext:
-    case ifnottex:
-    case ifnotxml:
-    case ifplaintext:
-    case ifset:
-    case iftex:
-    case ifxml:
-    case rawtex:
-    case titlepage:
-      break;
-
-    case rawdocbook:
-    case rawhtml:
-    case rawxml:
-      raw_output_block--;
-
-      if (raw_output_block <= 0)
-        {
-          xml_no_para = 0;
-          escape_html = 1;
-          xml_keep_space--;
-        }
-
-      if ((xml || html) && output_paragraph[output_paragraph_offset-1] == '\n')
-        output_paragraph_offset--;
-      break;
-
-    case detailmenu:
-      if (xml)
-        xml_insert_element (DETAILMENU, END);
-
-      in_detailmenu--;          /* No longer hacking menus. */
-      if (!in_menu)
-        {
-          if (!no_headers)
-            close_insertion_paragraph ();
-        }
-      break;
-
-    case direntry:              /* Eaten if html. */
-      insert_string ("END-INFO-DIR-ENTRY\n\n");
-      close_insertion_paragraph ();
-      break;
-
-    case documentdescription:
-      if (xml)
-        insert_string (document_description);
-        xml_insert_element (DOCUMENTDESCRIPTION, END);
-      break;
-      
-    case menu:
-      in_menu--;                /* No longer hacking menus. */
-      if (html && !no_headers)
-        add_html_block_elt ("</ul>\n");
-      else if (!no_headers && !xml)
-        close_insertion_paragraph ();
-      break;
-
-    case multitable:
-      end_multitable ();
-      break;
-
-    case enumerate:
-      stop_enumerating ();
-      close_insertion_paragraph ();
-      current_indent -= default_indentation_increment;
-      if (html)
-        add_html_block_elt ("</ol>\n");
-      break;
-
-    case flushleft:
-      if (html)
-        add_html_block_elt ("</div>\n");
-      close_insertion_paragraph ();
-      break;
-
-    case cartouche:
-      if (html)
-	add_html_block_elt ("</td></tr></table>\n");
-      close_insertion_paragraph ();
-      break;
-
-    case group:
-      if (!xml || docbook)
-        close_insertion_paragraph ();
-      break;
-
-    case floatenv:
-      if (xml)
-        xml_insert_element (FLOAT, END);
-      else
-        {
-          if (html)
-            add_html_block_elt ("<p><strong class=\"float-caption\">");
-          else
-            close_paragraph ();
-
-          no_indent = 1;
-
-          /* Legend:
-               1) @float Foo,lbl & no caption:    Foo 1.1
-               2) @float Foo & no caption:        Foo
-               3) @float ,lbl & no caption:       1.1
-               4) @float & no caption:                    */
-
-          if (!xml && !html)
-            indent (current_indent);
-
-          if (strlen (current_float_type ()))
-            execute_string ("%s", current_float_type ());
-
-          if (strlen (current_float_id ()) > 0)
-            {
-              if (strlen (current_float_type ()) > 0)
-                add_char (' ');
-
-              add_word (current_float_number ());
-            }
-
-          if (strlen (current_float_title ()) > 0)
-            {
-              if (strlen (current_float_type ()) > 0
-                  || strlen (current_float_id ()) > 0)
-                insert_string (": ");
-
-              execute_string ("%s", current_float_title ());
-            }
-
-          /* Indent the following paragraph. */
-          inhibit_paragraph_indentation = 0;
-
-          if (html)
-            add_word ("</strong></p></div>\n");
-          else
-            close_paragraph ();
-        }
-      float_active--;
-      break;
-
-    case format:
-    case smallformat:
-    case display:
-    case smalldisplay:
-    case example:
-    case smallexample:
-    case lisp:
-    case smalllisp:
-    case quotation:
-      /* @format and @smallformat are the only fixed_width insertion
-         without a change in indentation. */
-      if (type != format && type != smallformat && type != quotation)
-        current_indent -= example_indentation_increment;
-      else if (type == quotation)
-        current_indent -= default_indentation_increment;
-
-      if (html)
-        { /* The complex code in close_paragraph that kills whitespace
-             does not function here, since we've inserted non-whitespace
-             (the </whatever>) before it.  The indentation already got
-             inserted at the end of the last example line, so we have to
-             delete it, or browsers wind up showing an extra blank line.  */
-          kill_self_indent (default_indentation_increment);
-          add_html_block_elt (type == quotation
-              ? "</blockquote>\n" : "</pre>\n");
-        }
-
-      /* The ending of one of these insertions always marks the
-         start of a new paragraph, except for the XML output. */
-      if (!xml || docbook)
-        close_insertion_paragraph ();
-
-      /* </pre> closes paragraph without messing with </p>.  */
-      if (html && type != quotation)
-          paragraph_is_open = 0;
-      break;
-
-    case table:
-    case ftable:
-    case vtable:
-      current_indent -= default_indentation_increment;
-      if (html)
-        add_html_block_elt ("</dl>\n");
-      close_insertion_paragraph ();
-      break;
-
-    case itemize:
-      current_indent -= default_indentation_increment;
-      if (html)
-        add_html_block_elt ("</ul>\n");
-      close_insertion_paragraph ();
-      break;
-
-    case flushright:
-      force_flush_right--;
-      if (html)
-        add_html_block_elt ("</div>\n");
-      close_insertion_paragraph ();
-      break;
-
-    /* Handle the @defun insertions with this default clause. */
-    default:
-      {
-        int base_type;
-
-        if (type < defcv || type > defvr)
-          line_error ("end_insertion internal error: type=%d", type);
-  
-        base_type = get_base_type (type);
-        switch (base_type)
-          {
-          case deffn:
-          case defvr:
-          case deftp:
-          case deftypecv:
-          case deftypefn:
-          case deftypevr:
-          case defcv:
-          case defop:
-          case deftypemethod:
-          case deftypeop:
-          case deftypeivar:
-            if (html)
-              {
-                if (paragraph_is_open)
-                  add_html_block_elt ("</p>");
-                /* close the div and blockquote which has been opened in defun.c */
-                if (!rollback_empty_tag ("blockquote"))
-                  add_html_block_elt ("</blockquote>");
-                add_html_block_elt ("</div>\n");
-              }
-	    if (xml)
-	      xml_end_definition ();
-            break;
-          } /* switch (base_type)... */
-  
-        current_indent -= default_indentation_increment;
-        close_insertion_paragraph ();
-      }
-      break;
-      
-    }
-
-  if (current_indent < 0)
-    line_error ("end_insertion internal error: current indent=%d",
-                current_indent);
-}
-
-/* Insertions cannot cross certain boundaries, such as node beginnings.  In
-   code that creates such boundaries, you should call `discard_insertions'
-   before doing anything else.  It prints the errors for you, and cleans up
-   the insertion stack.
-
-   With nonzero SPECIALS_OK argument, allows unmatched
-   @if... conditionals, otherwise not.  This is because conditionals can
-   cross node boundaries.  Always happens with the @top node, for example.  */
-void
-discard_insertions (int specials_ok)
-{
-  int real_line_number = line_number;
-  while (insertion_stack)
-    {
-      if (specials_ok
-          && ((ifclear <= insertion_stack->insertion
-               && insertion_stack->insertion <= iftex)
-              || insertion_stack->insertion == rawdocbook
-              || insertion_stack->insertion == rawhtml
-              || insertion_stack->insertion == rawxml
-              || insertion_stack->insertion == rawtex))
-        break;
-      else
-        {
-          const char *offender = insertion_type_pname (insertion_stack->insertion);
-
-          file_line_error (insertion_stack->filename,
-                           insertion_stack->line_number,
-                           _("No matching `%cend %s'"), COMMAND_PREFIX,
-                           offender);
-          pop_insertion ();
-        }
-    }
-  line_number = real_line_number;
-}
-
-/* Insertion (environment) commands.  */
-
-void
-cm_quotation (void)
-{
-  /* We start the blockquote element in the insertion.  */
-  begin_insertion (quotation);
-}
-
-void
-cm_example (void)
-{
-  if (docbook && current_insertion_type () == floatenv)
-    xml_begin_docbook_float (FLOATEXAMPLE);
-
-  if (xml)
-    {
-      /* Rollback previous newlines.  These occur between
-         </para> and <example>.  */
-      if (output_paragraph[output_paragraph_offset-1] == '\n')
-        output_paragraph_offset--;
-
-      xml_insert_element (EXAMPLE, START);
-
-      /* Make sure example text is starting on a new line
-         for improved readability.  */
-      if (docbook)
-        add_char ('\n');
-    }
-
-  begin_insertion (example);
-}
-
-void
-cm_smallexample (void)
-{
-  if (docbook && current_insertion_type () == floatenv)
-    xml_begin_docbook_float (FLOATEXAMPLE);
-
-  if (xml)
-    {
-      /* See cm_example comments about newlines.  */
-      if (output_paragraph[output_paragraph_offset-1] == '\n')
-        output_paragraph_offset--;
-      xml_insert_element (SMALLEXAMPLE, START);
-      if (docbook)
-        add_char ('\n');
-    }
-
-  begin_insertion (smallexample);
-}
-
-void
-cm_lisp (void)
-{
-  if (docbook && current_insertion_type () == floatenv)
-    xml_begin_docbook_float (FLOATEXAMPLE);
-
-  if (xml)
-    {
-      /* See cm_example comments about newlines.  */
-      if (output_paragraph[output_paragraph_offset-1] == '\n')
-        output_paragraph_offset--;
-      xml_insert_element (LISP, START);
-      if (docbook)
-        add_char ('\n');
-    }
-
-  begin_insertion (lisp);
-}
-
-void
-cm_smalllisp (void)
-{
-  if (docbook && current_insertion_type () == floatenv)
-    xml_begin_docbook_float (FLOATEXAMPLE);
-
-  if (xml)
-    {
-      /* See cm_example comments about newlines.  */
-      if (output_paragraph[output_paragraph_offset-1] == '\n')
-        output_paragraph_offset--;
-      xml_insert_element (SMALLLISP, START);
-      if (docbook)
-        add_char ('\n');
-    }
-
-  begin_insertion (smalllisp);
-}
-
-void
-cm_cartouche (void)
-{
-  if (docbook && current_insertion_type () == floatenv)
-    xml_begin_docbook_float (CARTOUCHE);
-
-  if (xml)
-    xml_insert_element (CARTOUCHE, START);
-  begin_insertion (cartouche);
-}
-
-void
-cm_copying (void)
-{
-  begin_insertion (copying);
-}
-
-/* Not an insertion, despite the name, but it goes with cm_copying.  */
-void
-cm_insert_copying (void)
-{
-  if (!copying_text)
-    {
-      warning ("@copying not used before %s", command);
-      return;
-    }
-
-  execute_string ("%s", copying_text);
-
-  if (!xml && !html)
-    {
-      add_word ("\n\n");
-      /* Update output_position so that the node positions in the tag
-         tables will take account of the copying text.  */
-      flush_output ();
-    }
-}
-
-void
-cm_format (void)
-{
-  if (xml)
-    {
-      if (docbook && xml_in_bookinfo)
-	{
-	  xml_insert_element (ABSTRACT, START);
-	  xml_in_abstract = 1;
-	}
-      else
-        {
-          /* See cm_example comments about newlines.  */
-          if (output_paragraph[output_paragraph_offset-1] == '\n')
-            output_paragraph_offset--;
-          xml_insert_element (FORMAT, START);
-          if (docbook)
-            add_char ('\n');
-        }
-    }
-  begin_insertion (format);
-}
-
-void
-cm_smallformat (void)
-{
-  if (xml)
-    {
-      /* See cm_example comments about newlines.  */
-      if (output_paragraph[output_paragraph_offset-1] == '\n')
-        output_paragraph_offset--;
-      xml_insert_element (SMALLFORMAT, START);
-      if (docbook)
-        add_char ('\n');
-    }
-
-  begin_insertion (smallformat);
-}
-
-void
-cm_display (void)
-{
-  if (xml)
-    {
-      /* See cm_example comments about newlines.  */
-      if (output_paragraph[output_paragraph_offset-1] == '\n')
-        output_paragraph_offset--;
-      xml_insert_element (DISPLAY, START);
-      if (docbook)
-        add_char ('\n');
-    }
-
-  begin_insertion (display);
-}
-
-void
-cm_smalldisplay (void)
-{
-  if (xml)
-    {
-      /* See cm_example comments about newlines.  */
-      if (output_paragraph[output_paragraph_offset-1] == '\n')
-        output_paragraph_offset--;
-      xml_insert_element (SMALLDISPLAY, START);
-      if (docbook)
-        add_char ('\n');
-    }
-
-  begin_insertion (smalldisplay);
-}
-
-void
-cm_direntry (void)
-{
-  if (html || xml || no_headers)
-    command_name_condition ();
-  else
-    begin_insertion (direntry);
-}
-
-void
-cm_documentdescription (void)
-{
-  if (html)
-    begin_insertion (documentdescription);
-
-  else if (xml)
-    {
-      xml_insert_element (DOCUMENTDESCRIPTION, START);
-      begin_insertion (documentdescription);
-    }
-
-  else
-    command_name_condition ();
-}
-
-
-void
-cm_itemize (void)
-{
-  begin_insertion (itemize);
-}
-
-/* Start an enumeration insertion of type TYPE.  If the user supplied
-   no argument on the line, then use DEFAULT_STRING as the initial string. */
-static void
-do_enumeration (int type, char *default_string)
-{
-  get_until_in_line (0, ".", &enumeration_arg);
-  canon_white (enumeration_arg);
-
-  if (!*enumeration_arg)
-    {
-      free (enumeration_arg);
-      enumeration_arg = xstrdup (default_string);
-    }
-
-  if (!isdigit (*enumeration_arg) && !isletter (*enumeration_arg))
-    {
-      warning (_("%s requires letter or digit"), insertion_type_pname (type));
-
-      switch (type)
-        {
-        case enumerate:
-          default_string = "1";
-          break;
-        }
-      enumeration_arg = xstrdup (default_string);
-    }
-  begin_insertion (type);
-}
-
-void
-cm_enumerate (void)
-{
-  do_enumeration (enumerate, "1");
-}
-
-/*  Handle verbatim environment:
-    find_end_verbatim == 0:  process until end of file
-    find_end_verbatim != 0:  process until 'COMMAND_PREFIXend verbatim'
-                             or end of file
-
-  We cannot simply copy input stream onto output stream; as the
-  verbatim environment may be encapsulated in an @example environment,
-  for example. */
-void
-handle_verbatim_environment (int find_end_verbatim)
-{
-  int character;
-  int seen_end = 0;
-  int save_filling_enabled = filling_enabled;
-  int save_inhibit_paragraph_indentation = inhibit_paragraph_indentation;
-  int save_escape_html = escape_html;
-
-  if (!insertion_stack)
-    close_single_paragraph (); /* no blank lines if not at outer level */
-  inhibit_paragraph_indentation = 1;
-  filling_enabled = 0;
-  in_fixed_width_font++;
-  last_char_was_newline = 0;
-
-  /* No indentation: this is verbatim after all
-     If you want indent, enclose @verbatim in @example
-       current_indent += default_indentation_increment;
-   */
-
-  if (html)
-    { /* If inside @example, we'll be preceded by the indentation
-         already.  Browsers will ignore those spaces because we're about
-         to start another <pre> (don't ask me).  So, wipe them out for
-         cleanliness, and re-insert.  */
-      int i;
-      kill_self_indent (default_indentation_increment);
-      add_html_block_elt ("<pre class=\"verbatim\">");
-      for (i = current_indent; i > 0; i--)
-        add_char (' ');
-    }
-  else if (xml)
-    {
-      xml_insert_element (VERBATIM, START);
-      escape_html = 0;
-      add_word ("<![CDATA[");
-    }
-
-  while (input_text_offset < input_text_length)
-    {
-      character = curchar ();
-
-      if (character == '\n')
-        line_number++;
-
-      /* Assume no newlines in END_VERBATIM. */
-      else if (find_end_verbatim && (character == COMMAND_PREFIX) /* @ */
-          && (input_text_length - input_text_offset > sizeof (END_VERBATIM))
-          && !strncmp (&input_text[input_text_offset+1], END_VERBATIM,
-                       sizeof (END_VERBATIM)-1))
-        {
-          input_text_offset += sizeof (END_VERBATIM);
-          seen_end = 1;
-          break;
-        }
-
-      if (html && character == '&' && escape_html)
-        add_word ("&amp;");
-      else if (html && character == '<' && escape_html)
-        add_word ("&lt;");
-      else
-        add_char (character);
-
-      input_text_offset++;
-    }
-
-  if (find_end_verbatim && !seen_end)
-    warning (_("end of file inside verbatim block"));
-
-  if (html)
-    { /* See comments in example case above.  */
-      kill_self_indent (default_indentation_increment);
-      add_word ("</pre>");
-    }
-  else if (xml)
-    {
-      add_word ("]]>");
-      xml_insert_element (VERBATIM, END);
-      escape_html = save_escape_html;
-    }
-  
-  in_fixed_width_font--;
-  filling_enabled = save_filling_enabled;
-  inhibit_paragraph_indentation = save_inhibit_paragraph_indentation;
-}
-
-void
-cm_verbatim (void)
-{
-  handle_verbatim_environment (1);
-}
-
-void
-cm_table (void)
-{
-  begin_insertion (table);
-}
-
-void
-cm_multitable (void)
-{
-  begin_insertion (multitable); /* @@ */
-}
-
-void
-cm_ftable (void)
-{
-  begin_insertion (ftable);
-}
-
-void
-cm_vtable (void)
-{
-  begin_insertion (vtable);
-}
-
-void
-cm_group (void)
-{
-  begin_insertion (group);
-}
-
-/* Insert raw HTML (no escaping of `<' etc.). */
-void
-cm_html (int arg)
-{
-  if (process_html)
-    begin_insertion (rawhtml);
-  else
-    command_name_condition ();
-}
-
-void
-cm_xml (int arg)
-{
-  if (process_xml)
-    begin_insertion (rawxml);
-  else
-    command_name_condition ();
-}
-
-void
-cm_docbook (int arg)
-{
-  if (process_docbook)
-    begin_insertion (rawdocbook);
-  else
-    command_name_condition ();
-}
-
-void
-cm_ifdocbook (void)
-{
-  if (process_docbook)
-    begin_insertion (ifdocbook);
-  else
-    command_name_condition ();
-}
-
-void
-cm_ifnotdocbook (void)
-{
-  if (!process_docbook)
-    begin_insertion (ifnotdocbook);
-  else
-    command_name_condition ();
-}
-
-void
-cm_ifhtml (void)
-{
-  if (process_html)
-    begin_insertion (ifhtml);
-  else
-    command_name_condition ();
-}
-
-void
-cm_ifnothtml (void)
-{
-  if (!process_html)
-    begin_insertion (ifnothtml);
-  else
-    command_name_condition ();
-}
-
-
-void
-cm_ifinfo (void)
-{
-  if (process_info)
-    begin_insertion (ifinfo);
-  else
-    command_name_condition ();
-}
-
-void
-cm_ifnotinfo (void)
-{
-  if (!process_info)
-    begin_insertion (ifnotinfo);
-  else
-    command_name_condition ();
-}
-
-
-void
-cm_ifplaintext (void)
-{
-  if (process_plaintext)
-    begin_insertion (ifplaintext);
-  else
-    command_name_condition ();
-}
-
-void
-cm_ifnotplaintext (void)
-{
-  if (!process_plaintext)
-    begin_insertion (ifnotplaintext);
-  else
-    command_name_condition ();
-}
-
-
-void
-cm_tex (void)
-{
-  if (process_tex)
-    begin_insertion (rawtex);
-  else
-    command_name_condition ();
-}
-
-void
-cm_iftex (void)
-{
-  if (process_tex)
-    begin_insertion (iftex);
-  else
-    command_name_condition ();
-}
-
-void
-cm_ifnottex (void)
-{
-  if (!process_tex)
-    begin_insertion (ifnottex);
-  else
-    command_name_condition ();
-}
-
-void
-cm_ifxml (void)
-{
-  if (process_xml)
-    begin_insertion (ifxml);
-  else
-    command_name_condition ();
-}
-
-void
-cm_ifnotxml (void)
-{
-  if (!process_xml)
-    begin_insertion (ifnotxml);
-  else
-    command_name_condition ();
-}
-
-
-/* Generic xrefable block with a caption.  */
-void
-cm_float (void)
-{
-  begin_insertion (floatenv);
-}
-
-void
-cm_caption (int arg)
-{
-  char *temp;
-
-  /* This is a no_op command for most formats, as we handle it during @float
-     insertion.  For XML though, we handle it here to keep document structure
-     as close as possible, to the Texinfo source.  */
-
-  /* Everything is already handled at START.  */
-  if (arg == END)
-    return;
-
-  /* Check if it's mislocated.  */
-  if (current_insertion_type () != floatenv)
-    line_error (_("@%s not meaningful outside `@float' environment"), command);
-
-  get_until_in_braces ("\n@end float", &temp);
-
-  if (xml)
-    {
-      int elt = STREQ (command, "shortcaption") ? SHORTCAPTION : CAPTION;
-      xml_insert_element (elt, START);
-      if (!docbook)
-        execute_string ("%s", temp);
-      xml_insert_element (elt, END);
-    }
-
-  free (temp);
-}
-
-/* Begin an insertion where the lines are not filled or indented. */
-void
-cm_flushleft (void)
-{
-  begin_insertion (flushleft);
-}
-
-/* Begin an insertion where the lines are not filled, and each line is
-   forced to the right-hand side of the page. */
-void
-cm_flushright (void)
-{
-  begin_insertion (flushright);
-}
-
-void
-cm_menu (void)
-{
-  if (current_node == NULL && !macro_expansion_output_stream)
-    {
-      warning (_("@menu seen before first @node, creating `Top' node"));
-      warning (_("perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"));
-      /* Include @top command so we can construct the implicit node tree.  */
-      execute_string ("@node top\n@top Top\n");
-    }
-  begin_insertion (menu);
-}
-
-void
-cm_detailmenu (void)
-{
-  if (current_node == NULL && !macro_expansion_output_stream)
-    { /* Problems anyway, @detailmenu should always be inside @menu.  */
-      warning (_("@detailmenu seen before first node, creating `Top' node"));
-      execute_string ("@node top\n@top Top\n");
-    }
-  begin_insertion (detailmenu);
-}
-
-/* Title page commands. */
-
-void
-cm_titlepage (void)
-{
-  titlepage_cmd_present = 1;
-  if (xml && !docbook)
-    begin_insertion (titlepage);
-  else
-    command_name_condition ();
-}
-
-void
-cm_author (void)
-{
-  char *rest;
-  get_rest_of_line (1, &rest);
-
-  if (is_in_insertion_of_type (quotation))
-    {
-      if (html)
-        add_word_args ("&mdash; %s", rest);
-      else if (docbook)
-        {
-          /* FIXME Ideally, we should use an attribution element,
-             but they are supposed to be at the start of quotation
-             blocks.  So to avoid looking ahead mess, let's just
-             use mdash like HTML for now.  */
-          xml_insert_entity ("mdash");
-          add_word (rest);
-        }
-      else if (xml)
-        {
-          xml_insert_element (AUTHOR, START);
-          add_word (rest);
-          xml_insert_element (AUTHOR, END);
-        }
-      else
-        add_word_args ("-- %s", rest);
-    }
-  else if (is_in_insertion_of_type (titlepage))
-    {
-      if (xml && !docbook)
-        {
-          xml_insert_element (AUTHOR, START);
-          add_word (rest);
-          xml_insert_element (AUTHOR, END);
-        }
-    }
-  else
-    line_error (_("@%s not meaningful outside `@titlepage' and `@quotation' environments"),
-        command);
-
-  free (rest);
-}
-
-void
-cm_titlepage_cmds (void)
-{
-  char *rest;
-
-  get_rest_of_line (1, &rest);
-
-  if (!is_in_insertion_of_type (titlepage))
-    line_error (_("@%s not meaningful outside `@titlepage' environment"),
-        command);
-
-  if (xml && !docbook)
-    {
-      int elt = 0;
-
-      if (STREQ (command, "title"))
-        elt = BOOKTITLE;
-      else if (STREQ (command, "subtitle"))
-        elt = BOOKSUBTITLE;
-
-      xml_insert_element (elt, START);
-      add_word (rest);
-      xml_insert_element (elt, END);
-    }
-
-    free (rest);
-}
-
-/* End existing insertion block. */
-void
-cm_end (void)
-{
-  char *temp;
-  int type;
-
-  get_rest_of_line (0, &temp);
-
-  if (!insertion_level)
-    {
-      line_error (_("Unmatched `%c%s'"), COMMAND_PREFIX, command);
-      return;
-    }
-
-  if (temp[0] == 0)
-    line_error (_("`%c%s' needs something after it"), COMMAND_PREFIX, command);
-
-  type = find_type_from_name (temp);
-
-  if (type == bad_type)
-    {
-      line_error (_("Bad argument `%s' to `@%s', using `%s'"),
-           temp, command, insertion_type_pname (current_insertion_type ()));
-    }
-  if (xml && type == menu) /* fixme */
-    {
-      xml_end_menu ();
-    }
-  end_insertion (type);
-  free (temp);
-}
-
-/* @itemx, @item. */
-
-static int itemx_flag = 0;
-
-/* Return whether CMD takes a brace-delimited {arg}.  */
-int
-command_needs_braces (char *cmd)
-{
-  int i;
-  for (i = 0; command_table[i].name; i++)
-    {
-      if (STREQ (command_table[i].name, cmd))
-        return command_table[i].argument_in_braces == BRACE_ARGS;
-    }
-
-  return 0; /* macro or alias */
-}
-
-
-void
-cm_item (void)
-{
-  char *rest_of_line, *item_func;
-
-  /* Can only hack "@item" while inside of an insertion. */
-  if (insertion_level)
-    {
-      INSERTION_ELT *stack = insertion_stack;
-      int original_input_text_offset;
-
-      skip_whitespace ();
-      original_input_text_offset = input_text_offset;
-
-      get_rest_of_line (0, &rest_of_line);
-      item_func = current_item_function ();
-
-    /* Do the right thing depending on which insertion function is active. */
-    switch_top:
-      switch (stack->insertion)
-        {
-        case multitable:
-          multitable_item ();
-          /* Support text directly after the @item.  */
-          if (*rest_of_line)
-            {
-              line_number--;
-              input_text_offset = original_input_text_offset;
-            }
-          break;
-
-        case ifclear:
-        case ifhtml:
-        case ifinfo:
-        case ifnothtml:
-        case ifnotinfo:
-        case ifnotplaintext:
-        case ifnottex:
-	case ifnotxml:
-        case ifplaintext:
-        case ifset:
-        case iftex:
-	case ifxml:
-        case rawdocbook:
-        case rawhtml:
-        case rawxml:
-        case rawtex:
-        case tex:
-        case cartouche:
-          stack = stack->next;
-          if (!stack)
-            goto no_insertion;
-          else
-            goto switch_top;
-          break;
-
-        case menu:
-        case quotation:
-        case example:
-        case smallexample:
-        case lisp:
-        case smalllisp:
-        case format:
-        case smallformat:
-        case display:
-        case smalldisplay:
-        case group:
-          line_error (_("@%s not meaningful inside `@%s' block"),
-                      command,
-                      insertion_type_pname (current_insertion_type ()));
-          break;
-
-        case itemize:
-        case enumerate:
-          if (itemx_flag)
-            {
-              line_error (_("@itemx not meaningful inside `%s' block"),
-                          insertion_type_pname (current_insertion_type ()));
-            }
-          else
-            {
-              if (html)
-                add_html_block_elt ("<li>");
-              else if (xml)
-                xml_begin_item ();
-              else
-                {
-                  start_paragraph ();
-                  kill_self_indent (-1);
-                  filling_enabled = indented_fill = 1;
-
-                  if (current_item_function ())
-                    {
-                      output_column = current_indent - 2;
-                      indent (output_column);
-
-                      /* The item marker can be given with or without
-                         braces -- @bullet and @bullet{} are both ok.
-                         Or it might be something that doesn't take
-                         braces at all, such as "o" or "#" or "@ ".
-                         Thus, only supply braces if the item marker is
-                         a command, they haven't supplied braces
-                         themselves, and we know it needs them.  */
-                      if (item_func && *item_func)
-                        {
-                          if (*item_func == COMMAND_PREFIX
-                              && item_func[strlen (item_func) - 1] != '}'
-                              && command_needs_braces (item_func + 1))
-                            execute_string ("%s{}", item_func);
-                          else
-                            execute_string ("%s", item_func);
-                        }
-                      insert (' ');
-                      output_column++;
-                    }
-                  else
-                    enumerate_item ();
-
-                  /* Special hack.  This makes `close_paragraph' a no-op until
-                     `start_paragraph' has been called. */
-                  must_start_paragraph = 1;
-                }
-
-              /* Handle text directly after the @item.  */
-              if (*rest_of_line)
-                {
-                  line_number--;
-                  input_text_offset = original_input_text_offset;
-                }
-            }
-          break;
-
-        case table:
-        case ftable:
-        case vtable:
-          if (html)
-            { /* If nothing has been output since the last <dd>,
-                 remove the empty <dd> element.  Some browsers render
-                 an extra empty line for <dd><dt>, which makes @itemx
-                 conversion look ugly.  */
-              rollback_empty_tag ("dd");
-
-              /* Force the browser to render one blank line before
-                 each new @item in a table.  But don't do that if
-                 this is the first <dt> after the <dl>, or if we are
-                 converting @itemx.
-
-                 Note that there are some browsers which ignore <br>
-                 in this context, but I cannot find any way to force
-                 them all render exactly one blank line.  */
-              if (!itemx_flag && html_deflist_has_term)
-                add_html_block_elt ("<br>");
-
-              /* We are about to insert a <dt>, so this <dl> has a term.
-                 Feel free to insert a <br> next time. :)  */
-              html_deflist_has_term = 1;
-   
-              add_html_block_elt ("<dt>");
-              if (item_func && *item_func)
-                execute_string ("%s{%s}", item_func, rest_of_line);
-              else
-                execute_string ("%s", rest_of_line);
-
-              if (current_insertion_type () == ftable)
-                execute_string ("%cfindex %s\n", COMMAND_PREFIX, rest_of_line);
-
-              if (current_insertion_type () == vtable)
-                execute_string ("%cvindex %s\n", COMMAND_PREFIX, rest_of_line);
-
-              add_html_block_elt ("<dd>");
-            }
-          else if (xml) /* && docbook)*/ /* 05-08 */
-            {
-              xml_begin_table_item ();
-
-              if (!docbook && current_insertion_type () == ftable)
-                execute_string ("%cfindex %s\n", COMMAND_PREFIX, rest_of_line);
-
-              if (!docbook && current_insertion_type () == vtable)
-                execute_string ("%cvindex %s\n", COMMAND_PREFIX, rest_of_line);
-
-              if (item_func && *item_func)
-                execute_string ("%s{%s}", item_func, rest_of_line);
-              else
-                execute_string ("%s", rest_of_line);
-              xml_continue_table_item ();
-            }
-          else
-            {
-              /* We need this to determine if we have two @item's in a row
-                 (see test just below).  */
-              static int last_item_output_position = 0;
-
-              /* Get rid of extra characters. */
-              kill_self_indent (-1);
-
-              /* If we have one @item followed directly by another @item,
-                 we need to insert a blank line.  This is not true for
-                 @itemx, though.  */
-              if (!itemx_flag && last_item_output_position == output_position)
-                insert ('\n');
-
-              /* `close_paragraph' almost does what we want.  The problem
-                 is when paragraph_is_open, and last_char_was_newline, and
-                 the last newline has been turned into a space, because
-                 filling_enabled. I handle it here. */
-              if (last_char_was_newline && filling_enabled &&
-                  paragraph_is_open)
-                insert ('\n');
-              close_paragraph ();
-
-#if defined (INDENT_PARAGRAPHS_IN_TABLE)
-              /* Indent on a new line, but back up one indentation level. */
-              {
-                int save = inhibit_paragraph_indentation;
-                inhibit_paragraph_indentation = 1;
-                /* At this point, inserting any non-whitespace character will
-                   force the existing indentation to be output. */
-                add_char ('i');
-                inhibit_paragraph_indentation = save;
-              }
-#else /* !INDENT_PARAGRAPHS_IN_TABLE */
-              add_char ('i');
-#endif /* !INDENT_PARAGRAPHS_IN_TABLE */
-
-              output_paragraph_offset--;
-              kill_self_indent (default_indentation_increment + 1);
-
-              /* Add item's argument to the line. */
-              filling_enabled = 0;
-              if (item_func && *item_func)
-                execute_string ("%s{%s}", item_func, rest_of_line);
-              else
-                execute_string ("%s", rest_of_line);
-
-              if (current_insertion_type () == ftable)
-                execute_string ("%cfindex %s\n", COMMAND_PREFIX, rest_of_line);
-              else if (current_insertion_type () == vtable)
-                execute_string ("%cvindex %s\n", COMMAND_PREFIX, rest_of_line);
-
-              /* Start a new line, and let start_paragraph ()
-                 do the indenting of it for you. */
-              close_single_paragraph ();
-              indented_fill = filling_enabled = 1;
-              last_item_output_position = output_position;
-            }
-        }
-      free (rest_of_line);
-    }
-  else
-    {
-    no_insertion:
-      line_error (_("%c%s found outside of an insertion block"),
-                  COMMAND_PREFIX, command);
-    }
-}
-
-void
-cm_itemx (void)
-{
-  itemx_flag++;
-  cm_item ();
-  itemx_flag--;
-}
-
-int headitem_flag = 0;
-
-void
-cm_headitem (void)
-{
-  headitem_flag = 1;
-  cm_item ();
-}

Property changes on: head/contrib/texinfo/makeinfo/insertion.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/sectioning.h
===================================================================
--- head/contrib/texinfo/makeinfo/sectioning.h	(revision 276550)
+++ head/contrib/texinfo/makeinfo/sectioning.h	(nonexistent)
@@ -1,103 +0,0 @@
-/* sectioning.h -- all related stuff @chapter, @section... @contents
-   $Id: sectioning.h,v 1.5 2004/04/11 17:56:47 karl Exp $
-
-   Copyright (C) 1999, 2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Karl Heinz Marbaise <kama@hippo.fido.de>.  */
-
-#ifndef SECTIONING_H
-#define SECTIONING_H
-
-/* Sectioning.  */
-
-/* Level 4.  */
-extern void cm_chapter (void),
-  cm_unnumbered (void),
-  cm_appendix (void),
-  cm_top (void);
-
-/* Level 3.  */
-extern void cm_section (void),
-  cm_unnumberedsec (void),
-  cm_appendixsec (void);
-
-/* Level 2.  */
-extern void cm_subsection (void),
-  cm_unnumberedsubsec (void),
-  cm_appendixsubsec (void);
-
-/* Level 1.  */
-extern void cm_subsubsection (void),
-  cm_unnumberedsubsubsec (void),
-  cm_appendixsubsubsec (void);
-
-/* Headings.  */
-extern void cm_heading (void),
-  cm_chapheading (void),
-  cm_subheading (void),
-  cm_subsubheading (void),
-  cm_majorheading (void);
-
-extern void cm_raisesections (void),
-  cm_lowersections (void),
-  cm_ideprecated (int arg, int start, int end);
-
-extern void
-  sectioning_underscore (char *cmd),
-  insert_and_underscore (int level, char *cmd);
-
-/* needed in node.c */
-extern int set_top_section_level (int level);
-
-extern void sectioning_html (int level, char *cmd);
-extern int what_section (char *text, char **secname);
-extern char *current_chapter_number (void),
-  *current_sectioning_number (void),
-  *current_sectioning_name (void);
-
-/* The argument of @settitle, used for HTML. */
-extern char *title;
-
-
-/* Here is a structure which associates sectioning commands with
-   an integer that reflects the depth of the current section. */
-typedef struct
-{
-  char *name;
-  int level; /* I can't replace the levels with defines
-                because it is changed during run */
-  int num; /* ENUM_SECT_NO means no enumeration...
-              ENUM_SECT_YES means enumerated version
-              ENUM_SECT_APP appendix (Character enumerated
-                            at first position */
-  int toc; /* TOC_NO means do not enter in toc;
-              TOC_YES means enter it in toc */
-} section_alist_type;
-
-extern section_alist_type section_alist[];
-
-/* enumerate sections */
-#define ENUM_SECT_NO  0
-#define ENUM_SECT_YES 1
-#define ENUM_SECT_APP 2
-
-/* make entries into toc no/yes */
-#define TOC_NO  0
-#define TOC_YES 1
-
-
-#endif /* not SECTIONING_H */

Property changes on: head/contrib/texinfo/makeinfo/sectioning.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/sectioning.c
===================================================================
--- head/contrib/texinfo/makeinfo/sectioning.c	(revision 276550)
+++ head/contrib/texinfo/makeinfo/sectioning.c	(nonexistent)
@@ -1,831 +0,0 @@
-/* sectioning.c -- for @chapter, @section, ..., @contents ...
-   $Id: sectioning.c,v 1.25 2004/07/05 22:23:23 karl Exp $
-
-   Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Originally written by Karl Heinz Marbaise <kama@hippo.fido.de>.  */
-
-#include "system.h"
-#include "cmds.h"
-#include "macro.h"
-#include "makeinfo.h"
-#include "node.h"
-#include "toc.h"
-#include "sectioning.h"
-#include "xml.h"
-
-/* See comment in sectioning.h.  */
-section_alist_type section_alist[] = {
-  { "unnumberedsubsubsec", 5, ENUM_SECT_NO,  TOC_YES },
-  { "unnumberedsubsec",    4, ENUM_SECT_NO,  TOC_YES },
-  { "unnumberedsec",       3, ENUM_SECT_NO,  TOC_YES },
-  { "unnumbered",          2, ENUM_SECT_NO,  TOC_YES },
-  { "centerchap",          2, ENUM_SECT_NO,  TOC_YES },
-
-  { "appendixsubsubsec",   5, ENUM_SECT_APP, TOC_YES },  /* numbered like A.X.X.X */
-  { "appendixsubsec",      4, ENUM_SECT_APP, TOC_YES },
-  { "appendixsec",         3, ENUM_SECT_APP, TOC_YES },
-  { "appendixsection",     3, ENUM_SECT_APP, TOC_YES },
-  { "appendix",            2, ENUM_SECT_APP, TOC_YES },
-
-  { "subsubsec",           5, ENUM_SECT_YES, TOC_YES },
-  { "subsubsection",       5, ENUM_SECT_YES, TOC_YES },
-  { "subsection",          4, ENUM_SECT_YES, TOC_YES },
-  { "section",             3, ENUM_SECT_YES, TOC_YES },
-  { "chapter",             2, ENUM_SECT_YES, TOC_YES },
-
-  { "subsubheading",       5, ENUM_SECT_NO,  TOC_NO },
-  { "subheading",          4, ENUM_SECT_NO,  TOC_NO },
-  { "heading",             3, ENUM_SECT_NO,  TOC_NO },
-  { "chapheading",         2, ENUM_SECT_NO,  TOC_NO },
-  { "majorheading",        2, ENUM_SECT_NO,  TOC_NO },
-
-  { "top",                 1, ENUM_SECT_NO,  TOC_YES },
-  { NULL,                  0, 0, 0 }
-};
-
-/* The argument of @settitle, used for HTML. */
-char *title = NULL;
-
-
-#define APPENDIX_MAGIC   1024
-#define UNNUMBERED_MAGIC 2048
-
-/* Number memory for every level @chapter, @section,
-   @subsection, @subsubsection. */
-static int numbers [] = { 0, 0, 0, 0 };
-
-/* enum_marker == APPENDIX_MAGIC then we are counting appendencies
-   enum_marker == UNNUMBERED_MAGIC then we are within unnumbered area.
-   Handling situations like this:
-   @unnumbered ..
-   @section ...   */
-static int enum_marker = 0;
-
-/* Organized by level commands.  That is, "*" == chapter, "=" == section. */
-static char *scoring_characters = "*=-.";
-
-/* Amount to offset the name of sectioning commands to levels by. */
-static int section_alist_offset = 0;
-
-/* These two variables are for @float, @cindex like commands that need to know
-   in which section they are used.  */
-/* Last value returned by get_sectioning_number.  */
-static char *last_sectioning_number = "";
-/* Last title used by sectioning_underscore, etc.  */
-static char *last_sectioning_title = "";
-
-/* num == ENUM_SECT_NO  means unnumbered (should never call this)
-   num == ENUM_SECT_YES means numbered
-   num == ENUM_SECT_APP means numbered like A.1 and so on */
-static char *
-get_sectioning_number (int level, int num)
-{
-  static char s[100]; /* should ever be enough for 99.99.99.99
-                         Appendix A.1 */
-
-  char *p;
-  int i;
-
-  s[0] = 0;
-
-  /* create enumeration in front of chapter, section, subsection and so on. */
-  for (i = 0; i < level; i++)
-    {
-      p = s + strlen (s);
-      if ((i == 0) && (enum_marker == APPENDIX_MAGIC))
-        sprintf (p, "%c.", numbers[i] + 64); /* Should be changed to
-                                                be more portable */
-      else
-        sprintf (p, "%d.", numbers[i]);
-    }
-
-  /* the last number is never followed by a dot */
-  p = s + strlen (s);
-  if ((num == ENUM_SECT_APP)
-      && (i == 0)
-      && (enum_marker == APPENDIX_MAGIC))
-    sprintf (p, _("Appendix %c"), numbers[i] + 64);
-  else
-    sprintf (p, "%d", numbers[i]);
-
-  /* Poor man's cache :-)  */
-  if (strlen (last_sectioning_number))
-    free (last_sectioning_number);
-  last_sectioning_number = xstrdup (s);
-
-  return s;
-}
-
-
-/* Set the level of @top to LEVEL.  Return the old level of @top. */
-int
-set_top_section_level (int level)
-{
-  int i, result = -1;
-
-  for (i = 0; section_alist[i].name; i++)
-    if (strcmp (section_alist[i].name, "top") == 0)
-      {
-        result = section_alist[i].level;
-        section_alist[i].level = level;
-        break;
-      }
-  return result;
-}
-
-
-/* return the index of the given sectioning command in section_alist */
-static int
-search_sectioning (char *text)
-{
-  int i;
-  char *t;
-
-  /* ignore the optional command prefix */
-  if (text[0] == COMMAND_PREFIX)
-    text++;
-
-  for (i = 0; (t = section_alist[i].name); i++)
-    {
-      if (strcmp (t, text) == 0)
-        {
-          return i;
-        }
-    }
-  return -1;
-}
-
-/* Return an integer which identifies the type of section present in
-   TEXT -- 1 for @top, 2 for chapters, ..., 5 for subsubsections (as
-   specified in section_alist).  We take into account any @lowersections
-   and @raisesections.  If SECNAME is non-NULL, also return the
-   corresponding section name.  */
-int
-what_section (char *text, char **secname)
-{
-  int index, j;
-  char *temp;
-  int return_val;
-
- find_section_command:
-  for (j = 0; text[j] && cr_or_whitespace (text[j]); j++);
-  if (text[j] != COMMAND_PREFIX)
-    return -1;
-
-  text = text + j + 1;
-
-  /* We skip @c, @comment, and @?index commands. */
-  if ((strncmp (text, "comment", strlen ("comment")) == 0) ||
-      (text[0] == 'c' && cr_or_whitespace (text[1])) ||
-      (strcmp (text + 1, "index") == 0))
-    {
-      while (*text++ != '\n');
-      goto find_section_command;
-    }
-
-  /* Handle italicized sectioning commands. */
-  if (*text == 'i')
-    text++;
-
-  for (j = 0; text[j] && !cr_or_whitespace (text[j]); j++);
-
-  temp = xmalloc (1 + j);
-  strncpy (temp, text, j);
-  temp[j] = 0;
-
-  index = search_sectioning (temp);
-  free (temp);
-  if (index >= 0)
-    {
-      return_val = section_alist[index].level + section_alist_offset;
-      if (return_val < 0)
-        return_val = 0;
-      else if (return_val > 5)
-        return_val = 5;
-
-      if (secname)
-        {
-          int i;
-          int alist_size = sizeof (section_alist) / sizeof(section_alist_type);
-          /* Find location of offset sectioning entry, but don't go off
-             either end of the array.  */
-          int index_offset = MAX (index - section_alist_offset, 0);
-          index_offset = MIN (index_offset, alist_size - 1);
-
-          /* Also make sure we don't go into the next "group" of
-             sectioning changes, e.g., change from an @appendix to an
-             @heading or some such.  */
-#define SIGN(expr) ((expr) < 0 ? -1 : 1)
-          for (i = index; i != index_offset; i -= SIGN (section_alist_offset))
-            {
-              /* As it happens, each group has unique .num/.toc values.  */
-              if (section_alist[i].num != section_alist[index_offset].num
-                  || section_alist[i].toc != section_alist[index_offset].toc)
-                break;
-            }
-          *secname = section_alist[i].name;
-        }
-      return return_val;
-    }
-  return -1;
-}
-
-/* Returns current top level division (ie. chapter, unnumbered) number.
-   - For chapters, returns the number.
-   - For unnumbered sections, returns empty string.
-   - For appendices, returns A, B, etc. */
-char *
-current_chapter_number (void)
-{
-  if (enum_marker == UNNUMBERED_MAGIC)
-    return xstrdup ("");
-  else if (enum_marker == APPENDIX_MAGIC)
-    {
-      char s[2];
-      sprintf (s, "%c", numbers[0] + 64);
-      return xstrdup (s);
-    }
-  else
-    {
-      char s[11];
-      sprintf (s, "%d", numbers[0]);
-      return xstrdup (s);
-    }
-}
-
-/* Returns number of the last sectioning command used.  */
-char *
-current_sectioning_number (void)
-{
-  if (enum_marker == UNNUMBERED_MAGIC || !number_sections)
-    return xstrdup ("");
-  else
-    return xstrdup (last_sectioning_number);
-}
-
-/* Returns arguments of the last sectioning command used.  */
-char *
-current_sectioning_name (void)
-{
-  return xstrdup (last_sectioning_title);
-}
-
-/* insert_and_underscore, sectioning_underscore and sectioning_html call this.  */
-
-static char *
-handle_enum_increment (int level, int index)
-{
-  /* Here is how TeX handles enumeration:
-     - Anything starting with @unnumbered is not enumerated.
-     - @majorheading and the like are not enumberated.  */
-  int i;
-
-  /* First constraint above.  */
-  if (enum_marker == UNNUMBERED_MAGIC && level == 0)
-    return xstrdup ("");
-
-  /* Second constraint.  */
-  if (section_alist[index].num == ENUM_SECT_NO)
-    return xstrdup ("");
-
-  /* reset all counters which are one level deeper */
-  for (i = level; i < 3; i++)
-    numbers [i + 1] = 0;
-
-  numbers[level]++;
-  if (section_alist[index].num == ENUM_SECT_NO || enum_marker == UNNUMBERED_MAGIC
-      || !number_sections)
-    return xstrdup ("");
-  else
-    return xstrdup (get_sectioning_number (level, section_alist[index].num));
-}
-
-
-void
-sectioning_underscore (char *cmd)
-{
-  char *temp, *secname;
-  int level;
-  
-  /* If we're not indenting the first paragraph, we shall make it behave
-     like @noindent is called directly after the section heading. */
-  if (! do_first_par_indent)
-    cm_noindent ();
-
-  temp = xmalloc (2 + strlen (cmd));
-  temp[0] = COMMAND_PREFIX;
-  strcpy (&temp[1], cmd);
-  level = what_section (temp, &secname);
-  level -= 2;
-  if (level < 0)
-    level = 0;
-  free (temp);
-
-  /* If the argument to @top is empty, we try using the one from @settitle.
-     Warn if both are unusable.  */
-  if (STREQ (command, "top"))
-    {
-      int save_input_text_offset = input_text_offset;
-
-      get_rest_of_line (0, &temp);
-
-      /* Due to get_rest_of_line ... */
-      line_number--;
-
-      if (strlen (temp) == 0 && (!title || strlen (title) == 0))
-        warning ("Must specify a title with least one of @settitle or @top");
-
-      input_text_offset = save_input_text_offset;
-    }
-
-  if (xml)
-    {
-      /* If the section appears in the toc, it means it's a real section
-	 unlike majorheading, chapheading etc. */
-      if (section_alist[search_sectioning (cmd)].toc == TOC_YES)
-	{
-	  xml_close_sections (level);
-	  /* Mark the beginning of the section
-	     If the next command is printindex, we will remove
-	     the section and put an Index instead */
-	  flush_output ();
-	  xml_last_section_output_position = output_paragraph_offset;
-
-	  get_rest_of_line (0, &temp);
-
-          /* Use @settitle value if @top parameter is empty.  */
-          if (STREQ (command, "top") && strlen(temp) == 0)
-            temp = xstrdup (title ? title : "");
-
-          /* Docbook does not support @unnumbered at all.  So we provide numbers
-             that other formats use.  @appendix seems to be fine though, so we let
-             Docbook handle that as usual.  */
-          if (docbook && enum_marker != APPENDIX_MAGIC)
-            {
-              if (section_alist[search_sectioning (cmd)].num == ENUM_SECT_NO
-                  && section_alist[search_sectioning (cmd)].toc == TOC_YES)
-                xml_insert_element_with_attribute (xml_element (secname),
-                    START, "label=\"%s\" xreflabel=\"%s\"",
-                    handle_enum_increment (level, search_sectioning (cmd)),
-                    text_expansion (temp));
-              else
-                xml_insert_element_with_attribute (xml_element (secname),
-                    START, "label=\"%s\"",
-                    handle_enum_increment (level, search_sectioning (cmd)));
-            }
-          else
-            xml_insert_element (xml_element (secname), START);
-
-	  xml_insert_element (TITLE, START);
-	  xml_open_section (level, secname);
-	  execute_string ("%s", temp);
-	  xml_insert_element (TITLE, END);
-
-	  free (temp);
-	}
-      else
-        {
-          if (docbook)
-            {
-              if (level > 0)
-                xml_insert_element_with_attribute (xml_element (secname), START,
-                    "renderas=\"sect%d\"", level);
-              else
-                xml_insert_element_with_attribute (xml_element (secname), START,
-                    "renderas=\"other\"");
-            }
-          else
-            xml_insert_element (xml_element (secname), START);
-
-          get_rest_of_line (0, &temp);
-          execute_string ("%s", temp);
-          free (temp);
-
-          xml_insert_element (xml_element (secname), END);
-        }
-    }
-  else if (html)
-    sectioning_html (level, secname);
-  else
-    insert_and_underscore (level, secname);
-}
-
-
-/* Insert the text following input_text_offset up to the end of the line
-   in a new, separate paragraph.  Directly underneath it, insert a
-   line of WITH_CHAR, the same length of the inserted text. */
-void
-insert_and_underscore (int level, char *cmd)
-{
-  int i, len;
-  int index;
-  int old_no_indent;
-  unsigned char *starting_pos, *ending_pos;
-  char *temp;
-  char with_char = scoring_characters[level];
-
-  close_paragraph ();
-  filling_enabled =  indented_fill = 0;
-  old_no_indent = no_indent;
-  no_indent = 1;
-
-  if (macro_expansion_output_stream && !executing_string)
-    append_to_expansion_output (input_text_offset + 1);
-
-  get_rest_of_line (0, &temp);
-
-  /* Use @settitle value if @top parameter is empty.  */
-  if (STREQ (command, "top") && strlen(temp) == 0)
-    temp = xstrdup (title ? title : "");
-
-  starting_pos = output_paragraph + output_paragraph_offset;
-
-  /* Poor man's cache for section title.  */
-  if (strlen (last_sectioning_title))
-    free (last_sectioning_title);
-  last_sectioning_title = xstrdup (temp);
-
-  index = search_sectioning (cmd);
-  if (index < 0)
-    {
-      /* should never happen, but a poor guy, named Murphy ... */
-      warning (_("Internal error (search_sectioning) `%s'!"), cmd);
-      return;
-    }
-
-  /* This is a bit tricky: we must produce "X.Y SECTION-NAME" in the
-     Info output and in TOC, but only SECTION-NAME in the macro-expanded
-     output.  */
-
-  /* Step 1: produce "X.Y" and add it to Info output.  */
-  add_word_args ("%s ", handle_enum_increment (level, index));
-
-  /* Step 2: add "SECTION-NAME" to both Info and macro-expanded output.  */
-  if (macro_expansion_output_stream && !executing_string)
-    {
-      char *temp1 = xmalloc (2 + strlen (temp));
-      sprintf (temp1, "%s\n", temp);
-      remember_itext (input_text, input_text_offset);
-      me_execute_string (temp1);
-      free (temp1);
-    }
-  else
-    execute_string ("%s\n", temp);
-
-  /* Step 3: pluck "X.Y SECTION-NAME" from the output buffer and
-     insert it into the TOC.  */
-  ending_pos = output_paragraph + output_paragraph_offset;
-  if (section_alist[index].toc == TOC_YES)
-    toc_add_entry (substring (starting_pos, ending_pos - 1),
-                   level, current_node, NULL);
-
-  free (temp);
-
-  len = (ending_pos - starting_pos) - 1;
-  for (i = 0; i < len; i++)
-    add_char (with_char);
-  insert ('\n');
-  close_paragraph ();
-  filling_enabled = 1;
-  no_indent = old_no_indent;
-}
-
-/* Insert the text following input_text_offset up to the end of the
-   line as an HTML heading element of the appropriate `level' and
-   tagged as an anchor for the current node.. */
-
-void
-sectioning_html (int level, char *cmd)
-{
-  static int toc_ref_count = 0;
-  int index;
-  int old_no_indent;
-  unsigned char *starting_pos, *ending_pos;
-  char *temp, *toc_anchor = NULL;
-
-  close_paragraph ();
-  filling_enabled =  indented_fill = 0;
-  old_no_indent = no_indent;
-  no_indent = 1;
-
-  /* level 0 (chapter) is <h2>, and we go down from there.  */
-  add_html_block_elt_args ("<h%d class=\"%s\">", level + 2, cmd);
-
-  /* If we are outside of any node, produce an anchor that
-     the TOC could refer to.  */
-  if (!current_node || !*current_node)
-    {
-      static const char a_name[] = "<a name=\"";
-
-      starting_pos = output_paragraph + output_paragraph_offset;
-      add_word_args ("%sTOC%d\">", a_name, toc_ref_count++);
-      toc_anchor = substring (starting_pos + sizeof (a_name) - 1,
-                              output_paragraph + output_paragraph_offset);
-      /* This must be added after toc_anchor is extracted, since
-         toc_anchor cannot include the closing </a>.  For details,
-         see toc.c:toc_add_entry and toc.c:contents_update_html.
-
-         Also, the anchor close must be output before the section name
-         in case the name itself contains an anchor. */
-      add_word ("</a>");
-    }
-  starting_pos = output_paragraph + output_paragraph_offset;
-
-  if (macro_expansion_output_stream && !executing_string)
-    append_to_expansion_output (input_text_offset + 1);
-
-  get_rest_of_line (0, &temp);
-
-  /* Use @settitle value if @top parameter is empty.  */
-  if (STREQ (command, "top") && strlen(temp) == 0)
-    temp = xstrdup (title ? title : "");
-
-  index = search_sectioning (cmd);
-  if (index < 0)
-    {
-      /* should never happen, but a poor guy, named Murphy ... */
-      warning (_("Internal error (search_sectioning) \"%s\"!"), cmd);
-      return;
-    }
-
-  /* Produce "X.Y" and add it to HTML output.  */
-  {
-    char *title_number = handle_enum_increment (level, index);
-    if (strlen (title_number) > 0)
-      add_word_args ("%s ", title_number);
-  }
-
-  /* add the section name to both HTML and macro-expanded output.  */
-  if (macro_expansion_output_stream && !executing_string)
-    {
-      remember_itext (input_text, input_text_offset);
-      me_execute_string (temp);
-      write_region_to_macro_output ("\n", 0, 1);
-    }
-  else
-    execute_string ("%s", temp);
-
-  ending_pos = output_paragraph + output_paragraph_offset;
-
-  /* Pluck ``X.Y SECTION-NAME'' from the output buffer and insert it
-     into the TOC.  */
-  if (section_alist[index].toc == TOC_YES)
-    toc_add_entry (substring (starting_pos, ending_pos),
-                   level, current_node, toc_anchor);
-
-  free (temp);
-
-  if (outstanding_node)
-    outstanding_node = 0;
-
-  add_word_args ("</h%d>", level + 2);
-  close_paragraph();
-  filling_enabled = 1;
-  no_indent = old_no_indent;
-}
-
-
-/* Shift the meaning of @section to @chapter. */
-void
-cm_raisesections (void)
-{
-  discard_until ("\n");
-  section_alist_offset--;
-}
-
-/* Shift the meaning of @chapter to @section. */
-void
-cm_lowersections (void)
-{
-  discard_until ("\n");
-  section_alist_offset++;
-}
-
-/* The command still works, but prints a warning message in addition. */
-void
-cm_ideprecated (int arg, int start, int end)
-{
-  warning (_("%c%s is obsolete; use %c%s instead"),
-           COMMAND_PREFIX, command, COMMAND_PREFIX, command + 1);
-  sectioning_underscore (command + 1);
-}
-
-
-/* Treat this just like @unnumbered.  The only difference is
-   in node defaulting. */
-void
-cm_top (void)
-{
-  /* It is an error to have more than one @top. */
-  if (top_node_seen && strcmp (current_node, "Top") != 0)
-    {
-      TAG_ENTRY *tag = tag_table;
-
-      line_error (_("Node with %ctop as a section already exists"),
-                  COMMAND_PREFIX);
-
-      while (tag)
-        {
-          if (tag->flags & TAG_FLAG_IS_TOP)
-            {
-              file_line_error (tag->filename, tag->line_no,
-                               _("Here is the %ctop node"), COMMAND_PREFIX);
-              return;
-            }
-          tag = tag->next_ent;
-        }
-    }
-  else
-    {
-      top_node_seen = 1;
-
-      /* It is an error to use @top before using @node. */
-      if (!tag_table)
-        {
-          char *top_name;
-
-          get_rest_of_line (0, &top_name);
-          line_error (_("%ctop used before %cnode, defaulting to %s"),
-                      COMMAND_PREFIX, COMMAND_PREFIX, top_name);
-          execute_string ("@node Top, , (dir), (dir)\n@top %s\n", top_name);
-          free (top_name);
-          return;
-        }
-
-      cm_unnumbered ();
-
-      /* The most recently defined node is the top node. */
-      tag_table->flags |= TAG_FLAG_IS_TOP;
-
-      /* Now set the logical hierarchical level of the Top node. */
-      {
-        int orig_offset = input_text_offset;
-
-        input_text_offset = search_forward (node_search_string, orig_offset);
-
-        if (input_text_offset > 0)
-          {
-            int this_section;
-
-            /* We have encountered a non-top node, so mark that one exists. */
-            non_top_node_seen = 1;
-
-            /* Move to the end of this line, and find out what the
-               sectioning command is here. */
-            while (input_text[input_text_offset] != '\n')
-              input_text_offset++;
-
-            if (input_text_offset < input_text_length)
-              input_text_offset++;
-
-            this_section = what_section (input_text + input_text_offset,
-                                         NULL);
-
-            /* If we found a sectioning command, then give the top section
-               a level of this section - 1. */
-            if (this_section != -1)
-              set_top_section_level (this_section - 1);
-          }
-        input_text_offset = orig_offset;
-      }
-    }
-}
-
-/* The remainder of the text on this line is a chapter heading. */
-void
-cm_chapter (void)
-{
-  enum_marker = 0;
-  sectioning_underscore ("chapter");
-}
-
-/* The remainder of the text on this line is a section heading. */
-void
-cm_section (void)
-{
-  sectioning_underscore ("section");
-}
-
-/* The remainder of the text on this line is a subsection heading. */
-void
-cm_subsection (void)
-{
-  sectioning_underscore ("subsection");
-}
-
-/* The remainder of the text on this line is a subsubsection heading. */
-void
-cm_subsubsection (void)
-{
-  sectioning_underscore ("subsubsection");
-}
-
-/* The remainder of the text on this line is an unnumbered heading. */
-void
-cm_unnumbered (void)
-{
-  enum_marker = UNNUMBERED_MAGIC;
-  sectioning_underscore ("unnumbered");
-}
-
-/* The remainder of the text on this line is an unnumbered section heading. */
-void
-cm_unnumberedsec (void)
-{
-  sectioning_underscore ("unnumberedsec");
-}
-
-/* The remainder of the text on this line is an unnumbered
-   subsection heading. */
-void
-cm_unnumberedsubsec (void)
-{
-  sectioning_underscore ("unnumberedsubsec");
-}
-
-/* The remainder of the text on this line is an unnumbered
-   subsubsection heading. */
-void
-cm_unnumberedsubsubsec (void)
-{
-  sectioning_underscore ("unnumberedsubsubsec");
-}
-
-/* The remainder of the text on this line is an appendix heading. */
-void
-cm_appendix (void)
-{
-  /* Reset top level number so we start from Appendix A */
-  if (enum_marker != APPENDIX_MAGIC)
-    numbers [0] = 0;
-  enum_marker = APPENDIX_MAGIC;
-  sectioning_underscore ("appendix");
-}
-
-/* The remainder of the text on this line is an appendix section heading. */
-void
-cm_appendixsec (void)
-{
-  sectioning_underscore ("appendixsec");
-}
-
-/* The remainder of the text on this line is an appendix subsection heading. */
-void
-cm_appendixsubsec (void)
-{
-  sectioning_underscore ("appendixsubsec");
-}
-
-/* The remainder of the text on this line is an appendix
-   subsubsection heading. */
-void
-cm_appendixsubsubsec (void)
-{
-  sectioning_underscore ("appendixsubsubsec");
-}
-
-/* Compatibility functions substitute for chapter, section, etc. */
-void
-cm_majorheading (void)
-{
-  sectioning_underscore ("majorheading");
-}
-
-void
-cm_chapheading (void)
-{
-  sectioning_underscore ("chapheading");
-}
-
-void
-cm_heading (void)
-{
-  sectioning_underscore ("heading");
-}
-
-void
-cm_subheading (void)
-{
-  sectioning_underscore ("subheading");
-}
-
-void
-cm_subsubheading (void)
-{
-  sectioning_underscore ("subsubheading");
-}

Property changes on: head/contrib/texinfo/makeinfo/sectioning.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/index.h
===================================================================
--- head/contrib/texinfo/makeinfo/index.h	(revision 276550)
+++ head/contrib/texinfo/makeinfo/index.h	(nonexistent)
@@ -1,93 +0,0 @@
-/* index.h -- declarations for index.c.
-   $Id: index.h,v 1.2 2004/04/11 17:56:47 karl Exp $
-
-   Copyright (C) 1998, 99 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef INDEX_H
-#define INDEX_H
-
-#include "makeinfo.h"
-#include "cmds.h"
-
-/* User commands are only new indices.  (Macros are handled separately.)  */
-extern COMMAND **user_command_array;
-extern int user_command_array_len;
-
-/* An index element... */
-typedef struct index_elt
-{
-  struct index_elt *next;
-  char *entry;                  /* The index entry itself, after expansion. */
-  char *entry_text;             /* The original, non-expanded entry text. */
-  char *node;                   /* The node from whence it came. */
-  char *section;                /* Current section number we are in, */
-  char *section_name;           /* ... and its title.  */
-  int code;                     /* Nonzero means add `@code{...}' when
-                                   printing this element. */
-  int defining_line;            /* Line number where this entry was written. */
-  int output_line;              /* And line number where it is in the output. */
-  char *defining_file;          /* Source file for defining_line. */
-  char *output_file;            /* Output file for output_line. */
-  int entry_number;             /* Entry number.  */
-} INDEX_ELT;
-
-
-/* A list of short-names for each index.
-   There are two indices into the the_indices array.
-   * read_index is the index that points to the list of index
-     entries that we will find if we ask for the list of entries for
-     this name.
-   * write_index is the index that points to the list of index entries
-     that we will add new entries to.
-
-   Initially, read_index and write_index are the same, but the
-   @syncodeindex and @synindex commands can change the list we add
-   entries to.
-
-   For example, after the commands
-     @cindex foo
-     @defindex ii
-     @synindex cp ii
-     @cindex bar
-
-   the cp index will contain the entry `foo', and the new ii
-   index will contain the entry `bar'.  This is consistent with the
-   way texinfo.tex handles the same situation.
-
-   In addition, for each index, it is remembered whether that index is
-   a code index or not.  Code indices have @code{} inserted around the
-   first word when they are printed with printindex. */
-typedef struct
-{
-  char *name;
-  int read_index;   /* index entries for `name' */
-  int write_index;  /* store index entries here, @synindex can change it */
-  int code;
-} INDEX_ALIST;
-
-extern INDEX_ALIST **name_index_alist;
-
-/* Initialize all indices.  */
-extern void init_indices (void);
-
-extern int defined_indices;
-extern int printing_index;
-extern int index_counter;
-
-INDEX_ELT *index_list (char *name);
-
-#endif /* !INDEX_H */

Property changes on: head/contrib/texinfo/makeinfo/index.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/insertion.h
===================================================================
--- head/contrib/texinfo/makeinfo/insertion.h	(revision 276550)
+++ head/contrib/texinfo/makeinfo/insertion.h	(nonexistent)
@@ -1,78 +0,0 @@
-/* insertion.h -- declarations for insertion.c.
-   $Id: insertion.h,v 1.10 2004/04/11 17:56:47 karl Exp $
-
-   Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef INSERTION_H
-#define INSERTION_H
-
-/* Must match list in insertion.c.  */
-enum insertion_type
-{ 
-  cartouche, copying, defcv, deffn, defivar, defmac, defmethod, defop,
-  defopt, defspec, deftp, deftypecv, deftypefn, deftypefun, deftypeivar,
-  deftypemethod, deftypeop, deftypevar, deftypevr, defun, defvar, defvr,
-  detailmenu, direntry, display, documentdescription, enumerate,
-  example, floatenv, flushleft, flushright, format, ftable, group,
-  ifclear, ifdocbook, ifhtml, ifinfo, ifnotdocbook, ifnothtml, ifnotinfo,
-  ifnotplaintext, ifnottex, ifnotxml, ifplaintext, ifset, iftex, ifxml,
-  itemize, lisp, menu, multitable, quotation, rawdocbook, rawhtml, rawtex,
-  rawxml, smalldisplay, smallexample, smallformat, smalllisp, verbatim,
-  table, tex, vtable, titlepage, bad_type
-};
-
-typedef struct istack_elt
-{
-  struct istack_elt *next;
-  char *item_function;
-  char *filename;
-  int line_number;
-  int filling_enabled;
-  int indented_fill;
-  int insertion;
-  int inhibited;
-  int in_fixed_width_font;
-} INSERTION_ELT;
-
-extern int insertion_level;
-extern INSERTION_ELT *insertion_stack;
-extern int in_menu;
-extern int in_detailmenu;
-extern int had_menu_commentary;
-extern int in_paragraph;
-
-extern int headitem_flag;
-extern int after_headitem;
-
-extern void init_insertion_stack (void);
-extern void command_name_condition (void);
-extern void cm_ifdocbook (void), cm_ifnotdocbook(void), cm_docbook (int arg);
-extern void cm_ifhtml (void), cm_ifnothtml(void), cm_html (int arg);
-extern void cm_ifinfo (void), cm_ifnotinfo (void);
-extern void cm_ifplaintext (void), cm_ifnotplaintext(void);
-extern void cm_iftex (void), cm_ifnottex (void), cm_tex (void);
-extern void cm_ifxml (void), cm_ifnotxml (void), cm_xml (int arg);
-extern void handle_verbatim_environment (int find_end_verbatim);
-extern void begin_insertion (enum insertion_type type);
-extern void pop_insertion (void);
-extern void discard_insertions (int specials_ok);
-
-extern int is_in_insertion_of_type (int type);
-extern int command_needs_braces (char *cmd);
-
-extern enum insertion_type find_type_from_name (char *name);
-#endif /* !INSERTION_H */

Property changes on: head/contrib/texinfo/makeinfo/insertion.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/makeinfo.c
===================================================================
--- head/contrib/texinfo/makeinfo/makeinfo.c	(revision 276550)
+++ head/contrib/texinfo/makeinfo/makeinfo.c	(nonexistent)
@@ -1,4157 +0,0 @@
-/* makeinfo -- convert Texinfo source into other formats.
-   $Id: makeinfo.c,v 1.74 2004/12/19 17:15:42 karl Exp $
-
-   Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Original author of makeinfo: Brian Fox (bfox@ai.mit.edu).  */
-
-#include "system.h"
-#include "getopt.h"
-
-#define COMPILING_MAKEINFO
-#include "makeinfo.h"
-#include "cmds.h"
-#include "files.h"
-#include "float.h"
-#include "footnote.h"
-#include "html.h"
-#include "index.h"
-#include "insertion.h"
-#include "lang.h"
-#include "macro.h"
-#include "node.h"
-#include "sectioning.h"
-#include "toc.h"
-#include "xml.h"
-
-/* You can change some of the behavior of Makeinfo by changing the
-   following defines: */
-
-/* Define INDENT_PARAGRAPHS_IN_TABLE if you want the paragraphs which
-   appear within an @table, @ftable, or @itemize environment to have
-   standard paragraph indentation.  Without this, such paragraphs have
-   no starting indentation. */
-/* #define INDENT_PARAGRAPHS_IN_TABLE */
-
-/* Define PARAGRAPH_START_INDENT to be the amount of indentation that
-   the first lines of paragraphs receive by default, where no other
-   value has been specified.  Users can change this value on the command
-   line, with the --paragraph-indent option, or within the texinfo file,
-   with the @paragraphindent command. */
-#define PARAGRAPH_START_INDENT 3
-
-/* Define DEFAULT_PARAGRAPH_SPACING as the number of blank lines that you
-   wish to appear between paragraphs.  A value of 1 creates a single blank
-   line between paragraphs.  Paragraphs are defined by 2 or more consecutive
-   newlines in the input file (i.e., one or more blank lines). */
-#define DEFAULT_PARAGRAPH_SPACING 1
-
-/* Global variables.  */
-
-/* The output file name. */
-char *output_filename = NULL;
-
-/* Name of the output file that the user elected to pass on the command line.
-   Such a name overrides any name found with the @setfilename command. */
-char *command_output_filename = NULL;
-static char *save_command_output_filename = NULL;
-
-#define INITIAL_PARAGRAPH_SPACE 5000
-int paragraph_buffer_len = INITIAL_PARAGRAPH_SPACE;
-
-/* The amount of indentation to add at the starts of paragraphs.
-   0 means don't change existing indentation at paragraph starts.
-   > 0 is amount to indent new paragraphs by.
-   < 0 means indent to column zero by removing indentation if necessary.
-
-   This is normally zero, but some people prefer paragraph starts to be
-   somewhat more indented than paragraph bodies.  A pretty value for
-   this is 3. */
-int paragraph_start_indent = PARAGRAPH_START_INDENT;
-
-/* Indentation that is pending insertion.  We have this for hacking lines
-   which look blank, but contain whitespace.  We want to treat those as
-   blank lines. */
-int pending_indent = 0;
-
-/* The index in our internal command table of the currently
-   executing command. */
-int command_index;
-
-/* A search string which is used to find the first @setfilename. */
-char setfilename_search[] =
-  { COMMAND_PREFIX,
-      's', 'e', 't', 'f', 'i', 'l', 'e', 'n', 'a', 'm', 'e', 0 };
-
-/* Values for calling handle_variable_internal (). */
-#define SET     1
-#define CLEAR   2
-#define IFSET   3
-#define IFCLEAR 4
-
-/* Flags controlling the operation of the program. */
-
-/* Default is to remove output if there were errors.  */
-int force = 0;
-
-/* Default is to notify users of bad choices. */
-int print_warnings = 1;
-
-/* Number of errors that we tolerate on a given fileset. */
-int max_error_level = 100;
-
-/* The actual last inserted character.  Note that this may be something
-   other than NEWLINE even if last_char_was_newline is 1. */
-int last_inserted_character = 0;
-
-/* Nonzero means that a newline character has already been
-   inserted, so close_paragraph () should insert one less. */
-int line_already_broken = 0;
-
-/* When nonzero we have finished an insertion (see end_insertion ()) and we
-   want to ignore false continued paragraph closings. */
-int insertion_paragraph_closed = 0;
-
-/* Nonzero means attempt to make all of the lines have fill_column width. */
-int do_justification = 0;
-
-/* Nonzero means don't replace whitespace with &nbsp; in HTML mode.  */
-int in_html_elt = 0;
-
-/* Nonzero means we are inserting a block level HTML element that must not be
-   enclosed in a <p>, such as <ul>, <ol> and <h?>.  */
-int in_html_block_level_elt = 0;
-
-/* True when expanding a macro definition.  */
-static int executing_macro = 0;
-
-/* True when we are inside a <li> block of a menu.  */
-static int in_menu_item = 0;
-
-typedef struct brace_element
-{
-  struct brace_element *next;
-  COMMAND_FUNCTION *proc;
-  char *command;
-  int pos, line;
-  int in_fixed_width_font;
-} BRACE_ELEMENT;
-
-BRACE_ELEMENT *brace_stack = NULL;
-
-static void convert_from_file (char *name);
-static void convert_from_loaded_file (char *name);
-static void convert_from_stream (FILE *stream, char *name);
-static void do_flush_right_indentation (void);
-static void handle_variable (int action);
-static void handle_variable_internal (int action, char *name);
-static void init_brace_stack (void);
-static void init_internals (void);
-static void pop_and_call_brace (void);
-static void remember_brace (COMMAND_FUNCTION (*proc));
-static int end_of_sentence_p (void);
-
-void maybe_update_execution_strings (char **text, unsigned int new_len);
-
-/* Error handling.  */
-
-/* Number of errors encountered. */
-int errors_printed = 0;
-
-/* Remember that an error has been printed.  If more than
-   max_error_level have been printed, then exit the program. */
-static void
-remember_error (void)
-{
-  errors_printed++;
-  if (max_error_level && (errors_printed > max_error_level))
-    {
-      fprintf (stderr, _("Too many errors!  Gave up.\n"));
-      flush_file_stack ();
-      if (errors_printed - max_error_level < 2)
-	cm_bye ();
-      xexit (1);
-    }
-}
-
-/* Print the last error gotten from the file system. */
-int
-fs_error (char *filename)
-{
-  remember_error ();
-  perror (filename);
-  return 0;
-}
-
-/* Print an error message, and return false. */
-void
-#if defined (VA_FPRINTF) && __STDC__
-error (const char *format, ...)
-#else
-error (format, va_alist)
-     const char *format;
-     va_dcl
-#endif
-{
-#ifdef VA_FPRINTF
-  va_list ap;
-#endif
-
-  remember_error ();
-
-  VA_START (ap, format);
-#ifdef VA_FPRINTF
-  VA_FPRINTF (stderr, format, ap);
-#else
-  fprintf (stderr, format, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif /* not VA_FPRINTF */
-  va_end (ap);
-
-  putc ('\n', stderr);
-}
-
-/* Just like error (), but print the input file and line number as well. */
-void
-#if defined (VA_FPRINTF) && __STDC__
-file_line_error (char *infile, int lno, const char *format, ...)
-#else
-file_line_error (infile, lno, format, va_alist)
-   char *infile;
-   int lno;
-   const char *format;
-   va_dcl
-#endif
-{
-#ifdef VA_FPRINTF
-  va_list ap;
-#endif
-
-  remember_error ();
-  fprintf (stderr, "%s:%d: ", infile, lno);
-
-  VA_START (ap, format);
-#ifdef VA_FPRINTF
-  VA_FPRINTF (stderr, format, ap);
-#else
-  fprintf (stderr, format, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif /* not VA_FPRINTF */
-  va_end (ap);
-
-  fprintf (stderr, ".\n");
-}
-
-/* Just like file_line_error (), but take the input file and the line
-   number from global variables. */
-void
-#if defined (VA_FPRINTF) && __STDC__
-line_error (const char *format, ...)
-#else
-line_error (format, va_alist)
-   const char *format;
-   va_dcl
-#endif
-{
-#ifdef VA_FPRINTF
-  va_list ap;
-#endif
-
-  remember_error ();
-  fprintf (stderr, "%s:%d: ", input_filename, line_number);
-
-  VA_START (ap, format);
-#ifdef VA_FPRINTF
-  VA_FPRINTF (stderr, format, ap);
-#else
-  fprintf (stderr, format, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif /* not VA_FPRINTF */
-  va_end (ap);
-
-  fprintf (stderr, ".\n");
-}
-
-void
-#if defined (VA_FPRINTF) && __STDC__
-warning (const char *format, ...)
-#else
-warning (format, va_alist)
-     const char *format;
-     va_dcl
-#endif
-{
-#ifdef VA_FPRINTF
-  va_list ap;
-#endif
-
-  if (print_warnings)
-    {
-      fprintf (stderr, _("%s:%d: warning: "), input_filename, line_number);
-
-      VA_START (ap, format);
-#ifdef VA_FPRINTF
-      VA_FPRINTF (stderr, format, ap);
-#else
-      fprintf (stderr, format, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif /* not VA_FPRINTF */
-      va_end (ap);
-
-      fprintf (stderr, ".\n");
-    }
-}
-
-
-/* The other side of a malformed expression. */
-static void
-misplaced_brace (void)
-{
-  line_error (_("Misplaced %c"), '}');
-}
-
-/* Main.  */
-
-/* Display the version info of this invocation of Makeinfo. */
-static void
-print_version_info (void)
-{
-  printf ("makeinfo (GNU %s) %s\n", PACKAGE, VERSION);
-}
-
-/* If EXIT_VALUE is zero, print the full usage message to stdout.
-   Otherwise, just say to use --help for more info.
-   Then exit with EXIT_VALUE. */
-static void
-usage (int exit_value)
-{
-  if (exit_value != 0)
-    fprintf (stderr, _("Try `%s --help' for more information.\n"), progname);
-  else
-  {
-    printf (_("Usage: %s [OPTION]... TEXINFO-FILE...\n"), progname);
-    puts ("");
-
-    puts (_("\
-Translate Texinfo source documentation to various other formats, by default\n\
-Info files suitable for reading online with Emacs or standalone GNU Info.\n"));
-
-    printf (_("\
-General options:\n\
-      --error-limit=NUM       quit after NUM errors (default %d).\n\
-      --force                 preserve output even if errors.\n\
-      --help                  display this help and exit.\n\
-      --no-validate           suppress node cross-reference validation.\n\
-      --no-warn               suppress warnings (but not errors).\n\
-      --reference-limit=NUM   warn about at most NUM references (default %d).\n\
-  -v, --verbose               explain what is being done.\n\
-      --version               display version information and exit.\n"),
-            max_error_level, reference_warning_limit);
-    puts ("");
-
-     /* xgettext: no-wrap */
-    puts (_("\
-Output format selection (default is to produce Info):\n\
-      --docbook             output Docbook XML rather than Info.\n\
-      --html                output HTML rather than Info.\n\
-      --xml                 output Texinfo XML rather than Info.\n\
-      --plaintext           output plain text rather than Info.\n\
-"));
-
-    puts (_("\
-General output options:\n\
-  -E, --macro-expand FILE   output macro-expanded source to FILE.\n\
-                            ignoring any @setfilename.\n\
-      --no-headers          suppress node separators, Node: lines, and menus\n\
-                              from Info output (thus producing plain text)\n\
-                              or from HTML (thus producing shorter output);\n\
-                              also, write to standard output by default.\n\
-      --no-split            suppress splitting of Info or HTML output,\n\
-                            generate only one output file.\n\
-      --number-sections     output chapter and sectioning numbers.\n\
-  -o, --output=FILE         output to FILE (directory if split HTML),\n\
-"));
-
-    printf (_("\
-Options for Info and plain text:\n\
-      --enable-encoding       output accented and special characters in\n\
-                                Info output based on @documentencoding.\n\
-      --fill-column=NUM       break Info lines at NUM characters (default %d).\n\
-      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n\
-                                `separate' to put them in their own node;\n\
-                                `end' to put them at the end of the node\n\
-                                  in which they are defined (default).\n\
-      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %d).\n\
-                                If VAL is `none', do not indent; if VAL is\n\
-                                `asis', preserve existing indentation.\n\
-      --split-size=NUM        split Info files at size NUM (default %d).\n"),
-             fill_column, paragraph_start_indent,
-             DEFAULT_SPLIT_SIZE);
-    puts ("");
-
-    puts (_("\
-Options for HTML:\n\
-      --css-include=FILE        include FILE in HTML <style> output;\n\
-                                  read stdin if FILE is -.\n\
-"));
-
-    printf (_("\
-Options for XML and Docbook:\n\
-      --output-indent=VAL       indent XML elements by VAL spaces (default %d).\n\
-                                  If VAL is 0, ignorable whitespace is dropped.\n\
-"), xml_indentation_increment);
-    puts ("");
-
-    puts (_("\
-Input file options:\n\
-      --commands-in-node-names  allow @ commands in node names.\n\
-  -D VAR                        define the variable VAR, as with @set.\n\
-  -I DIR                        append DIR to the @include search path.\n\
-  -P DIR                        prepend DIR to the @include search path.\n\
-  -U VAR                        undefine the variable VAR, as with @clear.\n\
-"));
-
-    puts (_("\
-Conditional processing in input:\n\
-  --ifdocbook       process @ifdocbook and @docbook even if\n\
-                      not generating Docbook.\n\
-  --ifhtml          process @ifhtml and @html even if not generating HTML.\n\
-  --ifinfo          process @ifinfo even if not generating Info.\n\
-  --ifplaintext     process @ifplaintext even if not generating plain text.\n\
-  --iftex           process @iftex and @tex; implies --no-split.\n\
-  --ifxml           process @ifxml and @xml.\n\
-  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n\
-  --no-ifhtml       do not process @ifhtml and @html text.\n\
-  --no-ifinfo       do not process @ifinfo text.\n\
-  --no-ifplaintext  do not process @ifplaintext text.\n\
-  --no-iftex        do not process @iftex and @tex text.\n\
-  --no-ifxml        do not process @ifxml and @xml text.\n\
-\n\
-  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n\
-"));
-
-    puts (_("\
-  The defaults for the @if... conditionals depend on the output format:\n\
-  if generating HTML, --ifhtml is on and the others are off;\n\
-  if generating Info, --ifinfo is on and the others are off;\n\
-  if generating plain text, --ifplaintext is on and the others are off;\n\
-  if generating XML, --ifxml is on and the others are off.\n\
-"));
-
-    fputs (_("\
-Examples:\n\
-  makeinfo foo.texi                     write Info to foo's @setfilename\n\
-  makeinfo --html foo.texi              write HTML to @setfilename\n\
-  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n\
-  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n\
-  makeinfo --no-headers foo.texi        write plain text to standard output\n\
-\n\
-  makeinfo --html --no-headers foo.texi write html without node lines, menus\n\
-  makeinfo --number-sections foo.texi   write Info with numbered sections\n\
-  makeinfo --no-split foo.texi          write one Info file however big\n\
-"), stdout);
-
-    puts (_("\n\
-Email bug reports to bug-texinfo@gnu.org,\n\
-general questions and discussion to help-texinfo@gnu.org.\n\
-Texinfo home page: http://www.gnu.org/software/texinfo/"));
-
-  } /* end of full help */
-
-  xexit (exit_value);
-}
-
-struct option long_options[] =
-{
-  { "commands-in-node-names", 0, &expensive_validation, 1 },
-  { "css-include", 1, 0, 'C' },
-  { "docbook", 0, 0, 'd' },
-  { "enable-encoding", 0, &enable_encoding, 1 },
-  { "error-limit", 1, 0, 'e' },
-  { "fill-column", 1, 0, 'f' },
-  { "footnote-style", 1, 0, 's' },
-  { "force", 0, &force, 1 },
-  { "help", 0, 0, 'h' },
-  { "html", 0, 0, 'w' },
-  { "ifdocbook", 0, &process_docbook, 1 },
-  { "ifhtml", 0, &process_html, 1 },
-  { "ifinfo", 0, &process_info, 1 },
-  { "ifplaintext", 0, &process_plaintext, 1 },
-  { "iftex", 0, &process_tex, 1 },
-  { "ifxml", 0, &process_xml, 1 },
-  { "macro-expand", 1, 0, 'E' },
-  { "no-headers", 0, &no_headers, 1 },
-  { "no-ifdocbook", 0, &process_docbook, 0 },
-  { "no-ifhtml", 0, &process_html, 0 },
-  { "no-ifinfo", 0, &process_info, 0 },
-  { "no-ifplaintext", 0, &process_plaintext, 0 },
-  { "no-iftex", 0, &process_tex, 0 },
-  { "no-ifxml", 0, &process_xml, 0 },
-  { "no-number-footnotes", 0, &number_footnotes, 0 },
-  { "no-number-sections", 0, &number_sections, 0 },
-  { "no-pointer-validate", 0, &validating, 0 },
-  { "no-split", 0, &splitting, 0 },
-  { "no-validate", 0, &validating, 0 },
-  { "no-warn", 0, &print_warnings, 0 },
-  { "number-footnotes", 0, &number_footnotes, 1 },
-  { "number-sections", 0, &number_sections, 1 },
-  { "output", 1, 0, 'o' },
-  { "output-indent", 1, 0, 'i' },
-  { "paragraph-indent", 1, 0, 'p' },
-  { "plaintext", 0, 0, 't' },
-  { "reference-limit", 1, 0, 'r' },
-  { "split-size", 1, 0, 'S'},
-  { "verbose", 0, &verbose_mode, 1 },
-  { "version", 0, 0, 'V' },
-  { "xml", 0, 0, 'x' },
-  {NULL, 0, NULL, 0}
-};
-
-/* We use handle_variable_internal for -D and -U, and it depends on
-   execute_string, which depends on input_filename, which is not defined
-   while we are handling options. :-\  So we save these defines in this
-   struct, and handle them later.  */
-typedef struct command_line_define
-{
-  struct command_line_define *next;
-  int action;
-  char *define;
-} COMMAND_LINE_DEFINE;
-
-static COMMAND_LINE_DEFINE *command_line_defines = NULL;
-
-/* For each file mentioned in the command line, process it, turning
-   Texinfo commands into wonderfully formatted output text. */
-int
-main (int argc, char **argv)
-{
-  int c, ind;
-  int reading_from_stdin = 0;
-
-#ifdef HAVE_SETLOCALE
-  /* Do not use LC_ALL, because LC_NUMERIC screws up the scanf parsing
-     of the argument to @multicolumn.  */
-  setlocale (LC_TIME, "");
-#ifdef LC_MESSAGES /* ultrix */
-  setlocale (LC_MESSAGES, "");
-#endif
-  setlocale (LC_CTYPE, "");
-  setlocale (LC_COLLATE, "");
-#endif
-
-#ifdef ENABLE_NLS
-  /* Set the text message domain.  */
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-#endif
-
-  /* If TEXINFO_OUTPUT_FORMAT envvar is set, use it to set default output.
-     Can be overridden with one of the output options.  */
-  if (getenv ("TEXINFO_OUTPUT_FORMAT") != NULL)
-    {
-      if (STREQ (getenv ("TEXINFO_OUTPUT_FORMAT"), "docbook"))
-        {
-          splitting = 0;
-          html = 0;
-          docbook = 1;
-          xml = 1;
-          process_docbook = 1;
-        }
-      else if (STREQ (getenv ("TEXINFO_OUTPUT_FORMAT"), "html"))
-        {
-          html = 1;
-          docbook = 0;
-          xml = 0;
-          process_html = 1;
-        }
-      else if (STREQ (getenv ("TEXINFO_OUTPUT_FORMAT"), "info"))
-        {
-          html = 0;
-          docbook = 0;
-          xml = 0;
-        }
-      else if (STREQ (getenv ("TEXINFO_OUTPUT_FORMAT"), "plaintext"))
-        {
-          splitting = 0;
-          no_headers = 1;
-          html = 0;
-          docbook = 0;
-          xml = 0;
-          process_plaintext = 1;
-        }
-      else if (STREQ (getenv ("TEXINFO_OUTPUT_FORMAT"), "xml"))
-        {
-          splitting = 0;
-          html = 0;
-          docbook = 0;
-          xml = 1;
-          process_xml = 1;
-        }
-      else
-        fprintf (stderr,
-            _("%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"),
-                 progname, getenv ("TEXINFO_OUTPUT_FORMAT"));
-    }
-
-  /* Parse argument flags from the input line. */
-  while ((c = getopt_long (argc, argv, "D:de:E:f:hI:i:o:p:P:r:s:t:U:vV:wx",
-                           long_options, &ind)) != EOF)
-    {
-      if (c == 0 && long_options[ind].flag == 0)
-        c = long_options[ind].val;
-
-      switch (c)
-        {
-        case 'C':  /* --css-include */
-          css_include = xstrdup (optarg);
-          break;
-
-        case 'D':
-        case 'U':
-          /* User specified variable to set or clear. */
-          if (xml && !docbook)
-            {
-              COMMAND_LINE_DEFINE *new = xmalloc (sizeof (COMMAND_LINE_DEFINE));
-              new->action = (c == 'D') ? SET : CLEAR;
-              new->define = xstrdup (optarg);
-              new->next = command_line_defines;
-              command_line_defines = new;
-            }
-          else
-            handle_variable_internal ((c == 'D' ? SET : CLEAR), optarg);
-          break;
-
-        case 'd': /* --docbook */
-          splitting = 0;
-          xml = 1;
-          docbook = 1;
-          html = 0;
-	  process_docbook = 1;
-          break;
-
-        case 'e': /* --error-limit */
-          if (sscanf (optarg, "%d", &max_error_level) != 1)
-            {
-              fprintf (stderr,
-                      _("%s: %s arg must be numeric, not `%s'.\n"),
-                      progname, "--error-limit", optarg);
-              usage (1);
-            }
-          break;
-
-        case 'E': /* --macro-expand */
-          if (!macro_expansion_output_stream)
-            {
-              macro_expansion_filename = optarg;
-              macro_expansion_output_stream
-                = strcmp (optarg, "-") == 0 ? stdout : fopen (optarg, "w");
-              if (!macro_expansion_output_stream)
-                error (_("%s: could not open macro expansion output `%s'"),
-                       progname, optarg);
-            }
-          else
-            fprintf (stderr,
-                     _("%s: ignoring second macro expansion output `%s'.\n"),
-                     progname, optarg);
-          break;
-
-        case 'f': /* --fill-column */
-          if (sscanf (optarg, "%d", &fill_column) != 1)
-            {
-              fprintf (stderr,
-                       _("%s: %s arg must be numeric, not `%s'.\n"),
-                       progname, "--fill-column", optarg);
-              usage (1);
-            }
-          break;
-
-        case 'h': /* --help */
-          usage (0);
-          break;
-
-        case 'I':
-          /* Append user-specified dir to include file path. */
-          append_to_include_path (optarg);
-          break;
-
-        case 'i':
-          if (sscanf (optarg, "%d", &xml_indentation_increment) != 1)
-            {
-              fprintf (stderr,
-                     _("%s: %s arg must be numeric, not `%s'.\n"),
-                     progname, "--output-indent", optarg);
-              usage (1);
-            }
-          break;
-
-        case 'o': /* --output */
-          command_output_filename = xstrdup (optarg);
-          save_command_output_filename = command_output_filename;
-          break;
-
-        case 'p': /* --paragraph-indent */
-          if (set_paragraph_indent (optarg) < 0)
-            {
-              fprintf (stderr,
-   _("%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"),
-                       progname, optarg);
-              usage (1);
-            }
-          break;
-
-        case 'P':
-          /* Prepend user-specified include dir to include path. */
-          prepend_to_include_path (optarg);
-          break;
-
-        case 'r': /* --reference-limit */
-          if (sscanf (optarg, "%d", &reference_warning_limit) != 1)
-            {
-              fprintf (stderr,
-                     _("%s: %s arg must be numeric, not `%s'.\n"),
-                     progname, "--reference-limit", optarg);
-              usage (1);
-            }
-          break;
-
-        case 's': /* --footnote-style */
-          if (set_footnote_style (optarg) < 0)
-            {
-              fprintf (stderr,
-        _("%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"),
-                       progname, optarg);
-              usage (1);
-            }
-          footnote_style_preset = 1;
-          break;
-
-        case 'S': /* --split-size */
-          if (sscanf (optarg, "%d", &split_size) != 1)
-            {
-              fprintf (stderr,
-                     _("%s: %s arg must be numeric, not `%s'.\n"),
-                     progname, "--split-size", optarg);
-              usage (1);
-            }
-          break;
-
-        case 't': /* --plaintext */
-          splitting = 0;
-          no_headers = 1;
-          html = 0;
-          docbook = 0;
-          xml = 0;
-          process_plaintext = 1;
-          break;
-
-        case 'v':
-          verbose_mode++;
-          break;
-
-        case 'V': /* --version */
-          print_version_info ();
-          puts ("");
-          puts ("Copyright (C) 2004 Free Software Foundation, Inc.");
-          printf (_("There is NO warranty.  You may redistribute this software\n\
-under the terms of the GNU General Public License.\n\
-For more information about these matters, see the files named COPYING.\n"));
-          xexit (0);
-          break;
-
-        case 'w': /* --html */
-          xml = 0;
-          docbook = 0;
-          html = 1;
-          process_html = 1;
-          break;
-
-        case 'x': /* --xml */
-          splitting = 0;
-          html = 0;
-          docbook = 0;
-          xml = 1;
-          process_xml = 1;
-          break;
-
-        case '?':
-          usage (1);
-          break;
-        }
-    }
-
-  if (macro_expansion_output_stream)
-    validating = 0;
-
-  if (!validating)
-    expensive_validation = 0;
-
-  if (optind == argc)
-    {
-      /* Check to see if input is a file.  If so, process that. */
-      if (!isatty (fileno (stdin)))
-        reading_from_stdin = 1;
-      else
-        {
-          fprintf (stderr, _("%s: missing file argument.\n"), progname);
-          usage (1);
-        }
-    }
-
-  if (no_headers)
-    {
-      /* If the user did not specify an output file, use stdout. */
-      if (!command_output_filename)
-        command_output_filename = xstrdup ("-");
-
-      if (html && splitting && !STREQ (command_output_filename, "-"))
-        { /* --no-headers --no-split --html indicates confusion. */
-          fprintf (stderr,
-                  "%s: can't split --html output to `%s' with --no-headers.\n",
-                   progname, command_output_filename);
-          usage (1);
-        }
-
-      /* --no-headers implies --no-split.  */
-      splitting = 0;
-    }
-
-  if (process_info == -1)
-    { /* no explicit --[no-]ifinfo option, so we'll do @ifinfo
-         if we're generating info or (for compatibility) plain text.  */
-      process_info = !html && !xml;
-    }
-
-  if (process_plaintext == -1)
-    { /* no explicit --[no-]ifplaintext option, so we'll do @ifplaintext
-         if we're generating plain text.  */
-      process_plaintext = no_headers && !html && !xml;
-    }
-
-  if (verbose_mode)
-    print_version_info ();
-
-  /* Remaining arguments are file names of texinfo files.
-     Convert them, one by one. */
-  if (!reading_from_stdin)
-    {
-      while (optind != argc)
-        convert_from_file (argv[optind++]);
-    }
-  else
-    convert_from_stream (stdin, "stdin");
-
-  xexit (errors_printed ? 2 : 0);
-  return 0; /* Avoid bogus warnings.  */
-}
-
-/* Hacking tokens and strings.  */
-
-/* Return the next token as a string pointer.  We cons the string.  This
-   `token' means simply a command name.  */
-
-/* = is so @alias works.  ^ and _ are so macros can be used in math mode
-   without a space following.  Possibly we should simply allow alpha, to
-   be compatible with TeX.  */
-#define COMMAND_CHAR(c) (!cr_or_whitespace(c) \
-                         && (c) != '{' \
-                         && (c) != '}' \
-                         && (c) != '=' \
-                         && (c) != '_' \
-                         && (c) != '^' \
-                         )
-
-static char *
-read_token (void)
-{
-  int i, character;
-  char *result;
-
-  /* If the first character to be read is self-delimiting, then that
-     is the command itself. */
-  character = curchar ();
-  if (self_delimiting (character))
-    {
-      input_text_offset++;
-
-      if (character == '\n')
-        line_number++;
-
-      result = xstrdup (" ");
-      *result = character;
-      return result;
-    }
-
-  for (i = 0; ((input_text_offset != input_text_length)
-               && (character = curchar ())
-               && COMMAND_CHAR (character));
-       i++, input_text_offset++);
-  result = xmalloc (i + 1);
-  memcpy (result, &input_text[input_text_offset - i], i);
-  result[i] = 0;
-  return result;
-}
-
-/* Return nonzero if CHARACTER is self-delimiting. */
-int
-self_delimiting (int character)
-{
-  /* @; and @\ are not Texinfo commands, but they are listed here
-     anyway.  I don't know why.  --karl, 10aug96.  */
-  return strchr ("~{|}`^\\@?=;:./-,*\'\" !\n\t", character) != NULL;
-}
-
-/* Clear whitespace from the front and end of string. */
-void
-canon_white (char *string)
-{
-  char *p = string;
-  unsigned len;
-
-  if (!*p)
-    return;
-
-  do
-    {
-      if (!cr_or_whitespace (*p))
-	break;
-      ++p;
-    }
-  while (*p);
-
-  len = strlen (p);
-  while (len && cr_or_whitespace (p[len-1]))
-    --len;
-
-  if (p != string)
-    memmove (string, p, len);
-
-  string[len] = 0;
-}
-
-/* Bash STRING, replacing all whitespace with just one space. */
-void
-fix_whitespace (char *string)
-{
-  char *temp = xmalloc (strlen (string) + 1);
-  int string_index = 0;
-  int temp_index = 0;
-  int c;
-
-  canon_white (string);
-
-  while (string[string_index])
-    {
-      c = temp[temp_index++] = string[string_index++];
-
-      if (c == ' ' || c == '\n' || c == '\t')
-        {
-          temp[temp_index - 1] = ' ';
-          while ((c = string[string_index]) && (c == ' ' ||
-                                                c == '\t' ||
-                                                c == '\n'))
-            string_index++;
-        }
-    }
-  temp[temp_index] = 0;
-  strcpy (string, temp);
-  free (temp);
-}
-
-/* Discard text until the desired string is found.  The string is
-   included in the discarded text. */
-void
-discard_until (char *string)
-{
-  int temp = search_forward (string, input_text_offset);
-
-  int tt = (temp < 0) ? input_text_length : temp + strlen (string);
-  int from = input_text_offset;
-
-  /* Find out what line we are on. */
-  while (from != tt)
-    if (input_text[from++] == '\n')
-      line_number++;
-
-  if (temp < 0)
-    {
-      /* not found, move current position to end of string */
-      input_text_offset = input_text_length;
-      if (strcmp (string, "\n") != 0)
-        { /* Give a more descriptive feedback, if we are looking for ``@end ''
-             during macro execution.  That means someone used a multiline
-             command as an argument to, say, @section ... style commands.  */
-          char *end_block = xmalloc (8);
-          sprintf (end_block, "\n%cend ", COMMAND_PREFIX);
-          if (executing_string && strstr (string, end_block))
-            line_error (_("Multiline command %c%s used improperly"), 
-                COMMAND_PREFIX, command);
-          else
-            line_error (_("Expected `%s'"), string);
-          free (end_block);
-          return;
-        }
-    }
-  else
-    /* found, move current position to after the found string */
-    input_text_offset = temp + strlen (string);
-}
-
-/* Read characters from the file until we are at MATCH.
-   Place the characters read into STRING.
-   On exit input_text_offset is after the match string.
-   Return the offset where the string starts. */
-int
-get_until (char *match, char **string)
-{
-  int len, current_point, x, new_point, tem;
-
-  current_point = x = input_text_offset;
-  new_point = search_forward (match, input_text_offset);
-
-  if (new_point < 0)
-    new_point = input_text_length;
-  len = new_point - current_point;
-
-  /* Keep track of which line number we are at. */
-  tem = new_point + (strlen (match) - 1);
-  while (x != tem)
-    if (input_text[x++] == '\n')
-      line_number++;
-
-  *string = xmalloc (len + 1);
-
-  memcpy (*string, &input_text[current_point], len);
-  (*string)[len] = 0;
-
-  /* Now leave input_text_offset in a consistent state. */
-  input_text_offset = tem;
-
-  if (input_text_offset > input_text_length)
-    input_text_offset = input_text_length;
-
-  return new_point;
-}
-
-/* Replace input_text[FROM .. TO] with its expansion.  */
-void
-replace_with_expansion (int from, int *to)
-{
-  char *xp;
-  unsigned xp_len, new_len;
-  char *old_input = input_text;
-  unsigned raw_len = *to - from;
-  char *str;
-
-  /* The rest of the code here moves large buffers, so let's
-     not waste time if the input cannot possibly expand
-     into anything.  Unfortunately, we cannot avoid expansion
-     when we see things like @code etc., even if they only
-     asked for expansion of macros, since any Texinfo command
-     can be potentially redefined with a macro.  */
-  if (only_macro_expansion &&
-      memchr (input_text + from, COMMAND_PREFIX, raw_len) == 0)
-    return;
-
-  /* Get original string from input.  */
-  str = xmalloc (raw_len + 1);
-  memcpy (str, input_text + from, raw_len);
-  str[raw_len] = 0;
-
-  /* We are going to relocate input_text, so we had better output
-     pending portion of input_text now, before the pointer changes.  */
-  if (macro_expansion_output_stream && !executing_string
-      && !me_inhibit_expansion)
-    append_to_expansion_output (from);
-
-  /* Expand it.  */
-  xp = expansion (str, 0);
-  xp_len = strlen (xp);
-  free (str);
-
-  /* Plunk the expansion into the middle of `input_text' --
-     which is terminated by a newline, not a null.  Avoid
-     expensive move of the rest of the input if the expansion
-     has the same length as the original string.  */
-  if (xp_len != raw_len)
-    {
-      new_len = from + xp_len + input_text_length - *to + 1;
-      if (executing_string)
-        { /* If we are in execute_string, we might need to update
-             the relevant element in the execution_strings[] array,
-             since it could have to be relocated from under our
-             feet.  (input_text is reallocated here as well, if needed.)  */
-          maybe_update_execution_strings (&input_text, new_len);
-        }
-      else if (new_len > input_text_length + 1)
-        /* Don't bother to realloc if we have enough space.  */
-        input_text = xrealloc (input_text, new_len);
-
-      memmove (input_text + from + xp_len,
-               input_text + *to, input_text_length - *to + 1);
-
-      *to += xp_len - raw_len;
-      /* Since we change input_text_length here, the comparison above
-         isn't really valid, but it seems the worst that might happen is
-         an extra xrealloc or two, so let's not worry.  */
-      input_text_length += xp_len - raw_len;
-    }
-  memcpy (input_text + from, xp, xp_len);
-  free (xp);
-
-  /* Synchronize the macro-expansion pointers with our new input_text.  */
-  if (input_text != old_input)
-    forget_itext (old_input);
-  if (macro_expansion_output_stream && !executing_string)
-    remember_itext (input_text, from);
-}
-
-/* Read characters from the file until we are at MATCH or end of line.
-   Place the characters read into STRING.  If EXPAND is nonzero,
-   expand the text before looking for MATCH for those cases where
-   MATCH might be produced by some macro.  */
-void
-get_until_in_line (int expand, char *match, char **string)
-{
-  int real_bottom = input_text_length;
-  int limit = search_forward ("\n", input_text_offset);
-  if (limit < 0)
-    limit = input_text_length;
-
-  /* Replace input_text[input_text_offset .. limit-1] with its expansion.
-     This allows the node names and menu entries themselves to be
-     constructed via a macro, as in:
-        @macro foo{p, q}
-        Together: \p\ & \q\.
-        @end macro
-
-        @node @foo{A,B}, next, prev, top
-
-     Otherwise, the `,' separating the macro args A and B is taken as
-     the node argument separator, so the node name is `@foo{A'.  This
-     expansion is only necessary on the first call, since we expand the
-     whole line then.  */
-  if (expand)
-    {
-      replace_with_expansion (input_text_offset, &limit);
-    }
-
-  real_bottom = input_text_length;
-  input_text_length = limit;
-  get_until (match, string);
-  input_text_length = real_bottom;
-}
-
-void
-get_rest_of_line (int expand, char **string)
-{
-  xml_no_para ++;
-  if (expand)
-    {
-      char *tem;
-
-      /* Don't expand non-macros in input, since we want them
-         intact in the macro-expanded output.  */
-      only_macro_expansion++;
-      get_until_in_line (1, "\n", &tem);
-      only_macro_expansion--;
-      *string = expansion (tem, 0);
-      free (tem);
-    }
-  else
-    get_until_in_line (0, "\n", string);
-
-  canon_white (*string);
-
-  if (curchar () == '\n')       /* as opposed to the end of the file... */
-    {
-      line_number++;
-      input_text_offset++;
-    }
-  xml_no_para --;
-}
-
-/* Backup the input pointer to the previous character, keeping track
-   of the current line number. */
-void
-backup_input_pointer (void)
-{
-  if (input_text_offset)
-    {
-      input_text_offset--;
-      if (curchar () == '\n')
-        line_number--;
-    }
-}
-
-/* Read characters from the file until we are at MATCH or closing brace.
-   Place the characters read into STRING.  */
-void
-get_until_in_braces (char *match, char **string)
-{
-  char *temp;
-  int i, brace = 0;
-  int match_len = strlen (match);
-
-  for (i = input_text_offset; i < input_text_length; i++)
-    {
-      if (i < input_text_length - 1 && input_text[i] == '@')
-        {
-          i++;                  /* skip commands like @, and @{ */
-          continue;
-        }
-      else if (input_text[i] == '{')
-        brace++;
-      else if (input_text[i] == '}')
-        {
-          brace--;
-          /* If looking for a brace, don't stop at the interior brace,
-             like after "baz" in "@foo{something @bar{baz} more}".  */
-          if (brace == 0)
-            continue;
-        }
-      else if (input_text[i] == '\n')
-        line_number++;
-
-      if (brace < 0 ||
-          (brace == 0 && strncmp (input_text + i, match, match_len) == 0))
-        break;
-    }
-
-  match_len = i - input_text_offset;
-  temp = xmalloc (2 + match_len);
-  memcpy (temp, input_text + input_text_offset, match_len);
-  temp[match_len] = 0;
-  input_text_offset = i;
-  *string = temp;
-}
-
-
-
-/* Converting a file.  */
-
-/* Convert the file named by NAME.  The output is saved on the file
-   named as the argument to the @setfilename command. */
-static char *suffixes[] = {
-  /* ".txi" is checked first so that on 8+3 DOS filesystems, if they
-     have "texinfo.txi" and "texinfo.tex" in the same directory, the
-     former is used rather than the latter, due to file name truncation.  */
-  ".txi",
-  ".texinfo",
-  ".texi",
-  ".txinfo",
-  "",
-  NULL
-};
-
-static void
-initialize_conversion (void)
-{
-  init_tag_table ();
-  init_indices ();
-  init_internals ();
-  init_paragraph ();
-
-  /* This is used for splitting the output file and for doing section
-     headings.  It was previously initialized in `init_paragraph', but its
-     use there loses with the `init_paragraph' calls done by the
-     multitable code; the tag indices get reset to zero.  */
-  output_position = 0;
-}
-
-/* Reverse the chain of structures in LIST.  Output the new head
-   of the chain.  You should always assign the output value of this
-   function to something, or you will lose the chain. */
-GENERIC_LIST *
-reverse_list (GENERIC_LIST *list)
-{
-  GENERIC_LIST *next;
-  GENERIC_LIST *prev = NULL;
-
-  while (list)
-    {
-      next = list->next;
-      list->next = prev;
-      prev = list;
-      list = next;
-    }
-  return prev;
-}
-
-/* We read in multiples of 4k, simply because it is a typical pipe size
-   on unix systems. */
-#define READ_BUFFER_GROWTH (4 * 4096)
-
-/* Convert the Texinfo file coming from the open stream STREAM.  Assume the
-   source of the stream is named NAME. */
-static void
-convert_from_stream (FILE *stream, char *name)
-{
-  char *buffer = NULL;
-  int buffer_offset = 0, buffer_size = 0;
-
-  initialize_conversion ();
-
-  /* Read until the end of the stream.  This isn't strictly correct, since
-     the texinfo input may end before the stream ends, but it is a quick
-     working hueristic. */
-  while (!feof (stream))
-    {
-      int count;
-
-      if (buffer_offset + (READ_BUFFER_GROWTH + 1) >= buffer_size)
-        buffer = (char *)
-          xrealloc (buffer, (buffer_size += READ_BUFFER_GROWTH));
-
-      count = fread (buffer + buffer_offset, 1, READ_BUFFER_GROWTH, stream);
-
-      if (count < 0)
-        {
-          perror (name);
-          xexit (1);
-        }
-
-      buffer_offset += count;
-      if (count == 0)
-        break;
-    }
-
-  /* Set the globals to the new file. */
-  input_text = buffer;
-  input_text_length = buffer_offset;
-  input_filename = xstrdup (name);
-  node_filename = xstrdup (name);
-  input_text_offset = 0;
-  line_number = 1;
-
-  /* Not strictly necessary.  This magic prevents read_token () from doing
-     extra unnecessary work each time it is called (that is a lot of times).
-     The INPUT_TEXT_LENGTH is one past the actual end of the text. */
-  input_text[input_text_length] = '\n';
-
-  convert_from_loaded_file (name);
-}
-
-static void
-convert_from_file (char *name)
-{
-  int i;
-  char *filename = xmalloc (strlen (name) + 50);
-
-  /* Prepend file directory to the search path, so relative links work.  */
-  prepend_to_include_path (pathname_part (name));
-
-  initialize_conversion ();
-
-  /* Try to load the file specified by NAME, concatenated with our
-     various suffixes.  Prefer files like `makeinfo.texi' to
-     `makeinfo'.  */
-  for (i = 0; suffixes[i]; i++)
-    {
-      strcpy (filename, name);
-      strcat (filename, suffixes[i]);
-
-      if (find_and_load (filename, 1))
-        break;
-
-      if (!suffixes[i][0] && strrchr (filename, '.'))
-        {
-          fs_error (filename);
-          free (filename);
-          return;
-        }
-    }
-
-  if (!suffixes[i])
-    {
-      fs_error (name);
-      free (filename);
-      return;
-    }
-
-  input_filename = filename;
-
-  convert_from_loaded_file (name);
-
-  /* Pop the prepended path, so multiple filenames in the
-     command line do not screw each others include paths.  */
-  pop_path_from_include_path ();
-}
-
-static int
-create_html_directory (char *dir, int can_remove_file)
-{
-  struct stat st;
-
-  /* Already exists.  */
-  if (stat (dir, &st) == 0)
-    {
-      /* And it's a directory, so silently reuse it.  */
-      if (S_ISDIR (st.st_mode))
-        return 1;
-      /* Not a directory, so move it out of the way if we are allowed.  */
-      else if (can_remove_file)
-        {
-          if (unlink (dir) != 0)
-            return 0;
-        }
-      else
-        return 0;
-    }
-
-  if (mkdir (dir, 0777) == 0)
-    /* Success!  */
-    return 1;
-  else
-    return 0;
-}
-
-/* Given OUTPUT_FILENAME == ``/foo/bar/baz.html'', return
-   "/foo/bar/baz/baz.html".  This routine is called only if html && splitting.
-
-  Split html output goes into the subdirectory of the toplevel
-  filename, without extension.  For example:
-      @setfilename foo.info
-  produces output in files foo/index.html, foo/second-node.html, ...
-
-  But if the user said -o foo.whatever on the cmd line, then use
-  foo.whatever unchanged.  */
-
-static char *
-insert_toplevel_subdirectory (char *output_filename)
-{
-  static const char index_name[] = "index.html";
-  char *dir, *subdir, *base, *basename, *p;
-  char buf[PATH_MAX];
-  const int index_len = sizeof (index_name) - 1;
-
-  strcpy (buf, output_filename);
-  dir = pathname_part (buf);   /* directory of output_filename */
-  base = filename_part (buf);  /* strips suffix, too */
-  basename = xstrdup (base);   /* remember real @setfilename name */
-  p = dir + strlen (dir) - 1;
-  if (p > dir && IS_SLASH (*p))
-    *p = 0;
-  p = strrchr (base, '.');
-  if (p)
-    *p = 0;
-
-  /* Split html output goes into subdirectory of toplevel name. */
-  if (save_command_output_filename
-      && STREQ (output_filename, save_command_output_filename))
-    subdir = basename;  /* from user, use unchanged */
-  else
-    subdir = base;      /* implicit, omit suffix */
-
-  free (output_filename);
-  output_filename = xmalloc (strlen (dir) + 1
-                             + strlen (basename) + 1
-                             + index_len
-                             + 1);
-  strcpy (output_filename, dir);
-  if (strlen (dir))
-    strcat (output_filename, "/");
-  strcat (output_filename, subdir);
-
-  /* First try, do not remove existing file.  */
-  if (!create_html_directory (output_filename, 0))
-    {
-      /* That failed, try subdir name with .html.
-         Remove it if it exists.  */
-      strcpy (output_filename, dir);
-      if (strlen (dir))
-        strcat (output_filename, "/");
-      strcat (output_filename, basename);
-
-      if (!create_html_directory (output_filename, 1))
-        {
-          /* Last try failed too :-\  */
-          line_error (_("Can't create directory `%s': %s"),
-              output_filename, strerror (errno));
-          xexit (1);
-        }
-    }
-
-  strcat (output_filename, "/");
-  strcat (output_filename, index_name);
-  return output_filename;
-}
-
-/* FIXME: this is way too hairy */
-static void
-convert_from_loaded_file (char *name)
-{
-  char *real_output_filename = NULL;
-
-  remember_itext (input_text, 0);
-
-  input_text_offset = 0;
-
-  /* Avoid the `\input texinfo' line in HTML output (assuming it starts
-     the file).  */
-  if (looking_at ("\\input"))
-    discard_until ("\n");
-
-  /* Search this file looking for the special string which starts conversion.
-     Once found, we may truly begin. */
-  while (input_text_offset >= 0)
-    {
-      input_text_offset =
-        search_forward (setfilename_search, input_text_offset);
-
-      if (input_text_offset == 0
-          || (input_text_offset > 0
-              && input_text[input_text_offset -1] == '\n'))
-        break;
-      else if (input_text_offset > 0)
-        input_text_offset++;
-    }
-
-  if (input_text_offset < 0)
-    {
-      if (!command_output_filename)
-        {
-#if defined (REQUIRE_SETFILENAME)
-          error (_("No `%s' found in `%s'"), setfilename_search, name);
-          goto finished;
-#else
-          command_output_filename = output_name_from_input_name (name);
-#endif /* !REQUIRE_SETFILENAME */
-        }
-
-      {
-        int i, end_of_first_line;
-
-        /* Find the end of the first line in the file. */
-        for (i = 0; i < input_text_length - 1; i++)
-          if (input_text[i] == '\n')
-            break;
-
-        end_of_first_line = i + 1;
-
-        for (i = 0; i < end_of_first_line; i++)
-          {
-            if ((input_text[i] == '\\') &&
-                (strncmp (input_text + i + 1, "input", 5) == 0))
-              {
-                input_text_offset = i;
-                break;
-              }
-          }
-      }
-    }
-  else
-    input_text_offset += strlen (setfilename_search);
-
-  if (!command_output_filename)
-    {
-      get_until ("\n", &output_filename); /* read rest of line */
-      if (html || xml)
-        { /* Change any extension to .html or .xml.  */
-          char *html_name, *directory_part, *basename_part, *temp;
-
-          canon_white (output_filename);
-          directory_part = pathname_part (output_filename);
-
-          basename_part = filename_part (output_filename);
-
-          /* Zap any existing extension.  */
-          temp = strrchr (basename_part, '.');
-          if (temp)
-            *temp = 0;
-
-          /* Construct new filename.  */
-          html_name = xmalloc (strlen (directory_part)
-                               + strlen (basename_part) + 6);
-          strcpy (html_name, directory_part);
-          strcat (html_name, basename_part);
-          strcat (html_name, html ? ".html" : ".xml");
-
-          /* Replace name from @setfilename with the html name.  */
-          free (output_filename);
-          output_filename = html_name;
-        }
-    }
-  else
-    {
-      if (input_text_offset != -1)
-        discard_until ("\n");
-      else
-        input_text_offset = 0;
-
-      real_output_filename = output_filename = command_output_filename;
-      command_output_filename = NULL;  /* for included files or whatever */
-    }
-
-  canon_white (output_filename);
-  toplevel_output_filename = xstrdup (output_filename);
-
-  if (real_output_filename && strcmp (real_output_filename, "-") == 0)
-    {
-      if (macro_expansion_filename
-          && strcmp (macro_expansion_filename, "-") == 0)
-        {
-          fprintf (stderr,
-  _("%s: Skipping macro expansion to stdout as Info output is going there.\n"),
-                   progname);
-          macro_expansion_output_stream = NULL;
-        }
-      real_output_filename = xstrdup (real_output_filename);
-      output_stream = stdout;
-      splitting = 0;            /* Cannot split when writing to stdout. */
-    }
-  else
-    {
-      if (html && splitting)
-        {
-          if (FILENAME_CMP (output_filename, NULL_DEVICE) == 0
-              || FILENAME_CMP (output_filename, ALSO_NULL_DEVICE) == 0)
-            splitting = 0;
-          else
-            output_filename = insert_toplevel_subdirectory (output_filename);
-          real_output_filename = xstrdup (output_filename);
-        }
-      else if (!real_output_filename)
-        real_output_filename = expand_filename (output_filename, name);
-      else
-        real_output_filename = xstrdup (real_output_filename);
-
-      output_stream = fopen (real_output_filename, "w");
-    }
-
-  set_current_output_filename (real_output_filename);
-
-  if (xml && !docbook)
-    xml_begin_document (filename_part (output_filename));
-
-  if (verbose_mode)
-    printf (_("Making %s file `%s' from `%s'.\n"),
-            no_headers ? "text"
-            : html ? "HTML"
-            : xml ? "XML"
-            : "info",
-            output_filename, input_filename);
-
-  if (output_stream == NULL)
-    {
-      fs_error (real_output_filename);
-      goto finished;
-    }
-
-  /* Make the displayable filename from output_filename.  Only the base
-     portion of the filename need be displayed. */
-  flush_output ();              /* in case there was no @bye */
-  if (output_stream != stdout)
-    pretty_output_filename = filename_part (output_filename);
-  else
-    pretty_output_filename = xstrdup ("stdout");
-
-  /* For this file only, count the number of newlines from the top of
-     the file to here.  This way, we keep track of line numbers for
-     error reporting.  Line_number starts at 1, since the user isn't
-     zero-based. */
-  {
-    int temp = 0;
-    line_number = 1;
-    while (temp != input_text_offset)
-      if (input_text[temp++] == '\n')
-        line_number++;
-  }
-
-  /* html fixxme: should output this as trailer on first page.  */
-  if (!no_headers && !html && !xml)
-    add_word_args (_("This is %s, produced by makeinfo version %s from %s.\n"),
-                   output_filename, VERSION, input_filename);
-
-  close_paragraph ();
-
-  if (xml && !docbook)
-    {
-      /* Just before the real main loop, let's handle the defines.  */
-      COMMAND_LINE_DEFINE *temp;
-
-      for (temp = command_line_defines; temp; temp = temp->next)
-        {
-          handle_variable_internal (temp->action, temp->define);
-          free(temp->define);
-        }
-    }
-
-  reader_loop ();
-  if (xml)
-    xml_end_document ();
-
-
-finished:
-  discard_insertions (0);
-  close_paragraph ();
-  flush_file_stack ();
-
-  if (macro_expansion_output_stream)
-    {
-      fclose (macro_expansion_output_stream);
-      if (errors_printed && !force
-          && strcmp (macro_expansion_filename, "-") != 0
-          && FILENAME_CMP (macro_expansion_filename, NULL_DEVICE) != 0
-          && FILENAME_CMP (macro_expansion_filename, ALSO_NULL_DEVICE) != 0)
-        {
-          fprintf (stderr,
-_("%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"),
-                   progname, macro_expansion_filename);
-          if (unlink (macro_expansion_filename) < 0)
-            perror (macro_expansion_filename);
-        }
-    }
-
-  if (output_stream)
-    {
-      output_pending_notes ();
-
-      if (html)
-        {
-          no_indent = 1;
-          start_paragraph ();
-          add_word ("</body></html>\n");
-          close_paragraph ();
-        }
-
-      /* maybe we want local variables in info output.  */
-      {
-        char *trailer = info_trailer ();
-	if (!xml && !docbook && trailer)
-          {
-            if (html)
-              insert_string ("<!--");
-            insert_string (trailer);
-            free (trailer);
-            if (html)
-              insert_string ("\n-->\n");
-          }
-      }
-
-      /* Write stuff makeinfo generates after @bye, ie. info_trailer.  */
-      flush_output ();
-
-      if (output_stream != stdout)
-        fclose (output_stream);
-
-      /* If validating, then validate the entire file right now. */
-      if (validating)
-        validate_file (tag_table);
-
-      handle_delayed_writes ();
-
-      if (tag_table)
-        {
-          tag_table = (TAG_ENTRY *) reverse_list ((GENERIC_LIST *) tag_table);
-          if (!no_headers && !html && !STREQ (current_output_filename, "-"))
-            write_tag_table (real_output_filename);
-        }
-
-      if (splitting && !html && (!errors_printed || force))
-        {
-          clean_old_split_files (real_output_filename);
-          split_file (real_output_filename, split_size);
-        }
-      else if (errors_printed
-               && !force
-               && strcmp (real_output_filename, "-") != 0
-               && FILENAME_CMP (real_output_filename, NULL_DEVICE) != 0
-               && FILENAME_CMP (real_output_filename, ALSO_NULL_DEVICE) != 0)
-        { /* If there were errors, and no --force, remove the output.  */
-          fprintf (stderr,
-  _("%s: Removing output file `%s' due to errors; use --force to preserve.\n"),
-                   progname, real_output_filename);
-          if (unlink (real_output_filename) < 0)
-            perror (real_output_filename);
-        }
-    }
-  free (real_output_filename);
-}
-
-/* If enable_encoding is set and @documentencoding is used, return a
-   Local Variables section (as a malloc-ed string) so that Emacs'
-   locale features can work.  Else return NULL.  */
-char *
-info_trailer (void)
-{
-  char *encoding;
-
-  if (!enable_encoding)
-    return NULL;
-
-  encoding = current_document_encoding ();
-
-  if (encoding && *encoding)
-    {
-#define LV_FMT "\n\037\nLocal Variables:\ncoding: %s\nEnd:\n"
-      char *lv = xmalloc (sizeof (LV_FMT) + strlen (encoding));
-      sprintf (lv, LV_FMT, encoding);
-      free (encoding);
-      return lv;
-    }
-
-  free (encoding);
-  return NULL;
-}
-
-void
-free_and_clear (char **pointer)
-{
-  if (*pointer)
-    {
-      free (*pointer);
-      *pointer = NULL;
-    }
-}
-
- /* Initialize some state. */
-static void
-init_internals (void)
-{
-  free_and_clear (&output_filename);
-  free_and_clear (&command);
-  free_and_clear (&input_filename);
-  free_node_references ();
-  free_node_node_references ();
-  toc_free ();
-  init_insertion_stack ();
-  init_brace_stack ();
-  current_node = NULL; /* sometimes already freed */
-  command_index = 0;
-  in_menu = 0;
-  in_detailmenu = 0;
-  top_node_seen = 0;
-  non_top_node_seen = 0;
-  node_number = -1;
-}
-
-void
-init_paragraph (void)
-{
-  free (output_paragraph);
-  output_paragraph = xmalloc (paragraph_buffer_len);
-  output_paragraph[0] = 0;
-  output_paragraph_offset = 0;
-  output_column = 0;
-  paragraph_is_open = 0;
-  current_indent = 0;
-  meta_char_pos = 0;
-}
-
-/* This is called from `reader_loop' when we are at the * beginning a
-   menu line.  */
-
-static void
-handle_menu_entry (void)
-{
-  char *tem;
-
-  /* Ugh, glean_node_from_menu wants to read the * itself.  */
-  input_text_offset--;
-
-  /* Find node name in menu entry and save it in references list for
-     later validation.  Use followed_reference type for detailmenu
-     references since we don't want to use them for default node pointers.  */
-  tem = glean_node_from_menu (1, in_detailmenu
-                                 ? followed_reference : menu_reference);
-
-  if (html && tem)
-    { /* Start a menu item with the cleaned-up line.  Put an anchor
-         around the start text (before `:' or the node name). */
-      char *string;
-
-      discard_until ("* ");
-
-      /* The line number was already incremented in reader_loop when we
-         saw the newline, and discard_until has now incremented again.  */
-      line_number--;
-
-      if (had_menu_commentary)
-        {
-          add_html_block_elt ("<ul class=\"menu\">\n");
-          had_menu_commentary = 0;
-          in_paragraph = 0;
-        }
-
-      if (in_paragraph)
-        {
-          add_html_block_elt ("</p>\n");
-          add_html_block_elt ("<ul class=\"menu\">\n");
-          in_paragraph = 0;
-        }
-
-      in_menu_item = 1;
-
-      add_html_block_elt ("<li><a");
-      if (next_menu_item_number <= 9)
-        {
-          add_word(" accesskey=");
-          add_word_args("\"%d\"", next_menu_item_number);
-          next_menu_item_number++;
-        }
-      add_word (" href=\"");
-      string = expansion (tem, 0);
-      add_anchor_name (string, 1);
-      add_word ("\">");
-      free (string);
-
-      /* The menu item may use macros, so expand them now.  */
-      only_macro_expansion++;
-      get_until_in_line (1, ":", &string);
-      only_macro_expansion--;
-      execute_string ("%s", string); /* get escaping done */
-      free (string);
-
-      add_word ("</a>");
-
-      if (looking_at ("::"))
-        discard_until (":");
-      else
-        { /* discard the node name */
-          get_until_in_line (0, ".", &string);
-          free (string);
-        }
-      input_text_offset++;      /* discard the second colon or the period */
-
-      /* Insert a colon only if there is a description of this menu item.  */
-      {
-        int save_input_text_offset = input_text_offset;
-        int save_line_number = line_number;
-        char *test_string;
-        get_rest_of_line (0, &test_string);
-        if (strlen (test_string) > 0)
-          add_word (": ");
-        input_text_offset = save_input_text_offset;
-        line_number = save_line_number;
-      }
-    }
-  else if (xml && tem)
-    {
-      xml_start_menu_entry (tem);
-    }
-  else if (tem)
-    { /* For Info output, we can just use the input and the main case in
-         reader_loop where we output what comes in.  Just move off the *
-         so the next time through reader_loop we don't end up back here.  */
-      add_char ('*');
-      input_text_offset += 2; /* undo the pointer back-up above.  */
-    }
-
-  if (tem)
-    free (tem);
-}
-
-/* Find the command corresponding to STRING.  If the command is found,
-   return a pointer to the data structure.  Otherwise return -1.  */
-static COMMAND *
-get_command_entry (char *string)
-{
-  int i;
-
-  for (i = 0; command_table[i].name; i++)
-    if (strcmp (command_table[i].name, string) == 0)
-      return &command_table[i];
-
-  /* This command is not in our predefined command table.  Perhaps
-     it is a user defined command. */
-  for (i = 0; i < user_command_array_len; i++)
-    if (user_command_array[i] &&
-        (strcmp (user_command_array[i]->name, string) == 0))
-      return user_command_array[i];
-
-  /* We never heard of this command. */
-  return (COMMAND *) -1;
-}
-
-/* input_text_offset is right at the command prefix character.
-   Read the next token to determine what to do.  Return zero
-   if there's no known command or macro after the prefix character.  */
-static int
-read_command (void)
-{
-  COMMAND *entry;
-  int old_text_offset = input_text_offset++;
-
-  free_and_clear (&command);
-  command = read_token ();
-
-  /* Check to see if this command is a macro.  If so, execute it here. */
-  {
-    MACRO_DEF *def;
-
-    def = find_macro (command);
-
-    if (def)
-      {
-        /* We disallow recursive use of a macro call.  Inhibit the expansion
-           of this macro during the life of its execution. */
-        if (!(def->flags & ME_RECURSE))
-          def->inhibited = 1;
-
-        executing_macro++;
-        execute_macro (def);
-        executing_macro--;
-
-        if (!(def->flags & ME_RECURSE))
-          def->inhibited = 0;
-
-        return 1;
-      }
-  }
-
-  if (only_macro_expansion)
-    {
-      /* Back up to the place where we were called, so the
-         caller will have a chance to process this non-macro.  */
-      input_text_offset = old_text_offset;
-      return 0;
-    }
-
-  /* Perform alias expansion */
-  command = alias_expand (command);
-
-  if (enclosure_command (command))
-    {
-      remember_brace (enclosure_expand);
-      enclosure_expand (START, output_paragraph_offset, 0);
-      return 0;
-    }
-
-  entry = get_command_entry (command);
-  if (entry == (COMMAND *)-1)
-    {
-      line_error (_("Unknown command `%s'"), command);
-      return 0;
-    }
-
-  if (entry->argument_in_braces == BRACE_ARGS)
-    remember_brace (entry->proc);
-  else if (entry->argument_in_braces == MAYBE_BRACE_ARGS)
-    {
-      if (curchar () == '{')
-        remember_brace (entry->proc);
-      else
-        { /* No braces, so arg is next char.  */
-          int ch;
-          int saved_offset = output_paragraph_offset;
-          (*(entry->proc)) (START, output_paragraph_offset, 0);
-
-          /* Possibilities left for the next character: @ (error), }
-             (error), whitespace (skip) anything else (normal char).  */
-          skip_whitespace ();
-          ch = curchar ();
-          if (ch == '@')
-            {
-           line_error (_("Use braces to give a command as an argument to @%s"),
-               entry->name);
-              return 0;
-            }
-          else if (ch == '}')
-            {
-              /* Our caller will give the error message, because this }
-                 won't match anything.  */
-              return 0;
-            }
-
-          add_char (ch);
-          input_text_offset++;
-          (*(entry->proc)) (END, saved_offset, output_paragraph_offset);
-          return 1;
-        }
-    }
-
-  /* Get here if we have BRACE_ARGS, NO_BRACE_ARGS, or MAYBE_BRACE_ARGS
-     with braces.  */
-  (*(entry->proc)) (START, output_paragraph_offset, 0);
-  return 1;
-}
-
-/* Okay, we are ready to start the conversion.  Call the reader on
-   some text, and fill the text as it is output.  Handle commands by
-   remembering things like open braces and the current file position on a
-   stack, and when the corresponding close brace is found, you can call
-   the function with the proper arguments.  Although the filling isn't
-   necessary for HTML, it should do no harm.  */
-void
-reader_loop (void)
-{
-  int character;
-  int done = 0;
-
-  while (!done)
-    {
-      if (input_text_offset >= input_text_length)
-        break;
-
-      character = curchar ();
-
-      /* If only_macro_expansion, only handle macros and leave
-         everything else intact.  */
-      if (!only_macro_expansion && !in_fixed_width_font
-          && ((!html && !xml) || escape_html)
-          && (character == '\'' || character == '`')
-          && input_text[input_text_offset + 1] == character)
-        {
-          if (html)
-            {
-              input_text_offset += 2;
-              add_word (character == '`' ? "&ldquo;" : "&rdquo;");
-              continue;
-            }
-          else if (xml)
-            {
-              input_text_offset += 2;
-              xml_insert_entity (character == '`' ? "ldquo" : "rdquo");
-              continue;
-            }
-          else
-            {
-              input_text_offset++;
-              character = '"';
-            }
-        }
-
-      /* Convert --- to --.  */
-      if (!only_macro_expansion && character == '-' && !in_fixed_width_font
-          && ((!html && !xml) || escape_html))
-        {
-          int dash_count = 0;
-
-          /* Get the number of consequtive dashes.  */
-          while (input_text[input_text_offset] == '-')
-            {
-              dash_count++;
-              input_text_offset++;
-            }
-
-          /* Eat one dash.  */
-          dash_count--;
-
-          if (html || xml)
-            {
-              if (dash_count == 0)
-                add_char ('-');
-              else
-                while (dash_count > 0)
-                  {
-                    if (dash_count >= 2)
-                      {
-                        if (html)
-                          add_word ("&mdash;");
-                        else
-                          xml_insert_entity ("mdash");
-                        dash_count -= 2;
-                      }
-                    else if (dash_count >= 1)
-                      {
-                        if (html)
-                          add_word ("&ndash;");
-                        else
-                          xml_insert_entity ("ndash");
-                        dash_count--;
-                      }
-                  }
-            }
-          else
-            {
-              add_char ('-');
-              while (--dash_count > 0)
-                add_char ('-');
-            }
-
-          continue;
-        }
-
-      /* If this is a whitespace character, then check to see if the line
-         is blank.  If so, advance to the carriage return. */
-      if (!only_macro_expansion && whitespace (character))
-        {
-          int i = input_text_offset + 1;
-
-          while (i < input_text_length && whitespace (input_text[i]))
-            i++;
-
-          if (i == input_text_length || input_text[i] == '\n')
-            {
-              if (i == input_text_length)
-                i--;
-
-              input_text_offset = i;
-              character = curchar ();
-            }
-        }
-
-      if (character == '\n')
-        line_number++;
-
-      switch (character)
-        {
-        case '*': /* perhaps we are at a menu */
-          /* We used to check for this in the \n case but an @c in a
-             menu swallows its newline, so check here instead.  */
-          if (!only_macro_expansion && in_menu
-              && input_text_offset + 1 < input_text_length
-              && input_text[input_text_offset-1] == '\n')
-            handle_menu_entry ();
-          else
-            { /* Duplicate code from below, but not worth twisting the
-                 fallthroughs to get down there.  */
-              add_char (character);
-              input_text_offset++;
-            }
-          break;
-
-        /* Escapes for HTML unless we're outputting raw HTML.  Do
-           this always, even if SGML rules don't require it since
-           that's easier and safer for non-conforming browsers. */
-        case '&':
-          if (html && escape_html)
-            add_word ("&amp;");
-          else
-            add_char (character);
-          input_text_offset++;
-          break;
-
-        case '<':
-          if (html && escape_html)
-            add_word ("&lt;");
-          else if (xml && escape_html)
-            xml_insert_entity ("lt");
-          else
-            add_char (character);
-          input_text_offset++;
-          break;
-
-        case '>':
-          if (html && escape_html)
-            add_word ("&gt;");
-          else if (xml && escape_html)
-            xml_insert_entity ("gt");
-          else
-            add_char (character);
-          input_text_offset++;
-          break;
-
-        case COMMAND_PREFIX: /* @ */
-          if (read_command () || !only_macro_expansion)
-            break;
-
-        /* FALLTHROUGH (usually) */
-        case '{':
-          /* Special case.  We're not supposed to see this character by itself.
-             If we do, it means there is a syntax error in the input text.
-             Report the error here, but remember this brace on the stack so
-             we can ignore its partner. */
-          if (!only_macro_expansion)
-            {
-              if (command && !STREQ (command, "math"))
-                {
-                  line_error (_("Misplaced %c"), '{');
-                  remember_brace (misplaced_brace);
-                }
-              else
-                /* We don't mind `extra' braces inside @math.  */
-                remember_brace (cm_no_op);
-              /* remember_brace advances input_text_offset.  */
-              break;
-            }
-
-        /* FALLTHROUGH (usually) */
-        case '}':
-          if (!only_macro_expansion)
-            {
-              pop_and_call_brace ();
-              input_text_offset++;
-              break;
-            }
-
-        /* FALLTHROUGH (usually) */
-        default:
-          add_char (character);
-          input_text_offset++;
-        }
-    }
-  if (macro_expansion_output_stream && !only_macro_expansion)
-    maybe_write_itext (input_text, input_text_offset);
-}
-
-static void
-init_brace_stack (void)
-{
-  brace_stack = NULL;
-}
-
-/* Remember the current output position here.  Save PROC
-   along with it so you can call it later. */
-static void
-remember_brace_1 (COMMAND_FUNCTION (*proc), int position)
-{
-  BRACE_ELEMENT *new = xmalloc (sizeof (BRACE_ELEMENT));
-  new->next = brace_stack;
-  new->proc = proc;
-  new->command = command ? xstrdup (command) : "";
-  new->pos = position;
-  new->line = line_number;
-  new->in_fixed_width_font = in_fixed_width_font;
-  brace_stack = new;
-}
-
-static void
-remember_brace (COMMAND_FUNCTION (*proc))
-{
-  if (curchar () != '{')
-    line_error (_("%c%s expected braces"), COMMAND_PREFIX, command);
-  else
-    input_text_offset++;
-  remember_brace_1 (proc, output_paragraph_offset);
-}
-
-/* Pop the top of the brace stack, and call the associated function
-   with the args END and POS. */
-static void
-pop_and_call_brace (void)
-{
-  if (brace_stack == NULL)
-    {
-      line_error (_("Unmatched }"));
-      return;
-    }
-
-  {
-    BRACE_ELEMENT *temp;
-
-    int pos = brace_stack->pos;
-    COMMAND_FUNCTION *proc = brace_stack->proc;
-    in_fixed_width_font = brace_stack->in_fixed_width_font;
-
-    /* Reset current command, so the proc can know who it is.  This is
-       used in cm_accent.  */
-    command = brace_stack->command;
-
-    temp = brace_stack->next;
-    free (brace_stack);
-    brace_stack = temp;
-
-    (*proc) (END, pos, output_paragraph_offset);
-  }
-}
-
-/* Shift all of the markers in `brace_stack' by AMOUNT. */
-static void
-adjust_braces_following (int here, int amount)
-{
-  BRACE_ELEMENT *stack = brace_stack;
-
-  while (stack)
-    {
-      if (stack->pos >= here)
-        stack->pos += amount;
-      stack = stack->next;
-    }
-}
-
-/* Return the string which invokes PROC; a pointer to a function.
-   Always returns the first function in the command table if more than
-   one matches PROC.  */
-static const char *
-find_proc_name (COMMAND_FUNCTION (*proc))
-{
-  int i;
-
-  for (i = 0; command_table[i].name; i++)
-    if (proc == command_table[i].proc)
-      return command_table[i].name;
-  return _("NO_NAME!");
-}
-
-/* You call discard_braces () when you shouldn't have any braces on the stack.
-   I used to think that this happens for commands that don't take arguments
-   in braces, but that was wrong because of things like @code{foo @@}.  So now
-   I only detect it at the beginning of nodes. */
-void
-discard_braces (void)
-{
-  if (!brace_stack)
-    return;
-
-  while (brace_stack)
-    {
-      if (brace_stack->proc != misplaced_brace)
-        {
-          const char *proc_name;
-
-          proc_name = find_proc_name (brace_stack->proc);
-          file_line_error (input_filename, brace_stack->line,
-                           _("%c%s missing close brace"), COMMAND_PREFIX,
-                           proc_name);
-          pop_and_call_brace ();
-        }
-      else
-        {
-          BRACE_ELEMENT *temp;
-          temp = brace_stack->next;
-          free (brace_stack);
-          brace_stack = temp;
-        }
-    }
-}
-
-static int
-get_char_len (int character)
-{
-  /* Return the printed length of the character. */
-  int len;
-
-  switch (character)
-    {
-    case '\t':
-      len = (output_column + 8) & 0xf7;
-      if (len > fill_column)
-        len = fill_column - output_column;
-      else
-        len = len - output_column;
-      break;
-
-    case '\n':
-      len = fill_column - output_column;
-      break;
-
-    default:
-      /* ASCII control characters appear as two characters in the output
-         (e.g., ^A).  But characters with the high bit set are just one
-         on suitable terminals, so don't count them as two for line
-         breaking purposes.  */
-      if (0 <= character && character < ' ')
-        len = 2;
-      else
-        len = 1;
-    }
-  return len;
-}
-
-void
-#if defined (VA_FPRINTF) && __STDC__
-add_word_args (const char *format, ...)
-#else
-add_word_args (format, va_alist)
-    const char *format;
-    va_dcl
-#endif
-{
-  char buffer[2000]; /* xx no fixed limits */
-#ifdef VA_FPRINTF
-  va_list ap;
-#endif
-
-  VA_START (ap, format);
-#ifdef VA_SPRINTF
-  VA_SPRINTF (buffer, format, ap);
-#else
-  sprintf (buffer, format, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif /* not VA_SPRINTF */
-  va_end (ap);
-  add_word (buffer);
-}
-
-/* Add STRING to output_paragraph. */
-void
-add_word (char *string)
-{
-  while (*string)
-    add_char (*string++);
-}
-
-/* Like add_word, but inhibits conversion of whitespace into &nbsp;.
-   Use this to output HTML directives with embedded blanks, to make
-   them @w-safe.  */
-void
-add_html_elt (char *string)
-{
-  in_html_elt++;
-  add_word (string);
-  in_html_elt--;
-}
-
-/* These two functions below, add_html_block_elt and add_html_block_elt_args,
-   are mixtures of add_html_elt and add_word_args.  They inform makeinfo that
-   the current HTML element being inserted should not be enclosed in a <p>
-   element.  */
-void
-add_html_block_elt (char *string)
-{
-  in_html_block_level_elt++;
-  add_word (string);
-  in_html_block_level_elt--;
-}
-
-void
-#if defined (VA_FPRINTF) && __STDC__
-add_html_block_elt_args (const char *format, ...)
-#else
-add_html_block_elt_args (format, va_alist)
-    const char *format;
-    va_dcl
-#endif
-{
-  char buffer[2000]; /* xx no fixed limits */
-#ifdef VA_FPRINTF
-  va_list ap;
-#endif
-
-  VA_START (ap, format);
-#ifdef VA_SPRINTF
-  VA_SPRINTF (buffer, format, ap);
-#else
-  sprintf (buffer, format, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif /* not VA_SPRINTF */
-  va_end (ap);
-  add_html_block_elt (buffer);
-}
-
-/* Here is another awful kludge, used in add_char.  Ordinarily, macro
-   expansions take place in the body of the document, and therefore we
-   should html_output_head when we see one.  But there's an exception: a
-   macro call might take place within @copying, and that does not start
-   the real output, even though we fully expand the copying text.
-
-   So we need to be able to check if we are defining the @copying text.
-   We do this by looking back through the insertion stack.  */
-static int
-defining_copying (void)
-{
-  INSERTION_ELT *i;
-  for (i = insertion_stack; i; i = i->next)
-    {
-      if (i->insertion == copying)
-        return 1;
-    }
-  return 0;
-}
-
-
-/* Add the character to the current paragraph.  If filling_enabled is
-   nonzero, then do filling as well. */
-void
-add_char (int character)
-{
-  if (xml)
-    {
-      xml_add_char (character);
-      return;
-    }
-
-  /* If we are avoiding outputting headers, and we are currently
-     in a menu, then simply return.  But if we're only expanding macros,
-     then we're being called from glean_node_from_menu to try to
-     remember a menu reference, and we need that so we can do defaulting.  */
-  if (no_headers && !only_macro_expansion && (in_menu || in_detailmenu))
-    return;
-
-  /* If we are adding a character now, then we don't have to
-     ignore close_paragraph () calls any more. */
-  if (must_start_paragraph && character != '\n')
-    {
-      must_start_paragraph = 0;
-      line_already_broken = 0;  /* The line is no longer broken. */
-      if (current_indent > output_column)
-        {
-          indent (current_indent - output_column);
-          output_column = current_indent;
-        }
-    }
-
-  if (non_splitting_words
-      && !(html && in_html_elt)
-      && strchr (" \t\n", character))
-    {
-      if (html || docbook)
-        { /* Seems cleaner to use &nbsp; than an 8-bit char.  */
-          int saved_escape_html = escape_html;
-          escape_html = 0;
-          add_word ("&nbsp");
-          escape_html = saved_escape_html;
-          character = ';';
-        }
-      else
-        character = META (' '); /* unmeta-d in flush_output */
-    }
-
-  insertion_paragraph_closed = 0;
-
-  switch (character)
-    {
-    case '\n':
-      if (!filling_enabled && !(html && (in_menu || in_detailmenu)))
-        {
-          insert ('\n');
-
-          if (force_flush_right)
-            {
-              close_paragraph ();
-              /* Hack to force single blank lines out in this mode. */
-              flush_output ();
-            }
-
-          output_column = 0;
-
-          if (!no_indent && paragraph_is_open)
-            indent (output_column = current_indent);
-          break;
-        }
-      else if (end_of_sentence_p ())
-        /* CHARACTER is newline, and filling is enabled. */
-        {
-          insert (' ');
-          output_column++;
-          last_inserted_character = character;
-        }
-
-      if (last_char_was_newline)
-        {
-          if (html)
-            last_char_was_newline++;
-          close_paragraph ();
-          pending_indent = 0;
-        }
-      else
-        {
-          last_char_was_newline = 1;
-          if (html)
-            insert ('\n');
-          else
-            insert (' ');
-          output_column++;
-        }
-      break;
-
-    default: /* not at newline */
-      {
-        int len = get_char_len (character);
-        int suppress_insert = 0;
-
-        if ((character == ' ') && (last_char_was_newline))
-          {
-            if (!paragraph_is_open)
-              {
-                pending_indent++;
-                return;
-              }
-          }
-
-        /* This is sad, but it seems desirable to not force any
-           particular order on the front matter commands.  This way,
-           the document can do @settitle, @documentlanguage, etc, in
-           any order and with any omissions, and we'll still output
-           the html <head> `just in time'.  */
-        if ((executing_macro || !executing_string)
-            && !only_macro_expansion
-            && html && !html_output_head_p && !defining_copying ())
-          html_output_head ();
-
-        if (!paragraph_is_open)
-          {
-            start_paragraph ();
-            /* If the paragraph is supposed to be indented a certain
-               way, then discard all of the pending whitespace.
-               Otherwise, we let the whitespace stay. */
-            if (!paragraph_start_indent)
-              indent (pending_indent);
-            pending_indent = 0;
-
-            /* This check for in_html_block_level_elt prevents <p> from being
-               inserted when we already have html markup starting a paragraph,
-               as with <ul> and <h1> and the like.  */
-            if (html && !in_html_block_level_elt)
-              {
-                if ((in_menu || in_detailmenu) && in_menu_item)
-                  {
-                    insert_string ("</li></ul>\n");
-                    in_menu_item = 0;
-                  }
-                insert_string ("<p>");
-                in_paragraph = 1;
-                adjust_braces_following (0, 3); /* adjust for <p> */
-              }
-          }
-
-        output_column += len;
-        if (output_column > fill_column)
-          {
-            if (filling_enabled && !html)
-              {
-                int temp = output_paragraph_offset;
-                while (--temp > 0 && output_paragraph[temp] != '\n')
-                  {
-                    /* If we have found a space, we have the place to break
-                       the line. */
-                    if (output_paragraph[temp] == ' ')
-                      {
-                        /* Remove trailing whitespace from output. */
-                        while (temp && whitespace (output_paragraph[temp - 1]))
-                          temp--;
-
-                        /* If we went back all the way to the newline of the
-                           preceding line, it probably means that the word we
-                           are adding is itself wider than the space that the
-                           indentation and the fill_column let us use.  In
-                           that case, do NOT insert another newline, since it
-                           won't help.  Just indent to current_indent and
-                           leave it alone, since that's the most we can do.  */
-                        if (temp && output_paragraph[temp - 1] != '\n')
-                          output_paragraph[temp++] = '\n';
-
-                        /* We have correctly broken the line where we want
-                           to.  What we don't want is spaces following where
-                           we have decided to break the line.  We get rid of
-                           them. */
-                        {
-                          int t1 = temp;
-
-                          for (;; t1++)
-                            {
-                              if (t1 == output_paragraph_offset)
-                                {
-                                  if (whitespace (character))
-                                    suppress_insert = 1;
-                                  break;
-                                }
-                              if (!whitespace (output_paragraph[t1]))
-                                break;
-                            }
-
-                          if (t1 != temp)
-                            {
-                              adjust_braces_following (temp, (- (t1 - temp)));
-                              memmove (&output_paragraph[temp],
-                                       &output_paragraph[t1],
-                                       output_paragraph_offset - t1);
-                              output_paragraph_offset -= (t1 - temp);
-                            }
-                        }
-
-                        /* Filled, but now indent if that is right. */
-                        if (indented_fill && current_indent > 0)
-                          {
-                            int buffer_len = ((output_paragraph_offset - temp)
-                                              + current_indent);
-                            char *temp_buffer = xmalloc (buffer_len);
-                            int indentation = 0;
-
-                            /* We have to shift any markers that are in
-                               front of the wrap point. */
-                            adjust_braces_following (temp, current_indent);
-
-                            while (current_indent > 0 &&
-                                   indentation != current_indent)
-                              temp_buffer[indentation++] = ' ';
-
-                            memcpy ((char *) &temp_buffer[current_indent],
-                                     (char *) &output_paragraph[temp],
-                                     buffer_len - current_indent);
-
-                            if (output_paragraph_offset + buffer_len
-                                >= paragraph_buffer_len)
-                              {
-                                unsigned char *tt = xrealloc
-                                  (output_paragraph,
-                                   (paragraph_buffer_len += buffer_len));
-                                output_paragraph = tt;
-                              }
-                            memcpy ((char *) &output_paragraph[temp],
-                                     temp_buffer, buffer_len);
-                            output_paragraph_offset += current_indent;
-                            free (temp_buffer);
-                          }
-                        output_column = 0;
-                        while (temp < output_paragraph_offset)
-                          output_column +=
-                            get_char_len (output_paragraph[temp++]);
-                        output_column += len;
-                        break;
-                      }
-                  }
-              }
-          }
-
-        if (!suppress_insert)
-          {
-            insert (character);
-            last_inserted_character = character;
-          }
-        last_char_was_newline = 0;
-        line_already_broken = 0;
-      }
-    }
-}
-
-/* Add a character and store its position in meta_char_pos.  */
-void
-add_meta_char (int character)
-{
-  meta_char_pos = output_paragraph_offset;
-  add_char (character);
-}
-
-/* Insert CHARACTER into `output_paragraph'. */
-void
-insert (int character)
-{
-  /* We don't want to strip trailing whitespace in multitables.  Otherwise
-     horizontal separators confuse the font locking in Info mode in Emacs,
-     because it looks like a @subsection.  Adding a trailing space to those
-     lines fixes it.  */
-  if (character == '\n' && !html && !xml && !multitable_active)
-    {
-      while (output_paragraph_offset
-	     && whitespace (output_paragraph[output_paragraph_offset-1]))
-	output_paragraph_offset--;
-    }
-
-  output_paragraph[output_paragraph_offset++] = character;
-  if (output_paragraph_offset == paragraph_buffer_len)
-    {
-      output_paragraph =
-        xrealloc (output_paragraph, (paragraph_buffer_len += 100));
-    }
-}
-
-/* Insert the null-terminated string STRING into `output_paragraph'.  */
-void
-insert_string (const char *string)
-{
-  while (*string)
-    insert (*string++);
-}
-
-
-/* Sentences might have these characters after the period (or whatever).  */
-#define POST_SENTENCE(c) ((c) == ')' || (c) == '\'' || (c) == '"' \
-                          || (c) == ']')
-
-/* Return true if at an end-of-sentence character, possibly followed by
-   post-sentence punctuation to ignore.  */
-static int
-end_of_sentence_p (void)
-{
-  int loc = output_paragraph_offset - 1;
-
-  /* If nothing has been output, don't check output_paragraph[-1].  */
-  if (loc < 0)
-    return 0;
-
-  /* A post-sentence character that is at meta_char_pos is not really
-     a post-sentence character; it was produced by a markup such as
-     @samp.  We don't want the period inside @samp to be treated as a
-     sentence ender. */
-  while (loc > 0
-         && loc != meta_char_pos && POST_SENTENCE (output_paragraph[loc]))
-    loc--;
-  return loc != meta_char_pos && sentence_ender (output_paragraph[loc]);
-}
-
-
-/* Remove upto COUNT characters of whitespace from the
-   the current output line.  If COUNT is less than zero,
-   then remove until none left. */
-void
-kill_self_indent (int count)
-{
-  /* Handle infinite case first. */
-  if (count < 0)
-    {
-      output_column = 0;
-      while (output_paragraph_offset)
-        {
-          if (whitespace (output_paragraph[output_paragraph_offset - 1]))
-            output_paragraph_offset--;
-          else
-            break;
-        }
-    }
-  else
-    {
-      while (output_paragraph_offset && count--)
-        if (whitespace (output_paragraph[output_paragraph_offset - 1]))
-          output_paragraph_offset--;
-        else
-          break;
-    }
-}
-
-/* Nonzero means do not honor calls to flush_output (). */
-static int flushing_ignored = 0;
-
-/* Prevent calls to flush_output () from having any effect. */
-void
-inhibit_output_flushing (void)
-{
-  flushing_ignored++;
-}
-
-/* Allow calls to flush_output () to write the paragraph data. */
-void
-uninhibit_output_flushing (void)
-{
-  flushing_ignored--;
-}
-
-void
-flush_output (void)
-{
-  int i;
-
-  if (!output_paragraph_offset || flushing_ignored)
-    return;
-
-  for (i = 0; i < output_paragraph_offset; i++)
-    {
-      if (output_paragraph[i] == '\n')
-        {
-          output_line_number++;
-          node_line_number++;
-        }
-
-      /* If we turned on the 8th bit for a space inside @w, turn it
-         back off for output.  This might be problematic, since the
-         0x80 character may be used in 8-bit character sets.  Sigh.
-         In any case, don't do this for HTML, since the nbsp character
-         is valid input and must be passed along to the browser.  */
-      if (!html && (output_paragraph[i] & meta_character_bit))
-        {
-          int temp = UNMETA (output_paragraph[i]);
-          if (temp == ' ')
-            output_paragraph[i] &= 0x7f;
-        }
-    }
-
-  fwrite (output_paragraph, 1, output_paragraph_offset, output_stream);
-
-  output_position += output_paragraph_offset;
-  output_paragraph_offset = 0;
-  meta_char_pos = 0;
-}
-
-/* How to close a paragraph controlling the number of lines between
-   this one and the last one. */
-
-/* Paragraph spacing is controlled by this variable.  It is the number of
-   blank lines that you wish to appear between paragraphs.  A value of
-   1 creates a single blank line between paragraphs. */
-int paragraph_spacing = DEFAULT_PARAGRAPH_SPACING;
-
-static void
-close_paragraph_with_lines (int lines)
-{
-  int old_spacing = paragraph_spacing;
-  paragraph_spacing = lines;
-  close_paragraph ();
-  paragraph_spacing = old_spacing;
-}
-
-/* Close the current paragraph, leaving no blank lines between them. */
-void
-close_single_paragraph (void)
-{
-  close_paragraph_with_lines (0);
-}
-
-/* Close a paragraph after an insertion has ended. */
-void
-close_insertion_paragraph (void)
-{
-  if (!insertion_paragraph_closed)
-    {
-      /* Close the current paragraph, breaking the line. */
-      close_single_paragraph ();
-
-      /* Start a new paragraph, with the correct indentation for the now
-         current insertion level (one above the one that we are ending). */
-      start_paragraph ();
-
-      /* Tell `close_paragraph' that the previous line has already been
-         broken, so it should insert one less newline. */
-      line_already_broken = 1;
-
-      /* Tell functions such as `add_char' we've already found a newline. */
-      ignore_blank_line ();
-    }
-  else
-    {
-      /* If the insertion paragraph is closed already, then we are seeing
-         two `@end' commands in a row.  Note that the first one we saw was
-         handled in the first part of this if-then-else clause, and at that
-         time `start_paragraph' was called, partially to handle the proper
-         indentation of the current line.  However, the indentation level
-         may have just changed again, so we may have to outdent the current
-         line to the new indentation level. */
-      if (current_indent < output_column)
-        kill_self_indent (output_column - current_indent);
-    }
-
-  insertion_paragraph_closed = 1;
-}
-
-/* Close the currently open paragraph. */
-void
-close_paragraph (void)
-{
-  int i;
-
-  /* We don't need these newlines in XML and Docbook outputs for
-     paragraph seperation.  We have <para> element for that.  */
-  if (xml)
-    return;
-
-  /* The insertion paragraph is no longer closed. */
-  insertion_paragraph_closed = 0;
-
-  if (paragraph_is_open && !must_start_paragraph)
-    {
-      int tindex = output_paragraph_offset;
-
-      /* Back up to last non-newline/space character, forcing all such
-         subsequent characters to be newlines.  This isn't strictly
-         necessary, but a couple of functions use the presence of a newline
-         to make decisions. */
-      for (tindex = output_paragraph_offset - 1; tindex >= 0; --tindex)
-        {
-          int c = output_paragraph[tindex];
-
-          if (c == ' '|| c == '\n')
-            output_paragraph[tindex] = '\n';
-          else
-            break;
-        }
-
-      /* All trailing whitespace is ignored. */
-      output_paragraph_offset = ++tindex;
-
-      /* Break the line if that is appropriate. */
-      if (paragraph_spacing >= 0)
-        insert ('\n');
-
-      /* Add as many blank lines as is specified in `paragraph_spacing'. */
-      if (!force_flush_right)
-        {
-          for (i = 0; i < (paragraph_spacing - line_already_broken); i++)
-            {
-              insert ('\n');
-              /* Don't need anything extra for HTML in usual case of no
-                 extra paragraph spacing.  */
-              if (html && i > 0)
-                insert_string ("<br>");
-            }
-        }
-
-      /* If we are doing flush right indentation, then do it now
-         on the paragraph (really a single line). */
-      if (force_flush_right)
-        do_flush_right_indentation ();
-
-      flush_output ();
-      paragraph_is_open = 0;
-      no_indent = 0;
-      output_column = 0;
-    }
-
-  ignore_blank_line ();
-}
-
-/* Make the last line just read look as if it were only a newline. */
-void
-ignore_blank_line (void)
-{
-  last_inserted_character = '\n';
-  last_char_was_newline = 1;
-}
-
-/* Align the end of the text in output_paragraph with fill_column. */
-static void
-do_flush_right_indentation (void)
-{
-  char *temp;
-  int temp_len;
-
-  kill_self_indent (-1);
-
-  if (output_paragraph[0] != '\n')
-    {
-      output_paragraph[output_paragraph_offset] = 0;
-
-      if (output_paragraph_offset < fill_column)
-        {
-          int i;
-
-          if (fill_column >= paragraph_buffer_len)
-            output_paragraph =
-              xrealloc (output_paragraph,
-                        (paragraph_buffer_len += fill_column));
-
-          temp_len = strlen ((char *)output_paragraph);
-          temp = xmalloc (temp_len + 1);
-          memcpy (temp, (char *)output_paragraph, temp_len);
-
-          for (i = 0; i < fill_column - output_paragraph_offset; i++)
-            output_paragraph[i] = ' ';
-
-          memcpy ((char *)output_paragraph + i, temp, temp_len);
-          free (temp);
-          output_paragraph_offset = fill_column;
-          adjust_braces_following (0, i);
-        }
-    }
-}
-
-/* Begin a new paragraph. */
-void
-start_paragraph (void)
-{
-  /* First close existing one. */
-  if (paragraph_is_open)
-    close_paragraph ();
-
-  /* In either case, the insertion paragraph is no longer closed. */
-  insertion_paragraph_closed = 0;
-
-  /* However, the paragraph is open! */
-  paragraph_is_open = 1;
-
-  /* If we MUST_START_PARAGRAPH, that simply means that start_paragraph ()
-     had to be called before we would allow any other paragraph operations
-     to have an effect. */
-  if (!must_start_paragraph)
-    {
-      int amount_to_indent = 0;
-
-      /* If doing indentation, then insert the appropriate amount. */
-      if (!no_indent)
-        {
-          if (inhibit_paragraph_indentation)
-            {
-              amount_to_indent = current_indent;
-              if (inhibit_paragraph_indentation < 0)
-                inhibit_paragraph_indentation++;
-            }
-          else if (paragraph_start_indent < 0)
-            amount_to_indent = current_indent;
-          else
-            amount_to_indent = current_indent + paragraph_start_indent;
-
-          if (amount_to_indent >= output_column)
-            {
-              amount_to_indent -= output_column;
-              indent (amount_to_indent);
-              output_column += amount_to_indent;
-            }
-        }
-    }
-  else
-    must_start_paragraph = 0;
-}
-
-/* Insert the indentation specified by AMOUNT. */
-void
-indent (int amount)
-{
-  /* For every START_POS saved within the brace stack which will be affected
-     by this indentation, bump that start pos forward. */
-  adjust_braces_following (output_paragraph_offset, amount);
-
-  while (--amount >= 0)
-    insert (' ');
-}
-
-/* Search forward for STRING in input_text.
-   FROM says where where to start. */
-int
-search_forward (char *string, int from)
-{
-  int len = strlen (string);
-
-  while (from < input_text_length)
-    {
-      if (strncmp (input_text + from, string, len) == 0)
-        return from;
-      from++;
-    }
-  return -1;
-}
-
-/* search_forward until n characters.  */
-int
-search_forward_until_pos (char *string, int from, int end_pos)
-{
-  int save_input_text_length = input_text_length;
-  input_text_length = end_pos;
-
-  from = search_forward (string, from);
-
-  input_text_length = save_input_text_length;
-
-  return from;
-}
-
-/* Return next non-whitespace and non-cr character.  */
-int
-next_nonwhitespace_character (void)
-{
-  /* First check the current input_text.  Start from the next char because
-     we already have input_text[input_text_offset] in ``current''.  */
-  int pos = input_text_offset + 1;
-
-  while (pos < input_text_length)
-    {
-      if (!cr_or_whitespace(input_text[pos]))
-        return input_text[pos];
-      pos++;
-    }
-
-  { /* Can't find a valid character, so go through filestack
-       in case we are doing @include or expanding a macro.  */
-    FSTACK *tos = filestack;
-
-    while (tos)
-      {
-        int tmp_input_text_length = filestack->size;
-        int tmp_input_text_offset = filestack->offset;
-        char *tmp_input_text = filestack->text;
-
-        while (tmp_input_text_offset < tmp_input_text_length)
-          {
-            if (!cr_or_whitespace(tmp_input_text[tmp_input_text_offset]))
-              return tmp_input_text[tmp_input_text_offset];
-            tmp_input_text_offset++;
-          }
-
-        tos = tos->next;
-      }
-  }
-
-  return -1;
-}
-
-/* An external image is a reference, kind of.  The parsing is (not
-   coincidentally) similar, anyway.  */
-void
-cm_image (int arg)
-{
-  char *name_arg, *w_arg, *h_arg, *alt_arg, *ext_arg;
-
-  if (arg == END)
-    return;
-
-  name_arg = get_xref_token (1); /* expands all macros in image */
-  w_arg = get_xref_token (0);
-  h_arg = get_xref_token (0);
-  alt_arg = get_xref_token (1); /* expands all macros in alt text */
-  ext_arg = get_xref_token (0);
-
-  if (*name_arg)
-    {
-      struct stat file_info;
-      char *pathname = NULL;
-      char *fullname = xmalloc (strlen (name_arg)
-                       + (ext_arg && *ext_arg ? strlen (ext_arg) + 1: 4) + 1);
-
-      if (ext_arg && *ext_arg)
-        {
-          sprintf (fullname, "%s%s", name_arg, ext_arg);
-          if (access (fullname, R_OK) != 0)
-            pathname = get_file_info_in_path (fullname, include_files_path,
-                                              &file_info);
-
-	  if (pathname == NULL)
-	    {
-	      /* Backwards compatibility (4.6 <= version < 4.7):
-		 try prefixing @image's EXTENSION parameter with a period. */
-	      sprintf (fullname, "%s.%s", name_arg, ext_arg);
-	      if (access (fullname, R_OK) != 0)
-		pathname = get_file_info_in_path (fullname, include_files_path,
-						  &file_info);
-	    }
-        }
-      else
-        {
-          sprintf (fullname, "%s.png", name_arg);
-          if (access (fullname, R_OK) != 0) {
-            pathname = get_file_info_in_path (fullname,
-                                              include_files_path, &file_info);
-            if (pathname == NULL) {
-              sprintf (fullname, "%s.jpg", name_arg);
-              if (access (fullname, R_OK) != 0) {
-                sprintf (fullname, "%s.gif", name_arg);
-                if (access (fullname, R_OK) != 0) {
-                  pathname = get_file_info_in_path (fullname,
-                                               include_files_path, &file_info);
-                }
-              }
-            }
-          }
-        }
-
-      if (html)
-        {
-          int image_in_div = 0;
-
-          if (pathname == NULL && access (fullname, R_OK) != 0)
-            {
-              line_error(_("@image file `%s' (for HTML) not readable: %s"),
-                             fullname, strerror (errno));
-              return;
-            }
-          if (pathname != NULL && access (pathname, R_OK) != 0)
-            {
-              line_error (_("No such file `%s'"),
-                          fullname);
-              return;
-            }
-
-          if (!paragraph_is_open)
-            {
-              add_html_block_elt ("<div class=\"block-image\">");
-              image_in_div = 1;
-            }
-
-          add_html_elt ("<img src=");
-          add_word_args ("\"%s\"", fullname);
-          add_html_elt (" alt=");
-          add_word_args ("\"%s\">", 
-              escape_string (*alt_arg ? text_expansion (alt_arg) : fullname));
-
-          if (image_in_div)
-            add_html_block_elt ("</div>");
-        }
-      else if (xml && docbook)
-        xml_insert_docbook_image (name_arg);
-      else if (xml)
-        {
-          extern int xml_in_para;
-          extern int xml_no_para;
-          int elt = xml_in_para ? INLINEIMAGE : IMAGE;
-
-          if (!xml_in_para)
-            xml_no_para++;
-
-          xml_insert_element_with_attribute (elt,
-              START, "width=\"%s\" height=\"%s\" name=\"%s\" extension=\"%s\"",
-              w_arg, h_arg, name_arg, ext_arg);
-          xml_insert_element (IMAGEALTTEXT, START);
-          execute_string ("%s", alt_arg);
-          xml_insert_element (IMAGEALTTEXT, END);
-          xml_insert_element (elt, END);
-
-          if (!xml_in_para)
-            xml_no_para--;
-        }
-      else
-        { /* Try to open foo.EXT or foo.txt.  */
-          FILE *image_file;
-          char *txtpath = NULL;
-          char *txtname = xmalloc (strlen (name_arg)
-                                   + (ext_arg && *ext_arg
-                                      ? strlen (ext_arg) : 4) + 1);
-          strcpy (txtname, name_arg);
-          strcat (txtname, ".txt");
-          image_file = fopen (txtname, "r");
-          if (image_file == NULL)
-            {
-              txtpath = get_file_info_in_path (txtname,
-                                               include_files_path, &file_info);
-              if (txtpath != NULL)
-                image_file = fopen (txtpath, "r");
-            }
-
-          if (image_file != NULL
-              || access (fullname, R_OK) == 0
-              || (pathname != NULL && access (pathname, R_OK) == 0))
-            {
-              int ch;
-              int save_inhibit_indentation = inhibit_paragraph_indentation;
-              int save_filling_enabled = filling_enabled;
-              int image_in_brackets = paragraph_is_open;
-
-              /* Write magic ^@^H[image ...^@^H] cookie in the info file, if
-                 there's an accompanying bitmap.  Otherwise just include the
-                 text image.  In the plaintext output, always include the text
-                 image without the magic cookie.  */
-              int use_magic_cookie = !no_headers
-                && access (fullname, R_OK) == 0 && !STREQ (fullname, txtname);
-
-              inhibit_paragraph_indentation = 1;
-              filling_enabled = 0;
-              last_char_was_newline = 0;
-
-              if (use_magic_cookie)
-                {
-                  add_char ('\0');
-                  add_word ("\010[image");
-
-                  if (access (fullname, R_OK) == 0
-                      || (pathname != NULL && access (pathname, R_OK) == 0))
-                    add_word_args (" src=\"%s\"", fullname);
-
-                  if (*alt_arg)
-                    add_word_args (" alt=\"%s\"", alt_arg);
-                }
-
-              if (image_file != NULL)
-                {
-                  if (use_magic_cookie)
-                    add_word (" text=\"");
-
-                  if (image_in_brackets)
-                    add_char ('[');
-
-                  /* Maybe we need to remove the final newline if the image
-                     file is only one line to allow in-line images.  On the
-                     other hand, they could just make the file without a
-                     final newline.  */
-                  while ((ch = getc (image_file)) != EOF)
-                    {
-                      if (use_magic_cookie && (ch == '"' || ch == '\\'))
-                        add_char ('\\');
-                      add_char (ch);
-                    }
-
-                  if (image_in_brackets)
-                    add_char (']');
-                  
-                  if (use_magic_cookie)
-                    add_char ('"');
-
-                  if (fclose (image_file) != 0)
-                    perror (txtname);
-                }
-
-              if (use_magic_cookie)
-                {
-                  add_char ('\0');
-                  add_word ("\010]");
-                }
-
-              inhibit_paragraph_indentation = save_inhibit_indentation;
-              filling_enabled = save_filling_enabled;
-            }
-          else
-            warning (_("@image file `%s' (for text) unreadable: %s"),
-                        txtname, strerror (errno));
-        }
-
-      free (fullname);
-      if (pathname)
-        free (pathname);
-    }
-  else
-    line_error (_("@image missing filename argument"));
-
-  if (name_arg)
-    free (name_arg);
-  if (w_arg)
-    free (w_arg);
-  if (h_arg)
-    free (h_arg);
-  if (alt_arg)
-    free (alt_arg);
-  if (ext_arg)
-    free (ext_arg);
-}
-
-/* Conditionals.  */
-
-/* A structure which contains `defined' variables. */
-typedef struct defines {
-  struct defines *next;
-  char *name;
-  char *value;
-} DEFINE;
-
-/* The linked list of `set' defines. */
-DEFINE *defines = NULL;
-
-/* Add NAME to the list of `set' defines. */
-static void
-set (char *name, char *value)
-{
-  DEFINE *temp;
-
-  for (temp = defines; temp; temp = temp->next)
-    if (strcmp (name, temp->name) == 0)
-      {
-        free (temp->value);
-        temp->value = xstrdup (value);
-        return;
-      }
-
-  temp = xmalloc (sizeof (DEFINE));
-  temp->next = defines;
-  temp->name = xstrdup (name);
-  temp->value = xstrdup (value);
-  defines = temp;
-
-  if (xml && !docbook)
-    {
-      xml_insert_element_with_attribute (SETVALUE, START, "name=\"%s\"", name);
-      execute_string ("%s", value);
-      xml_insert_element (SETVALUE, END);
-    }
-}
-
-/* Remove NAME from the list of `set' defines. */
-static void
-clear (char *name)
-{
-  DEFINE *temp, *last;
-
-  last = NULL;
-  temp = defines;
-
-  while (temp)
-    {
-      if (strcmp (temp->name, name) == 0)
-        {
-          if (last)
-            last->next = temp->next;
-          else
-            defines = temp->next;
-
-          free (temp->name);
-          free (temp->value);
-          free (temp);
-          break;
-        }
-      last = temp;
-      temp = temp->next;
-    }
-
-  if (xml && !docbook)
-    {
-      xml_insert_element_with_attribute (CLEARVALUE, START, "name=\"%s\"", name);
-      xml_insert_element (CLEARVALUE, END);
-    }
-}
-
-/* Return the value of NAME.  The return value is NULL if NAME is unset. */
-static char *
-set_p (char *name)
-{
-  DEFINE *temp;
-
-  for (temp = defines; temp; temp = temp->next)
-    if (strcmp (temp->name, name) == 0)
-      return temp->value;
-
-  return NULL;
-}
-
-/* Create a variable whose name appears as the first word on this line. */
-void
-cm_set (void)
-{
-  handle_variable (SET);
-}
-
-/* Remove a variable whose name appears as the first word on this line. */
-void
-cm_clear (void)
-{
-  handle_variable (CLEAR);
-}
-
-void
-cm_ifset (void)
-{
-  handle_variable (IFSET);
-}
-
-void
-cm_ifclear (void)
-{
-  handle_variable (IFCLEAR);
-}
-
-/* This command takes braces, but we parse the contents specially, so we
-   don't use the standard brace popping code.
-
-   The syntax @ifeq{arg1, arg2, texinfo-commands} performs texinfo-commands
-   if ARG1 and ARG2 caselessly string compare to the same string, otherwise,
-   it produces no output. */
-void
-cm_ifeq (void)
-{
-  char **arglist;
-
-  arglist = get_brace_args (0);
-
-  if (arglist)
-    {
-      if (array_len (arglist) > 1)
-        {
-          if ((strcasecmp (arglist[0], arglist[1]) == 0) &&
-              (arglist[2]))
-            execute_string ("%s\n", arglist[2]);
-        }
-
-      free_array (arglist);
-    }
-}
-
-void
-cm_value (int arg, int start_pos, int end_pos)
-{
-  static int value_level = 0, saved_meta_pos = -1;
-
-  /* xml_add_char() skips any content inside menus when output format is
-     Docbook, so @value{} is no use there.  Also start_pos and end_pos does not
-     get updated, causing name to be empty string.  So just return.  */
-   if (docbook && in_menu)
-     return;
-
-  /* All the text after @value{ upto the matching } will eventually
-     disappear from output_paragraph, when this function is called
-     with ARG == END.  If the text produced until then sets
-     meta_char_pos, we will need to restore it to the value it had
-     before @value was seen.  So we need to save the previous value
-     of meta_char_pos here.  */
-  if (arg == START)
-    {
-      /* If we are already inside some outer @value, don't overwrite
-         the value saved in saved_meta_pos.  */
-      if (!value_level)
-        saved_meta_pos = meta_char_pos;
-      value_level++;
-      /* While the argument of @value is processed, we need to inhibit
-         textual transformations like "--" into "-", since @set didn't
-         do that when it grabbed the name of the variable.  */
-      in_fixed_width_font++;
-    }
-  else
-    {
-      char *name = (char *) &output_paragraph[start_pos];
-      char *value;
-      output_paragraph[end_pos] = 0;
-      name = xstrdup (name);
-      value = set_p (name);
-      output_column -= end_pos - start_pos;
-      output_paragraph_offset = start_pos;
-
-      /* Restore the previous value of meta_char_pos if the stuff
-         inside this @value{} moved it.  */
-      if (saved_meta_pos == -1) /* can't happen inside @value{} */
-        abort ();
-      if (value_level == 1
-          && meta_char_pos >= start_pos && meta_char_pos < end_pos)
-        {
-          meta_char_pos = saved_meta_pos;
-          saved_meta_pos = -1;
-        }
-      value_level--;
-      /* No need to decrement in_fixed_width_font, since before
-         we are called with arg == END, the reader loop already
-         popped the brace stack, which restored in_fixed_width_font,
-         among other things.  */
-
-      if (value)
-	{
-	  /* We need to get past the closing brace since the value may
-	     expand to a context-sensitive macro (e.g. @xref) and produce
-	     spurious warnings */
-	  input_text_offset++; 
-	  execute_string ("%s", value);
-	  input_text_offset--;
-	}
-      else
-	{
-          warning (_("undefined flag: %s"), name);
-          add_word_args (_("{No value for `%s'}"), name);
-	}
-
-      free (name);
-    }
-}
-
-/* Set, clear, or conditionalize based on ACTION. */
-static void
-handle_variable (int action)
-{
-  char *name;
-
-  get_rest_of_line (0, &name);
-  /* If we hit the end of text in get_rest_of_line, backing up
-     input pointer will cause the last character of the last line
-     be pushed back onto the input, which is wrong.  */
-  if (input_text_offset < input_text_length)
-    backup_input_pointer ();
-  handle_variable_internal (action, name);
-  free (name);
-}
-
-static void
-handle_variable_internal (int action, char *name)
-{
-  char *temp;
-  int delimiter, additional_text_present = 0;
-
-  /* Only the first word of NAME is a valid tag. */
-  temp = name;
-  delimiter = 0;
-  while (*temp && (delimiter || !whitespace (*temp)))
-    {
-/* #if defined (SET_WITH_EQUAL) */
-      if (*temp == '"' || *temp == '\'')
-        {
-          if (*temp == delimiter)
-            delimiter = 0;
-          else
-            delimiter = *temp;
-        }
-/* #endif SET_WITH_EQUAL */
-      temp++;
-    }
-
-  if (*temp)
-    additional_text_present++;
-
-  *temp = 0;
-
-  if (!*name)
-    line_error (_("%c%s requires a name"), COMMAND_PREFIX, command);
-  else
-    {
-      switch (action)
-        {
-        case SET:
-          {
-            char *value;
-
-#if defined (SET_WITH_EQUAL)
-            /* Allow a value to be saved along with a variable.  The value is
-               the text following an `=' sign in NAME, if any is present. */
-
-            for (value = name; *value && *value != '='; value++);
-
-            if (*value)
-              *value++ = 0;
-
-            if (*value == '"' || *value == '\'')
-              {
-                value++;
-                value[strlen (value) - 1] = 0;
-              }
-
-#else /* !SET_WITH_EQUAL */
-            /* The VALUE of NAME is the remainder of the line sans
-               whitespace. */
-            if (additional_text_present)
-              {
-                value = temp + 1;
-                canon_white (value);
-              }
-            else
-              value = "";
-#endif /* !SET_WITH_VALUE */
-
-            set (name, value);
-          }
-          break;
-
-        case CLEAR:
-          clear (name);
-          break;
-
-        case IFSET:
-        case IFCLEAR:
-          /* If IFSET and NAME is not set, or if IFCLEAR and NAME is set,
-             read lines from the the file until we reach a matching
-             "@end CONDITION".  This means that we only take note of
-             "@ifset/clear" and "@end" commands. */
-          {
-            char condition[8];
-            int condition_len;
-            int orig_line_number = line_number;
-
-            if (action == IFSET)
-              strcpy (condition, "ifset");
-            else
-              strcpy (condition, "ifclear");
-
-            condition_len = strlen (condition);
-
-          if ((action == IFSET && !set_p (name))
-              || (action == IFCLEAR && set_p (name)))
-            {
-              int level = 0, done = 0;
-
-              while (!done && input_text_offset < input_text_length)
-                {
-                  char *freeable_line, *line;
-
-                  get_rest_of_line (0, &freeable_line);
-
-                  for (line = freeable_line; whitespace (*line); line++);
-
-                  if (*line == COMMAND_PREFIX &&
-                      (strncmp (line + 1, condition, condition_len) == 0))
-                    level++;
-                  else if (strncmp (line, "@end", 4) == 0)
-                    {
-                      char *cname = line + 4;
-                      char *temp;
-
-                      while (*cname && whitespace (*cname))
-                        cname++;
-                      temp = cname;
-
-                      while (*temp && !whitespace (*temp))
-                        temp++;
-                      *temp = 0;
-
-                      if (strcmp (cname, condition) == 0)
-                        {
-                          if (!level)
-                            {
-                              done = 1;
-                            }
-                          else
-                            level--;
-                        }
-                    }
-                  free (freeable_line);
-                }
-
-              if (!done)
-                file_line_error (input_filename, orig_line_number,
-                                 _("Reached eof before matching @end %s"),
-                                 condition);
-
-              /* We found the end of a false @ifset/ifclear.  If we are
-                 in a menu, back up over the newline that ends the ifset,
-                 since that newline may also begin the next menu entry. */
-              break;
-            }
-          else
-            {
-              if (action == IFSET)
-                begin_insertion (ifset);
-              else
-                begin_insertion (ifclear);
-            }
-          }
-          break;
-        }
-    }
-}
-
-/* Execution of random text not in file. */
-typedef struct {
-  char *string;                 /* The string buffer. */
-  int size;                     /* The size of the buffer. */
-  int in_use;                   /* Nonzero means string currently in use. */
-} EXECUTION_STRING;
-
-static EXECUTION_STRING **execution_strings = NULL;
-static int execution_strings_index = 0;
-static int execution_strings_slots = 0;
-
-static EXECUTION_STRING *
-get_execution_string (int initial_size)
-{
-  int i = 0;
-  EXECUTION_STRING *es = NULL;
-
-  if (execution_strings)
-    {
-      for (i = 0; i < execution_strings_index; i++)
-        if (execution_strings[i] && (execution_strings[i]->in_use == 0))
-          {
-            es = execution_strings[i];
-            break;
-          }
-    }
-
-  if (!es)
-    {
-      if (execution_strings_index + 1 >= execution_strings_slots)
-        {
-          execution_strings = xrealloc
-            (execution_strings,
-             (execution_strings_slots += 3) * sizeof (EXECUTION_STRING *));
-          for (; i < execution_strings_slots; i++)
-            execution_strings[i] = NULL;
-        }
-
-      execution_strings[execution_strings_index] =
-        xmalloc (sizeof (EXECUTION_STRING));
-      es = execution_strings[execution_strings_index];
-      execution_strings_index++;
-
-      es->size = 0;
-      es->string = NULL;
-      es->in_use = 0;
-    }
-
-  if (initial_size > es->size)
-    {
-      es->string = xrealloc (es->string, initial_size);
-      es->size = initial_size;
-    }
-  return es;
-}
-
-/* Given a pointer to TEXT and its desired length NEW_LEN, find TEXT's
-   entry in the execution_strings[] array and change the .STRING and
-   .SIZE members of that entry as appropriate.  */
-void
-maybe_update_execution_strings (char **text, unsigned int new_len)
-{
-  int i = 0;
-
-  if (execution_strings)
-    {
-      for (i = 0; i < execution_strings_index; i++)
-        if (execution_strings[i] && (execution_strings[i]->in_use == 1) &&
-            execution_strings[i]->string == *text)
-          {
-            /* Don't ever shrink the string storage in execution_strings[]!
-               execute_string assumes that it is always big enough to store
-               every possible execution_string, and will break if that's
-               not true.  So we only enlarge the string storage if the
-               current size isn't big enough.  */
-            if (execution_strings[i]->size < new_len)
-              {
-                execution_strings[i]->string =
-                  *text = xrealloc (*text, new_len + 1);
-                execution_strings[i]->size = new_len + 1;
-              }
-            return;
-          }
-    }
-  /* We should *never* end up here, since if we are inside
-     execute_string, TEXT is always in execution_strings[].  */
-  abort ();
-}
-
-/* FIXME: this is an arbitrary limit.  */
-#define EXECUTE_STRING_MAX 16*1024
-
-/* Execute the string produced by formatting the ARGs with FORMAT.  This
-   is like submitting a new file with @include. */
-void
-#if defined (VA_FPRINTF) && __STDC__
-execute_string (char *format, ...)
-#else
-execute_string (format, va_alist)
-    char *format;
-    va_dcl
-#endif
-{
-  EXECUTION_STRING *es;
-  char *temp_string, *temp_input_filename;
-#ifdef VA_FPRINTF
-  va_list ap;
-#endif
-  int insertion_level_at_start = insertion_level;
-
-  es = get_execution_string (EXECUTE_STRING_MAX);
-  temp_string = es->string;
-  es->in_use = 1;
-
-  VA_START (ap, format);
-#ifdef VA_SPRINTF
-  VA_SPRINTF (temp_string, format, ap);
-#else
-  sprintf (temp_string, format, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif /* not VA_SPRINTF */
-  va_end (ap);
-
-  pushfile ();
-  input_text_offset = 0;
-  input_text = temp_string;
-  input_text_length = strlen (temp_string);
-  input_filename = xstrdup (input_filename);
-  temp_input_filename = input_filename;
-
-  executing_string++;
-  reader_loop ();
-
-  /* If insertion stack level changes during execution, that means a multiline
-     command is used inside braces or @section ... kind of commands.  */
-  if (insertion_level_at_start != insertion_level && !executing_macro)
-    {
-      line_error (_("Multiline command %c%s used improperly"),
-          COMMAND_PREFIX,
-          command);
-      /* We also need to keep insertion_level intact to make sure warnings are
-         issued for @end ... command.  */
-      while (insertion_level > insertion_level_at_start)
-        pop_insertion ();
-    }
-
-  popfile ();
-  executing_string--;
-  es->in_use = 0;
-  free (temp_input_filename);
-}
-
-
-/* Return what would be output for STR (in newly-malloced memory), i.e.,
-   expand Texinfo commands according to the current output format.  If
-   IMPLICIT_CODE is set, expand @code{STR}.  This is generally used for
-   short texts; filling, indentation, and html escapes are disabled.  */
-
-char *
-expansion (char *str, int implicit_code)
-{
-  return maybe_escaped_expansion (str, implicit_code, 0);
-}
-
-
-/* Do HTML escapes according to DO_HTML_ESCAPE.  Needed in
-   cm_printindex, q.v.  */
-
-char *
-maybe_escaped_expansion (char *str, int implicit_code, int do_html_escape)
-{
-  char *result;
-
-  /* Inhibit indentation and filling, so that extra newlines
-     are not added to the expansion.  (This is undesirable if
-     we write the expanded text to macro_expansion_output_stream.)  */
-  int saved_filling_enabled = filling_enabled;
-  int saved_indented_fill = indented_fill;
-  int saved_no_indent = no_indent;
-  int saved_escape_html = escape_html;
-
-  filling_enabled = 0;
-  indented_fill = 0;
-  no_indent = 1;
-  escape_html = do_html_escape;
-
-  result = full_expansion (str, implicit_code);
-
-  filling_enabled = saved_filling_enabled;
-  indented_fill = saved_indented_fill;
-  no_indent = saved_no_indent;
-  escape_html = saved_escape_html;
-
-  return result;
-}
-
-
-/* Expand STR (or @code{STR} if IMPLICIT_CODE is nonzero).  No change to
-   any formatting parameters -- filling, indentation, html escapes,
-   etc., are not reset.  Always returned in new memory.  */
-
-char *
-full_expansion (char *str, int implicit_code)
-{
-  int length;
-  char *result;
-
-  /* Inhibit any real output.  */
-  int start = output_paragraph_offset;
-  int saved_paragraph_is_open = paragraph_is_open;
-  int saved_output_column = output_column;
-
-  /* More output state to save.  */
-  int saved_meta_pos = meta_char_pos;
-  int saved_last_char = last_inserted_character;
-  int saved_last_nl = last_char_was_newline;
-
-  /* If we are called in the middle of processing a command, we need
-     to dup and save the global variable `command' (which holds the
-     name of this command), since the recursive reader loop will free
-     it from under our feet if it finds any macros in STR.  */
-  char *saved_command = command ? xstrdup (command) : NULL;
-
-  inhibit_output_flushing ();
-  paragraph_is_open = 1;
-  if (strlen (str) > (implicit_code
-                      ? EXECUTE_STRING_MAX - 1 - sizeof("@code{}")
-                      : EXECUTE_STRING_MAX - 1))
-    line_error (_("`%.40s...' is too long for expansion; not expanded"), str);
-  else
-    execute_string (implicit_code ? "@code{%s}" : "%s", str);
-  uninhibit_output_flushing ();
-
-  /* Copy the expansion from the buffer.  */
-  length = output_paragraph_offset - start;
-  result = xmalloc (1 + length);
-  memcpy (result, (char *) (output_paragraph + start), length);
-  result[length] = 0;
-
-  /* Pretend it never happened.  */
-  free_and_clear (&command);
-  command = saved_command;
-
-  output_paragraph_offset = start;
-  paragraph_is_open = saved_paragraph_is_open;
-  output_column = saved_output_column;
-
-  meta_char_pos = saved_meta_pos;
-  last_inserted_character = saved_last_char;
-  last_char_was_newline = saved_last_nl;
-
-  return result;
-}
-
-
-/* Return text (info) expansion of STR no matter what the current output
-   format is.  */
-
-char *
-text_expansion (char *str)
-{
-  char *ret;
-  int save_html = html;
-  int save_xml = xml;
-  int save_docbook = docbook;
-
-  html = 0;
-  xml = 0;
-  docbook = 0;
-  ret = expansion (str, 0);
-  html = save_html;
-  xml = save_xml;
-  docbook = save_docbook;
-
-  return ret;
-}
-
-
-/* Set the paragraph indentation variable to the value specified in STRING.
-   Values can be:
-     `asis': Don't change existing indentation.
-     `none': Remove existing indentation.
-        NUM: Indent NUM spaces at the starts of paragraphs.
-             If NUM is zero, we assume `none'.
-   Returns 0 if successful, or nonzero if STRING isn't one of the above. */
-int
-set_paragraph_indent (char *string)
-{
-  if (strcmp (string, "asis") == 0 || strcmp (string, _("asis")) == 0)
-    paragraph_start_indent = 0;
-  else if (strcmp (string, "none") == 0 || strcmp (string, _("none")) == 0)
-    paragraph_start_indent = -1;
-  else
-    {
-      if (sscanf (string, "%d", &paragraph_start_indent) != 1)
-        return -1;
-      else
-        {
-          if (paragraph_start_indent == 0)
-            paragraph_start_indent = -1;
-        }
-    }
-  return 0;
-}

Property changes on: head/contrib/texinfo/makeinfo/makeinfo.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/xml.c
===================================================================
--- head/contrib/texinfo/makeinfo/xml.c	(revision 276550)
+++ head/contrib/texinfo/makeinfo/xml.c	(nonexistent)
@@ -1,2328 +0,0 @@
-/* xml.c -- xml output.
-   $Id: xml.c,v 1.52 2004/12/19 17:02:23 karl Exp $
-
-   Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Originally written by Philippe Martin <feloy@free.fr>.  */
-
-#include "system.h"
-#include "makeinfo.h"
-#include "insertion.h"
-#include "files.h"
-#include "float.h"
-#include "macro.h"
-#include "cmds.h"
-#include "lang.h"
-
-#include "xml.h"
-
-/* Options */
-int xml_index_divisions = 1;
-
-typedef struct _element
-{
-  char name[32];
-  int contains_para;
-  int contained_in_para;
-  int keep_space;
-} element;
-
-element texinfoml_element_list [] = {
-  { "texinfo",             1, 0, 0 },
-  { "setfilename",         0, 0, 0 },
-  { "titlefont",           0, 0, 0 },
-  { "settitle",            0, 0, 0 },
-  { "documentdescription", 1, 0, 0 },
-
-  { "node",                1, 0, 0 },
-  { "nodenext",            0, 0, 0 },
-  { "nodeprev",            0, 0, 0 },
-  { "nodeup",              0, 0, 0 },
-
-  { "chapter",             1, 0, 0 },
-  { "section",             1, 0, 0 },
-  { "subsection",          1, 0, 0 },
-  { "subsubsection",       1, 0, 0 },
-
-  { "top",                 1, 0, 0 },
-  { "unnumbered",          1, 0, 0 },
-  { "unnumberedsec",       1, 0, 0 },
-  { "unnumberedsubsec",    1, 0, 0 },
-  { "unnumberedsubsubsec", 1, 0, 0 },
-
-  { "appendix",            1, 0, 0 },
-  { "appendixsec",         1, 0, 0 },
-  { "appendixsubsec",      1, 0, 0 },
-  { "appendixsubsubsec",   1, 0, 0 },
-
-  { "majorheading",        0, 0, 0 },
-  { "chapheading",         0, 0, 0 },
-  { "heading",             0, 0, 0 },
-  { "subheading",          0, 0, 0 },
-  { "subsubheading",       0, 0, 0 },
-
-  { "titlepage",           1, 0, 0 },
-  { "author",              0, 0, 0 },
-  { "booktitle",           0, 0, 0 },
-  { "booksubtitle",        0, 0, 0 },
-
-  { "menu",                1, 0, 0 },
-  { "detailmenu",          1, 0, 0 },
-  { "menuentry",           0, 0, 0 },
-  { "menutitle",           0, 0, 0 },
-  { "menucomment",         0, 0, 0 },
-  { "menunode",            0, 0, 0 },
-  { "nodename",            0, 0, 0 },
-
-  { "acronym",             0, 1, 0 },
-  { "acronymword",         0, 1, 0 },
-  { "acronymdesc",         0, 1, 0 },
-
-  { "abbrev",              0, 1, 0 },
-  { "abbrevword",          0, 1, 0 },
-  { "abbrevdesc",          0, 1, 0 },
-
-  { "tt",                  0, 1, 0 },
-  { "code",                0, 1, 0 },
-  { "command",             0, 1, 0 },
-  { "env",                 0, 1, 0 },
-  { "file",                0, 1, 0 },
-  { "option",              0, 1, 0 },
-  { "samp",                0, 1, 0 },
-  { "kbd",                 0, 1, 0 },
-  { "url",                 0, 1, 0 },
-  { "key",                 0, 1, 0 },
-  { "var",                 0, 1, 0 },
-  { "sc",                  0, 1, 0 },
-  { "dfn",                 0, 1, 0 },
-  { "emph",                0, 1, 0 },
-  { "strong",              0, 1, 0 },
-  { "cite",                0, 1, 0 },
-  { "notfixedwidth",       0, 1, 0 },
-  { "i",                   0, 1, 0 },
-  { "b",                   0, 1, 0 },
-  { "r",                   0, 1, 0 },
-  { "slanted",             0, 1, 0 },
-  { "sansserif",           0, 1, 0 },
-
-  { "exdent",              0, 0, 0 },
-
-  { "title",               0, 0, 0 },
-  { "ifinfo",              1, 0, 0 },
-  { "sp",                  0, 0, 0 },
-  { "center",              1, 0, 0 },
-  { "dircategory",         0, 0, 0 },
-  { "quotation",           1, 0, 0 },
-  { "example",             0, 0, 1 },
-  { "smallexample",        0, 0, 1 },
-  { "lisp",                0, 0, 1 },
-  { "smalllisp",           0, 0, 1 },
-  { "cartouche",           1, 0, 0 },
-  { "copying",             1, 0, 0 },
-  { "format",              0, 0, 1 },
-  { "smallformat",         0, 0, 1 },
-  { "display",             0, 0, 1 },
-  { "smalldisplay",        0, 0, 1 },
-  { "verbatim",            0, 0, 1 },
-  { "footnote",            0, 1, 0 },
-  { "",                    0, 1, 0 }, /* LINEANNOTATION (docbook) */
-
-  { "",                    1, 0, 0 }, /* TIP (docbook)       */
-  { "",                    1, 0, 0 }, /* NOTE (docbook)      */
-  { "",                    1, 0, 0 }, /* IMPORTANT (docbook) */
-  { "",                    1, 0, 0 }, /* WARNING (docbook)   */
-  { "",                    1, 0, 0 }, /* CAUTION (docbook)   */
-
-  { "itemize",             0, 0, 0 },
-  { "itemfunction",        0, 0, 0 },
-  { "item",                1, 0, 0 },
-  { "enumerate",           0, 0, 0 },
-  { "table",               0, 0, 0 },
-  { "tableitem",           0, 0, 0 },
-  { "tableterm",           0, 0, 0 },
-
-  { "indexterm",           0, 1, 0 },
-
-  { "math",                0, 1, 0 },
-
-  { "dmn",                 0, 1, 0 },
-
-  { "xref",                0, 1, 0 },
-  { "xrefnodename",        0, 1, 0 },
-  { "xrefinfoname",        0, 1, 0 },
-  { "xrefprinteddesc",     0, 1, 0 },
-  { "xrefinfofile",        0, 1, 0 },
-  { "xrefprintedname",     0, 1, 0 },
-
-  { "inforef",             0, 1, 0 },
-  { "inforefnodename",     0, 1, 0 },
-  { "inforefrefname",      0, 1, 0 },
-  { "inforefinfoname",     0, 1, 0 },
-
-  { "uref",                0, 1, 0 },
-  { "urefurl",             0, 1, 0 },
-  { "urefdesc",            0, 1, 0 },
-  { "urefreplacement",     0, 1, 0 },
-
-  { "email",               0, 1, 0 },
-  { "emailaddress",        0, 1, 0 },
-  { "emailname",           0, 1, 0 },
-
-  { "group",               0, 0, 0 },
-  { "float",               1, 0, 0 },
-  { "floattype",           0, 0, 0 },
-  { "floatpos",            0, 0, 0 },
-  { "caption",             0, 0, 0 },
-  { "shortcaption",        0, 0, 0 },
-
-  { "",                    0, 0, 0 }, /* TABLE (docbook) */
-  { "",                    0, 0, 0 }, /* FIGURE (docbook) */
-  { "",                    0, 0, 0 }, /* EXAMPLE (docbook) */
-  { "",                    1, 0, 0 }, /* SIDEBAR (docbook) */
-
-  { "printindex",          0, 0, 0 },
-  { "listoffloats",        0, 0, 0 },
-  { "anchor",              0, 1, 0 },
-
-  { "image",               0, 0, 0 },
-  { "inlineimage",         0, 1, 0 },
-  { "alttext",             0, 1, 0 },
-
-  { "",                    0, 1, 0 }, /* PRIMARY (docbook) */
-  { "",                    0, 1, 0 }, /* SECONDARY (docbook) */
-  { "",                    0, 0, 0 }, /* INFORMALFIGURE (docbook) */
-  { "",                    0, 0, 0 }, /* MEDIAOBJECT (docbook) */
-  { "",                    0, 0, 0 }, /* IMAGEOBJECT (docbook) */
-  { "",                    0, 0, 0 }, /* IMAGEDATA (docbook) */
-  { "",                    0, 0, 0 }, /* TEXTOBJECT (docbook) */
-  { "",                    0, 0, 0 }, /* INDEXENTRY (docbook) */
-  { "",                    0, 0, 0 }, /* PRIMARYIE (docbook) */
-  { "",                    0, 0, 0 }, /* SECONDARYIE (docbook) */
-  { "",                    0, 0, 0 }, /* INDEXDIV (docbook) */
-  { "multitable",          0, 0, 0 },
-  { "",                    0, 0, 0 }, /* TGROUP (docbook) */
-  { "columnfraction",      0, 0, 0 },
-  { "thead",               0, 0, 0 },
-  { "tbody",               0, 0, 0 },
-  { "entry",               0, 0, 0 },
-  { "row",                 0, 0, 0 },
-  { "",                    0, 0, 0 }, /* BOOKINFO (docbook) */
-  { "",                    0, 0, 0 }, /* ABSTRACT (docbook) */
-  { "",                    0, 0, 0 }, /* REPLACEABLE (docbook) */
-  { "",                    0, 0, 0 }, /* ENVAR (docbook) */
-  { "",                    0, 0, 0 }, /* COMMENT (docbook) */
-  { "",                    0, 0, 0 }, /* FUNCTION (docbook) */
-  { "",                    0, 0, 0 }, /* LEGALNOTICE (docbook) */
-
-  { "contents",            0, 0, 0 },
-  { "shortcontents",       0, 0, 0 },
-  { "documentlanguage",    0, 0, 0 },
-
-  { "setvalue",            0, 0, 0 },
-  { "clearvalue",          0, 0, 0 },
-
-  { "definition",          0, 0, 0 },
-  { "definitionterm",      0, 0, 0 },
-  { "definitionitem",      1, 0, 0 },
-  { "defcategory",         0, 0, 0 },
-  { "deffunction",         0, 0, 0 },
-  { "defvariable",         0, 0, 0 },
-  { "defparam",            0, 0, 0 },
-  { "defdelimiter",        0, 0, 0 },
-  { "deftype",             0, 0, 0 },
-  { "defparamtype",        0, 0, 0 },
-  { "defdatatype",         0, 0, 0 },
-  { "defclass",            0, 0, 0 },
-  { "defclassvar",         0, 0, 0 },
-  { "defoperation",        0, 0, 0 },
-
-  { "para",                0, 0, 0 } /* Must be last */
-  /* name / contains para / contained in para / preserve space */
-};
-
-element docbook_element_list [] = {
-  { "book",                0, 0, 0 }, /* TEXINFO */
-  { "",                    0, 0, 0 }, /* SETFILENAME */
-  { "",                    0, 0, 0 }, /* TITLEINFO */
-  { "title",               0, 0, 0 }, /* SETTITLE */
-  { "",                    1, 0, 0 }, /* DOCUMENTDESCRIPTION (?) */
-
-  { "",                    1, 0, 0 }, /* NODE */
-  { "",                    0, 0, 0 }, /* NODENEXT */
-  { "",                    0, 0, 0 }, /* NODEPREV */
-  { "",                    0, 0, 0 }, /* NODEUP */
-
-  { "chapter",             1, 0, 0 },
-  { "sect1",               1, 0, 0 }, /* SECTION */
-  { "sect2",               1, 0, 0 }, /* SUBSECTION */
-  { "sect3",               1, 0, 0 }, /* SUBSUBSECTION */
-
-  { "chapter",             1, 0, 0 }, /* TOP */
-  { "chapter",             1, 0, 0 }, /* UNNUMBERED */
-  { "sect1",               1, 0, 0 }, /* UNNUMBEREDSEC */
-  { "sect2",               1, 0, 0 }, /* UNNUMBEREDSUBSEC */
-  { "sect3",               1, 0, 0 }, /* UNNUMBEREDSUBSUBSEC */
-
-  { "appendix",            1, 0, 0 },
-  { "sect1",               1, 0, 0 }, /* APPENDIXSEC */
-  { "sect2",               1, 0, 0 }, /* APPENDIXSUBSEC */
-  { "sect3",               1, 0, 0 }, /* APPENDIXSUBSUBSEC */
-
-  { "bridgehead",          0, 0, 0 }, /* MAJORHEADING */
-  { "bridgehead",          0, 0, 0 }, /* CHAPHEADING */
-  { "bridgehead",          0, 0, 0 }, /* HEADING */
-  { "bridgehead",          0, 0, 0 }, /* SUBHEADING */
-  { "bridgehead",          0, 0, 0 }, /* SUBSUBHEADING */
-
-  { "",                    0, 0, 0 }, /* TITLEPAGE */
-  { "",                    0, 0, 0 }, /* AUTHOR */
-  { "",                    0, 0, 0 }, /* BOOKTITLE */
-  { "",                    0, 0, 0 }, /* BOOKSUBTITLE */
-
-  { "",                    1, 0, 0 }, /* MENU */
-  { "",                    1, 0, 0 }, /* DETAILMENU */
-  { "",                    1, 0, 0 }, /* MENUENTRY */
-  { "",                    0, 0, 0 }, /* MENUTITLE */
-  { "",                    1, 0, 0 }, /* MENUCOMMENT */
-  { "",                    0, 0, 0 }, /* MENUNODE */
-  { "anchor",              0, 0, 0 }, /* NODENAME */
-
-  { "acronym",             0, 1, 0 },
-  { "",                    0, 1, 0 }, /* ACRONYMWORD */
-  { "",                    0, 1, 0 }, /* ACRONYMDESC */
-
-  { "abbrev",              0, 1, 0 },
-  { "",                    0, 1, 0 }, /* ABBREVWORD */
-  { "",                    0, 1, 0 }, /* ABBREVDESC */
-
-  { "literal",             0, 1, 0 }, /* TT */
-  { "literal",             0, 1, 0 }, /* CODE */
-  { "command",             0, 1, 0 }, /* COMMAND */
-  { "envar",               0, 1, 0 }, /* ENV */
-  { "filename",            0, 1, 0 }, /* FILE */
-  { "option",              0, 1, 0 }, /* OPTION */
-  { "literal",             0, 1, 0 }, /* SAMP */
-  { "userinput",           0, 1, 0 }, /* KBD */
-  { "wordasword",          0, 1, 0 }, /* URL */
-  { "keycap",              0, 1, 0 }, /* KEY */
-  { "replaceable",         0, 1, 0 }, /* VAR */
-  { "",                    0, 1, 0 }, /* SC */
-  { "firstterm",           0, 1, 0 }, /* DFN */
-  { "emphasis",            0, 1, 0 }, /* EMPH */
-  { "emphasis",            0, 1, 0 }, /* STRONG */
-  { "citetitle",           0, 1, 0 }, /* CITE */
-  { "",                    0, 1, 0 }, /* NOTFIXEDWIDTH */
-  { "wordasword",          0, 1, 0 }, /* I */
-  { "emphasis",            0, 1, 0 }, /* B */
-  { "",                    0, 1, 0 }, /* R */
-
-  { "",                    0, 0, 0 }, /* EXDENT */
-
-  { "title",               0, 0, 0 },
-  { "",                    1, 0, 0 }, /* IFINFO */
-  { "",                    0, 0, 0 }, /* SP */
-  { "",                    1, 0, 0 }, /* CENTER */
-  { "",                    0, 0, 0 }, /* DIRCATEGORY */
-  { "blockquote",          1, 0, 0 }, /* QUOTATION */
-  { "screen",              0, 0, 1 }, /* EXAMPLE */
-  { "screen",              0, 0, 1 }, /* SMALLEXAMPLE */
-  { "programlisting",      0, 0, 1 }, /* LISP */
-  { "programlisting",      0, 0, 1 }, /* SMALLLISP */
-  { "",                    1, 0, 0 }, /* CARTOUCHE */
-  { "",                    1, 0, 0 }, /* COPYING */
-  { "screen",              0, 1, 1 }, /* FORMAT */
-  { "screen",              0, 1, 1 }, /* SMALLFORMAT */
-  { "literallayout",       0, 1, 1 }, /* DISPLAY */
-  { "literallayout",       0, 1, 1 }, /* SMALLDISPLAY */
-  { "screen",              0, 0, 1 }, /* VERBATIM */
-  { "footnote",            0, 1, 0 },
-  { "lineannotation",      0, 1, 0 },
-
-  { "tip",                 1, 0, 0 },
-  { "note",                1, 0, 0 },
-  { "important",           1, 0, 0 },
-  { "warning",             1, 0, 0 },
-  { "caution",             1, 0, 0 },
-
-  { "itemizedlist",        0, 0, 0 }, /* ITEMIZE */
-  { "",                    0, 0, 0 }, /* ITEMFUNCTION */
-  { "listitem",            1, 0, 0 }, /* ITEM */
-  { "orderedlist",         0, 0, 0 }, /* ENUMERATE */
-  { "variablelist",        0, 0, 0 }, /* TABLE */
-  { "varlistentry",        0, 0, 0 }, /* TABLEITEM */
-  { "term",                0, 0, 0 }, /* TABLETERM */
-
-  { "indexterm",           0, 1, 0 }, /* INDEXTERM */
-
-  { "",                    0, 1, 0 }, /* MATH */
-
-  { "",                    0, 1, 0 }, /* DIMENSION */
-
-  { "xref",                0, 1, 0 }, /* XREF */
-  { "link",                0, 1, 0 }, /* XREFNODENAME */
-  { "",                    0, 1, 0 }, /* XREFINFONAME */
-  { "",                    0, 1, 0 }, /* XREFPRINTEDDESC */
-  { "",                    0, 1, 0 }, /* XREFINFOFILE */
-  { "",                    0, 1, 0 }, /* XREFPRINTEDNAME */
-
-  { "",                    0, 1, 0 }, /* INFOREF */
-  { "",                    0, 1, 0 }, /* INFOREFNODENAME */
-  { "",                    0, 1, 0 }, /* INFOREFREFNAME */
-  { "",                    0, 1, 0 }, /* INFOREFINFONAME */
-
-  { "ulink",               0, 1, 0 }, /* UREF */
-  { "",                    0, 1, 0 }, /* UREFURL */
-  { "",                    0, 1, 0 }, /* UREFDESC */
-  { "",                    0, 1, 0 }, /* UREFREPLACEMENT */
-
-  { "ulink",               0, 1, 0 }, /* EMAIL */
-  { "",                    0, 1, 0 }, /* EMAILADDRESS */
-  { "",                    0, 1, 0 }, /* EMAILNAME */
-
-  { "",                    0, 0, 0 }, /* GROUP */
-  { "",                    1, 0, 0 }, /* FLOAT */
-  { "",                    0, 0, 0 }, /* FLOATTYPE */
-  { "",                    0, 0, 0 }, /* FLOATPOS */
-  { "",                    0, 0, 0 }, /* CAPTION */
-  { "",                    0, 0, 0 }, /* SHORTCAPTION */
-
-  { "table",               0, 1, 0 },
-  { "figure",              0, 1, 0 },
-  { "example",             1, 1, 0 },
-  { "sidebar",             1, 0, 0 },
-
-  { "index",               0, 1, 0 }, /* PRINTINDEX */
-  { "",                    0, 1, 0 }, /* LISTOFFLOATS */
-  { "",                    0, 1, 0 }, /* ANCHOR */
-
-  { "",                    0, 0, 0 }, /* IMAGE */
-  { "inlinemediaobject",   0, 1, 0 }, /* INLINEIMAGE */
-  { "",                    0, 0, 0 }, /* IMAGEALTTEXT */
-
-  { "primary",             0, 1, 0 }, /* PRIMARY */
-  { "secondary",           0, 1, 0 },
-  { "informalfigure",      0, 0, 0 },
-  { "mediaobject",         0, 0, 0 },
-  { "imageobject",         0, 1, 0 },
-  { "imagedata",           0, 1, 0 },
-  { "textobject",          0, 1, 0 },
-  { "indexentry",          0, 0, 0 },
-  { "primaryie",           0, 0, 0 },
-  { "secondaryie",         0, 0, 0 },
-  { "indexdiv",            0, 0, 0 },
-  { "informaltable",       0, 0, 0 },
-  { "tgroup",              0, 0, 0 },
-  { "colspec",             0, 0, 0 },
-  { "thead",               0, 0, 0 },
-  { "tbody",               0, 0, 0 },
-  { "entry",               0, 0, 0 },
-  { "row",                 0, 0, 0 },
-  { "bookinfo",            0, 0, 0 },
-  { "abstract",            1, 0, 0 },
-  { "replaceable",         0, 0, 0 },
-  { "envar",               0, 1, 0 },
-  { "comment",             0, 0, 0 },
-  { "function",            0, 1, 0 },
-  { "legalnotice",         1, 0, 0 },
-
-  { "",                    0, 0, 0 }, /* CONTENTS (xml) */
-  { "",                    0, 0, 0 }, /* SHORTCONTENTS (xml) */
-  { "",                    0, 0, 0 }, /* DOCUMENT LANGUAGE (xml) */
-
-  { "",                    0, 0, 0 }, /* SETVALUE (xml) */
-  { "",                    0, 0, 0 }, /* CLEARVALUE (xml) */
-
-  { "blockquote",          1, 0, 0 }, /* DEFINITION */
-  { "screen",              0, 0, 1 }, /* DEFINITIONTERM */
-  { "",                    0, 0, 0 }, /* DEFINITIONITEM (xml) */
-  { "",                    0, 0, 0 }, /* DEFCATEGORY (xml) */
-  { "function",            0, 0, 0 }, /* DEFFUNCTION */
-  { "varname",             0, 0, 0 }, /* DEFVARIABLE */
-  { "varname",             0, 0, 0 }, /* DEFPARAM */
-  { "",                    0, 0, 0 }, /* DEFDELIMITER (xml) */
-  { "returnvalue",         0, 0, 0 }, /* DEFTYPE */
-  { "type",                0, 0, 0 }, /* DEFPARAMTYPE */
-  { "structname",          0, 0, 0 }, /* DEFDATATYPE */
-  { "classname",           0, 0, 0 }, /* DEFCLASS */
-  { "property",            0, 0, 0 }, /* DEFCLASSVAR */
-  { "methodname",          0, 0, 0 }, /* DEFOPERATION */
-
-  { "para",                0, 0, 0 } /* Must be last */
-  /* name / contains para / contained in para / preserve space */
-};
-
-element *xml_element_list = NULL;
-
-
-typedef struct _replace_element
-{
-  int element_to_replace;
-  int element_containing;
-  int element_replacing;
-} replace_element;
-
-/* Elements to replace - Docbook only
-   -------------------
-   if `element_to_replace' have to be inserted
-   as a child of `element_containing,'
-   use `element_replacing' instead.
-
-   A value of `-1' for element_replacing means `do not use any element.'
-*/
-
-replace_element replace_elements [] = {
-  { I, TABLETERM, EMPH },
-  { B, TABLETERM, EMPH },
-  { TT, CODE, -1 },
-  { EXAMPLE, DISPLAY, -1 },
-  { CODE, DFN, -1 },
-  { CODE, VAR, -1 },
-  { EMPH, CODE, REPLACEABLE },
-  { VAR, VAR, -1},
-  { VAR, B, EMPH},
-  { B, CODE, ENVAR},
-  { CODE, I, EMPH},
-  { SAMP, VAR, -1 },
-  { FORMAT, BOOKINFO, ABSTRACT },
-  { QUOTATION, ABSTRACT, -1},
-  { LINEANNOTATION, LINEANNOTATION, -1 },
-  { LEGALNOTICE, ABSTRACT, -1 },
-  { QUOTATION, QUOTATION, -1 },
-  /* Formal versions of table and image elements.  */
-  { MULTITABLE, FLOAT, FLOATTABLE },
-  { INFORMALFIGURE, FLOAT, FLOATFIGURE },
-  { CARTOUCHE, FLOAT, FLOATCARTOUCHE },
-  /* Unnecessary markup in @defun blocks.  */
-  { VAR, DEFPARAM, -1 },
-  { CODE, DEFTYPE, -1 },
-  /* Add your elements to replace here */
-  {-1, 0, 0}
-};
-
-int xml_in_menu_entry = 0;
-int xml_in_menu_entry_comment = 0;
-int xml_node_open = 0;
-int xml_node_level = -1;
-int xml_in_para = 0;
-int xml_just_after_element = 0;
-int xml_keep_space = 0;
-
-int xml_no_indent = 0;
-
-int xml_no_para = 0;
-char *xml_node_id = NULL;
-int xml_sort_index = 0;
-
-int xml_in_xref_token = 0;
-int xml_in_bookinfo = 0;
-int xml_in_book_title = 0;
-int xml_in_abstract = 0;
-
-/* Non-zero if we are handling an element that can appear between
-   @item and @itemx, @deffn and @deffnx.  */
-int xml_dont_touch_items_defs = 0;
-
-/* We need to keep footnote state, because elements inside footnote may try
-   to close the previous parent para.  */
-static int xml_in_footnote = 0;
-
-static int xml_after_table_term = 0;
-static int book_started = 0;
-static int first_section_opened = 0;
-
-static int xml_in_tableitem[256];
-static int xml_in_item[256];
-static int xml_table_level = 0;
-
-static int xml_in_def_item[256];
-static int xml_definition_level = 0;
-int xml_after_def_term = 0;
-
-static int in_table_title = 0;
-
-static int in_indexentry = 0;
-static int in_secondary = 0;
-static int in_indexterm = 0;
-
-char *
-xml_id (char *id)
-{
-  char *tem = xmalloc (strlen (id) + 1);
-  char *p = tem;
-  strcpy (tem, id);
-  while (*p)
-    { /* Check if a character is allowed in ID attributes.  This list differs
-         slightly from XML specs that it doesn't contain underscores.
-         See http://xml.coverpages.org/sgmlsyn/sgmlsyn.htm, ``9.3 Name''  */
-      if (!strchr ("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-.", *p))
-        *p = '-';
-      p++;
-    }
-  p = tem;
-  /* First character can only be a letter.  */
-  if (!strchr ("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", *p))
-    *p = 'i';
-  return tem;
-}
-
-int
-xml_element (char *name)
-{
-  int i;
-  for (i=0; i<=PARA; i++)
-    {
-      if (strcasecmp (name, texinfoml_element_list[i].name) == 0)
-        return i;
-    }
-  printf ("Error xml_element\n");
-  return -1;
-}
-
-void
-xml_begin_document (char *output_filename)
-{
-  if (book_started)
-    return;
-
-  book_started = 1;
-
-  /* Make sure this is the very first string of the output document.  */
-  output_paragraph_offset = 0;
-
-  insert_string ("<?xml version=\"1.0\"");
-
-  /* At this point, we register a delayed writing for document encoding,
-     so in the end, proper encoding attribute will be inserted here.
-     Since the user is unaware that we are implicitly executing this
-     command, we should disable warnings temporarily, in order to avoid
-     possible confusion.  (ie. if the output is not seekable,
-     register_delayed_write issues a warning.)  */
-  {
-    extern int print_warnings;
-    int save_print_warnings = print_warnings;
-    print_warnings = 0;
-    register_delayed_write ("@documentencoding");
-    print_warnings = save_print_warnings;
-  }
-
-  insert_string ("?>\n");
-
-  if (docbook)
-    {
-      insert_string ("<!DOCTYPE book PUBLIC \"-//OASIS//DTD DocBook XML V4.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\" [\n  <!ENTITY tex \"TeX\">\n  <!ENTITY latex \"LaTeX\">\n]>");
-      xml_element_list = docbook_element_list;
-    }
-  else
-    {
-      insert_string ("<!DOCTYPE texinfo PUBLIC \"-//GNU//DTD TexinfoML V");
-      insert_string (VERSION);
-      insert_string ("//EN\" \"http://www.gnu.org/software/texinfo/dtd/");
-      insert_string (VERSION);
-      insert_string ("/texinfo.dtd\">");
-      xml_element_list = texinfoml_element_list;
-    }
-  if (language_code != last_language_code)
-    {
-      if (docbook)
-        xml_insert_element_with_attribute (TEXINFO, START, "lang=\"%s\"", language_table[language_code].abbrev);
-      else
-	xml_insert_element_with_attribute (TEXINFO, START, "xml:lang=\"%s\"", language_table[language_code].abbrev);
-    }
-  if (!docbook)
-    {
-      xml_insert_element (SETFILENAME, START);
-      insert_string (output_filename);
-      xml_insert_element (SETFILENAME, END);
-    }
-}
-
-/*  */
-static int element_stack[256];
-static int element_stack_index = 0;
-
-static int
-xml_current_element (void)
-{
-  return element_stack[element_stack_index-1];
-}
-
-static void
-xml_push_current_element (int elt)
-{
-  element_stack[element_stack_index++] = elt;
-  if (element_stack_index > 200)
-    printf ("*** stack overflow (%d - %s) ***\n",
-            element_stack_index,
-            xml_element_list[elt].name);
-}
-
-static void
-xml_pop_current_element (void)
-{
-  element_stack_index--;
-  if (element_stack_index < 0)
-    printf ("*** stack underflow (%d - %d) ***\n",
-            element_stack_index,
-            xml_current_element());
-}
-
-int
-xml_current_stack_index (void)
-{
-  return element_stack_index;
-}
-
-void
-xml_end_current_element (void)
-{
-  xml_insert_element (xml_current_element (), END);
-}
-
-static void
-xml_indent (void)
-{
-  if (xml_indentation_increment > 0)
-    {
-      int i;
-      if (output_paragraph[output_paragraph_offset-1] != '\n')
-        insert ('\n');
-      for (i = 0; i < element_stack_index * xml_indentation_increment; i++)
-        insert (' ');
-    }
-}
-
-void
-xml_start_para (void)
-{
-  if (xml_in_para || xml_in_footnote
-      || !xml_element_list[xml_current_element()].contains_para)
-    return;
-
-  while (output_paragraph[output_paragraph_offset-1] == '\n')
-    output_paragraph_offset--;
-  xml_indent ();
-
-  insert_string ("<para");
-  if (xml_no_indent)
-    insert_string (" role=\"continues\"");
-  insert_string (">");
-  xml_no_indent = 0;
-  xml_in_para = 1;
-}
-
-void
-xml_end_para (void)
-{
-  if (!xml_in_para || xml_in_footnote)
-    return;
-
-  while (cr_or_whitespace(output_paragraph[output_paragraph_offset-1]))
-    output_paragraph_offset--;
-
-  insert_string ("</para>");
-  if (xml_indentation_increment > 0)
-    insert ('\n');
-  xml_in_para = 0;
-}
-
-void
-xml_end_document (void)
-{
-  if (xml_node_open)
-    {
-      if (xml_node_level != -1)
-        {
-          xml_close_sections (xml_node_level);
-          xml_node_level = -1;
-        }
-      xml_insert_element (NODE, END);
-    }
-  else
-    xml_close_sections (xml_node_level);
-
-  xml_insert_element (TEXINFO, END);
-  if (xml_indentation_increment == 0)
-    insert ('\n');
-  insert_string ("<!-- Keep this comment at the end of the file\n\
-Local variables:\n\
-mode: sgml\n\
-sgml-indent-step:1\n\
-sgml-indent-data:nil\n\
-End:\n\
--->\n");
-  if (element_stack_index != 0)
-    error ("Element stack index : %d\n", element_stack_index);
-}
-
-/* MUST be 0 or 1, not true or false values */
-static int start_element_inserted = 1;
-
-/* NOTE: We use `elt' rather than `element' in the argument list of
-   the next function, since otherwise the Solaris SUNWspro compiler
-   barfs because `element' is a typedef declared near the beginning of
-   this file.  */
-void
-#if defined (VA_FPRINTF) && __STDC__
-xml_insert_element_with_attribute (int elt, int arg, char *format, ...)
-#else
-xml_insert_element_with_attribute (elt, arg, format, va_alist)
-     int elt;
-     int arg;
-     char *format;
-     va_dcl
-#endif
-{
-  /* Look at the replace_elements table to see if we have to change the element */
-  if (xml_sort_index)
-      return;
-  if (docbook)
-    {
-      replace_element *element_list = replace_elements;
-      while (element_list->element_to_replace >= 0)
-        {
-          if ( ( (arg == START) &&
-                 (element_list->element_containing == xml_current_element ()) &&
-                 (element_list->element_to_replace == elt) ) ||
-               ( (arg == END) &&
-                 (element_list->element_containing == element_stack[element_stack_index-1-start_element_inserted]) &&
-                 (element_list->element_to_replace == elt) ) )
-            {
-              elt = element_list->element_replacing;
-              break;
-            }
-          element_list ++;
-        }
-
-      /* Forget the element */
-      if (elt < 0)
-        {
-          if (arg == START)
-            start_element_inserted = 0;
-          else
-            /* Replace the default value, for the next time */
-            start_element_inserted = 1;
-          return;
-        }
-    }
-
-  if (!book_started)
-    return;
-
-  if (!xml_dont_touch_items_defs && arg == START)
-    {
-      if (xml_after_table_term && elt != TABLETERM && xml_table_level
-          && !xml_in_item[xml_table_level])
-        {
-          xml_after_table_term = 0;
-          xml_insert_element (ITEM, START);
-          xml_in_item[xml_table_level] = 1;
-        }
-      else if (xml_after_def_term && elt != DEFINITIONTERM)
-        {
-          xml_after_def_term = 0;
-          xml_insert_element (DEFINITIONITEM, START);
-          xml_in_def_item[xml_definition_level] = 1;
-        }
-    }
-
-  if (docbook && !only_macro_expansion && (in_menu || in_detailmenu))
-    return;
-
-  if (executing_string && arg == END)
-    switch (elt)
-      {
-      case TABLEITEM:
-        xml_in_tableitem[xml_table_level] = 0;
-        break;
-      case ITEM:
-        xml_in_item[xml_table_level] = 0;
-        break;
-      case DEFINITIONTERM:
-        xml_in_def_item[xml_definition_level] = 0;
-        break;
-      }
-
-  /* We are special-casing FIGURE element for docbook.  It does appear in
-     the tag stack, but not in the output.  This is to make element replacement
-     work beautifully.  */
-  if (docbook && elt == FLOAT)
-    {
-      if (arg == START)
-        xml_push_current_element (elt);
-      else
-        xml_pop_current_element ();
-      return;
-    }
-
-  if (!xml_element_list[elt].name || !strlen (xml_element_list[elt].name))
-    {
-      /*printf ("Warning: Inserting empty element %d\n", elt);*/
-      return;
-    }
-
-  if (arg == START && !xml_in_para && !xml_no_para
-      && xml_element_list[elt].contained_in_para)
-    xml_start_para ();
-
-  if (arg == START && xml_in_para && !xml_element_list[elt].contained_in_para)
-    xml_end_para ();
-
-  if (arg == END && xml_in_para && !xml_element_list[elt].contained_in_para)
-    xml_end_para ();
-
-  if (docbook && xml_table_level && !in_table_title
-      && !xml_in_tableitem[xml_table_level] && !xml_in_item[xml_table_level]
-      && arg == START && elt != TABLEITEM && elt != TABLETERM
-      && !in_indexterm && xml_current_element() == TABLE)
-    {
-      in_table_title = 1;
-      xml_insert_element (TITLE, START);
-    }
-
-  if (arg == START && !xml_in_para && !xml_keep_space
-      && !xml_element_list[elt].contained_in_para)
-    xml_indent ();
-
-  if (arg == START)
-    xml_push_current_element (elt);
-  else
-    xml_pop_current_element ();
-
-  /* Eat one newline before </example> and the like.  */
-  if (!docbook && arg == END
-      && (xml_element_list[elt].keep_space || elt == GROUP)
-      && output_paragraph[output_paragraph_offset-1] == '\n')
-    output_paragraph_offset--;
-
-  /* And eat whitespace before </entry> in @multitables.  */
-  if (arg == END && elt == ENTRY)
-      while (cr_or_whitespace(output_paragraph[output_paragraph_offset-1]))
-    output_paragraph_offset--;
-
-  /* Indent elements that can contain <para>.  */
-  if (arg == END && !xml_in_para && !xml_keep_space
-      && xml_element_list[elt].contains_para)
-    xml_indent ();
-
-  /* Here are the elements we want indented.  These do not contain <para>
-     directly.  */
-  if (arg == END && (elt == MENUENTRY || elt == ITEMIZE || elt == ENUMERATE
-        || elt == TABLEITEM || elt == TABLE
-        || elt == MULTITABLE || elt == TGROUP || elt == THEAD || elt == TBODY
-        || elt == ROW || elt == INFORMALFIGURE
-        || (!docbook && (elt == DEFINITION || elt == DEFINITIONTERM))))
-    xml_indent ();
-
-  insert ('<');
-  if (arg == END)
-    insert ('/');
-  insert_string (xml_element_list[elt].name);
-
-  /*  printf ("%s ", xml_element_list[elt].name);*/
-
-  if (format)
-    {
-      char temp_string[2000]; /* xx no fixed limits */
-#ifdef VA_SPRINTF
-      va_list ap;
-#endif
-
-      VA_START (ap, format);
-#ifdef VA_SPRINTF
-      VA_SPRINTF (temp_string, format, ap);
-#else
-      sprintf (temp_string, format, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif
-      insert (' ');
-      insert_string (temp_string);
-      va_end (ap);
-    }
-
-  if (arg == START && xml_node_id && elt != NODENAME)
-    {
-      insert_string (" id=\"");
-      insert_string (xml_node_id);
-      insert ('"');
-      free (xml_node_id);
-      xml_node_id = NULL;
-    }
-
-  if (xml_element_list[elt].keep_space)
-    {
-      if (arg == START)
-	{
-          if (!docbook)
-            insert_string (" xml:space=\"preserve\"");
-	  xml_keep_space++;
-	}
-      else
-	xml_keep_space--;
-    }
-
-  insert ('>');
-
-  if (!xml_in_para && !xml_element_list[elt].contained_in_para
-      && xml_element_list[elt].contains_para && xml_indentation_increment > 0)
-    insert ('\n');
-
-  xml_just_after_element = 1;
-}
-
-/* See the NOTE before xml_insert_element_with_attribute, for why we
-   use `elt' rather than `element' here.  */
-void
-xml_insert_element (int elt, int arg)
-{
-  xml_insert_element_with_attribute (elt, arg, NULL);
-}
-
-void
-xml_insert_entity (char *entity_name)
-{
-  int saved_escape_html = escape_html;
-
-  if (!book_started)
-    return;
-  if (docbook && !only_macro_expansion && (in_menu || in_detailmenu))
-    return;
-
-  if (!xml_in_para && !xml_no_para && !only_macro_expansion
-      && xml_element_list[xml_current_element ()].contains_para
-      && !in_fixed_width_font)
-    xml_start_para ();
-
-  escape_html = 0;
-  add_char ('&');
-  escape_html = saved_escape_html;
-  insert_string (entity_name);
-  add_char (';');
-}
-
-typedef struct _xml_section xml_section;
-struct _xml_section {
-  int level;
-  char *name;
-  xml_section *prev;
-};
-
-xml_section *last_section = NULL;
-
-void
-xml_begin_node (void)
-{
-  first_section_opened = 1;
-  if (xml_in_abstract)
-    {
-      xml_insert_element (ABSTRACT, END);
-      xml_in_abstract = 0;
-    }
-  if (xml_in_bookinfo)
-    {
-      xml_insert_element (BOOKINFO, END);
-      xml_in_bookinfo = 0;
-    }
-  if (xml_node_open && ! docbook)
-    {
-      if (xml_node_level != -1)
-        {
-          xml_close_sections (xml_node_level);
-          xml_node_level = -1;
-        }
-      xml_insert_element (NODE, END);
-    }
-  xml_insert_element (NODE, START);
-  xml_node_open = 1;
-}
-
-void
-xml_close_sections (int level)
-{
-  if (!first_section_opened)
-    {
-      if (xml_in_abstract)
-	{
-	  xml_insert_element (ABSTRACT, END);
-	  xml_in_abstract = 0;
-	}
-      if (xml_in_bookinfo)
-	{
-	  xml_insert_element (BOOKINFO, END);
-	  xml_in_bookinfo = 0;
-	}
-      first_section_opened = 1;
-    }
-
-  while (last_section && last_section->level >= level)
-    {
-      xml_section *temp = last_section;
-      xml_insert_element (xml_element(last_section->name), END);
-      temp = last_section;
-      last_section = last_section->prev;
-      free (temp->name);
-      free (temp);
-    }
-}
-
-void
-xml_open_section (int level, char *name)
-{
-  xml_section *sect = (xml_section *) xmalloc (sizeof (xml_section));
-
-  sect->level = level;
-  sect->name = xmalloc (1 + strlen (name));
-  strcpy (sect->name, name);
-  sect->prev = last_section;
-  last_section = sect;
-
-  if (xml_node_open && xml_node_level == -1)
-    xml_node_level = level;
-}
-
-void
-xml_start_menu_entry (char *tem)
-{
-  char *string;
-  discard_until ("* ");
-
-  /* The line number was already incremented in reader_loop when we
-     saw the newline, and discard_until has now incremented again.  */
-  line_number--;
-
-  if (xml_in_menu_entry)
-    {
-      if (xml_in_menu_entry_comment)
-        {
-          xml_insert_element (MENUCOMMENT, END);
-          xml_in_menu_entry_comment=0;
-        }
-      xml_insert_element (MENUENTRY, END);
-      xml_in_menu_entry=0;
-    }
-  xml_insert_element (MENUENTRY, START);
-  xml_in_menu_entry=1;
-
-  xml_insert_element (MENUNODE, START);
-  string = expansion (tem, 0);
-  add_word (string);
-  xml_insert_element (MENUNODE, END);
-  free (string);
-
-  /* The menu item may use macros, so expand them now.  */
-  xml_insert_element (MENUTITLE, START);
-  only_macro_expansion++;
-  get_until_in_line (1, ":", &string);
-  only_macro_expansion--;
-  execute_string ("%s", string); /* get escaping done */
-  xml_insert_element (MENUTITLE, END);
-  free (string);
-
-  if (looking_at ("::"))
-    discard_until (":");
-  else
-    { /* discard the node name */
-      get_until_in_line (0, ".", &string);
-      free (string);
-    }
-  input_text_offset++;  /* discard the second colon or the period */
-  skip_whitespace_and_newlines();
-  xml_insert_element (MENUCOMMENT, START);
-  xml_in_menu_entry_comment ++;
-}
-
-void
-xml_end_menu (void)
-{
-  if (xml_in_menu_entry)
-    {
-      if (xml_in_menu_entry_comment)
-        {
-          xml_insert_element (MENUCOMMENT, END);
-          xml_in_menu_entry_comment --;
-        }
-      xml_insert_element (MENUENTRY, END);
-      xml_in_menu_entry--;
-    }
-  xml_insert_element (MENU, END);
-}
-
-static int xml_last_character;
-
-void
-xml_add_char (int character)
-{
-  if (!book_started)
-      return;
-  if (docbook && !only_macro_expansion && (in_menu || in_detailmenu))
-    return;
-
-  if (docbook && xml_table_level && !in_table_title
-      && !xml_in_item[xml_table_level] && !xml_in_tableitem[xml_table_level]
-      && !cr_or_whitespace (character) && !in_indexterm)
-    {
-      in_table_title = 1;
-      xml_insert_element (TITLE, START);
-    }
-
-  if (!first_section_opened && !xml_in_abstract && !xml_in_book_title
-      && !xml_no_para && character != '\r' && character != '\n'
-      && character != ' ' && !is_in_insertion_of_type (copying))
-    {
-      if (!xml_in_bookinfo)
-	{
-	  xml_insert_element (BOOKINFO, START);
-	  xml_in_bookinfo = 1;
-	}
-      xml_insert_element (ABSTRACT, START);
-      xml_in_abstract = 1;
-    }
-
-  if (!xml_sort_index && !xml_in_xref_token && !xml_dont_touch_items_defs)
-    {
-      if (xml_after_table_term && xml_table_level
-          && !xml_in_item[xml_table_level])
-        {
-          xml_after_table_term = 0;
-          xml_insert_element (ITEM, START);
-          xml_in_item[xml_table_level] = 1;
-        }
-      else if (xml_after_def_term)
-        {
-          xml_after_def_term = 0;
-          xml_insert_element (DEFINITIONITEM, START);
-          xml_in_def_item[xml_definition_level] = 1;
-        }
-    }
-
-  if (xml_just_after_element && !xml_in_para && !inhibit_paragraph_indentation)
-    {
-      if (character == '\r' || character == '\n' || character == '\t' || character == ' ')
-        return;
-      xml_just_after_element = 0;
-    }
-
-  if (xml_element_list[xml_current_element()].contains_para
-      && !xml_in_para && !only_macro_expansion && !xml_no_para
-      && !cr_or_whitespace (character) && !in_fixed_width_font)
-    xml_start_para ();
-
-  if (xml_in_para && character == '\n' && xml_last_character == '\n'
-      && !only_macro_expansion && !xml_no_para
-      && xml_element_list[xml_current_element()].contains_para )
-    {
-      xml_end_para ();
-      xml_just_after_element = 1;
-      return;
-    }
-
-  if (xml_in_menu_entry_comment && character == '\n' && xml_last_character == '\n')
-    {
-      xml_insert_element (MENUCOMMENT, END);
-      xml_in_menu_entry_comment = 0;
-      xml_insert_element (MENUENTRY, END);
-      xml_in_menu_entry = 0;
-    }
-
-  if (xml_in_menu_entry_comment && whitespace(character)
-      && cr_or_whitespace(xml_last_character))
-    return;
-
-  if (character == '\n' && !xml_in_para && !inhibit_paragraph_indentation)
-    return;
-
-  xml_last_character = character;
-
-  if (character == '&' && escape_html)
-      insert_string ("&amp;");
-  else if (character == '<' && escape_html)
-      insert_string ("&lt;");
-  else if (character == '\n' && !xml_keep_space)
-    {
-      if (!xml_in_para && xml_just_after_element && !multitable_active)
-	return;
-      else
-	insert (docbook ? '\n' : ' ');
-    }
-  else
-    insert (character);
-
-  return;
-}
-
-void
-xml_insert_footnote (char *note)
-{
-  if (!xml_in_para)
-    xml_start_para ();
-
-  xml_in_footnote = 1;
-  xml_insert_element (FOOTNOTE, START);
-  insert_string ("<para>");
-  execute_string ("%s", note);
-  insert_string ("</para>");
-  xml_insert_element (FOOTNOTE, END);
-  xml_in_footnote = 0;
-}
-
-/* We need to keep the quotation stack ourself, because insertion_stack
-   loses item_function when we are closing the block, so we don't know
-   what to close then.  */
-typedef struct quotation_elt
-{
-  struct quotation_elt *next;
-  char *type;
-} QUOTATION_ELT;
-
-static QUOTATION_ELT *quotation_stack = NULL;
-
-void
-xml_insert_quotation (char *type, int arg)
-{
-  int quotation_started = 0;
-
-  if (arg == START)
-    {
-      QUOTATION_ELT *new = xmalloc (sizeof (QUOTATION_ELT));
-      new->type = xstrdup (type);
-      new->next = quotation_stack;
-      quotation_stack = new;
-    }
-  else
-    type = quotation_stack->type;
-
-  /* Make use of special quotation styles of Docbook if we can.  */
-  if (docbook && strlen(type))
-    {
-      /* Let's assume it started.  */
-      quotation_started = 1;
-
-      if (strcasecmp (type, "tip") == 0)
-        xml_insert_element (TIP, arg);
-      else if (strcasecmp (type, "note") == 0)
-        xml_insert_element (NOTE, arg);
-      else if (strcasecmp (type, "important") == 0)
-        xml_insert_element (IMPORTANT, arg);
-      else if (strcasecmp (type, "warning") == 0)
-        xml_insert_element (WARNING, arg);
-      else if (strcasecmp (type, "caution") == 0)
-        xml_insert_element (CAUTION, arg);
-      else
-        /* Didn't find a known quotation type :\ */
-        quotation_started = 0;
-    }
-
-  if (!quotation_started)
-    {
-      xml_insert_element (QUOTATION, arg);
-      if (strlen(type) && arg == START)
-        execute_string ("@b{%s:} ", type);
-    }
-
-  if (arg == END)
-    {
-      QUOTATION_ELT *temp = quotation_stack;
-      if (temp == NULL)
-        return;
-      quotation_stack = quotation_stack->next;
-      free(temp->type);
-      free(temp);
-    }
-}
-
-/* Starting generic docbook floats.  Just starts elt with correct label
-   and id attributes, and inserts title.  */
-void
-xml_begin_docbook_float (int elt)
-{
-  if (current_float_used_title ())	/* in a nested float */
-    {
-      xml_insert_element (elt, START);	/* just insert the tag */
-      return;
-    }
-
-
-  /* OK, need the title, tag, etc. */
-  if (elt == CARTOUCHE)    /* no labels on <sidebar> */
-    {
-       if (strlen (current_float_id ()) == 0)
-          xml_insert_element (elt, START);
-       else
-          xml_insert_element_with_attribute (elt, START,
-              "id=\"%s\"", xml_id (current_float_id ()));
-    }
-  else if (strlen (current_float_id ()) == 0)
-    xml_insert_element_with_attribute (elt, START, "label=\"\"");
-  else
-    xml_insert_element_with_attribute (elt, START,
-        "id=\"%s\" label=\"%s\"", xml_id (current_float_id ()),
-        current_float_number ());
-
-  xml_insert_element (TITLE, START);
-  execute_string ("%s", current_float_title ());
-  xml_insert_element (TITLE, END);
-
-  current_float_set_title_used ();	/* mark this title, tag, etc used */
-}
-
-/*
- * Lists and Tables
- */
-void
-xml_begin_table (int type, char *item_function)
-{
-  switch (type)
-    {
-    case ftable:
-    case vtable:
-    case table:
-      /*if (docbook)*/ /* 05-08 */
-        {
-          xml_insert_element (TABLE, START);
-          xml_table_level ++;
-          xml_in_tableitem[xml_table_level] = 0;
-          xml_in_item[xml_table_level] = 0;
-          xml_after_table_term = 0;
-        }
-      break;
-    case itemize:
-      if (!docbook)
-        {
-          xml_insert_element (ITEMIZE, START);
-          xml_table_level ++;
-          xml_in_item[xml_table_level] = 0;
-          xml_insert_element (ITEMFUNCTION, START);
-          if (*item_function == COMMAND_PREFIX
-              && item_function[strlen (item_function) - 1] != '}'
-              && command_needs_braces (item_function + 1))
-            execute_string ("%s{}", item_function);
-          else
-            execute_string ("%s", item_function);
-          xml_insert_element (ITEMFUNCTION, END);
-        }
-      else
-        {
-          xml_insert_element_with_attribute (ITEMIZE, START,
-                                             "mark=\"%s\"",
-                                             (*item_function == COMMAND_PREFIX) ?
-                                             &item_function[1] : item_function);
-          xml_table_level ++;
-          xml_in_item[xml_table_level] = 0;
-        }
-      break;
-    }
-}
-
-void
-xml_end_table (int type)
-{
-  switch (type)
-    {
-    case ftable:
-    case vtable:
-    case table:
-      if (xml_in_item[xml_table_level])
-        {
-          xml_insert_element (ITEM, END);
-          xml_in_item[xml_table_level] = 0;
-        }
-      if (xml_in_tableitem[xml_table_level])
-        {
-          xml_insert_element (TABLEITEM, END);
-          xml_in_tableitem[xml_table_level] = 0;
-        }
-      xml_insert_element (TABLE, END);
-      xml_after_table_term = 0;
-      xml_table_level --;
-
-      break;
-    case itemize:
-      if (xml_in_item[xml_table_level])
-        {
-          xml_insert_element (ITEM, END);
-          xml_in_item[xml_table_level] = 0;
-        }
-      /* gnat-style manual contains an itemized list without items! */
-      if (in_table_title)
-	{
-	  xml_insert_element (TITLE, END);
-	  in_table_title = 0;
-	}
-      xml_insert_element (ITEMIZE, END);
-      xml_table_level --;
-      break;
-    }
-}
-
-void
-xml_begin_item (void)
-{
-  if (xml_in_item[xml_table_level])
-    xml_insert_element (ITEM, END);
-
-  xml_insert_element (ITEM, START);
-  xml_in_item[xml_table_level] = 1;
-}
-
-void
-xml_begin_table_item (void)
-{
-  if (!xml_after_table_term)
-    {
-      if (xml_in_item[xml_table_level])
-        xml_insert_element (ITEM, END);
-      if (xml_in_tableitem[xml_table_level])
-        xml_insert_element (TABLEITEM, END);
-
-      if (in_table_title)
-	{
-	  in_table_title = 0;
-	  xml_insert_element (TITLE, END);
-	}
-      xml_insert_element (TABLEITEM, START);
-    }
-  xml_insert_element (TABLETERM, START);
-  xml_in_tableitem[xml_table_level] = 1;
-  xml_in_item[xml_table_level] = 0;
-  xml_after_table_term = 0;
-}
-
-void
-xml_continue_table_item (void)
-{
-  xml_insert_element (TABLETERM, END);
-  xml_after_table_term = 1;
-  xml_in_item[xml_table_level] = 0;
-}
-
-void
-xml_begin_enumerate (char *enum_arg)
-{
-  if (!docbook)
-    xml_insert_element_with_attribute (ENUMERATE, START, "first=\"%s\"", enum_arg);
-  else
-    {
-      if (isdigit (*enum_arg))
-        {
-          int enum_val = atoi (enum_arg);
-
-          /* Have to check the value, not just the first digit.  */
-          if (enum_val == 0)
-            xml_insert_element_with_attribute (ENUMERATE, START,
-                "numeration=\"arabic\" role=\"0\"", NULL);
-          else if (enum_val == 1)
-            xml_insert_element_with_attribute (ENUMERATE, START,
-                "numeration=\"arabic\"", NULL);
-          else
-            xml_insert_element_with_attribute (ENUMERATE, START,
-                "continuation=\"continues\" numeration=\"arabic\"", NULL);
-        }
-      else if (isupper (*enum_arg))
-        {
-          if (enum_arg[0] == 'A')
-            xml_insert_element_with_attribute (ENUMERATE, START,
-                "numeration=\"upperalpha\"", NULL);
-          else
-            xml_insert_element_with_attribute (ENUMERATE, START,
-                "continuation=\"continues\" numeration=\"upperalpha\"", NULL);
-        }
-      else
-        {
-          if (enum_arg[0] == 'a')
-            xml_insert_element_with_attribute (ENUMERATE, START,
-                "numeration=\"loweralpha\"", NULL);
-          else
-            xml_insert_element_with_attribute (ENUMERATE, START,
-                "continuation=\"continues\" numeration=\"loweralpha\"", NULL);
-        }
-    }
-  xml_table_level ++;
-  xml_in_item[xml_table_level] = 0;
-}
-
-void
-xml_end_enumerate (void)
-{
-  if (xml_in_item[xml_table_level])
-    {
-      xml_insert_element (ITEM, END);
-      xml_in_item[xml_table_level] = 0;
-    }
-  xml_insert_element (ENUMERATE, END);
-  xml_table_level --;
-}
-
-static void
-xml_insert_text_file (char *name_arg)
-{
-  char *fullname = xmalloc (strlen (name_arg) + 4 + 1);
-  FILE *image_file;
-  strcpy (fullname, name_arg);
-  strcat (fullname, ".txt");
-  image_file = fopen (fullname, "r");
-  if (image_file)
-    {
-      int ch;
-      int save_inhibit_indentation = inhibit_paragraph_indentation;
-      int save_filling_enabled = filling_enabled;
-
-      xml_insert_element (TEXTOBJECT, START);
-      xml_insert_element (DISPLAY, START);
-
-      inhibit_paragraph_indentation = 1;
-      filling_enabled = 0;
-      last_char_was_newline = 0;
-
-      /* Maybe we need to remove the final newline if the image
-         file is only one line to allow in-line images.  On the
-         other hand, they could just make the file without a
-         final newline.  */
-      while ((ch = getc (image_file)) != EOF)
-        add_char (ch);
-
-      inhibit_paragraph_indentation = save_inhibit_indentation;
-      filling_enabled = save_filling_enabled;
-
-      xml_insert_element (DISPLAY, END);
-      xml_insert_element (TEXTOBJECT, END);
-
-      if (fclose (image_file) != 0)
-        perror (fullname);
-    }
-  else
-    warning (_("@image file `%s' unreadable: %s"), fullname,
-             strerror (errno));
-
-  free (fullname);
-}
-
-/* If NAME.EXT is accessible or FORCE is nonzero, insert a docbook
-   imagedata element for FMT.  Return 1 if inserted something, 0 else.  */
-
-static int
-try_docbook_image (const char *name, const char *ext, const char *fmt,
-                   int force)
-{
-  int used = 0;
-  char *fullname = xmalloc (strlen (name) + 1 + strlen (ext) + 1);
-  sprintf (fullname, "%s.%s", name, ext);
-
-  if (force || access (fullname, R_OK) == 0)
-   {
-     xml_insert_element (IMAGEOBJECT, START);
-     xml_insert_element_with_attribute (IMAGEDATA, START,
-       "fileref=\"%s\" format=\"%s\"", fullname, fmt);
-     xml_insert_element (IMAGEDATA, END);
-     xml_insert_element (IMAGEOBJECT, END);
-     used = 1;
-   }
- 
- free (fullname);
- return used;
-}
-
-
-void
-xml_insert_docbook_image (char *name_arg)
-{
-  int found = 0;
-  int elt = xml_in_para ? INLINEIMAGE : MEDIAOBJECT;
-
-  if (is_in_insertion_of_type (floatenv))
-    xml_begin_docbook_float (INFORMALFIGURE);
-  else if (!xml_in_para)
-    xml_insert_element (INFORMALFIGURE, START);
-
-  xml_no_para++;
-
-  xml_insert_element (elt, START);
-
-  /* A selected few from http://docbook.org/tdg/en/html/imagedata.html.  */
-  if (try_docbook_image (name_arg, "eps", "EPS", 0))
-    found++;
-  if (try_docbook_image (name_arg, "gif", "GIF", 0))
-    found++;
-  if (try_docbook_image (name_arg, "jpg", "JPG", 0))
-    found++;
-  if (try_docbook_image (name_arg, "jpeg", "JPEG", 0))
-    found++;
-  if (try_docbook_image (name_arg, "pdf", "PDF", 0))
-    found++;
-  if (try_docbook_image (name_arg, "png", "PNG", 0))
-    found++;
-  if (try_docbook_image (name_arg, "svg", "SVG", 0))
-    found++;
-
-  /* If no luck so far, just assume we'll eventually have a jpg.  */
-  if (!found)
-    try_docbook_image (name_arg, "jpg", "JPG", 1);
- 
-  xml_insert_text_file (name_arg);
-  xml_insert_element (elt, END);
-
-  xml_no_para--;
-
-  if (elt == MEDIAOBJECT)
-    xml_insert_element (INFORMALFIGURE, END);
-}
-
-void
-xml_asterisk (void)
-{
-}
-
-
-/*
- *     INDEX
- */
-/* Used to separate primary and secondary entries in an index -- we need
-   to have real multilivel indexing support, not just string analysis.  */
-#define INDEX_SEP "@this string will never appear@" /* was , */
-
-typedef struct
-{
-  char *from;
-  char *to;
-} XML_SYNONYM;
-
-static XML_SYNONYM **xml_synonyms = NULL;
-static int xml_synonyms_count = 0;
-
-void
-xml_insert_indexterm (char *indexterm, char *index)
-{
-  /* @index commands can appear between @item and @itemx, @deffn and @deffnx.  */
-  if (!docbook)
-    {
-      /* Check to see if we need to do index redirection per @synindex.  */
-      int i;
-      for (i = 0; i < xml_synonyms_count; i++)
-        {
-          if (STREQ (xml_synonyms[i]->from, index))
-            index = xstrdup (xml_synonyms[i]->to);
-        }
-
-      xml_dont_touch_items_defs++;
-      xml_insert_element_with_attribute (INDEXTERM, START, "index=\"%s\"", index);
-      in_indexterm = 1;
-      execute_string ("%s", indexterm);
-      xml_insert_element (INDEXTERM, END);
-      in_indexterm = 0;
-      xml_dont_touch_items_defs--;
-    }
-  else
-    {
-      char *primary = NULL, *secondary = NULL;
-      if (strstr (indexterm+1, INDEX_SEP))
-        {
-          primary = xmalloc (strlen (indexterm) + 1);
-          strcpy (primary, indexterm);
-          secondary = strstr (primary+1, INDEX_SEP);
-          *secondary = '\0';
-          secondary += strlen (INDEX_SEP);
-        }
-      xml_insert_element_with_attribute (INDEXTERM, START, "role=\"%s\"", index);
-      in_indexterm = 1;
-      xml_insert_element (PRIMARY, START);
-      if (primary)
-        execute_string ("%s", primary);
-      else
-        execute_string ("%s", indexterm);
-      xml_insert_element (PRIMARY, END);
-      if (primary)
-        {
-          xml_insert_element (SECONDARY, START);
-          execute_string ("%s", secondary);
-          xml_insert_element (SECONDARY, END);
-        }
-      xml_insert_element (INDEXTERM, END);
-      in_indexterm = 0;
-    }
-}
-
-
-int xml_last_section_output_position = 0;
-static char last_division_letter = ' ';
-static char index_primary[2000]; /** xx no fixed limit */
-static int indexdivempty = 0;
-
-static void
-xml_close_indexentry (void)
-{
-  if (!in_indexentry)
-    return;
-  if (in_secondary)
-    xml_insert_element (SECONDARYIE, END);
-  xml_insert_element (INDEXENTRY, END);
-  in_secondary = 0;
-  in_indexentry = 0;
-}
-
-void
-xml_begin_index (void)
-{
-  typedef struct xml_index_title {
-      struct xml_index_title *next;
-      char *title;
-  } XML_INDEX_TITLE;
-
-  static XML_INDEX_TITLE *xml_index_titles = NULL;
-
-  if (!handling_delayed_writes)
-    { /* We assume that we just opened a section, and so that the last output is
-         <SECTION ID="node-name"><TITLE>Title</TITLE>
-         where SECTION can be CHAPTER, ...  */
-
-      XML_INDEX_TITLE *new = xmalloc (sizeof (XML_INDEX_TITLE));
-      xml_section *temp = last_section;
-
-      int l = output_paragraph_offset-xml_last_section_output_position;
-      char *tmp = xmalloc (l+1);
-      char *p = tmp;
-      strncpy (tmp, (char *) output_paragraph, l);
-
-      /* We remove <SECTION */
-      tmp[l] = '\0';
-      while (*p != '<')
-        p++;
-      while (*p != ' ')
-        p++;
-      /* ... and its label attribute.  */
-      if (strncmp (p, " label=", 7) == 0)
-        {
-          p++;
-          while (*p != ' ')
-            p++;
-        }
-
-      output_paragraph_offset = xml_last_section_output_position;
-      xml_last_section_output_position = 0;
-
-      xml_pop_current_element (); /* remove section element from elements stack */
-
-      if (last_section)
-        last_section = last_section->prev; /* remove section from sections stack */
-      if (temp)
-        {
-          free (temp->name);
-          free (temp);
-        }
-
-      new->title = xstrdup (p);
-      new->next = xml_index_titles;
-      xml_index_titles = new;
-    }
-  else
-    {
-      static int xml_index_titles_reversed = 0;
-
-      if (!xml_index_titles_reversed)
-        {
-          xml_index_titles = (XML_INDEX_TITLE *) reverse_list
-            ((GENERIC_LIST *) xml_index_titles);
-          xml_index_titles_reversed = 1;
-        }
-
-      /* We put <INDEX> */
-      xml_insert_element (PRINTINDEX, START);
-      if (xml_index_titles)
-        {
-          /* Remove the final > */
-          output_paragraph_offset--;
-          /* and put  ID="node-name"><TITLE>Title</TITLE> */
-          insert_string (xml_index_titles->title);
-          free (xml_index_titles->title);
-          xml_index_titles = xml_index_titles->next;
-        }
-
-      if (xml_index_divisions)
-        {
-          xml_insert_element (INDEXDIV, START);
-          indexdivempty = 1;
-        }
-    }
-}
-
-void
-xml_end_index (void)
-{
-  xml_close_indexentry ();
-  if (xml_index_divisions)
-    xml_insert_element (INDEXDIV, END);
-  xml_insert_element (PRINTINDEX, END);
-}
-
-static void
-xml_index_divide (char *entry)
-{
-  char c;
-  if (strlen (entry) > (strlen (xml_element_list[CODE].name) + 2) &&
-      strncmp (entry+1, xml_element_list[CODE].name, strlen (xml_element_list[CODE].name)) == 0)
-    c = entry[strlen (xml_element_list[CODE].name)+2];
-  else
-    c = entry[0];
-  if (tolower (c) != last_division_letter && isalpha (c))
-    {
-      last_division_letter = tolower (c);
-      xml_close_indexentry ();
-      if (!indexdivempty)
-        {
-          xml_insert_element (INDEXDIV, END);
-          xml_insert_element (INDEXDIV, START);
-        }
-      xml_insert_element (TITLE, START);
-      insert (toupper (c));
-      xml_insert_element (TITLE, END);
-    }
-}
-
-void
-xml_insert_indexentry (char *entry, char *node)
-{
-  char *primary = NULL, *secondary;
-  if (xml_index_divisions)
-    xml_index_divide (entry);
-
-  indexdivempty = 0;
-  if (strstr (entry+1, INDEX_SEP))
-    {
-      primary = xmalloc (strlen (entry) + 1);
-      strcpy (primary, entry);
-      secondary = strstr (primary+1, INDEX_SEP);
-      *secondary = '\0';
-      secondary += strlen (INDEX_SEP);
-
-      if (in_secondary && strcmp (primary, index_primary) == 0)
-        {
-          xml_insert_element (SECONDARYIE, END);
-          xml_insert_element (SECONDARYIE, START);
-          execute_string ("%s", secondary);
-        }
-      else
-        {
-          xml_close_indexentry ();
-          xml_insert_element (INDEXENTRY, START);
-          in_indexentry = 1;
-          xml_insert_element (PRIMARYIE, START);
-          execute_string ("%s", primary);
-          xml_insert_element (PRIMARYIE, END);
-          xml_insert_element (SECONDARYIE, START);
-          execute_string ("%s", secondary);
-          in_secondary = 1;
-        }
-    }
-  else
-    {
-      xml_close_indexentry ();
-      xml_insert_element (INDEXENTRY, START);
-      in_indexentry = 1;
-      xml_insert_element (PRIMARYIE, START);
-      execute_string ("%s", entry);
-    }
-  add_word (", ");
-
-  /* Don't link to @unnumbered sections directly.
-     We are disabling warnings temporarily, otherwise these xrefs
-     will cause bogus warnings about missing punctuation.  */
-  {
-    extern int print_warnings;
-    int save_print_warnings = print_warnings;
-    print_warnings = 0;
-    execute_string ("%cxref{%s}", COMMAND_PREFIX, xstrdup (node));
-    print_warnings = save_print_warnings;
-  }
-
-  if (primary)
-    {
-      strcpy (index_primary, primary);
-      /*      xml_insert_element (SECONDARYIE, END);*/
-      /*     *(secondary-1) = ',';*/ /* necessary ? */
-      free (primary);
-    }
-  else
-    xml_insert_element (PRIMARYIE, END);
-
-  /*  xml_insert_element (INDEXENTRY, END); */
-}
-
-void
-xml_synindex (char *from, char *to)
-{
-  int i, slot;
-
-  slot = -1;
-  for (i = 0; i < xml_synonyms_count; i++)
-    if (!xml_synonyms[i])
-      {
-        slot = i;
-        break;
-      }
-
-  if (slot < 0)
-    {
-      slot = xml_synonyms_count;
-      xml_synonyms_count++;
-
-      xml_synonyms = (XML_SYNONYM **) xrealloc (xml_synonyms,
-          (xml_synonyms_count + 1) * sizeof (XML_SYNONYM *));
-    }
-
-  xml_synonyms[slot] = xmalloc (sizeof (XML_SYNONYM));
-  xml_synonyms[slot]->from = xstrdup (from);
-  xml_synonyms[slot]->to = xstrdup (to);
-}
-
-/*
- * MULTITABLE
- */
-
-static int multitable_columns_count;
-static int *multitable_column_widths;
-
-void
-xml_begin_multitable (int ncolumns, int *column_widths)
-{
-  int i;
-  if (docbook)
-    {
-      if (is_in_insertion_of_type (floatenv))
-        xml_begin_docbook_float (MULTITABLE);
-      else
-        xml_insert_element (MULTITABLE, START);
-
-      multitable_columns_count = ncolumns;
-      multitable_column_widths = xmalloc (sizeof (int) * ncolumns);
-      memcpy (multitable_column_widths, column_widths,
-          sizeof (int) * ncolumns);
-
-      xml_no_para = 1;
-    }
-  else
-    {
-      xml_insert_element (MULTITABLE, START);
-      for (i=0; i<ncolumns; i++)
-        {
-          xml_insert_element (COLSPEC, START);
-          add_word_args ("%d", column_widths[i]);
-          xml_insert_element (COLSPEC, END);
-        }
-      xml_no_para = 1;
-    }
-}
-
-static void
-xml_begin_multitable_group (void)
-{
-  int i;
-
-  xml_insert_element_with_attribute (TGROUP, START, "cols=\"%d\"",
-      multitable_columns_count);
-
-  for (i=0; i < multitable_columns_count; i++)
-    {
-      xml_insert_element_with_attribute (COLSPEC, START,
-          "colwidth=\"%d*\"", multitable_column_widths[i]);
-      xml_insert_element (COLSPEC, END);
-    }
-}
-
-void
-xml_end_multitable_row (int first_row)
-{
-  if (!first_row)
-    {
-      xml_insert_element (ENTRY, END);
-      xml_insert_element (ROW, END);
-    }
-
-  if (headitem_flag)
-    {
-      if (!first_row)
-        {
-          if (after_headitem)
-            xml_insert_element (THEAD, END);
-          else
-            xml_insert_element (TBODY, END);
-          xml_insert_element (TGROUP, END);
-        }
-
-      xml_begin_multitable_group ();
-      xml_insert_element (THEAD, START);
-    }
-  else if (first_row)
-    {
-      xml_begin_multitable_group ();
-      xml_insert_element (TBODY, START);
-    }
-  else if (after_headitem)
-    {
-      xml_insert_element (THEAD, END);
-      xml_insert_element (TBODY, START);
-    }
-  else if (first_row)
-    xml_insert_element (TBODY, START);
-
-  xml_insert_element (ROW, START);
-  xml_insert_element (ENTRY, START);
-}
-
-void
-xml_end_multitable_column (void)
-{
-  xml_insert_element (ENTRY, END);
-  xml_insert_element (ENTRY, START);
-}
-
-void
-xml_end_multitable (void)
-{
-  xml_insert_element (ENTRY, END);
-  xml_insert_element (ROW, END);
-
-  if (after_headitem)
-    {
-      if (docbook)
-        warning (_("@headitem as the last item of @multitable produces invalid Docbook documents"));
-      xml_insert_element (THEAD, END);
-    }
-  else
-    xml_insert_element (TBODY, END);
-
-  if (docbook)
-    xml_insert_element (TGROUP, END);
-
-  xml_insert_element (MULTITABLE, END);
-  xml_no_para = 0;
-}
-
-/*
- * Parameters in @def definitions
- */
-
-#define DEFUN_SELF_DELIMITING(c) \
-  ((c) == '(' || (c) == ')' || (c) == '[' || (c) == ']')
-
-void
-xml_process_defun_args (char **defun_args, int auto_var_p)
-{
-  int pending_space = 0;
-  int just_after_paramtype = 0;
-
-  for (;;)
-    {
-      char *defun_arg = *defun_args++;
-
-      if (defun_arg == NULL)
-        break;
-
-      if (defun_arg[0] == ' ')
-        {
-          pending_space = 1;
-          continue;
-        }
-
-      if (pending_space)
-        {
-          add_char (' ');
-          pending_space = 0;
-        }
-
-      if (DEFUN_SELF_DELIMITING (defun_arg[0]))
-        {
-	  xml_insert_element (DEFDELIMITER, START);
-          add_char (defun_arg[0]);
-	  xml_insert_element (DEFDELIMITER, END);
-	  just_after_paramtype = 0;
-        }
-      else if (defun_arg[0] == '&')
-	{
-	  xml_insert_element (DEFPARAM, START);
-	  add_word (defun_arg);
-	  xml_insert_element (DEFPARAM, END);
-	  just_after_paramtype = 0;
-	}
-      else if (defun_arg[0] == COMMAND_PREFIX || just_after_paramtype)
-	{
-	  xml_insert_element (DEFPARAM, START);
-	  execute_string ("%s", defun_arg);
-	  xml_insert_element (DEFPARAM, END);
-	  just_after_paramtype = 0;
-	}
-      else if (defun_arg[0] == ',' || defun_arg[0] == ';')
-	{
-	  xml_insert_element (DEFDELIMITER, START);
-	  add_word (defun_arg);
-	  xml_insert_element (DEFDELIMITER, END);
-	  just_after_paramtype = 0;
-	}
-      else if (auto_var_p)
-	{
-	  xml_insert_element (DEFPARAM, START);
-	  add_word (defun_arg);
-	  xml_insert_element (DEFPARAM, END);
-	  just_after_paramtype = 0;
-	}
-      else
-	{
-	  xml_insert_element (DEFPARAMTYPE, START);
-	  add_word (defun_arg);
-	  xml_insert_element (DEFPARAMTYPE, END);
-	  just_after_paramtype = 1;
-	}
-    }
-}
-
-void
-xml_begin_definition (void)
-{
-  xml_insert_element (DEFINITION, START);
-  xml_definition_level ++;
-  xml_in_def_item[xml_definition_level] = 0;
-}
-
-void
-xml_end_definition (void)
-{
-  if (xml_in_def_item[xml_definition_level])
-    {
-      xml_insert_element (DEFINITIONITEM, END);
-      xml_in_def_item[xml_definition_level] = 0;
-    }
-  xml_after_def_term = 0;
-  xml_insert_element (DEFINITION, END);
-  xml_definition_level --;
-}
-
-void
-xml_begin_def_term (int base_type, const char *category,
-    char *defined_name, char *type_name, char *type_name2)
-{
-  xml_after_def_term = 0;
-  xml_insert_element (DEFINITIONTERM, START);
-
-  /* Index entry */
-  switch (base_type)
-    {
-    case deffn:
-    case deftypefn:
-      execute_string ("@findex %s\n", defined_name);
-      break;
-    case defvr:
-    case deftypevr:
-    case defcv:
-      execute_string ("@vindex %s\n", defined_name);
-      break;
-    case deftypecv:
-    case deftypeivar:
-      execute_string ("@vindex %s %s %s\n", defined_name, _("of"), type_name);
-      break;
-    case deftypemethod:
-    case defop:
-    case deftypeop:
-      execute_string ("@findex %s %s %s\n", defined_name, _("on"), type_name);
-      break;
-    case deftp:
-      execute_string ("@tindex %s\n", defined_name);
-      break;
-    }
-
-  /* Start with category.  */
-  xml_insert_element (DEFCATEGORY, START);
-  execute_string (docbook ? "--- %s:" : "%s", category);
-  xml_insert_element (DEFCATEGORY, END);
-  add_char(' ');
-
-  /* Output type name first for typed definitions.  */
-  switch (base_type)
-    {
-    case deffn:
-    case defvr:
-    case deftp:
-      break;
-
-    case deftypefn:
-    case deftypevr:
-      xml_insert_element (DEFTYPE, START);
-      execute_string ("%s", type_name);
-      xml_insert_element (DEFTYPE, END);
-      add_char (' ');
-      break;
-
-    case deftypecv:
-    case deftypeivar:
-    case deftypemethod:
-    case deftypeop:
-      xml_insert_element (DEFTYPE, START);
-      execute_string ("%s", type_name2);
-      xml_insert_element (DEFTYPE, END);
-      add_char (' ');
-      break;
-
-    default:
-      xml_insert_element (DEFCLASS, START);
-      execute_string ("%s", type_name);
-      xml_insert_element (DEFCLASS, END);
-      add_char (' ');
-      break;
-    }
-
-  /* Categorize rest of the definitions.  */
-  switch (base_type)
-    {
-    case deffn:
-    case deftypefn:
-      xml_insert_element (DEFFUNCTION, START);
-      execute_string ("%s", defined_name);
-      xml_insert_element (DEFFUNCTION, END);
-      break;
-
-    case defvr:
-    case deftypevr:
-      xml_insert_element (DEFVARIABLE, START);
-      execute_string ("%s", defined_name);
-      xml_insert_element (DEFVARIABLE, END);
-      break;
-
-    case deftp:
-      xml_insert_element (DEFDATATYPE, START);
-      execute_string ("%s", defined_name);
-      xml_insert_element (DEFDATATYPE, END);
-      break;
-
-    case defcv:
-    case deftypecv:
-    case deftypeivar:
-      xml_insert_element (DEFCLASSVAR, START);
-      execute_string ("%s", defined_name);
-      xml_insert_element (DEFCLASSVAR, END);
-      break;
-
-    case defop:
-    case deftypeop:
-    case deftypemethod:
-      /* Operation / Method */
-      xml_insert_element (DEFOPERATION, START);
-      execute_string ("%s", defined_name);
-      xml_insert_element (DEFOPERATION, END);
-      break;
-    }
-}
-
-void
-xml_end_def_term (void)
-{
-  xml_insert_element (DEFINITIONTERM, END);
-  xml_after_def_term = 1;
-}

Property changes on: head/contrib/texinfo/makeinfo/xml.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/makeinfo.h
===================================================================
--- head/contrib/texinfo/makeinfo/makeinfo.h	(revision 276550)
+++ head/contrib/texinfo/makeinfo/makeinfo.h	(nonexistent)
@@ -1,386 +0,0 @@
-/* makeinfo.h -- declarations for Makeinfo.
-   $Id: makeinfo.h,v 1.17 2004/11/30 02:03:23 karl Exp $
-
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free
-   Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#ifndef MAKEINFO_H
-#define MAKEINFO_H
-
-#ifdef COMPILING_MAKEINFO
-#  define DECLARE(type,var,init) type var = init
-#else
-#  define DECLARE(type,var,init) extern type var
-#endif
-
-/* Hardcoded per GNU standards, not dependent on argv[0].  */
-DECLARE (char *, progname, "makeinfo");
-
-/* Nonzero means a string is in execution, as opposed to a file. */
-DECLARE (int, executing_string, 0);
-
-/* Nonzero means to inhibit writing macro expansions to the output
-   stream, because it has already been written. */
-DECLARE (int, me_inhibit_expansion, 0);
-
-/* Current output stream. */
-DECLARE (FILE *, output_stream, NULL);
-
-DECLARE (char *, pretty_output_filename, NULL);
-
-/* Current output file name.  */
-DECLARE (char *, current_output_filename, NULL);
-
-/* Output paragraph buffer. */
-DECLARE (unsigned char *, output_paragraph, NULL);
-
-/* Offset into OUTPUT_PARAGRAPH. */
-DECLARE (int, output_paragraph_offset, 0);
-
-/* The output paragraph "cursor" horizontal position. */
-DECLARE (int, output_column, 0);
-
-/* Position in the output file. */
-DECLARE (int, output_position, 0);
-
-/* Number of lines in the output.  */
-DECLARE (int, output_line_number, 1);
-DECLARE (int, node_line_number, 0);
-
-/* The offset into OUTPUT_PARAGRAPH where we have a meta character
-   produced by a markup such as @code or @dfn.  */
-DECLARE (int, meta_char_pos, -1);
-
-/* Nonzero means output_paragraph contains text. */
-DECLARE (int, paragraph_is_open, 0);
-
-/* Nonzero means that `start_paragraph' MUST be called before we pay
-   any attention to `close_paragraph' calls. */
-DECLARE (int, must_start_paragraph, 0);
-
-/* Nonzero means that we have seen "@top" once already. */
-DECLARE (int, top_node_seen, 0);
-
-/* Nonzero means that we have seen a non-"@top" node already. */
-DECLARE (int, non_top_node_seen, 0);
-
-/* Nonzero indicates that indentation is temporarily turned off. */
-DECLARE (int, no_indent, 1);
-
-/* The amount of indentation to apply at the start of each line. */
-DECLARE (int, current_indent, 0);
-
-/* Nonzero means that we suppress the indentation of the first paragraph
-   following any section heading.  */
-DECLARE (int, do_first_par_indent, 0);
-
-/* Amount by which @example indentation increases/decreases. */
-DECLARE (int, example_indentation_increment, 5);
-
-/* Amount by which @table, @defun, etc. indentation increases/decreases.  */
-DECLARE (int, default_indentation_increment, 5);
-
-/* Amount by which xml indentation increases/decreases.
-   Zero means unnecessary whitespace is compressed.  */
-DECLARE (int, xml_indentation_increment, 2);
-
-/* Nonzero indicates that filling a line also indents the new line. */
-DECLARE (int, indented_fill, 0);
-
-/* Nonzero means forcing output text to be flushright. */
-DECLARE (int, force_flush_right, 0);
-
-/* The column at which long lines are broken. */
-DECLARE (int, fill_column, 72);
-
-/* Nonzero means that words are not to be split, even in long lines.  This
-   gets changed for cm_w (). */
-DECLARE (int, non_splitting_words, 0);
-
-/* Nonzero means that we are currently hacking the insides of an
-   insertion which would use a fixed width font. */
-DECLARE (int, in_fixed_width_font, 0);
-
-/* Nonzero if we are currently processing a multitable command */
-DECLARE (int, multitable_active, 0);
-
-/* Nonzero means that we're generating HTML. (--html) */
-DECLARE (int, html, 0);
-
-/* Nonzero means that we're generating XML. (--xml) */
-DECLARE (int, xml, 0);
-
-/* Nonzero means that we're generating DocBook. (--docbook) */
-DECLARE (int, docbook, 0);
-
-/* Nonzero means true 8-bit output for Info and plain text.
-   (--enable-encoding) */
-DECLARE (int, enable_encoding, 0);
-
-/* Nonzero means escape characters in HTML output. */
-DECLARE (int, escape_html, 1);
-
-/* Access key number for next menu entry to be generated (1 to 9, or 10 to
-   mean no access key)  */
-DECLARE (int, next_menu_item_number, 1);
-
-/* Nonzero means that the use of paragraph_start_indent is inhibited.
-   @example uses this to line up the left columns of the example text.
-   A negative value for this variable is incremented each time it is used.
-   @noindent uses this to inhibit indentation for a single paragraph.  */
-DECLARE (int, inhibit_paragraph_indentation, 0);
-
-/* Nonzero indicates that filling will take place on long lines. */
-DECLARE (int, filling_enabled, 1);
-
-/* The current node's node name. */
-DECLARE (char *, current_node, NULL);
-
-/* Command name in the process of being hacked. */
-DECLARE (char *, command, NULL);
-
-/* Nonzero if we have seen an @titlepage command.  */
-DECLARE (int, titlepage_cmd_present, 0);
-
-/* @copying ... @end copying. */
-DECLARE (char *, copying_text, NULL);
-
-/* @documentdescription ... @end documentdescription. */
-DECLARE (const char *, document_description, NULL);
-
-/* Nonzero if the last character inserted has the syntax class of NEWLINE. */
-DECLARE (int, last_char_was_newline, 1);
-
-/* The current input file state. */
-DECLARE (char *, input_filename, (char *)NULL);
-DECLARE (char *, input_text, (char *)NULL);
-DECLARE (int, input_text_length, 0);
-DECLARE (int, input_text_offset, 0);
-DECLARE (int, line_number, 0);
-DECLARE (char *, toplevel_output_filename, NULL);
-#define curchar() input_text[input_text_offset]
-
-/* A colon separated list of directories to search for files included
-   with @include.  This can be controlled with the `-I' option to makeinfo. */
-DECLARE (char *, include_files_path, NULL);
-
-/* The filename of the current input file.  This is never freed. */
-DECLARE (char *, node_filename, NULL);
-
-/* Name of CSS file to include, if any.  (--css-include).  */
-DECLARE (char *, css_include, NULL);
-
-/* Nonzero means do not output "Node: Foo" for node separations, that
-   is, generate plain text.  (--no-headers) */
-DECLARE (int, no_headers, 0);
-
-/* Nonzero means that we process @docbook and @ifdocbook.  (--ifdocbook) */
-DECLARE (int, process_docbook, 0);
-
-/* Nonzero means that we process @html and @rawhtml even when not
-   generating HTML.  (--ifhtml) */
-DECLARE (int, process_html, 0);
-
-/* Positive means process @ifinfo (even if not generating Info);
-   zero means don't process @ifinfo (even if we are);
-   -1 means we don't know yet.  (--ifinfo) */
-DECLARE (int, process_info, -1);
-
-/* Positive means process @ifplaintext (even if not generating plain text);
-   zero means we don't process @ifplaintext (even if we are);
-   -1 means we don't know yet.  (--ifplaintext) */
-DECLARE (int, process_plaintext, -1);
-
-/* Nonzero means that we process @tex and @iftex.  (--iftex) */
-DECLARE (int, process_tex, 0);
-
-/* Nonzero means that we process @xml and @ifxml.  (--ifxml) */
-DECLARE (int, process_xml, 0);
-
-/* Maximum number of references to a single node before complaining.
-   (--reference-limit) */
-DECLARE (int, reference_warning_limit, 1000);
-
-/* Default is to check node references.  (--no-validate) */
-DECLARE (int, validating, 1);
-
-/* Nonzero means print information about what is going on.  (--verbose) */
-DECLARE (int, verbose_mode, 0);
-
-/* Nonzero means prefix each @chapter, ... with a number like
-   1, 1.1, etc.  (--number-sections) */
-DECLARE (int, number_sections, 1);
-
-/* Nonzero means split size.  When zero, DEFAULT_SPLIT_SIZE is used. */
-DECLARE (int, split_size, 0);
-
-/* Nonzero means expand node names and references while validating.
-   This will avoid errors when the Texinfo document uses features
-   like @@ and @value inconsistently in node names, but will slow
-   the program by about 80%.  You HAVE been warned.  */
-DECLARE (int, expensive_validation, 0);
-
-/* C's standard macros don't check to make sure that the characters being
-   changed are within range.  So I have to check explicitly. */
-
-#define coerce_to_upper(c) ((islower(c) ? toupper(c) : (c)))
-#define coerce_to_lower(c) ((isupper(c) ? tolower(c) : (c)))
-
-#define control_character_bit 0x40 /* %01000000, must be off. */
-#define meta_character_bit 0x080/* %10000000, must be on.  */
-#define CTL(c) ((c) & (~control_character_bit))
-#define UNCTL(c) coerce_to_upper(((c)|control_character_bit))
-#define META(c) ((c) | (meta_character_bit))
-#define UNMETA(c) ((c) & (~meta_character_bit))
-
-#define whitespace(c)       ((c) == '\t' || (c) == ' ')
-#define sentence_ender(c)   ((c) == '.'  || (c) == '?' || (c) == '!')
-#define cr_or_whitespace(c) (whitespace(c) || (c) == '\r' || (c) == '\n')
-
-#ifndef isletter
-#define isletter(c) (((c) >= 'A' && (c) <= 'Z') || ((c) >= 'a' && (c) <= 'z'))
-#endif
-
-#ifndef isupper
-#define isupper(c) ((c) >= 'A' && (c) <= 'Z')
-#endif
-
-#ifndef isdigit
-#define isdigit(c)  ((c) >= '0' && (c) <= '9')
-#endif
-
-#ifndef digit_value
-#define digit_value(c) ((c) - '0')
-#endif
-
-/* These characters are not really HTML-safe (with strict XHTML),
-   and also there are possible collisions.  That's the whole reason we
-   designed a new conversion scheme in the first place.  But we
-   nevertheless need to generate the old names.  See
-   `add_escaped_anchor_name' in html.c.  */
-#define OLD_HTML_SAFE "$-_.+!*'()"
-#define OLD_URL_SAFE_CHAR(ch) (strchr (OLD_HTML_SAFE, ch))
-
-/* For the current/stable scheme.  */
-#define URL_SAFE_CHAR(ch) (isalnum (ch))
-
-#define COMMAND_PREFIX '@'
-
-#define END_VERBATIM "end verbatim"
-
-/* Stuff for splitting large files.  The numbers for Emacs
-   texinfo-format-buffer are much smaller, but memory capacities have
-   increased so much, 50k info files seem a bit tiny these days.  */
-#define DEFAULT_SPLIT_SIZE 300000
-DECLARE (int, splitting, 1);    /* Defaults to true for now. */
-
-#define skip_whitespace() \
-     while ((input_text_offset != input_text_length) && \
-             whitespace (curchar())) \
-       input_text_offset++
-
-#define skip_whitespace_and_newlines() \
-  do { \
-   while (input_text_offset != input_text_length \
-          && cr_or_whitespace (curchar ())) \
-      { \
-         if (curchar () == '\n') \
-           line_number++; \
-         input_text_offset++; \
-      } \
-   } while (0)
-
-/* Return nonzero if STRING is the text at input_text + input_text_offset,
-   else zero. */
-#define looking_at(string) \
-  (strncmp (input_text + input_text_offset, string, strlen (string)) == 0)
-
-/* Any list with a member named `next'.  */
-typedef struct generic_list {
-  struct generic_list *next;
-} GENERIC_LIST;
-
-/* Reverse the order of a list.  */
-extern GENERIC_LIST * reverse_list (GENERIC_LIST *list);
-
-/* Possibly return Local Variables trailer for Info output.  */
-extern char *info_trailer (void),
-  *expansion (char *str, int implicit_code),
-  *text_expansion (char *str),
-  *maybe_escaped_expansion (char *str, int implicit_code, int do_escape_html),
-  *full_expansion (char *str, int implicit_code);
-
-extern void free_and_clear (char **pointer),
-  add_word (char *string),
-  add_char (int character),
-  add_meta_char (int character),
-  close_single_paragraph (void),
-  insert_string (const char *),
-  insert (int character),
-  get_rest_of_line (int expand, char **string),
-  add_html_block_elt (char *string),
-  get_until_in_braces (char *match, char **string),
-  get_until_in_line (int expand, char *match, char **string),
-  canon_white (char *string),
-  discard_until (char *string),
-  indent (int amount),
-  kill_self_indent (int count),
-  backup_input_pointer (void),
-  inhibit_output_flushing (void),
-  uninhibit_output_flushing (void),
-  flush_output (void),
-  start_paragraph (void),
-  close_paragraph (void),
-  close_insertion_paragraph (void),
-  init_paragraph (void),
-  ignore_blank_line (void),
-  reader_loop (void),
-  discard_braces (void),
-  replace_with_expansion (int from, int *to),
-  fix_whitespace (char *string),
-  add_html_elt (char *string);
-
-extern int get_until (char *match, char **string),
-  set_paragraph_indent (char *string),
-  self_delimiting (int character),
-  search_forward (char *string, int from),
-  search_forward_until_pos (char *string, int from, int end_pos),
-  next_nonwhitespace_character (void),
-  fs_error (char *filename);
-
-#if defined (VA_FPRINTF) && __STDC__
-/* Unfortunately we must use prototypes if we are to use <stdarg.h>.  */
-extern void add_word_args (const char *, ...),
-  add_html_block_elt_args (const char *, ...),
-  execute_string (char *, ...),
-  warning (const char *format, ...),
-  error (const char *format, ...),
-  line_error (const char *format, ...),
-  file_line_error (char *infile, int lno, const char *format, ...);
-#else
-extern void add_word_args (),
-  add_html_block_elt_args (),
-  execute_string (),
-  warning (),
-  error (),
-  line_error (),
-  file_line_error ();
-#endif /* no prototypes */
-
-#endif /* not MAKEINFO_H */

Property changes on: head/contrib/texinfo/makeinfo/makeinfo.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/footnote.c
===================================================================
--- head/contrib/texinfo/makeinfo/footnote.c	(revision 276550)
+++ head/contrib/texinfo/makeinfo/footnote.c	(nonexistent)
@@ -1,391 +0,0 @@
-/* footnote.c -- footnotes for Texinfo.
-   $Id: footnote.c,v 1.7 2004/04/11 17:56:47 karl Exp $
-
-   Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "system.h"
-#include "footnote.h"
-#include "macro.h"
-#include "makeinfo.h"
-#include "node.h"
-#include "xml.h"
-#include "xref.h"
-
-/* Nonzero means that the footnote style for this document was set on
-   the command line, which overrides any other settings. */
-int footnote_style_preset = 0;
-
-/* The current footnote number in this node.  Each time a new node is
-   started this is reset to 1. */
-int current_footnote_number = 1;
-
-/* Nonzero means we automatically number footnotes with no specified marker. */
-int number_footnotes = 1;
-
-/* Nonzero means we are currently outputting footnotes. */
-int already_outputting_pending_notes = 0;
-
-
-/* Footnotes can be handled in one of two ways:
-
-   separate_node:
-        Make them look like followed references, with the reference
-        destinations in a makeinfo manufactured node or,
-   end_node:
-        Make them appear at the bottom of the node that they originally
-        appeared in. */
-
-#define separate_node 0
-#define end_node 1
-
-int footnote_style = end_node;
-int first_footnote_this_node = 1;
-int footnote_count = 0;
-
-/* Set the footnote style based on the style identifier in STRING. */
-int
-set_footnote_style (char *string)
-{
-  if (strcasecmp (string, "separate") == 0)
-    footnote_style = separate_node;
-  else if (strcasecmp (string, "end") == 0)
-    footnote_style = end_node;
-  else
-    return -1;
-
- return 0;
-}
-
-void
-cm_footnotestyle (void)
-{
-  char *arg;
-
-  get_rest_of_line (1, &arg);
-
-  /* If set on command line, do not change the footnote style.  */
-  if (!footnote_style_preset && set_footnote_style (arg) != 0)
-    line_error (_("Bad argument to %c%s"), COMMAND_PREFIX, command);
-
-  free (arg);
-}
-
-typedef struct fn
-{
-  struct fn *next;
-  char *marker;
-  char *note;
-  int number;
-}  FN;
-
-FN *pending_notes = NULL;
-
-/* A method for remembering footnotes.  Note that this list gets output
-   at the end of the current node. */
-static void
-remember_note (char *marker, char *note)
-{
-  FN *temp = xmalloc (sizeof (FN));
-
-  temp->marker = xstrdup (marker);
-  temp->note = xstrdup (note);
-  temp->next = pending_notes;
-  temp->number = current_footnote_number;
-  pending_notes = temp;
-  footnote_count++;
-}
-
-/* How to get rid of existing footnotes. */
-static void
-free_pending_notes (void)
-{
-  FN *temp;
-
-  while ((temp = pending_notes))
-    {
-      free (temp->marker);
-      free (temp->note);
-      pending_notes = pending_notes->next;
-      free (temp);
-    }
-  first_footnote_this_node = 1;
-  footnote_count = 0;
-  current_footnote_number = 1;	/* for html */
-}
-
-/* What to do when you see a @footnote construct. */
-
- /* Handle a "footnote".
-    footnote *{this is a footnote}
-    where "*" is the (optional) marker character for this note. */
-void
-cm_footnote (void)
-{
-  char *marker;
-  char *note;
-
-  get_until ("{", &marker);
-  canon_white (marker);
-
-  if (macro_expansion_output_stream && !executing_string)
-    append_to_expansion_output (input_text_offset + 1); /* include the { */
-
-  /* Read the argument in braces. */
-  if (curchar () != '{')
-    {
-      line_error (_("`%c%s' needs an argument `{...}', not just `%s'"),
-                  COMMAND_PREFIX, command, marker);
-      free (marker);
-      return;
-    }
-  else
-    {
-      int len;
-      int braces = 1;
-      int loc = ++input_text_offset;
-
-      while (braces)
-        {
-          if (loc == input_text_length)
-            {
-              line_error (_("No closing brace for footnote `%s'"), marker);
-              return;
-            }
-
-          if (input_text[loc] == '{')
-            braces++;
-          else if (input_text[loc] == '}')
-            braces--;
-          else if (input_text[loc] == '\n')
-            line_number++;
-
-          loc++;
-        }
-
-      len = (loc - input_text_offset) - 1;
-      note = xmalloc (len + 1);
-      memcpy (note, &input_text[input_text_offset], len);
-      note[len] = 0;
-      input_text_offset = loc;
-    }
-
-  /* Must write the macro-expanded argument to the macro expansion
-     output stream.  This is like the case in index_add_arg.  */
-  if (macro_expansion_output_stream && !executing_string)
-    {
-      /* Calling me_execute_string on a lone } provokes an error, since
-         as far as the reader knows there is no matching {.  We wrote
-         the { above in the call to append_to_expansion_output. */
-      me_execute_string_keep_state (note, "}");
-    }
-
-  if (!current_node || !*current_node)
-    {
-      line_error (_("Footnote defined without parent node"));
-      free (marker);
-      free (note);
-      return;
-    }
-
-  /* output_pending_notes is non-reentrant (it uses a global data
-     structure pending_notes, which it frees before it returns), and
-     TeX doesn't grok footnotes inside footnotes anyway.  Disallow
-     that.  */
-  if (already_outputting_pending_notes)
-    {
-      line_error (_("Footnotes inside footnotes are not allowed"));
-      free (marker);
-      free (note);
-      return;
-    }
-
-  if (!*marker)
-    {
-      free (marker);
-
-      if (number_footnotes)
-        {
-          marker = xmalloc (10);
-          sprintf (marker, "%d", current_footnote_number);
-        }
-      else
-        marker = xstrdup ("*");
-    }
-
-  if (xml)
-    xml_insert_footnote (note);
-  else 
-    {
-  remember_note (marker, note);
-
-  /* fixme: html: footnote processing needs work; we currently ignore
-     the style requested; we could clash with a node name of the form
-     `fn-<n>', though that's unlikely. */
-  if (html)
-    {
-      /* Hyperlink also serves as an anchor (mnemonic: fnd is footnote
-         definition.)  */
-      add_html_elt ("<a rel=\"footnote\" href=");
-      add_word_args ("\"#fn-%d\" name=\"fnd-%d\"><sup>%s</sup></a>",
-		     current_footnote_number, current_footnote_number,
-                     marker);
-    }
-  else
-    /* Your method should at least insert MARKER. */
-    switch (footnote_style)
-      {
-      case separate_node:
-        add_word_args ("(%s)", marker);
-        execute_string (" (*note %s-Footnote-%d::)",
-                        current_node, current_footnote_number);
-        if (first_footnote_this_node)
-          {
-            char *temp_string, *expanded_ref;
-
-            temp_string = xmalloc (strlen (current_node)
-                                   + strlen ("-Footnotes") + 1);
-
-            strcpy (temp_string, current_node);
-            strcat (temp_string, "-Footnotes");
-            expanded_ref = expansion (temp_string, 0);
-            remember_node_reference (expanded_ref, line_number,
-                                     followed_reference);
-            free (temp_string);
-            free (expanded_ref);
-            first_footnote_this_node = 0;
-          }
-        break;
-
-      case end_node:
-        add_word_args ("(%s)", marker);
-        break;
-
-      default:
-        break;
-      }
-  current_footnote_number++;
-    }
-  free (marker);
-  free (note);
-}
-
-/* Output the footnotes.  We are at the end of the current node. */
-void
-output_pending_notes (void)
-{
-  FN *footnote = pending_notes;
-
-  if (!pending_notes)
-    return;
-
-  if (html)
-    {
-      add_html_block_elt ("<div class=\"footnote\">\n<hr>\n");
-      /* We add an anchor here so @printindex can refer to this point
-         (as the node name) for entries defined in footnotes.  */
-      if (!splitting)
-        add_word ("<a name=\"texinfo-footnotes-in-document\"></a>");
-      add_word_args ("<h4>%s</h4>", (char *) _("Footnotes"));
-    }
-  else
-    switch (footnote_style)
-      {
-      case separate_node:
-        {
-          char *old_current_node = current_node;
-          char *old_command = xstrdup (command);
-
-          already_outputting_pending_notes++;
-          execute_string ("%cnode %s-Footnotes,,,%s\n",
-                          COMMAND_PREFIX, current_node, current_node);
-          already_outputting_pending_notes--;
-          current_node = old_current_node;
-          free (command);
-          command = old_command;
-        }
-      break;
-
-      case end_node:
-        close_paragraph ();
-        in_fixed_width_font++;
-        /* This string should be translated according to the
-           @documentlanguage, not the current LANG.  We can't do that
-           yet, so leave it in English.  */
-        execute_string ("---------- Footnotes ----------\n\n");
-        in_fixed_width_font--;
-        break;
-      }
-
-  /* Handle the footnotes in reverse order. */
-  {
-    int save_in_fixed_width_font = in_fixed_width_font;
-    FN **array = xmalloc ((footnote_count + 1) * sizeof (FN *));
-    array[footnote_count] = NULL;
-
-    while (--footnote_count > -1)
-      {
-        array[footnote_count] = footnote;
-        footnote = footnote->next;
-      }
-
-    filling_enabled = 1;
-    indented_fill = 1;
-    in_fixed_width_font = 0;
-
-    while ((footnote = array[++footnote_count]))
-      {
-        if (html)
-          {
-	    /* Make the text of every footnote begin a separate paragraph.  */
-            add_html_block_elt ("<p class=\"footnote\"><small>");
-            /* Make footnote number a link to its definition.  */
-            add_word_args ("[<a name=\"fn-%d\" href=\"#fnd-%d\">%d</a>]",
-			   footnote->number, footnote->number, footnote->number);
-            add_word ("</small> ");
-            already_outputting_pending_notes++;
-            execute_string ("%s", footnote->note);
-            already_outputting_pending_notes--;
-            add_word ("</p>\n");
-          }
-        else
-          {
-            char *old_current_node = current_node;
-            char *old_command = xstrdup (command);
-
-            already_outputting_pending_notes++;
-            execute_string ("%canchor{%s-Footnote-%d}(%s) %s",
-                            COMMAND_PREFIX, current_node, footnote->number,
-                            footnote->marker, footnote->note);
-            already_outputting_pending_notes--;
-            current_node = old_current_node;
-            free (command);
-            command = old_command;
-          }
-
-        close_paragraph ();
-      }
-
-    if (html)
-      add_word ("<hr></div>");
-    close_paragraph ();
-    free (array);
-
-    in_fixed_width_font = save_in_fixed_width_font;
-  }
-
-  free_pending_notes ();
-}

Property changes on: head/contrib/texinfo/makeinfo/footnote.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/xml.h
===================================================================
--- head/contrib/texinfo/makeinfo/xml.h	(revision 276550)
+++ head/contrib/texinfo/makeinfo/xml.h	(nonexistent)
@@ -1,159 +0,0 @@
-/* xml.h -- xml output declarations.
-   $Id: xml.h,v 1.24 2004/11/26 00:48:35 karl Exp $
-
-   Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Originally written by Philippe Martin <feloy@free.fr>.  */
-
-#ifndef XML_H
-#define XML_H
-
-/* Options. */
-
-/* Separate index entries into divisions for each letters. */
-extern int xml_index_divisions;
-extern int xml_sort_index;
-
-extern int xml_no_indent;
-
-extern int xml_node_open;
-extern int xml_no_para;
-extern char *xml_node_id;
-extern int xml_last_section_output_position;
-
-extern int xml_in_xref_token;
-extern int xml_in_bookinfo;
-extern int xml_in_book_title;
-extern int xml_in_abstract;
-
-/* Non-zero if we are handling an element that can appear between
-   @item and @itemx, @deffn and @deffnx.  */
-extern int xml_dont_touch_items_defs;
-
-/* Non-zero if whitespace in the source document should be kept as-is.  */
-extern int xml_keep_space;
-
-enum xml_element
-{
-  TEXINFO=0, SETFILENAME, TITLEFONT, SETTITLE, DOCUMENTDESCRIPTION,
-  /* Node */
-  NODE, NODENEXT, NODEPREV, NODEUP,
-  /* Structuring */
-  CHAPTER, SECTION, SUBSECTION, SUBSUBSECTION,
-  TOP, UNNUMBERED, UNNUMBEREDSEC, UNNUMBEREDSUBSEC,
-    UNNUMBEREDSUBSUBSEC,  
-  APPENDIX, APPENDIXSEC, APPENDIXSUBSEC, APPENDIXSUBSUBSEC, 
-  MAJORHEADING, CHAPHEADING, HEADING, SUBHEADING, SUBSUBHEADING,
-  /* Titlepage */
-  TITLEPAGE, AUTHOR, BOOKTITLE, BOOKSUBTITLE,
-  /* Menu */
-  MENU, DETAILMENU, MENUENTRY, MENUTITLE, MENUCOMMENT, MENUNODE,
-  NODENAME,
-  /* -- */
-  ACRONYM, ACRONYMWORD, ACRONYMDESC,
-  ABBREV, ABBREVWORD, ABBREVDESC,
-  TT, CODE, COMMAND_TAG, ENV, FILE_TAG, OPTION, SAMP, KBD, URL, KEY,
-  VAR, SC, DFN, EMPH, STRONG, CITE, NOTFIXEDWIDTH, I, B, R, SLANTED, SANSSERIF,
-  EXDENT,
-  TITLE, 
-  IFINFO, 
-  SP, CENTER,
-  DIRCATEGORY,
-  QUOTATION, EXAMPLE, SMALLEXAMPLE, LISP, SMALLLISP, CARTOUCHE,
-    COPYING, FORMAT, SMALLFORMAT, DISPLAY, SMALLDISPLAY, VERBATIM,
-  FOOTNOTE, LINEANNOTATION,
-  TIP, NOTE, IMPORTANT, WARNING, CAUTION,
-  ITEMIZE, ITEMFUNCTION, ITEM, ENUMERATE, TABLE, TABLEITEM, TABLETERM,
-  INDEXTERM, 
-  MATH, DIMENSION,
-  XREF, XREFNODENAME, XREFINFONAME, XREFPRINTEDDESC, XREFINFOFILE,
-    XREFPRINTEDNAME, 
-  INFOREF, INFOREFNODENAME, INFOREFREFNAME, INFOREFINFONAME, 
-  UREF, UREFURL, UREFDESC, UREFREPLACEMENT,
-  EMAIL, EMAILADDRESS, EMAILNAME,
-  GROUP, FLOAT, FLOATTYPE, FLOATPOS, CAPTION, SHORTCAPTION,
-  FLOATTABLE, FLOATFIGURE, FLOATEXAMPLE, FLOATCARTOUCHE,
-  PRINTINDEX, LISTOFFLOATS,
-  ANCHOR, 
-  IMAGE, INLINEIMAGE, IMAGEALTTEXT,
-  PRIMARY, SECONDARY, INFORMALFIGURE, MEDIAOBJECT, IMAGEOBJECT,
-    IMAGEDATA, TEXTOBJECT,  
-  INDEXENTRY, PRIMARYIE, SECONDARYIE, INDEXDIV,
-  MULTITABLE, TGROUP, COLSPEC, THEAD, TBODY, ENTRY, ROW,
-  BOOKINFO, ABSTRACT, REPLACEABLE, ENVAR, COMMENT, FUNCTION, LEGALNOTICE,
-  CONTENTS, SHORTCONTENTS, DOCUMENTLANGUAGE,
-  SETVALUE, CLEARVALUE,
-  DEFINITION, DEFINITIONTERM, DEFINITIONITEM,
-  DEFCATEGORY, DEFFUNCTION, DEFVARIABLE, DEFPARAM, DEFDELIMITER, DEFTYPE,
-  DEFPARAMTYPE, DEFDATATYPE, DEFCLASS, DEFCLASSVAR, DEFOPERATION,
-  PARA
-};
-
-extern void xml_add_char (int character),
-  xml_asterisk (void),
-  xml_insert_element (int elt, int arg),
-  xml_insert_entity (char *entity_name),
-  xml_insert_footnote (char *note),
-  xml_insert_quotation (char *type, int arg),
-  xml_insert_indexentry (char *entry, char *node),
-  xml_insert_indexterm (char *indexterm, char *index),
-  xml_insert_docbook_image (char *name_arg),
-  xml_synindex (char *from, char *to),
-  xml_start_para (void),
-  xml_end_para (void),
-  xml_begin_document (char *output_filename),
-  xml_end_document (void),
-  xml_start_menu_entry (char *tem),
-  xml_end_menu (void),
-  xml_end_current_element (void),
-  xml_open_section (int level, char *name),
-  xml_close_sections (int level),
-  xml_begin_node (void),
-  xml_begin_index (void),
-  xml_end_index (void),
-  xml_begin_multitable (int ncolumns, int *column_widths),
-  xml_end_multitable (void),
-  xml_end_multitable_row (int first_row),
-  xml_end_multitable_column (void),
-  xml_begin_table (int type, char *item_function),
-  xml_end_table (int type),
-  xml_begin_item (void),
-  xml_begin_table_item (void),
-  xml_continue_table_item (void),
-  xml_begin_enumerate (char *enum_arg),
-  xml_end_enumerate (void),
-  xml_begin_docbook_float (int elt);
-
-extern char *xml_id (char *id);
-
-extern void xml_begin_definition (void),
-  xml_end_definition (void),
-  xml_process_defun_args (char **defun_args, int auto_var_p),
-  xml_begin_def_term (int base_type, const char *category,
-      char *defined_name, char *type_name, char *type_name2),
-  xml_end_def_term (void);
-
-extern int xml_current_stack_index (void),
-  xml_element (char *name);
-
-#if defined (VA_FPRINTF) && __STDC__
-void xml_insert_element_with_attribute (int elt, int arg, char *format, ...);
-#else
-void xml_insert_element_with_attribute ();
-#endif
-
-#endif /* XML_H */

Property changes on: head/contrib/texinfo/makeinfo/xml.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/footnote.h
===================================================================
--- head/contrib/texinfo/makeinfo/footnote.h	(revision 276550)
+++ head/contrib/texinfo/makeinfo/footnote.h	(nonexistent)
@@ -1,38 +0,0 @@
-/* footnote.h -- declarations for footnote.c.
-   $Id: footnote.h,v 1.2 2004/04/11 17:56:47 karl Exp $
-
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-   */
-
-#ifndef FOOTNOTE_H
-#define FOOTNOTE_H
-
-extern int footnote_style_preset;
-extern int current_footnote_number;
-extern int number_footnotes;
-extern int already_outputting_pending_notes;
-
-/* The Texinfo @commands.  */
-extern void cm_footnote (void);
-extern void cm_footnotestyle (void);
-
-extern int set_footnote_style (char *string);    /* called for -s option */
-
-extern void output_pending_notes (void); /* called for output */
-
-#endif /* !FOOTNOTE_H */

Property changes on: head/contrib/texinfo/makeinfo/footnote.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/macro.c
===================================================================
--- head/contrib/texinfo/makeinfo/macro.c	(revision 276550)
+++ head/contrib/texinfo/makeinfo/macro.c	(nonexistent)
@@ -1,1108 +0,0 @@
-/* macro.c -- user-defined macros for Texinfo.
-   $Id: macro.c,v 1.6 2004/04/11 17:56:47 karl Exp $
-
-   Copyright (C) 1998, 1999, 2002, 2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "system.h"
-#include "cmds.h"
-#include "files.h"
-#include "macro.h"
-#include "makeinfo.h"
-#include "insertion.h"
-
-/* If non-NULL, this is an output stream to write the full macro expansion
-   of the input text to.  The result is another texinfo file, but
-   missing @include, @infoinclude, @macro, and macro invocations.  Instead,
-   all of the text is placed within the file. */
-FILE *macro_expansion_output_stream = NULL;
-
-/* Output file for -E.  */
-char *macro_expansion_filename;
-
-/* Nonzero means a macro string is in execution, as opposed to a file. */
-int me_executing_string = 0;
-
-/* Nonzero means we want only to expand macros and
-   leave everything else intact.  */
-int only_macro_expansion = 0;
-
-static ITEXT **itext_info = NULL;
-static int itext_size = 0;
-
-/* Return the arglist on the current line.  This can behave in two different
-   ways, depending on the variable BRACES_REQUIRED_FOR_MACRO_ARGS. */
-int braces_required_for_macro_args = 0;
-
-/* Array of macros and definitions. */
-MACRO_DEF **macro_list = NULL;
-
-int macro_list_len = 0;         /* Number of elements. */
-int macro_list_size = 0;        /* Number of slots in total. */
-
-/* Return the length of the array in ARRAY. */
-int
-array_len (char **array)
-{
-  int i = 0;
-
-  if (array)
-    for (i = 0; array[i]; i++);
-
-  return i;
-}
-
-void
-free_array (char **array)
-{
-  if (array)
-    {
-      int i;
-      for (i = 0; array[i]; i++)
-        free (array[i]);
-
-      free (array);
-    }
-}
-
-/* Return the macro definition of NAME or NULL if NAME is not defined. */
-MACRO_DEF *
-find_macro (char *name)
-{
-  int i;
-  MACRO_DEF *def;
-
-  def = NULL;
-  for (i = 0; macro_list && (def = macro_list[i]); i++)
-    {
-      if ((!def->inhibited) && (strcmp (def->name, name) == 0))
-        break;
-    }
-  return def;
-}
-
-/* Add the macro NAME with ARGLIST and BODY to the list of defined macros.
-   SOURCE_FILE is the name of the file where this definition can be found,
-   and SOURCE_LINENO is the line number within that file.  If a macro already
-   exists with NAME, then a warning is produced, and that previous
-   definition is overwritten. */
-static void
-add_macro (char *name, char **arglist, char *body, char *source_file,
-    int source_lineno, int flags)
-{
-  MACRO_DEF *def;
-
-  def = find_macro (name);
-
-  if (!def)
-    {
-      if (macro_list_len + 2 >= macro_list_size)
-        macro_list = xrealloc
-          (macro_list, ((macro_list_size += 10) * sizeof (MACRO_DEF *)));
-
-      macro_list[macro_list_len] = xmalloc (sizeof (MACRO_DEF));
-      macro_list[macro_list_len + 1] = NULL;
-
-      def = macro_list[macro_list_len];
-      macro_list_len += 1;
-      def->name = name;
-    }
-  else
-    {
-      char *temp_filename = input_filename;
-      int temp_line = line_number;
-
-      warning (_("macro `%s' previously defined"), name);
-
-      input_filename = def->source_file;
-      line_number = def->source_lineno;
-      warning (_("here is the previous definition of `%s'"), name);
-
-      input_filename = temp_filename;
-      line_number = temp_line;
-
-      if (def->arglist)
-        {
-          int i;
-
-          for (i = 0; def->arglist[i]; i++)
-            free (def->arglist[i]);
-
-          free (def->arglist);
-        }
-      free (def->source_file);
-      free (def->body);
-    }
-
-  def->source_file = xstrdup (source_file);
-  def->source_lineno = source_lineno;
-  def->body = body;
-  def->arglist = arglist;
-  def->inhibited = 0;
-  def->flags = flags;
-}
-
-
-char **
-get_brace_args (int quote_single)
-{
-  char **arglist, *word;
-  int arglist_index, arglist_size;
-  int character, escape_seen, start;
-  int depth = 1;
-
-  /* There is an arglist in braces here, so gather the args inside of it. */
-  skip_whitespace_and_newlines ();
-  input_text_offset++;
-  arglist = NULL;
-  arglist_index = arglist_size = 0;
-
- get_arg:
-  skip_whitespace_and_newlines ();
-  start = input_text_offset;
-  escape_seen = 0;
-
-  while ((character = curchar ()))
-    {
-      if (character == '\\')
-        {
-          input_text_offset += 2;
-          escape_seen = 1;
-        }
-      else if (character == '{')
-        {
-          depth++;
-          input_text_offset++;
-        }
-      else if ((character == ',' && !quote_single) ||
-               ((character == '}') && depth == 1))
-        {
-          int len = input_text_offset - start;
-
-          if (len || (character != '}'))
-            {
-              word = xmalloc (1 + len);
-              memcpy (word, input_text + start, len);
-              word[len] = 0;
-
-              /* Clean up escaped characters. */
-              if (escape_seen)
-                {
-                  int i;
-                  for (i = 0; word[i]; i++)
-                    if (word[i] == '\\')
-                      memmove (word + i, word + i + 1,
-                               1 + strlen (word + i + 1));
-                }
-
-              if (arglist_index + 2 >= arglist_size)
-                arglist = xrealloc
-                  (arglist, (arglist_size += 10) * sizeof (char *));
-
-              arglist[arglist_index++] = word;
-              arglist[arglist_index] = NULL;
-            }
-
-          input_text_offset++;
-          if (character == '}')
-            break;
-          else
-            goto get_arg;
-        }
-      else if (character == '}')
-        {
-          depth--;
-          input_text_offset++;
-        }
-      else
-        {
-          input_text_offset++;
-          if (character == '\n') line_number++;
-        }
-    }
-  return arglist;
-}
-
-static char **
-get_macro_args (MACRO_DEF *def)
-{
-  int i;
-  char *word;
-
-  /* Quickly check to see if this macro has been invoked with any arguments.
-     If not, then don't skip any of the following whitespace. */
-  for (i = input_text_offset; i < input_text_length; i++)
-    if (!cr_or_whitespace (input_text[i]))
-      break;
-
-  if (input_text[i] != '{')
-    {
-      if (braces_required_for_macro_args)
-        {
-          return NULL;
-        }
-      else
-        {
-          /* Braces are not required to fill out the macro arguments.  If
-             this macro takes one argument, it is considered to be the
-             remainder of the line, sans whitespace. */
-          if (def->arglist && def->arglist[0] && !def->arglist[1])
-            {
-              char **arglist;
-
-              get_rest_of_line (0, &word);
-              if (input_text[input_text_offset - 1] == '\n')
-                {
-                  input_text_offset--;
-                  line_number--;
-                }
-              /* canon_white (word); */
-              arglist = xmalloc (2 * sizeof (char *));
-              arglist[0] = word;
-              arglist[1] = NULL;
-              return arglist;
-            }
-          else
-            {
-              /* The macro either took no arguments, or took more than
-                 one argument.  In that case, it must be invoked with
-                 arguments surrounded by braces. */
-              return NULL;
-            }
-        }
-    }
-  return get_brace_args (def->flags & ME_QUOTE_ARG);
-}
-
-/* Substitute actual parameters for named parameters in body.
-   The named parameters which appear in BODY must by surrounded
-   reverse slashes, as in \foo\. */
-static char *
-apply (char **named, char **actuals, char *body)
-{
-  int i;
-  int new_body_index, new_body_size;
-  char *new_body, *text;
-  int length_of_actuals;
-
-  length_of_actuals = array_len (actuals);
-  new_body_size = strlen (body);
-  new_body = xmalloc (1 + new_body_size);
-
-  /* Copy chars from BODY into NEW_BODY. */
-  i = 0;
-  new_body_index = 0;
-
-  while (body[i])
-    { /* Anything but a \ is easy.  */
-      if (body[i] != '\\')
-        new_body[new_body_index++] = body[i++];
-      else
-        { /* Snarf parameter name, check against named parameters. */
-          char *param;
-          int param_start, len;
-
-          param_start = ++i;
-          while (body[i] && body[i] != '\\')
-            i++;
-
-          len = i - param_start;
-          param = xmalloc (1 + len);
-          memcpy (param, body + param_start, len);
-          param[len] = 0;
-
-          if (body[i]) /* move past \ */
-            i++;
-
-          if (len == 0)
-            { /* \\ always means \, even if macro has no args.  */
-              len++;
-              text = xmalloc (1 + len);
-              sprintf (text, "\\%s", param);
-            }
-          else
-            {
-              int which;
-              
-              /* Check against named parameters. */
-              for (which = 0; named && named[which]; which++)
-                if (STREQ (named[which], param))
-                  break;
-
-              if (named && named[which])
-                {
-                  text = which < length_of_actuals ? actuals[which] : NULL;
-                  if (!text)
-                    text = "";
-                  len = strlen (text);
-                  text = xstrdup (text);  /* so we can free it */
-                }
-              else
-                { /* not a parameter, so it's an error.  */
-                  warning (_("\\ in macro expansion followed by `%s' instead of parameter name"),
-                             param); 
-                  len++;
-                  text = xmalloc (1 + len);
-                  sprintf (text, "\\%s", param);
-                }
-            }
-
-          if (strlen (param) + 2 < len)
-            {
-              new_body_size += len + 1;
-              new_body = xrealloc (new_body, new_body_size);
-            }
-
-          free (param);
-
-          strcpy (new_body + new_body_index, text);
-          new_body_index += len;
-
-          free (text);
-        }
-    }
-
-  new_body[new_body_index] = 0;
-  return new_body;
-}
-
-/* Expand macro passed in DEF, a pointer to a MACRO_DEF, and
-   return its expansion as a string.  */
-char *
-expand_macro (MACRO_DEF *def)
-{
-  char **arglist;
-  int num_args;
-  char *execution_string = NULL;
-  int start_line = line_number;
-
-  /* Find out how many arguments this macro definition takes. */
-  num_args = array_len (def->arglist);
-
-  /* Gather the arguments present on the line if there are any. */
-  arglist = get_macro_args (def);
-
-  if (num_args < array_len (arglist))
-    {
-      free_array (arglist);
-      line_error (_("Macro `%s' called on line %d with too many args"),
-                  def->name, start_line);
-      return execution_string;
-    }
-
-  if (def->body)
-    execution_string = apply (def->arglist, arglist, def->body);
-
-  free_array (arglist);
-  return execution_string;
-}
-
-/* Execute the macro passed in DEF, a pointer to a MACRO_DEF.  */
-void
-execute_macro (MACRO_DEF *def)
-{
-  char *execution_string;
-  int start_line = line_number, end_line;
-
-  if (macro_expansion_output_stream && !executing_string && !me_inhibit_expansion)
-    me_append_before_this_command ();
-
-  execution_string = expand_macro (def);
-  if (!execution_string)
-    return;
-
-  if (def->body)
-    {
-      /* Reset the line number to where the macro arguments began.
-         This makes line numbers reported in error messages correct in
-         case the macro arguments span several lines and the expanded
-         arguments invoke other commands.  */
-      end_line = line_number;
-      line_number = start_line;
-
-      if (macro_expansion_output_stream
-          && !executing_string && !me_inhibit_expansion)
-        {
-          remember_itext (input_text, input_text_offset);
-          me_execute_string (execution_string);
-        }
-      else
-        execute_string ("%s", execution_string);
-
-      free (execution_string);
-      line_number = end_line;
-    }
-}
-
-
-/* Read and remember the definition of a macro.  If RECURSIVE is set,
-   set the ME_RECURSE flag.  MACTYPE is either "macro" or "rmacro", and
-   tells us what the matching @end should be.  */
-static void
-define_macro (char *mactype, int recursive)
-{
-  int i, start;
-  char *name, *line;
-  char *last_end = NULL;
-  char *body = NULL;
-  char **arglist = NULL;
-  int body_size = 0, body_index = 0;
-  int depth = 1;
-  int flags = 0;
-  int defining_line = line_number;
-
-  if (macro_expansion_output_stream && !executing_string)
-    me_append_before_this_command ();
-
-  skip_whitespace ();
-
-  /* Get the name of the macro.  This is the set of characters which are
-     not whitespace and are not `{' immediately following the @macro. */
-  start = input_text_offset;
-  {
-    int len;
-
-    for (i = start; i < input_text_length && input_text[i] != '{'
-                    && !cr_or_whitespace (input_text[i]);
-         i++) ;
-
-    len = i - start;
-    name = xmalloc (1 + len);
-    memcpy (name, input_text + start, len);
-    name[len] = 0;
-    input_text_offset = i;
-  }
-
-  skip_whitespace ();
-
-  /* It is not required that the definition of a macro includes an arglist.
-     If not, don't try to get the named parameters, just use a null list. */
-  if (curchar () == '{')
-    {
-      int character;
-      int arglist_index = 0, arglist_size = 0;
-      int gathering_words = 1;
-      char *word = NULL;
-
-      /* Read the words inside of the braces which determine the arglist.
-         These words will be replaced within the body of the macro at
-         execution time. */
-
-      input_text_offset++;
-      skip_whitespace_and_newlines ();
-
-      while (gathering_words)
-        {
-          int len;
-
-          for (i = input_text_offset;
-               (character = input_text[i]);
-               i++)
-            {
-              switch (character)
-                {
-                case '\n':
-                  line_number++;
-                case ' ':
-                case '\t':
-                case ',':
-                case '}':
-                  /* Found the end of the current arglist word.  Save it. */
-                  len = i - input_text_offset;
-                  word = xmalloc (1 + len);
-                  memcpy (word, input_text + input_text_offset, len);
-                  word[len] = 0;
-                  input_text_offset = i;
-
-                  /* Advance to the comma or close-brace that signified
-                     the end of the argument. */
-                  while ((character = curchar ())
-                         && character != ','
-                         && character != '}')
-                    {
-                      input_text_offset++;
-                      if (character == '\n')
-                        line_number++;
-                    }
-
-                  /* Add the word to our list of words. */
-                  if (arglist_index + 2 >= arglist_size)
-                    {
-                      arglist_size += 10;
-                      arglist = xrealloc (arglist,
-                                          arglist_size * sizeof (char *));
-                    }
-
-                  arglist[arglist_index++] = word;
-                  arglist[arglist_index] = NULL;
-                  break;
-                }
-
-              if (character == '}')
-                {
-                  input_text_offset++;
-                  gathering_words = 0;
-                  break;
-                }
-
-              if (character == ',')
-                {
-                  input_text_offset++;
-                  skip_whitespace_and_newlines ();
-                  i = input_text_offset - 1;
-                }
-            }
-        }
-      
-      /* If we have exactly one argument, do @quote-arg implicitly.  Not
-         only does this match TeX's behavior (which can't feasibly be
-         changed), but it's a good idea.  */
-      if (arglist_index == 1)
-        flags |= ME_QUOTE_ARG;
-    }
-
-  /* Read the text carefully until we find an "@end macro" which
-     matches this one.  The text in between is the body of the macro. */
-  skip_whitespace_and_newlines ();
-
-  while (depth)
-    {
-      if ((input_text_offset + 9) > input_text_length)
-        {
-          file_line_error (input_filename, defining_line,
-			   _("%cend macro not found"), COMMAND_PREFIX);
-          return;
-        }
-
-      get_rest_of_line (0, &line);
-
-      /* Handle commands only meaningful within a macro. */
-      if ((*line == COMMAND_PREFIX) && (depth == 1) &&
-          (strncmp (line + 1, "allow-recursion", 15) == 0) &&
-          (line[16] == 0 || whitespace (line[16])))
-        {
-          for (i = 16; whitespace (line[i]); i++);
-          strcpy (line, line + i);
-          flags |= ME_RECURSE;
-          if (!*line)
-            {
-              free (line);
-              continue;
-            }
-        }
-
-      if ((*line == COMMAND_PREFIX) && (depth == 1) &&
-          (strncmp (line + 1, "quote-arg", 9) == 0) &&
-          (line[10] == 0 || whitespace (line[10])))
-        {
-          for (i = 10; whitespace (line[i]); i++);
-          strcpy (line, line + i);
-
-          if (arglist && arglist[0] && !arglist[1])
-            {
-              flags |= ME_QUOTE_ARG;
-              if (!*line)
-                {
-                  free (line);
-                  continue;
-                }
-            }
-          else
-           line_error (_("@quote-arg only useful for single-argument macros"));
-        }
-
-      if (*line == COMMAND_PREFIX
-          && (strncmp (line + 1, "macro ", 6) == 0
-              || strncmp (line + 1, "rmacro ", 7) == 0))
-        depth++;
-
-      /* Incorrect implementation of nesting -- just check that the last
-         @end matches what we started with.  Since nested macros don't
-         work in TeX anyway, this isn't worth the trouble to get right.  */
-      if (*line == COMMAND_PREFIX && strncmp (line + 1, "end macro", 9) == 0)
-        {
-          depth--;
-          last_end = "macro";
-        }
-      if (*line == COMMAND_PREFIX && strncmp (line + 1, "end rmacro", 10) == 0)
-        {
-          depth--;
-          last_end = "rmacro";
-        }
-
-      if (depth)
-        {
-          if ((body_index + strlen (line) + 3) >= body_size)
-            body = xrealloc (body, body_size += 3 + strlen (line));
-          strcpy (body + body_index, line);
-          body_index += strlen (line);
-          body[body_index++] = '\n';
-          body[body_index] = 0;
-        }
-      free (line);
-    }
-
-  /* Check that @end matched the macro command.  */
-  if (!STREQ (last_end, mactype))
-    warning (_("mismatched @end %s with @%s"), last_end, mactype);
-
-  /* If it was an empty macro like
-     @macro foo
-     @end macro
-     create an empty body.  (Otherwise, the macro is not expanded.)  */
-  if (!body)
-    {
-      body = (char *)malloc(1);
-      *body = 0;
-    }
-
-  /* We now have the name, the arglist, and the body.  However, BODY
-     includes the final newline which preceded the `@end macro' text.
-     Delete it. */
-  if (body && strlen (body))
-    body[strlen (body) - 1] = 0;
-
-  if (recursive)
-    flags |= ME_RECURSE;
-    
-  add_macro (name, arglist, body, input_filename, defining_line, flags);
-
-  if (macro_expansion_output_stream && !executing_string)
-    {
-      /* Remember text for future expansions.  */
-      remember_itext (input_text, input_text_offset);
-
-      /* Bizarrely, output the @macro itself.  This is so texinfo.tex
-         will have a chance to read it when texi2dvi calls makeinfo -E.
-         The problem is that we don't really expand macros in all
-         contexts; a @table's @item is one.  And a fix is not obvious to
-         me, since it appears virtually identical to any other internal
-         expansion.  Just setting a variable in cm_item caused other
-         strange expansion problems.  */
-      write_region_to_macro_output ("@", 0, 1);
-      write_region_to_macro_output (mactype, 0, strlen (mactype));
-      write_region_to_macro_output (" ", 0, 1);
-      write_region_to_macro_output (input_text, start, input_text_offset);
-    }
-}
-
-void 
-cm_macro (void)
-{
-  define_macro ("macro", 0);
-}
-
-void 
-cm_rmacro (void)
-{
-  define_macro ("rmacro", 1);
-}
-
-/* Delete the macro with name NAME.  The macro is deleted from the list,
-   but it is also returned.  If there was no macro defined, NULL is
-   returned. */
-
-static MACRO_DEF *
-delete_macro (char *name)
-{
-  int i;
-  MACRO_DEF *def;
-
-  def = NULL;
-
-  for (i = 0; macro_list && (def = macro_list[i]); i++)
-    if (strcmp (def->name, name) == 0)
-      {
-        memmove (macro_list + i, macro_list + i + 1,
-               ((macro_list_len + 1) - i) * sizeof (MACRO_DEF *));
-        macro_list_len--;
-        break;
-      }
-  return def;
-}
-
-void
-cm_unmacro (void)
-{
-  int i;
-  char *line, *name;
-  MACRO_DEF *def;
-
-  if (macro_expansion_output_stream && !executing_string)
-    me_append_before_this_command ();
-
-  get_rest_of_line (0, &line);
-
-  for (i = 0; line[i] && !whitespace (line[i]); i++);
-  name = xmalloc (i + 1);
-  memcpy (name, line, i);
-  name[i] = 0;
-
-  def = delete_macro (name);
-
-  if (def)
-    {
-      free (def->source_file);
-      free (def->name);
-      free (def->body);
-
-      if (def->arglist)
-        {
-          int i;
-
-          for (i = 0; def->arglist[i]; i++)
-            free (def->arglist[i]);
-
-          free (def->arglist);
-        }
-
-      free (def);
-    }
-
-  free (line);
-  free (name);
-
-  if (macro_expansion_output_stream && !executing_string)
-    remember_itext (input_text, input_text_offset);
-}
-
-/* How to output sections of the input file verbatim. */
-
-/* Set the value of POINTER's offset to OFFSET. */
-ITEXT *
-remember_itext (char *pointer, int offset)
-{
-  int i;
-  ITEXT *itext = NULL;
-
-  /* If we have no info, initialize a blank list. */
-  if (!itext_info)
-    {
-      itext_info = xmalloc ((itext_size = 10) * sizeof (ITEXT *));
-      for (i = 0; i < itext_size; i++)
-        itext_info[i] = NULL;
-    }
-
-  /* If the pointer is already present in the list, then set the offset. */
-  for (i = 0; i < itext_size; i++)
-    if ((itext_info[i]) &&
-        (itext_info[i]->pointer == pointer))
-      {
-        itext = itext_info[i];
-        itext_info[i]->offset = offset;
-        break;
-      }
-
-  if (i == itext_size)
-    {
-      /* Find a blank slot (or create a new one), and remember the
-         pointer and offset. */
-      for (i = 0; i < itext_size; i++)
-        if (itext_info[i] == NULL)
-          break;
-
-      /* If not found, then add some slots. */
-      if (i == itext_size)
-        {
-          int j;
-
-          itext_info = xrealloc
-            (itext_info, (itext_size += 10) * sizeof (ITEXT *));
-
-          for (j = i; j < itext_size; j++)
-            itext_info[j] = NULL;
-        }
-
-      /* Now add the pointer and the offset. */
-      itext_info[i] = xmalloc (sizeof (ITEXT));
-      itext_info[i]->pointer = pointer;
-      itext_info[i]->offset = offset;
-      itext = itext_info[i];
-    }
-  return itext;
-}
-
-/* Forget the input text associated with POINTER. */
-void
-forget_itext (char *pointer)
-{
-  int i;
-
-  for (i = 0; i < itext_size; i++)
-    if (itext_info[i] && (itext_info[i]->pointer == pointer))
-      {
-        free (itext_info[i]);
-        itext_info[i] = NULL;
-        break;
-      }
-}
-
-/* Append the text which appeared in input_text from the last offset to
-   the character just before the command that we are currently executing. */
-void
-me_append_before_this_command (void)
-{
-  int i;
-
-  for (i = input_text_offset; i && (input_text[i] != COMMAND_PREFIX); i--)
-    ;
-  maybe_write_itext (input_text, i);
-}
-
-/* Similar to execute_string, but only takes a single string argument,
-   and remembers the input text location, etc. */
-void
-me_execute_string (char *execution_string)
-{
-  int saved_escape_html = escape_html;
-  int saved_in_paragraph = in_paragraph;
-  escape_html = me_executing_string == 0;
-  in_paragraph = 0;
-  
-  pushfile ();
-  input_text_offset = 0;
-  /* The following xstrdup is so we can relocate input_text at will.  */
-  input_text = xstrdup (execution_string);
-  input_filename = xstrdup (input_filename);
-  input_text_length = strlen (execution_string);
-
-  remember_itext (input_text, 0);
-
-  me_executing_string++;
-  reader_loop ();
-  free (input_text);
-  free (input_filename);
-  popfile ();
-  me_executing_string--;
-
-  in_paragraph = saved_in_paragraph;
-  escape_html = saved_escape_html;
-}
-
-/* A wrapper around me_execute_string which saves and restores
-   variables important for output generation.  This is called
-   when we need to produce macro-expanded output for input which
-   leaves no traces in the Info output.  */
-void
-me_execute_string_keep_state (char *execution_string, char *append_string)
-{
-  int op_orig, opcol_orig, popen_orig;
-  int fill_orig, newline_orig, indent_orig, meta_pos_orig;
-
-  remember_itext (input_text, input_text_offset);
-  op_orig = output_paragraph_offset;
-  meta_pos_orig = meta_char_pos;
-  opcol_orig = output_column;
-  popen_orig = paragraph_is_open;
-  fill_orig = filling_enabled;
-  newline_orig = last_char_was_newline;
-  filling_enabled = 0;
-  indent_orig = no_indent;
-  no_indent = 1;
-  me_execute_string (execution_string);
-  if (append_string)
-    write_region_to_macro_output (append_string, 0, strlen (append_string));
-  output_paragraph_offset = op_orig;
-  meta_char_pos = meta_pos_orig;
-  output_column = opcol_orig;
-  paragraph_is_open = popen_orig;
-  filling_enabled = fill_orig;
-  last_char_was_newline = newline_orig;
-  no_indent = indent_orig;
-}
-
-/* Append the text which appears in input_text from the last offset to
-   the current OFFSET. */
-void
-append_to_expansion_output (int offset)
-{
-  int i;
-  ITEXT *itext = NULL;
-
-  for (i = 0; i < itext_size; i++)
-    if (itext_info[i] && itext_info[i]->pointer == input_text)
-      {
-        itext = itext_info[i];
-        break;
-      }
-
-  if (!itext)
-    return;
-
-  if (offset > itext->offset)
-    {
-      write_region_to_macro_output (input_text, itext->offset, offset);
-      remember_itext (input_text, offset);
-    }
-}
-
-/* Only write this input text iff it appears in our itext list. */
-void
-maybe_write_itext (char *pointer, int offset)
-{
-  int i;
-  ITEXT *itext = NULL;
-
-  for (i = 0; i < itext_size; i++)
-    if (itext_info[i] && (itext_info[i]->pointer == pointer))
-      {
-        itext = itext_info[i];
-        break;
-      }
-
-  if (itext && (itext->offset < offset))
-    {
-      write_region_to_macro_output (itext->pointer, itext->offset, offset);
-      remember_itext (pointer, offset);
-    }
-}
-
-void
-write_region_to_macro_output (char *string, int start, int end)
-{
-  if (macro_expansion_output_stream)
-    fwrite (string + start, 1, end - start, macro_expansion_output_stream);
-}
-
-/* Aliases. */
-
-typedef struct alias_struct
-{
-  char *alias;
-  char *mapto;
-  struct alias_struct *next;
-} alias_type;
-
-static alias_type *aliases; 
-
-/* @alias aname = cmdname */
-
-void
-cm_alias (void)
-{
-  alias_type *a = xmalloc (sizeof (alias_type));
-
-  skip_whitespace ();
-  get_until_in_line (0, "=", &(a->alias));
-  canon_white (a->alias);
-
-  discard_until ("=");
-  skip_whitespace ();
-  get_until_in_line (0, " ", &(a->mapto));
-
-  a->next = aliases;
-  aliases = a;
-}
-
-/* Perform an alias expansion.  Called from read_command.  */
-char *
-alias_expand (char *tok)
-{
-  alias_type *findit = aliases;
-
-  while (findit)
-    if (strcmp (findit->alias, tok) == 0)
-      {
-	free (tok);
-	return alias_expand (xstrdup (findit->mapto));
-      }
-    else
-      findit = findit->next;
-
-  return tok;
-}
-
-/* definfoenclose implementation.  */
-
-/* This structure is used to track enclosure macros.  When an enclosure
-   macro is recognized, a pointer to the enclosure block corresponding 
-   to its name is saved in the brace element for its argument. */
-typedef struct enclose_struct
-{
-  char *enclose;
-  char *before;
-  char *after;
-  struct enclose_struct *next;
-} enclosure_type;
-
-static enclosure_type *enclosures; 
-
-typedef struct enclosure_stack_struct
-{
-    enclosure_type *current;
-    struct enclosure_stack_struct *next;
-} enclosure_stack_type;
-
-static enclosure_stack_type *enclosure_stack;
-
-/* @definfoenclose */
-void
-cm_definfoenclose (void)
-{
-  enclosure_type *e = xmalloc (sizeof (enclosure_type));
-
-  skip_whitespace ();
-  get_until_in_line (1, ",", &(e->enclose));
-  discard_until (",");
-  get_until_in_line (0, ",", &(e->before));
-  discard_until (",");
-  get_until_in_line (0, "\n", &(e->after));
-
-  e->next = enclosures;
-  enclosures = e;
-}
-
-/* If TOK is an enclosure command, push it on the enclosure stack and
-   return 1.  Else return 0.  */
-
-int
-enclosure_command (char *tok)
-{
-  enclosure_type *findit = enclosures;
-
-  while (findit)
-    if (strcmp (findit->enclose, tok) == 0)
-      {
-        enclosure_stack_type *new = xmalloc (sizeof (enclosure_stack_type));
-        new->current = findit;
-        new->next = enclosure_stack;
-        enclosure_stack = new;
-
-        return 1;
-      }
-    else
-      findit = findit->next;
-
-  return 0;
-}
-
-/* actually perform the enclosure expansion */
-void
-enclosure_expand (int arg, int start, int end)
-{
-  if (arg == START)
-    add_word (enclosure_stack->current->before);
-  else
-    {
-      enclosure_stack_type *temp;
-
-      add_word (enclosure_stack->current->after);
-
-      temp = enclosure_stack;
-      enclosure_stack = enclosure_stack->next;
-      free (temp);
-    }
-}

Property changes on: head/contrib/texinfo/makeinfo/macro.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/files.c
===================================================================
--- head/contrib/texinfo/makeinfo/files.c	(revision 276550)
+++ head/contrib/texinfo/makeinfo/files.c	(nonexistent)
@@ -1,784 +0,0 @@
-/* files.c -- file-related functions for makeinfo.
-   $Id: files.c,v 1.5 2004/07/27 00:06:31 karl Exp $
-
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "system.h"
-#include "files.h"
-#include "html.h"
-#include "index.h"
-#include "macro.h"
-#include "makeinfo.h"
-#include "node.h"
-
-FSTACK *filestack = NULL;
-
-static int node_filename_stack_index = 0;
-static int node_filename_stack_size = 0;
-static char **node_filename_stack = NULL;
-
-/* Looking for include files.  */
-
-/* Given a string containing units of information separated by colons,
-   return the next one pointed to by INDEX, or NULL if there are no more.
-   Advance INDEX to the character after the colon. */
-static char *
-extract_colon_unit (char *string, int *index)
-{
-  int start;
-  int path_sep_char = PATH_SEP[0];
-  int i = *index;
-
-  if (!string || (i >= strlen (string)))
-    return NULL;
-
-  /* Each call to this routine leaves the index pointing at a colon if
-     there is more to the path.  If i > 0, then increment past the
-     `:'.  If i == 0, then the path has a leading colon.  Trailing colons
-     are handled OK by the `else' part of the if statement; an empty
-     string is returned in that case. */
-  if (i && string[i] == path_sep_char)
-    i++;
-
-  start = i;
-  while (string[i] && string[i] != path_sep_char) i++;
-  *index = i;
-
-  if (i == start)
-    {
-      if (string[i])
-        (*index)++;
-
-      /* Return "" in the case of a trailing `:'. */
-      return xstrdup ("");
-    }
-  else
-    {
-      char *value;
-
-      value = xmalloc (1 + (i - start));
-      memcpy (value, &string[start], (i - start));
-      value [i - start] = 0;
-
-      return value;
-    }
-}
-
-/* Return the full pathname for FILENAME by searching along PATH.
-   When found, return the stat () info for FILENAME in FINFO.
-   If PATH is NULL, only the current directory is searched.
-   If the file could not be found, return a NULL pointer. */
-char *
-get_file_info_in_path (char *filename, char *path, struct stat *finfo)
-{
-  char *dir;
-  int result, index = 0;
-
-  if (path == NULL)
-    path = ".";
-
-  /* Handle absolute pathnames.  */
-  if (IS_ABSOLUTE (filename)
-      || (*filename == '.'
-          && (IS_SLASH (filename[1])
-              || (filename[1] == '.' && IS_SLASH (filename[2])))))
-    {
-      if (stat (filename, finfo) == 0)
-        return xstrdup (filename);
-      else
-        return NULL;
-    }
-
-  while ((dir = extract_colon_unit (path, &index)))
-    {
-      char *fullpath;
-
-      if (!*dir)
-        {
-          free (dir);
-          dir = xstrdup (".");
-        }
-
-      fullpath = xmalloc (2 + strlen (dir) + strlen (filename));
-      sprintf (fullpath, "%s/%s", dir, filename);
-      free (dir);
-
-      result = stat (fullpath, finfo);
-
-      if (result == 0)
-        return fullpath;
-      else
-        free (fullpath);
-    }
-  return NULL;
-}
-
-/* Prepend and append new paths to include_files_path.  */
-void
-prepend_to_include_path (char *path)
-{
-  if (!include_files_path)
-    {
-      include_files_path = xstrdup (path);
-      include_files_path = xrealloc (include_files_path,
-          strlen (include_files_path) + 3); /* 3 for ":.\0" */
-      strcat (strcat (include_files_path, PATH_SEP), ".");
-    }
-  else
-    {
-      char *tmp = xstrdup (include_files_path);
-      include_files_path = xrealloc (include_files_path,
-          strlen (include_files_path) + strlen (path) + 2); /* 2 for ":\0" */
-      strcpy (include_files_path, path);
-      strcat (include_files_path, PATH_SEP);
-      strcat (include_files_path, tmp);
-      free (tmp);
-    }
-}
-
-void
-append_to_include_path (char *path)
-{
-  if (!include_files_path)
-    include_files_path = xstrdup (".");
-
-  include_files_path = (char *) xrealloc (include_files_path,
-        2 + strlen (include_files_path) + strlen (path));
-  strcat (include_files_path, PATH_SEP);
-  strcat (include_files_path, path);
-}
-
-/* Remove the first path from the include_files_path.  */
-void
-pop_path_from_include_path (void)
-{
-  int i = 0;
-  char *tmp;
-
-  if (include_files_path)
-    for (i = 0; i < strlen (include_files_path)
-        && include_files_path[i] != ':'; i++);
-
-  /* Advance include_files_path to the next char from ':'  */
-  tmp = (char *) xmalloc (strlen (include_files_path) - i);
-  strcpy (tmp, (char *) include_files_path + i + 1);
-
-  free (include_files_path);
-  include_files_path = tmp;
-}
-
-/* Find and load the file named FILENAME.  Return a pointer to
-   the loaded file, or NULL if it can't be loaded.  If USE_PATH is zero,
-   just look for the given file (this is used in handle_delayed_writes),
-   else search along include_files_path.   */
-
-char *
-find_and_load (char *filename, int use_path)
-{
-  struct stat fileinfo;
-  long file_size;
-  int file = -1, count = 0;
-  char *fullpath, *result;
-  int n, bytes_to_read;
-
-  result = fullpath = NULL;
-
-  fullpath
-    = get_file_info_in_path (filename, use_path ? include_files_path : NULL, 
-                             &fileinfo);
-
-  if (!fullpath)
-    goto error_exit;
-
-  filename = fullpath;
-  file_size = (long) fileinfo.st_size;
-
-  file = open (filename, O_RDONLY);
-  if (file < 0)
-    goto error_exit;
-
-  /* Load the file, with enough room for a newline and a null. */
-  result = xmalloc (file_size + 2);
-
-  /* VMS stat lies about the st_size value.  The actual number of
-     readable bytes is always less than this value.  The arcane
-     mysteries of VMS/RMS are too much to probe, so this hack
-    suffices to make things work.  It's also needed on Cygwin.  And so
-    we might as well use it everywhere.  */
-  bytes_to_read = file_size;
-  while ((n = read (file, result + count, bytes_to_read)) > 0)
-    {
-      count += n;
-      bytes_to_read -= n;
-    }
-  if (0 < count && count < file_size)
-    result = xrealloc (result, count + 2); /* why waste the slack? */
-  else if (n == -1)
-error_exit:
-    {
-      if (result)
-        free (result);
-
-      if (fullpath)
-        free (fullpath);
-
-      if (file != -1)
-        close (file);
-
-      return NULL;
-    }
-  close (file);
-
-  /* Set the globals to the new file. */
-  input_text = result;
-  input_text_length = count;
-  input_filename = fullpath;
-  node_filename = xstrdup (fullpath);
-  input_text_offset = 0;
-  line_number = 1;
-  /* Not strictly necessary.  This magic prevents read_token () from doing
-     extra unnecessary work each time it is called (that is a lot of times).
-     INPUT_TEXT_LENGTH is one past the actual end of the text. */
-  input_text[input_text_length] = '\n';
-  /* This, on the other hand, is always necessary.  */
-  input_text[input_text_length+1] = 0;
-  return result;
-}
-
-/* Pushing and popping files.  */
-static void
-push_node_filename (void)
-{
-  if (node_filename_stack_index + 1 > node_filename_stack_size)
-    node_filename_stack = xrealloc
-    (node_filename_stack, (node_filename_stack_size += 10) * sizeof (char *));
-
-  node_filename_stack[node_filename_stack_index] = node_filename;
-  node_filename_stack_index++;
-}
-
-static void
-pop_node_filename (void)
-{
-  node_filename = node_filename_stack[--node_filename_stack_index];
-}
-
-/* Save the state of the current input file. */
-void
-pushfile (void)
-{
-  FSTACK *newstack = xmalloc (sizeof (FSTACK));
-  newstack->filename = input_filename;
-  newstack->text = input_text;
-  newstack->size = input_text_length;
-  newstack->offset = input_text_offset;
-  newstack->line_number = line_number;
-  newstack->next = filestack;
-
-  filestack = newstack;
-  push_node_filename ();
-}
-
-/* Make the current file globals be what is on top of the file stack. */
-void
-popfile (void)
-{
-  FSTACK *tos = filestack;
-
-  if (!tos)
-    abort ();                   /* My fault.  I wonder what I did? */
-
-  if (macro_expansion_output_stream)
-    {
-      maybe_write_itext (input_text, input_text_offset);
-      forget_itext (input_text);
-    }
-
-  /* Pop the stack. */
-  filestack = filestack->next;
-
-  /* Make sure that commands with braces have been satisfied. */
-  if (!executing_string && !me_executing_string)
-    discard_braces ();
-
-  /* Get the top of the stack into the globals. */
-  input_filename = tos->filename;
-  input_text = tos->text;
-  input_text_length = tos->size;
-  input_text_offset = tos->offset;
-  line_number = tos->line_number;
-  free (tos);
-
-  /* Go back to the (now) current node. */
-  pop_node_filename ();
-}
-
-/* Flush all open files on the file stack. */
-void
-flush_file_stack (void)
-{
-  while (filestack)
-    {
-      char *fname = input_filename;
-      char *text = input_text;
-      popfile ();
-      free (fname);
-      free (text);
-    }
-}
-
-/* Return the index of the first character in the filename
-   which is past all the leading directory characters.  */
-static int
-skip_directory_part (char *filename)
-{
-  int i = strlen (filename) - 1;
-
-  while (i && !IS_SLASH (filename[i]))
-    i--;
-  if (IS_SLASH (filename[i]))
-    i++;
-  else if (filename[i] && HAVE_DRIVE (filename))
-    i = 2;
-
-  return i;
-}
-
-static char *
-filename_non_directory (char *name)
-{
-  return xstrdup (name + skip_directory_part (name));
-}
-
-/* Return just the simple part of the filename; i.e. the
-   filename without the path information, or extensions.
-   This conses up a new string. */
-char *
-filename_part (char *filename)
-{
-  char *basename = filename_non_directory (filename);
-
-#ifdef REMOVE_OUTPUT_EXTENSIONS
-  /* See if there is an extension to remove.  If so, remove it. */
-  {
-    char *temp = strrchr (basename, '.');
-    if (temp)
-      *temp = 0;
-  }
-#endif /* REMOVE_OUTPUT_EXTENSIONS */
-  return basename;
-}
-
-/* Return the pathname part of filename.  This can be NULL. */
-char *
-pathname_part (char *filename)
-{
-  char *result = NULL;
-  int i;
-
-  filename = expand_filename (filename, "");
-
-  i = skip_directory_part (filename);
-  if (i)
-    {
-      result = xmalloc (1 + i);
-      strncpy (result, filename, i);
-      result[i] = 0;
-    }
-  free (filename);
-  return result;
-}
-
-/* Return the full path to FILENAME. */
-static char *
-full_pathname (char *filename)
-{
-  int initial_character;
-  char *result;
-
-  /* No filename given? */
-  if (!filename || !*filename)
-    return xstrdup ("");
-  
-  /* Already absolute? */
-  if (IS_ABSOLUTE (filename) ||
-      (*filename == '.' &&
-       (IS_SLASH (filename[1]) ||
-        (filename[1] == '.' && IS_SLASH (filename[2])))))
-    return xstrdup (filename);
-
-  initial_character = *filename;
-  if (initial_character != '~')
-    {
-      char *localdir = xmalloc (1025);
-#ifdef HAVE_GETCWD
-      if (!getcwd (localdir, 1024))
-#else
-      if (!getwd (localdir))
-#endif
-        {
-          fprintf (stderr, _("%s: getwd: %s, %s\n"),
-                   progname, filename, localdir);
-          xexit (1);
-        }
-
-      strcat (localdir, "/");
-      strcat (localdir, filename);
-      result = xstrdup (localdir);
-      free (localdir);
-    }
-  else
-    { /* Does anybody know why WIN32 doesn't want to support $HOME?
-         If the reason is they don't have getpwnam, they should
-         only disable the else clause below.  */
-#ifndef WIN32
-      if (IS_SLASH (filename[1]))
-        {
-          /* Return the concatenation of the environment variable HOME
-             and the rest of the string. */
-          char *temp_home;
-
-          temp_home = (char *) getenv ("HOME");
-          result = xmalloc (strlen (&filename[1])
-                                    + 1
-                                    + temp_home ? strlen (temp_home)
-                                    : 0);
-          *result = 0;
-
-          if (temp_home)
-            strcpy (result, temp_home);
-
-          strcat (result, &filename[1]);
-        }
-      else
-        {
-          struct passwd *user_entry;
-          int i, c;
-          char *username = xmalloc (257);
-
-          for (i = 1; (c = filename[i]); i++)
-            {
-              if (IS_SLASH (c))
-                break;
-              else
-                username[i - 1] = c;
-            }
-          if (c)
-            username[i - 1] = 0;
-
-          user_entry = getpwnam (username);
-
-          if (!user_entry)
-            return xstrdup (filename);
-
-          result = xmalloc (1 + strlen (user_entry->pw_dir)
-                                    + strlen (&filename[i]));
-          strcpy (result, user_entry->pw_dir);
-          strcat (result, &filename[i]);
-        }
-#endif /* not WIN32 */
-    }
-  return result;
-}
-
-/* Return the expansion of FILENAME. */
-char *
-expand_filename (char *filename, char *input_name)
-{
-  int i;
-
-  if (filename)
-    {
-      filename = full_pathname (filename);
-      if (IS_ABSOLUTE (filename)
-	  || (*filename == '.' &&
-	      (IS_SLASH (filename[1]) ||
-	       (filename[1] == '.' && IS_SLASH (filename[2])))))
-	return filename;
-    }
-  else
-    {
-      filename = filename_non_directory (input_name);
-
-      if (!*filename)
-        {
-          free (filename);
-          filename = xstrdup ("noname.texi");
-        }
-
-      for (i = strlen (filename) - 1; i; i--)
-        if (filename[i] == '.')
-          break;
-
-      if (!i)
-        i = strlen (filename);
-
-      if (i + 6 > (strlen (filename)))
-        filename = xrealloc (filename, i + 6);
-      strcpy (filename + i, html ? ".html" : ".info");
-      return filename;
-    }
-
-  if (IS_ABSOLUTE (input_name))
-    {
-      /* Make it so that relative names work. */
-      char *result;
-      
-      i = strlen (input_name) - 1;
-
-      result = xmalloc (1 + strlen (input_name) + strlen (filename));
-      strcpy (result, input_name);
-
-      while (!IS_SLASH (result[i]) && i)
-        i--;
-      if (IS_SLASH (result[i]))
-        i++;
-
-      strcpy (&result[i], filename);
-      free (filename);
-      return result;
-    }
-  return filename;
-}
-
-char *
-output_name_from_input_name (char *name)
-{
-  return expand_filename (NULL, name);
-}
-
-
-/* Modify the file name FNAME so that it fits the limitations of the
-   underlying filesystem.  In particular, truncate the file name as it
-   would be truncated by the filesystem.  We assume the result can
-   never be longer than the original, otherwise we couldn't be sure we
-   have enough space in the original string to modify it in place.  */
-char *
-normalize_filename (char *fname)
-{
-  int maxlen;
-  char orig[PATH_MAX + 1];
-  int i;
-  char *lastdot, *p;
-
-#ifdef _PC_NAME_MAX
-  maxlen = pathconf (fname, _PC_NAME_MAX);
-  if (maxlen < 1)
-#endif
-    maxlen = PATH_MAX;
-
-  i = skip_directory_part (fname);
-  if (fname[i] == '\0')
-    return fname;	/* only a directory name -- don't modify */
-  strcpy (orig, fname + i);
-
-  switch (maxlen)
-    {
-      case 12:	/* MS-DOS 8+3 filesystem */
-	if (orig[0] == '.')	/* leading dots are not allowed */
-	  orig[0] = '_';
-	lastdot = strrchr (orig, '.');
-	if (!lastdot)
-	  lastdot = orig + strlen (orig);
-	strncpy (fname + i, orig, lastdot - orig);
-	for (p = fname + i;
-	     p < fname + i + (lastdot - orig) && p < fname + i + 8;
-	     p++)
-	  if (*p == '.')
-	    *p = '_';
-	*p = '\0';
-	if (*lastdot == '.')
-	  strncat (fname + i, lastdot, 4);
-	break;
-      case 14:	/* old Unix systems with 14-char limitation */
-	strcpy (fname + i, orig);
-	if (strlen (fname + i) > 14)
-	  fname[i + 14] = '\0';
-	break;
-      default:
-	strcpy (fname + i, orig);
-	if (strlen (fname) > maxlen - 1)
-	  fname[maxlen - 1] = '\0';
-	break;
-    }
-
-  return fname;
-}
-
-/* Delayed writing functions.  A few of the commands
-   needs to be handled at the end, namely @contents,
-   @shortcontents, @printindex and @listoffloats.
-   These functions take care of that.  */
-static DELAYED_WRITE *delayed_writes = NULL;
-int handling_delayed_writes = 0;
-
-void
-register_delayed_write (char *delayed_command)
-{
-  DELAYED_WRITE *new;
-
-  if (!current_output_filename || !*current_output_filename)
-    {
-      /* Cannot register if we don't know what the output file is.  */
-      warning (_("`%s' omitted before output filename"), delayed_command);
-      return;
-    }
-
-  if (STREQ (current_output_filename, "-"))
-    {
-      /* Do not register a new write if the output file is not seekable.
-         Let the user know about it first, though.  */
-      warning (_("`%s' omitted since writing to stdout"), delayed_command);
-      return;
-    }
-
-  /* Don't complain if the user is writing /dev/null, since surely they
-     don't care, but don't register the delayed write, either.  */
-  if (FILENAME_CMP (current_output_filename, NULL_DEVICE) == 0
-      || FILENAME_CMP (current_output_filename, ALSO_NULL_DEVICE) == 0)
-    return;
-    
-  /* We need the HTML header in the output,
-     to get a proper output_position.  */
-  if (!executing_string && html)
-    html_output_head ();
-  /* Get output_position updated.  */
-  flush_output ();
-
-  new = xmalloc (sizeof (DELAYED_WRITE));
-  new->command = xstrdup (delayed_command);
-  new->filename = xstrdup (current_output_filename);
-  new->input_filename = xstrdup (input_filename);
-  new->position = output_position;
-  new->calling_line = line_number;
-  new->node = current_node ? xstrdup (current_node): "";
-
-  new->node_order = node_order;
-  new->index_order = index_counter;
-
-  new->next = delayed_writes;
-  delayed_writes = new;
-}
-
-void
-handle_delayed_writes (void)
-{
-  DELAYED_WRITE *temp = (DELAYED_WRITE *) reverse_list
-    ((GENERIC_LIST *) delayed_writes);
-  int position_shift_amount, line_number_shift_amount;
-  char *delayed_buf;
-
-  handling_delayed_writes = 1;
-
-  while (temp)
-    {
-      delayed_buf = find_and_load (temp->filename, 0);
-
-      if (output_paragraph_offset > 0)
-        {
-          error (_("Output buffer not empty."));
-          return;
-        }
-
-      if (!delayed_buf)
-        {
-          fs_error (temp->filename);
-          return;
-        }
-
-      output_stream = fopen (temp->filename, "w");
-      if (!output_stream)
-        {
-          fs_error (temp->filename);
-          return;
-        }
-
-      if (fwrite (delayed_buf, 1, temp->position, output_stream) != temp->position)
-        {
-          fs_error (temp->filename);
-          return;
-        }
-
-      {
-        int output_position_at_start = output_position;
-        int line_number_at_start = output_line_number;
-
-        /* In order to make warnings and errors
-           refer to the correct line number.  */
-        input_filename = temp->input_filename;
-        line_number = temp->calling_line;
-
-        execute_string ("%s", temp->command);
-        flush_output ();
-
-        /* Since the output file is modified, following delayed writes
-           need to be updated by this amount.  */
-        position_shift_amount = output_position - output_position_at_start;
-        line_number_shift_amount = output_line_number - line_number_at_start;
-      }
-
-      if (fwrite (delayed_buf + temp->position, 1,
-            input_text_length - temp->position, output_stream)
-          != input_text_length - temp->position
-          || fclose (output_stream) != 0)
-        fs_error (temp->filename);
-
-      /* Done with the buffer.  */
-      free (delayed_buf);
-
-      /* Update positions in tag table for nodes that are defined after
-         the line this delayed write is registered.  */
-      if (!html && !xml)
-        {
-          TAG_ENTRY *node;
-          for (node = tag_table; node; node = node->next_ent)
-            if (node->order > temp->node_order)
-              node->position += position_shift_amount;
-        }
-
-      /* Something similar for the line numbers in all of the defined
-         indices.  */
-      {
-        int i;
-        for (i = 0; i < defined_indices; i++)
-          if (name_index_alist[i])
-            {
-              char *name = ((INDEX_ALIST *) name_index_alist[i])->name;
-              INDEX_ELT *index;
-              for (index = index_list (name); index; index = index->next)
-                if ((no_headers || STREQ (index->node, temp->node))
-                    && index->entry_number > temp->index_order)
-                  index->output_line += line_number_shift_amount;
-            }
-      }
-
-      /* Shift remaining delayed positions
-         by the length of this write.  */
-      {
-        DELAYED_WRITE *future_write = temp->next;
-        while (future_write)
-          {
-            if (STREQ (temp->filename, future_write->filename))
-              future_write->position += position_shift_amount;
-            future_write = future_write->next;
-          }
-      }
-
-      temp = temp->next;
-    }
-}

Property changes on: head/contrib/texinfo/makeinfo/files.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/macro.h
===================================================================
--- head/contrib/texinfo/makeinfo/macro.h	(revision 276550)
+++ head/contrib/texinfo/makeinfo/macro.h	(nonexistent)
@@ -1,77 +0,0 @@
-/* macro.h -- declarations for macro.c.
-   $Id: macro.h,v 1.2 2004/04/11 17:56:47 karl Exp $
-
-   Copyright (C) 1998, 99 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-   */
-
-#ifndef MACRO_H
-#define MACRO_H
-
-extern FILE *macro_expansion_output_stream;
-extern char *macro_expansion_filename;
-extern int me_executing_string;
-extern int only_macro_expansion;
-
-/* Here is a structure used to remember input text strings and offsets
-   within them. */
-typedef struct {
-  char *pointer;                /* Pointer to the input text. */
-  int offset;                   /* Offset of the last character output. */
-} ITEXT;
-
-/* Macro definitions for user-defined commands. */
-typedef struct {
-  char *name;                   /* Name of the macro. */
-  char **arglist;               /* Args to replace when executing. */
-  char *body;                   /* Macro body. */
-  char *source_file;            /* File where this macro is defined. */
-  int source_lineno;            /* Line number within FILENAME. */
-  int inhibited;                /* Nonzero means make find_macro () fail. */
-  int flags;                    /* ME_RECURSE, ME_QUOTE_ARG, etc. */
-} MACRO_DEF;
-
-/* flags for MACRO_DEF */
-#define ME_RECURSE      0x01
-#define ME_QUOTE_ARG    0x02
-
-extern void execute_macro (MACRO_DEF *def);
-extern MACRO_DEF *find_macro (char *name);
-extern char *expand_macro (MACRO_DEF *def);
-
-extern ITEXT *remember_itext (char *pointer, int offset);
-extern void forget_itext (char *pointer);
-extern void maybe_write_itext (char *pointer, int offset);
-extern void write_region_to_macro_output (char *string, int start, int end);
-extern void append_to_expansion_output (int offset);
-extern void me_append_before_this_command (void);
-extern void me_execute_string (char *execution_string);
-extern void me_execute_string_keep_state (char *execution_string,
-    char *append_string);
-
-extern char *alias_expand (char *tok);
-extern int enclosure_command (char *tok);
-extern void enclosure_expand (int arg, int start, int end);
-
-/* The @commands.  */
-extern void cm_macro (void), cm_rmacro (void), cm_unmacro (void);
-extern void cm_alias (void), cm_definfoenclose (void);
-
-extern int array_len (char **array);
-extern void free_array (char **array);
-extern char **get_brace_args (int quote_single);
-
-#endif /* not MACRO_H */

Property changes on: head/contrib/texinfo/makeinfo/macro.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/README
===================================================================
--- head/contrib/texinfo/makeinfo/README	(revision 276550)
+++ head/contrib/texinfo/makeinfo/README	(nonexistent)
@@ -1,17 +0,0 @@
-$Id: README,v 1.3 2004/04/11 17:56:46 karl Exp $
-texinfo/makeinfo/README
-
-  Copyright (C) 2002 Free Software Foundation, Inc.
-
-  Copying and distribution of this file, with or without modification,
-  are permitted in any medium without royalty provided the copyright
-  notice and this notice are preserved.
-
-makeinfo is a standalone program to convert Texinfo source into Info
-files readable with standalone info or M-x info in Emacs.
-
-makeinfo can also output other formats: plain ASCII (with --no-headers)
-or HTML (with --html) or XML (with --xml).
-
-The Emacs function M-x texinfo-format-buffer does more or less the same
-job, but makeinfo is faster and gives better error messages.

Property changes on: head/contrib/texinfo/makeinfo/README
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/files.h
===================================================================
--- head/contrib/texinfo/makeinfo/files.h	(revision 276550)
+++ head/contrib/texinfo/makeinfo/files.h	(nonexistent)
@@ -1,70 +0,0 @@
-/* files.h -- declarations for files.c.
-   $Id: files.h,v 1.4 2004/07/27 00:06:31 karl Exp $
-
-   Copyright (C) 1998, 2002, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-   */
-
-#ifndef FILES_H
-#define FILES_H
-
-/* A stack of file information records.  If a new file is read in with
-   "@input", we remember the old input file state on this stack. */
-typedef struct fstack
-{
-  struct fstack *next;
-  char *filename;
-  char *text;
-  int size;
-  int offset;
-  int line_number;
-} FSTACK;
-extern FSTACK *filestack;
-
-extern void pushfile (void);
-extern void popfile (void);
-extern void flush_file_stack (void);
-extern char *get_file_info_in_path (char *filename, char *path,
-    struct stat *finfo);
-extern char *find_and_load (char *filename, int use_path);
-extern char *output_name_from_input_name (char *name);
-extern char *expand_filename (char *filename, char *input_name);
-extern char *filename_part (char *filename);
-extern char *pathname_part (char *filename);
-extern char *normalize_filename (char *fname);
-extern void append_to_include_path (char *path);
-extern void prepend_to_include_path (char *path);
-extern void pop_path_from_include_path (void);
-extern void register_delayed_write (char *delayed_command);
-extern void handle_delayed_writes (void);
-
-typedef struct delayed_write
-{
-  struct delayed_write *next;
-  char *command;
-  char *filename;
-  char *input_filename;
-  char *node;
-  int position;
-  int calling_line;
-
-  int node_order;
-  int index_order;
-} DELAYED_WRITE;
-
-extern int handling_delayed_writes;
-
-#endif /* !FILES_H */

Property changes on: head/contrib/texinfo/makeinfo/files.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/cmds.c
===================================================================
--- head/contrib/texinfo/makeinfo/cmds.c	(revision 276550)
+++ head/contrib/texinfo/makeinfo/cmds.c	(nonexistent)
@@ -1,1883 +0,0 @@
-/* cmds.c -- Texinfo commands.
-   $Id: cmds.c,v 1.55 2004/12/14 00:15:36 karl Exp $
-
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "system.h"
-#include "cmds.h"
-#include "defun.h"
-#include "files.h"
-#include "footnote.h"
-#include "html.h"
-#include "insertion.h"
-#include "lang.h"
-#include "macro.h"
-#include "makeinfo.h"
-#include "node.h"
-#include "sectioning.h"
-#include "toc.h"
-#include "xml.h"
-
-#ifdef TM_IN_SYS_TIME
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-
-/* Options. */
-static void cm_exampleindent (void),
-     cm_firstparagraphindent (void),
-     cm_paragraphindent (void),
-     cm_novalidate (void);
-
-/* Internals. */
-static void cm_obsolete (int arg, int start, int end),
-     not_fixed_width (int arg);
-
-/* The dispatch table.  */
-COMMAND command_table[] = {
-  { "\t", insert_space, NO_BRACE_ARGS },
-  { "\n", insert_space, NO_BRACE_ARGS },
-  { " ", insert_space, NO_BRACE_ARGS },
-  { "!", cm_punct, NO_BRACE_ARGS },
-  { "\"", cm_accent_umlaut, MAYBE_BRACE_ARGS },
-  { "'", cm_accent_acute, MAYBE_BRACE_ARGS },
-  { "*", cm_asterisk, NO_BRACE_ARGS },
-  { ",", cm_accent_cedilla, MAYBE_BRACE_ARGS },
-  { "-", cm_no_op, NO_BRACE_ARGS },
-  { ".", cm_punct, NO_BRACE_ARGS },
-  { "/", cm_no_op, NO_BRACE_ARGS },
-  { ":", cm_colon, NO_BRACE_ARGS },
-  { "=", cm_accent, MAYBE_BRACE_ARGS },
-  { "?", cm_punct, NO_BRACE_ARGS },
-  { "@", insert_self, NO_BRACE_ARGS },
-  { "\\", insert_self, NO_BRACE_ARGS },
-  { "^", cm_accent_hat, MAYBE_BRACE_ARGS },
-  { "`", cm_accent_grave, MAYBE_BRACE_ARGS },
-  { "{", insert_self, NO_BRACE_ARGS },
-  { "|", cm_no_op, NO_BRACE_ARGS },
-  { "}", insert_self, NO_BRACE_ARGS },
-  { "~", cm_accent_tilde, MAYBE_BRACE_ARGS },
-  { "AA", cm_special_char, BRACE_ARGS },
-  { "AE", cm_special_char, BRACE_ARGS },
-  { "H", cm_accent, MAYBE_BRACE_ARGS },
-  { "L", cm_special_char, BRACE_ARGS },
-  { "LaTeX", cm_LaTeX, BRACE_ARGS },
-  { "O", cm_special_char, BRACE_ARGS },
-  { "OE", cm_special_char, BRACE_ARGS },
-  { "TeX", cm_TeX, BRACE_ARGS },
-  { "aa", cm_special_char, BRACE_ARGS },
-  { "abbr", cm_abbr, BRACE_ARGS },
-  { "acronym", cm_acronym, BRACE_ARGS },
-  { "ae", cm_special_char, BRACE_ARGS },
-  { "afivepaper", cm_ignore_line, NO_BRACE_ARGS },
-  { "afourlatex", cm_ignore_line, NO_BRACE_ARGS },
-  { "afourpaper", cm_ignore_line, NO_BRACE_ARGS },
-  { "afourwide", cm_ignore_line, NO_BRACE_ARGS },
-  { "alias", cm_alias, NO_BRACE_ARGS },
-  { "anchor", cm_anchor, BRACE_ARGS },
-  { "appendix", cm_appendix, NO_BRACE_ARGS },
-  { "appendixsection", cm_appendixsec, NO_BRACE_ARGS },
-  { "appendixsec", cm_appendixsec, NO_BRACE_ARGS },
-  { "appendixsubsec", cm_appendixsubsec, NO_BRACE_ARGS },
-  { "appendixsubsubsec", cm_appendixsubsubsec, NO_BRACE_ARGS },
-  { "asis", cm_no_op, BRACE_ARGS },
-  { "author", cm_author, NO_BRACE_ARGS },
-  { "b", cm_b, BRACE_ARGS },
-  { "bullet", cm_bullet, BRACE_ARGS },
-  { "bye", cm_bye, NO_BRACE_ARGS },
-  { "c", cm_comment, NO_BRACE_ARGS },
-  { "caption", cm_caption, BRACE_ARGS },
-  { "cartouche", cm_cartouche, NO_BRACE_ARGS },
-  { "center", cm_center, NO_BRACE_ARGS },
-  { "centerchap", cm_unnumbered, NO_BRACE_ARGS },
-  { "chapheading", cm_chapheading, NO_BRACE_ARGS },
-  { "chapter", cm_chapter, NO_BRACE_ARGS },
-  { "cindex", cm_cindex, NO_BRACE_ARGS },
-  { "cite", cm_cite, BRACE_ARGS },
-  { "clear", cm_clear, NO_BRACE_ARGS },
-  { "code", cm_code, BRACE_ARGS },
-  { "comma", cm_comma, BRACE_ARGS },
-  { "command", cm_code, BRACE_ARGS },
-  { "comment", cm_comment, NO_BRACE_ARGS },
-  { "contents", cm_contents, NO_BRACE_ARGS },
-  { "copying", cm_copying, NO_BRACE_ARGS },
-  { "copyright", cm_copyright, BRACE_ARGS },
-  { "ctrl", cm_obsolete, BRACE_ARGS },
-  { "defcodeindex", cm_defcodeindex, NO_BRACE_ARGS },
-  { "defcv", cm_defun, NO_BRACE_ARGS },
-  { "defcvx", cm_defun, NO_BRACE_ARGS },
-  { "deffn", cm_defun, NO_BRACE_ARGS },
-  { "deffnx", cm_defun, NO_BRACE_ARGS },
-  { "defindex", cm_defindex, NO_BRACE_ARGS },
-  { "definfoenclose", cm_definfoenclose, NO_BRACE_ARGS },
-  { "defivar", cm_defun, NO_BRACE_ARGS },
-  { "defivarx", cm_defun, NO_BRACE_ARGS },
-  { "defmac", cm_defun, NO_BRACE_ARGS },
-  { "defmacx", cm_defun, NO_BRACE_ARGS },
-  { "defmethod", cm_defun, NO_BRACE_ARGS },
-  { "defmethodx", cm_defun, NO_BRACE_ARGS },
-  { "defop", cm_defun, NO_BRACE_ARGS },
-  { "defopt", cm_defun, NO_BRACE_ARGS },
-  { "defoptx", cm_defun, NO_BRACE_ARGS },
-  { "defopx", cm_defun, NO_BRACE_ARGS },
-  { "defspec", cm_defun, NO_BRACE_ARGS },
-  { "defspecx", cm_defun, NO_BRACE_ARGS },
-  { "deftp", cm_defun, NO_BRACE_ARGS },
-  { "deftpx", cm_defun, NO_BRACE_ARGS },
-  { "deftypecv", cm_defun, NO_BRACE_ARGS },
-  { "deftypecvx", cm_defun, NO_BRACE_ARGS },
-  { "deftypefn", cm_defun, NO_BRACE_ARGS },
-  { "deftypefnx", cm_defun, NO_BRACE_ARGS },
-  { "deftypefun", cm_defun, NO_BRACE_ARGS },
-  { "deftypefunx", cm_defun, NO_BRACE_ARGS },
-  { "deftypeivar", cm_defun, NO_BRACE_ARGS },
-  { "deftypeivarx", cm_defun, NO_BRACE_ARGS },
-  { "deftypemethod", cm_defun, NO_BRACE_ARGS },
-  { "deftypemethodx", cm_defun, NO_BRACE_ARGS },
-  { "deftypeop", cm_defun, NO_BRACE_ARGS },
-  { "deftypeopx", cm_defun, NO_BRACE_ARGS },
-  { "deftypevar", cm_defun, NO_BRACE_ARGS },
-  { "deftypevarx", cm_defun, NO_BRACE_ARGS },
-  { "deftypevr", cm_defun, NO_BRACE_ARGS },
-  { "deftypevrx", cm_defun, NO_BRACE_ARGS },
-  { "defun", cm_defun, NO_BRACE_ARGS },
-  { "defunx", cm_defun, NO_BRACE_ARGS },
-  { "defvar", cm_defun, NO_BRACE_ARGS },
-  { "defvarx", cm_defun, NO_BRACE_ARGS },
-  { "defvr", cm_defun, NO_BRACE_ARGS },
-  { "defvrx", cm_defun, NO_BRACE_ARGS },
-  { "detailmenu", cm_detailmenu, NO_BRACE_ARGS },
-  { "dfn", cm_dfn, BRACE_ARGS },
-  { "dircategory", cm_dircategory, NO_BRACE_ARGS },
-  { "direntry", cm_direntry, NO_BRACE_ARGS },
-  { "display", cm_display, NO_BRACE_ARGS },
-  { "dmn", cm_dmn, BRACE_ARGS },
-  { "docbook", cm_docbook, NO_BRACE_ARGS },
-  { "documentdescription", cm_documentdescription, NO_BRACE_ARGS },
-  { "documentencoding", cm_documentencoding, NO_BRACE_ARGS },
-  { "documentlanguage", cm_documentlanguage, NO_BRACE_ARGS },
-  { "dotaccent", cm_accent, MAYBE_BRACE_ARGS },
-  { "dotless", cm_dotless, BRACE_ARGS },
-  { "dots", cm_dots, BRACE_ARGS },
-  { "email", cm_email, BRACE_ARGS },
-  { "emph", cm_emph, BRACE_ARGS },
-  { "end", cm_end, NO_BRACE_ARGS },
-  { "enddots", cm_enddots, BRACE_ARGS },
-  { "enumerate", cm_enumerate, NO_BRACE_ARGS },
-  { "env", cm_code, BRACE_ARGS },
-  { "equiv", cm_equiv, BRACE_ARGS },
-  { "error", cm_error, BRACE_ARGS },
-  { "euro", cm_special_char, BRACE_ARGS },
-  { "evenfooting", cm_ignore_line, NO_BRACE_ARGS },
-  { "evenheading", cm_ignore_line, NO_BRACE_ARGS },
-  { "everyfooting", cm_ignore_line, NO_BRACE_ARGS },
-  { "everyheading", cm_ignore_line, NO_BRACE_ARGS },
-  { "example", cm_example, NO_BRACE_ARGS },
-  { "exampleindent", cm_exampleindent, NO_BRACE_ARGS },
-  { "exclamdown", cm_special_char, BRACE_ARGS },
-  { "exdent", cm_exdent, NO_BRACE_ARGS },
-  { "expansion", cm_expansion, BRACE_ARGS },
-  { "file", cm_code, BRACE_ARGS },
-  { "finalout", cm_no_op, NO_BRACE_ARGS },
-  { "findex", cm_findex, NO_BRACE_ARGS },
-  { "firstparagraphindent", cm_firstparagraphindent, NO_BRACE_ARGS },
-  { "float", cm_float, NO_BRACE_ARGS },
-  { "flushleft", cm_flushleft, NO_BRACE_ARGS },
-  { "flushright", cm_flushright, NO_BRACE_ARGS },
-  { "footnote", cm_footnote, NO_BRACE_ARGS}, /* self-arg eater */
-  { "footnotestyle", cm_footnotestyle, NO_BRACE_ARGS },
-  { "format", cm_format, NO_BRACE_ARGS },
-  { "ftable", cm_ftable, NO_BRACE_ARGS },
-  { "group", cm_group, NO_BRACE_ARGS },
-  { "heading", cm_heading, NO_BRACE_ARGS },
-  { "headings", cm_ignore_line, NO_BRACE_ARGS },
-  { "headitem", cm_headitem, NO_BRACE_ARGS },
-  { "html", cm_html, NO_BRACE_ARGS },
-  { "hyphenation", cm_ignore_arg, BRACE_ARGS },
-  { "i", cm_i, BRACE_ARGS },
-  { "ifclear", cm_ifclear, NO_BRACE_ARGS },
-  { "ifeq", cm_ifeq, NO_BRACE_ARGS },
-  { "ifdocbook", cm_ifdocbook, NO_BRACE_ARGS },
-  { "ifhtml", cm_ifhtml, NO_BRACE_ARGS },
-  { "ifinfo", cm_ifinfo, NO_BRACE_ARGS },
-  { "ifnotdocbook", cm_ifnotdocbook, NO_BRACE_ARGS },
-  { "ifnothtml", cm_ifnothtml, NO_BRACE_ARGS },
-  { "ifnotinfo", cm_ifnotinfo, NO_BRACE_ARGS },
-  { "ifnotplaintext", cm_ifnotplaintext, NO_BRACE_ARGS },
-  { "ifnottex", cm_ifnottex, NO_BRACE_ARGS },
-  { "ifnotxml", cm_ifnotxml, NO_BRACE_ARGS },
-  { "ifplaintext", cm_ifplaintext, NO_BRACE_ARGS },
-  { "ifset", cm_ifset, NO_BRACE_ARGS },
-  { "iftex", cm_iftex, NO_BRACE_ARGS },
-  { "ifxml", cm_ifxml, NO_BRACE_ARGS },
-  { "ignore", command_name_condition, NO_BRACE_ARGS },
-  { "image", cm_image, BRACE_ARGS },
-  { "include", cm_include, NO_BRACE_ARGS },
-  { "indent", cm_indent, NO_BRACE_ARGS },
-  { "indicateurl", cm_indicate_url, BRACE_ARGS },
-  { "inforef", cm_inforef, BRACE_ARGS },
-  { "insertcopying", cm_insert_copying, NO_BRACE_ARGS },
-  { "item", cm_item, NO_BRACE_ARGS },
-  { "itemize", cm_itemize, NO_BRACE_ARGS },
-  { "itemx", cm_itemx, NO_BRACE_ARGS },
-  { "kbd", cm_kbd, BRACE_ARGS },
-  { "kbdinputstyle", cm_ignore_line, NO_BRACE_ARGS },
-  { "key", cm_key, BRACE_ARGS },
-  { "kindex", cm_kindex, NO_BRACE_ARGS },
-  { "l", cm_special_char, BRACE_ARGS },
-  { "lisp", cm_lisp, NO_BRACE_ARGS },
-  { "listoffloats", cm_listoffloats, NO_BRACE_ARGS },
-  { "lowersections", cm_lowersections, NO_BRACE_ARGS },
-  { "macro", cm_macro, NO_BRACE_ARGS },
-  { "majorheading", cm_majorheading, NO_BRACE_ARGS },
-  { "math", cm_math, BRACE_ARGS },
-  { "menu", cm_menu, NO_BRACE_ARGS },
-  { "minus", cm_minus, BRACE_ARGS },
-  { "multitable", cm_multitable, NO_BRACE_ARGS },
-  { "need", cm_ignore_line, NO_BRACE_ARGS },
-  { "node", cm_node, NO_BRACE_ARGS },
-  { "noindent", cm_noindent_cmd, NO_BRACE_ARGS },
-  { "novalidate", cm_novalidate, NO_BRACE_ARGS },
-  { "nwnode", cm_node, NO_BRACE_ARGS },
-  { "o", cm_special_char, BRACE_ARGS },
-  { "oddfooting", cm_ignore_line, NO_BRACE_ARGS },
-  { "oddheading", cm_ignore_line, NO_BRACE_ARGS },
-  { "oe", cm_special_char, BRACE_ARGS },
-  { "option", cm_code, BRACE_ARGS },
-  { "ordf", cm_special_char, BRACE_ARGS },
-  { "ordm", cm_special_char, BRACE_ARGS },
-  { "page", cm_no_op, NO_BRACE_ARGS },
-  { "pagesizes", cm_ignore_line, NO_BRACE_ARGS },
-  { "paragraphindent", cm_paragraphindent, NO_BRACE_ARGS },
-  { "pindex", cm_pindex, NO_BRACE_ARGS },
-  { "point", cm_point, BRACE_ARGS },
-  { "pounds", cm_special_char, BRACE_ARGS },
-  { "print", cm_print, BRACE_ARGS },
-  { "printindex", cm_printindex, NO_BRACE_ARGS },
-  { "pxref", cm_pxref, BRACE_ARGS },
-  { "questiondown", cm_special_char, BRACE_ARGS },
-  { "quotation", cm_quotation, NO_BRACE_ARGS },
-  { "r", cm_r, BRACE_ARGS },
-  { "raisesections", cm_raisesections, NO_BRACE_ARGS },
-  { "ref", cm_ref, BRACE_ARGS },
-  { "refill", cm_no_op, NO_BRACE_ARGS },
-  { "registeredsymbol", cm_registeredsymbol, BRACE_ARGS },
-  { "result", cm_result, BRACE_ARGS },
-  { "ringaccent", cm_accent, MAYBE_BRACE_ARGS },
-  { "rmacro", cm_rmacro, NO_BRACE_ARGS },
-  { "samp", cm_code, BRACE_ARGS },
-  { "sansserif", cm_sansserif, BRACE_ARGS },
-  { "sc", cm_sc, BRACE_ARGS },
-  { "section", cm_section, NO_BRACE_ARGS },
-  { "set", cm_set, NO_BRACE_ARGS },
-  { "setchapternewpage", cm_ignore_line, NO_BRACE_ARGS },
-  { "setchapterstyle", cm_obsolete, NO_BRACE_ARGS },
-  { "setcontentsaftertitlepage", cm_no_op, NO_BRACE_ARGS },
-  { "setfilename", cm_setfilename, NO_BRACE_ARGS },
-  { "setshortcontentsaftertitlepage", cm_no_op, NO_BRACE_ARGS },
-  { "settitle", cm_settitle, NO_BRACE_ARGS },
-  { "shortcaption", cm_caption, BRACE_ARGS },
-  { "shortcontents", cm_contents, NO_BRACE_ARGS },
-  { "shorttitlepage", cm_ignore_line, NO_BRACE_ARGS },
-  { "slanted", cm_slanted, BRACE_ARGS },
-  { "smallbook", cm_ignore_line, NO_BRACE_ARGS },
-  { "smalldisplay", cm_smalldisplay, NO_BRACE_ARGS },
-  { "smallexample", cm_smallexample, NO_BRACE_ARGS },
-  { "smallformat", cm_smallformat, NO_BRACE_ARGS },
-  { "smalllisp", cm_smalllisp, NO_BRACE_ARGS },
-  { "sp", cm_sp, NO_BRACE_ARGS },
-  { "ss", cm_special_char, BRACE_ARGS },
-  { "strong", cm_strong, BRACE_ARGS },
-  { "subheading", cm_subheading, NO_BRACE_ARGS },
-  { "subsection", cm_subsection, NO_BRACE_ARGS },
-  { "subsubheading", cm_subsubheading, NO_BRACE_ARGS },
-  { "subsubsection", cm_subsubsection, NO_BRACE_ARGS },
-  { "subtitle", cm_titlepage_cmds, NO_BRACE_ARGS },
-  { "summarycontents", cm_contents, NO_BRACE_ARGS },
-  { "syncodeindex", cm_synindex, NO_BRACE_ARGS },
-  { "synindex", cm_synindex, NO_BRACE_ARGS },
-  { "t", cm_tt, BRACE_ARGS },
-  { "tab", cm_tab, NO_BRACE_ARGS },
-  { "table", cm_table, NO_BRACE_ARGS },
-  { "tex", cm_tex, NO_BRACE_ARGS },
-  { "tie", cm_tie, BRACE_ARGS },
-  { "tieaccent", cm_accent, MAYBE_BRACE_ARGS },
-  { "tindex", cm_tindex, NO_BRACE_ARGS },
-  { "title", cm_titlepage_cmds, NO_BRACE_ARGS },
-  { "titlefont", cm_titlefont, BRACE_ARGS },
-  { "titlepage", cm_titlepage, NO_BRACE_ARGS },
-  { "today", cm_today, BRACE_ARGS },
-  { "top", cm_top, NO_BRACE_ARGS  },
-  { "u", cm_accent, MAYBE_BRACE_ARGS },
-  { "ubaraccent", cm_accent, MAYBE_BRACE_ARGS },
-  { "udotaccent", cm_accent, MAYBE_BRACE_ARGS },
-  { "unmacro", cm_unmacro, NO_BRACE_ARGS },
-  { "unnumbered", cm_unnumbered, NO_BRACE_ARGS },
-  { "unnumberedsec", cm_unnumberedsec, NO_BRACE_ARGS },
-  { "unnumberedsubsec", cm_unnumberedsubsec, NO_BRACE_ARGS },
-  { "unnumberedsubsubsec", cm_unnumberedsubsubsec, NO_BRACE_ARGS },
-  { "uref", cm_uref, BRACE_ARGS },
-  { "url", cm_uref, BRACE_ARGS },
-  { "v", cm_accent, MAYBE_BRACE_ARGS },
-  { "value", cm_value, BRACE_ARGS },
-  { "var", cm_var, BRACE_ARGS },
-  { "verb", cm_verb, NO_BRACE_ARGS },
-  { "verbatim", cm_verbatim, NO_BRACE_ARGS },
-  { "verbatiminclude", cm_verbatiminclude, NO_BRACE_ARGS },
-  { "vindex", cm_vindex, NO_BRACE_ARGS },
-  { "vtable", cm_vtable, NO_BRACE_ARGS },
-  { "vskip", cm_ignore_line, NO_BRACE_ARGS },
-  { "w", cm_w, BRACE_ARGS },
-  { "xml", cm_xml, NO_BRACE_ARGS },
-  { "xref", cm_xref, BRACE_ARGS },
-
-  /* Deprecated commands.  These used to be for italics.  */
-  { "iappendix", cm_ideprecated, NO_BRACE_ARGS },
-  { "iappendixsec", cm_ideprecated, NO_BRACE_ARGS },
-  { "iappendixsection", cm_ideprecated, NO_BRACE_ARGS },
-  { "iappendixsubsec", cm_ideprecated, NO_BRACE_ARGS },
-  { "iappendixsubsubsec", cm_ideprecated, NO_BRACE_ARGS },
-  { "ichapter", cm_ideprecated, NO_BRACE_ARGS },
-  { "isection", cm_ideprecated, NO_BRACE_ARGS },
-  { "isubsection", cm_ideprecated, NO_BRACE_ARGS },
-  { "isubsubsection", cm_ideprecated, NO_BRACE_ARGS },
-  { "iunnumbered", cm_ideprecated, NO_BRACE_ARGS },
-  { "iunnumberedsec", cm_ideprecated, NO_BRACE_ARGS },
-  { "iunnumberedsubsec", cm_ideprecated, NO_BRACE_ARGS },
-  { "iunnumberedsubsubsec", cm_ideprecated, NO_BRACE_ARGS },
-
-  /* Now @include does what this was used to. */
-  { "infoinclude", cm_obsolete, NO_BRACE_ARGS },
-  { "titlespec", cm_obsolete, NO_BRACE_ARGS },
-
-  { NULL, NULL, NO_BRACE_ARGS }
-};
-
-/* The bulk of the Texinfo commands. */
-
-/* Commands which insert their own names. */
-void
-insert_self (int arg)
-{
-  if (arg == START)
-    add_word (command);
-}
-
-void
-insert_space (int arg)
-{
-  if (arg == START)
-    {
-      if (xml && !docbook)
-        xml_insert_entity ("space");
-      else
-        add_char (' ');
-    }
-}
-
-/* Insert a comma.  Useful when a literal , would break our parsing of
-   multiple arguments.  */
-void
-cm_comma (int arg)
-{
-  if (arg == START)
-    add_char (',');
-}
-
-
-/* Force a line break in the output. */
-void
-cm_asterisk (void)
-{
-  if (html)
-    add_word ("<br>");
-  else if (xml && !docbook)
-    xml_insert_entity ("linebreak");
-  else if (docbook) 
-    xml_asterisk ();
-  else
-    {
-      close_single_paragraph ();
-      cm_noindent ();
-    }
-}
-
-/* Insert ellipsis. */
-void
-cm_dots (int arg)
-{
-  if (arg == START)
-    {
-      if (xml && !docbook)
-        xml_insert_entity ("dots");
-      else if (docbook)
-        xml_insert_entity ("hellip");
-      else
-	if (html && !in_fixed_width_font)
-	  insert_string ("<small class=\"dots\">...</small>");
-	else
-	  add_word ("...");
-    }
-}
-
-/* Insert ellipsis for sentence end. */
-void
-cm_enddots (int arg)
-{
-  if (arg == START)
-    {
-      if (xml && !docbook)
-	xml_insert_entity ("enddots");
-      else if (docbook)
-	{
-	  xml_insert_entity ("hellip");
-	  add_char ('.');
-	}
-      else
-	if (html && !in_fixed_width_font)
-	  insert_string ("<small class=\"enddots\">....</small>");
-	else
-	  add_word ("....");
-    }
-}
-
-void
-cm_bullet (int arg)
-{
-  if (arg == START)
-    {
-      if (html)
-        add_word ("&bull;");
-      else if (xml && !docbook)
-	xml_insert_entity ("bullet");
-      else if (docbook)
-	xml_insert_entity ("bull");
-      else
-        add_char ('*');
-    }
-}
-
-void
-cm_minus (int arg)
-{
-  if (arg == START)
-    {
-      if (xml)
-	xml_insert_entity ("minus");
-      else if (html)
-        add_word ("&minus;");
-      else
-	add_char ('-');
-    }
-}
-
-/* Formatting a dimension unit.  */
-void
-cm_dmn (int arg)
-{
-  if (html)
-    insert_html_tag_with_attribute (arg, "span", "class=\"dmn\"");
-  else if (docbook)
-    /* No units in docbook yet.  */
-    ;
-  else if (xml)
-    xml_insert_element (DIMENSION, arg);
-}
-
-/* Insert "TeX". */
-void
-cm_TeX (int arg)
-{
-  static int last_position;
-
-  if (arg == START)
-    {
-      if (xml)
-	xml_insert_entity ("tex");
-      else
-	add_word ("TeX");
-
-      last_position = output_paragraph_offset;
-    }
-  else if (last_position != output_paragraph_offset)
-    {
-      warning (_("arguments to @%s ignored"), command);
-      output_paragraph_offset = last_position;
-    }
-}
-
-/* Insert "LaTeX".  */
-void
-cm_LaTeX (int arg)
-{
-  static int last_position;
-
-  if (arg == START)
-    {
-      if (xml)
-        xml_insert_entity ("latex");
-      else
-        add_word ("LaTeX");
-
-      last_position = output_paragraph_offset;
-    }
-  else if (last_position != output_paragraph_offset)
-    {
-      warning (_("arguments to @%s ignored"), command);
-      output_paragraph_offset = last_position;
-    }
-}
-
-/* Copyright symbol.  */
-void
-cm_copyright (int arg)
-{
-  if (arg == START)
-    {
-    if (html)
-      add_word ("&copy;");
-    else if (xml && !docbook)
-      xml_insert_entity ("copyright");
-    else if (docbook)
-      xml_insert_entity ("copy");
-    else
-      add_word ("(C)");
-    }
-}
-
-/* Registered symbol.  */
-void
-cm_registeredsymbol (int arg)
-{
-  if (arg == START)
-    {
-      if (html)
-        add_word ("&reg;");
-      else if (docbook)
-        xml_insert_entity ("reg");
-      else if (xml && !docbook)
-        xml_insert_entity ("registered");
-      else
-        add_word ("(R)");
-    }
-}
-
-void
-cm_today (int arg)
-{
-  static char *months[12] =
-    { N_("January"), N_("February"), N_("March"), N_("April"), N_("May"),
-      N_("June"), N_("July"), N_("August"), N_("September"), N_("October"),
-      N_("November"), N_("December") };
-  if (arg == START)
-    {
-      time_t timer = time (0);
-      struct tm *ts = localtime (&timer);
-      add_word_args ("%d %s %d", ts->tm_mday, _(months[ts->tm_mon]),
-                     ts->tm_year + 1900);
-    }
-}
-
-void
-cm_comment (void)
-{
-  /* For HTML, do not output comments before HTML header is written,
-     otherwise comments before @settitle cause an empty <title> in the
-     header.  */
-  if ((html && html_output_head_p) || xml)
-    {
-      char *line;
-      get_rest_of_line (0, &line);
-
-      if (strlen (line) > 0)
-        {
-          int save_inhibit_indentation = inhibit_paragraph_indentation;
-          int save_paragraph_is_open = paragraph_is_open;
-          int save_escape_html = escape_html;
-          int save_xml_no_para = xml_no_para;
-          int i;
-
-          inhibit_paragraph_indentation = 1;
-          escape_html = 0;
-          xml_no_para = 1;
-
-          /* @c and @comment can appear between @item and @itemx,
-             @deffn and @deffnx.  */
-          xml_dont_touch_items_defs++;
-
-          /* Use insert for HTML, and XML when indentation is enabled.
-             For Docbook, use add_char.  */
-          if (xml && xml_indentation_increment > 0
-              && output_paragraph[output_paragraph_offset-1] != '\n')
-            insert ('\n');
-
-          /* Crunch double hyphens in comments.  */
-          add_html_block_elt ("<!-- ");
-          for (i = 0; i < strlen (line); i++)
-            if (line[i] != '-' || (i && line[i-1] != '-'))
-              add_char (line[i]);
-          add_word (" -->");
-
-          if (html)
-            add_char ('\n');
-
-          inhibit_paragraph_indentation = save_inhibit_indentation;
-          paragraph_is_open = save_paragraph_is_open;
-          escape_html = save_escape_html;
-          xml_no_para = save_xml_no_para;
-          xml_dont_touch_items_defs--;
-        }
-
-      free (line);
-    }
-  else
-    cm_ignore_line ();
-}
-
-
-
-/* We keep acronyms with two arguments around, to be able to refer to them
-   later with only one argument.  */
-static ACRONYM_DESC *acronyms_stack = NULL;
-
-static void
-cm_acronym_or_abbr (int arg, int is_abbr)
-{
-  char *aa, *description;
-  unsigned len;
-
-  /* We do everything at START.  */
-  if (arg == END)
-    return;
-
-  get_until_in_braces (",", &aa);
-  if (input_text[input_text_offset] == ',')
-    input_text_offset++;
-  get_until_in_braces ("}", &description);
-
-  canon_white (aa);
-  canon_white (description);
-
-  /* If not enclosed in braces, strip after comma to be compatible
-     with texinfo.tex.  */
-  if (description[0] != '{' && strchr (description, ',') != NULL)
-    {
-      int i = 0;
-      while (description[i] != ',')
-        i++;
-      /* For now, just terminate the string at comma.  */
-      description[i] = 0;
-    }
-
-  /* Get description out of braces.  */
-  if (description[0] == '{')
-    description++;
-
-  len = strlen (description);
-  if (len && description[len-1] == '}')
-    description[len-1] = 0;
-
-  /* Save new description.  */
-  if (strlen (description) > 0)
-    {
-      ACRONYM_DESC *new = xmalloc (sizeof (ACRONYM_DESC));
-
-      new->acronym = xstrdup (aa);
-      new->description = xstrdup (description);
-      new->next = acronyms_stack;
-      acronyms_stack = new;
-    }
-
-  if (html)
-    {
-      add_word (is_abbr ? "<abbr" : "<acronym");
-
-      if (strlen (description) > 0)
-        add_word_args (" title=\"%s\"", text_expansion (description));
-      else if (acronyms_stack)
-        {
-          /* No second argument, get from previous.  Search order is from
-             last to first defined, so we get the most recent version of
-             the description.  */
-          ACRONYM_DESC *temp = acronyms_stack;
-
-          while (temp)
-            {
-              if (STREQ (aa, temp->acronym)
-                  && strlen (temp->description) > 0)
-                {
-                  add_word_args (" title=\"%s\"",
-                                 text_expansion (temp->description));
-                  break;
-                }
-              temp = temp->next;
-            }
-        }
-
-      add_char ('>');
-      execute_string ("%s", aa);
-      add_word (is_abbr ? "</abbr>" : "</acronym>");
-    }
-  else if (docbook)
-    {
-      xml_insert_element (is_abbr ? ABBREV : ACRONYM, START);
-      execute_string ("%s", aa);
-      xml_insert_element (is_abbr ? ABBREV : ACRONYM, END);
-    }
-  else if (xml)
-    {
-      xml_insert_element (is_abbr ? ABBREV : ACRONYM, START);
-
-      xml_insert_element (is_abbr ? ABBREVWORD : ACRONYMWORD, START);
-      execute_string ("%s", aa);
-      xml_insert_element (is_abbr ? ABBREVWORD : ACRONYMWORD, END);
-
-      if (strlen (description) > 0)
-        {
-          xml_insert_element (is_abbr ? ABBREVDESC : ACRONYMDESC, START);
-          execute_string ("%s", description);
-          xml_insert_element (is_abbr ? ABBREVDESC : ACRONYMDESC, END);
-        }
-
-      xml_insert_element (is_abbr ? ABBREV : ACRONYM, END);
-    }
-  else
-    execute_string ("%s", aa);
-
-  /* Put description into parenthesis after the acronym for all outputs
-     except XML.  */
-  if (strlen (description) > 0 && (!xml || docbook))
-    add_word_args (" (%s)", description);
-}
-
-void
-cm_acronym (int arg)
-{
-  cm_acronym_or_abbr (arg, 0);
-}
-
-void
-cm_abbr (int arg)
-{
-  cm_acronym_or_abbr (arg, 1);
-}
-
-void
-cm_tt (int arg)
-{
-  /* @t{} is a no-op in Info.  */
-  if (html)
-    insert_html_tag (arg, "tt");
-  else if (xml)
-    xml_insert_element (TT, arg);
-}
-
-void
-cm_code (int arg)
-{
-  if (arg == START)
-    in_fixed_width_font++;
-
-  if (xml)
-    {
-      if (STREQ (command, "command"))
-	xml_insert_element (COMMAND_TAG, arg);
-      else if (STREQ (command, "env"))
-	xml_insert_element (ENV, arg);
-      else if (STREQ (command, "file"))
-	xml_insert_element (FILE_TAG, arg);
-      else if (STREQ (command, "option"))
-	xml_insert_element (OPTION, arg);
-      else if (STREQ (command, "samp"))
-        {
-          if (docbook && arg == START)
-            {
-              /* Even though @samp is in_fixed_width_font, it
-                 should always start a paragraph.  Unfortunately,
-                 in_fixed_width_font inhibits that.  */
-              xml_start_para ();
-              xml_insert_entity ("lsquo");
-            }
-          xml_insert_element (SAMP, arg);
-          if (docbook && arg == END)
-            xml_insert_entity ("rsquo");
-        }
-      else
-	xml_insert_element (CODE, arg);
-    }
-  else if (html)
-    {
-      if (STREQ (command, "code"))
-        insert_html_tag (arg, "code");
-      else
-        { /* Use <samp> tag in general to get typewriter.  */
-          if (arg == START)
-            { /* If @samp specifically, add quotes a la TeX output.  */
-              if (STREQ (command, "samp")) add_char ('`');
-              add_word ("<samp>");
-            }
-          insert_html_tag_with_attribute (arg, "span", "class=\"%s\"",command);
-          if (arg == END)
-            {
-              add_word ("</samp>");
-              if (STREQ (command, "samp")) add_char ('\'');
-            }
-        }
-    }
-  else
-    {
-      extern int printing_index;
-
-      if (!printing_index)
-        {
-          if (arg == START)
-            add_char ('`');
-          else
-            add_meta_char ('\'');
-        }
-    }
-}
-
-void
-cm_kbd (int arg)
-{
-  if (xml)
-    xml_insert_element (KBD, arg);
-  else if (html)
-    { /* Seems like we should increment in_fixed_width_font for Info
-         format too, but then the quote-omitting special case gets
-         confused.  Punt.  */
-      if (arg == START)
-        in_fixed_width_font++;
-      insert_html_tag (arg, "kbd");
-    }
-  else
-    { /* People use @kbd in an example to get the "user input" font.
-         We don't want quotes in that case.  */
-      if (!in_fixed_width_font)
-        cm_code (arg);
-    }
-}
-
-/* Just show a url (http://example.org/..., for example), don't link to it.  */
-void
-cm_indicate_url (int arg, int start, int end)
-{
-  if (xml)
-    xml_insert_element (URL, arg);
-  else if (html)
-    {
-      if (arg == START)
-        add_word ("&lt;");
-      insert_html_tag (arg, "code");
-      if (arg != START)
-        add_word ("&gt;");
-    }
-  else
-    if (arg == START)
-      add_word ("<");
-    else
-      add_word (">");
-}
-
-void
-cm_key (int arg)
-{
-  if (xml)
-    xml_insert_element (KEY, arg);
-  else if (html)
-    add_word (arg == START ? "&lt;" : "&gt;");
-  else
-    add_char (arg == START ? '<' : '>');
-}
-
-/* Handle a command that switches to a non-fixed-width font.  */
-void
-not_fixed_width (int arg)
-{
-  if (arg == START)
-    in_fixed_width_font = 0;
-}
-
-/* @var in makeinfo just uppercases the text. */
-void
-cm_var (int arg, int start_pos, int end_pos)
-{
-  if (xml)
-    xml_insert_element (VAR, arg);
-  else
-    {
-  not_fixed_width (arg);
-
-  if (html)
-    insert_html_tag (arg, "var");
-  else if (arg == END)
-    {
-      while (start_pos < end_pos)
-        {
-          unsigned char c = output_paragraph[start_pos];
-          if (strchr ("[](),", c))
-            warning (_("unlikely character %c in @var"), c);
-          output_paragraph[start_pos] = coerce_to_upper (c);
-          start_pos++;
-        }
-    }
-    }
-}
-
-void
-cm_sc (int arg, int start_pos, int end_pos)
-{
-  if (xml)
-    xml_insert_element (SC, arg);
-  else
-    {
-      not_fixed_width (arg);
-
-      if (arg == START)
-        {
-          if (html)
-            insert_html_tag_with_attribute (arg, "span", "class=\"sc\"");
-        }
-      else
-        {
-          int all_upper;
-
-          if (html)
-            start_pos += sizeof ("<span class=\"sc\">") - 1; /* skip <span> */
-
-          /* Avoid the warning below if there's no text inside @sc{}, or
-             when processing menus under --no-headers.  */
-          all_upper = start_pos < end_pos;
-
-          while (start_pos < end_pos)
-            {
-              unsigned char c = output_paragraph[start_pos];
-              if (!isupper (c))
-                all_upper = 0;
-              if (!html)
-                output_paragraph[start_pos] = coerce_to_upper (c);
-              start_pos++;
-            }
-          if (all_upper)
-            warning (_("@sc argument all uppercase, thus no effect"));
-
-          if (html)
-            insert_html_tag (arg, "span");
-        }
-    }
-}
-
-void
-cm_dfn (int arg, int position)
-{
-  if (xml)
-    xml_insert_element (DFN, arg);
-  else
-    {
-  if (html)
-    insert_html_tag (arg, "dfn");
-  else if (arg == START)
-    add_char ('"');
-  else
-    add_meta_char ('"');
-    }
-}
-
-void
-cm_emph (int arg)
-{
-  if (xml)
-    xml_insert_element (EMPH, arg);
-  else if (html)
-    insert_html_tag (arg, "em");
-  else
-    add_char ('_');
-}
-
-void
-cm_verb (int arg)
-{
-  int character;
-  int delimiter = 0; /* avoid warning */
-  int seen_end = 0;
-
-  in_fixed_width_font++;
-  /* are these necessary ? */
-  last_char_was_newline = 0;
-
-  if (html)
-    add_word ("<tt>");
-
-  if (input_text_offset < input_text_length)
-    {
-      character = curchar ();
-      if (character == '{')
-	input_text_offset++;
-      else
-	line_error (_("`{' expected, but saw `%c'"), character);
-    }
-    
-  if (input_text_offset < input_text_length)
-    {
-      delimiter = curchar ();
-      input_text_offset++;
-    }
-
-  while (input_text_offset < input_text_length)
-    {
-      character = curchar ();
-
-      if (character == '\n')
-        {
-          line_number++;
-          if (html)
-            add_word ("<br>\n");
-        }
-
-      else if (html && character == '<')
-        add_word ("&lt;");
-
-      else if (html && character == '&')
-        add_word ("&amp;");
-
-      else if (character == delimiter && input_text[input_text_offset+1] == '}')
-	{ /* Assume no newlines in END_VERBATIM. */
-	  seen_end = 1;
-	  input_text_offset++;
-	  break;
-	}
-
-      else
-        add_char (character);
-
-      input_text_offset++;
-    }
-
-  if (!seen_end)
-    warning (_("end of file inside verb block"));
-  
-  if (input_text_offset < input_text_length)
-    {
-      character = curchar ();
-      if (character == '}')
-	input_text_offset++;
-      else
-	line_error (_("`}' expected, but saw `%c'"), character);
-    }
-
-  if (html)
-    add_word ("</tt>");
-
-  in_fixed_width_font--;
-}
-
-
-void
-cm_strong (int arg, int start_pos, int end_pos)
-{
-  if (docbook && arg == START)
-    xml_insert_element_with_attribute (B, arg, "role=\"bold\"");
-  else if (xml)
-    xml_insert_element (STRONG, arg);
-  else if (html)
-    insert_html_tag (arg, "strong");
-  else
-    add_char ('*');
-  
-  if (!xml && !html && !docbook && !no_headers
-      && arg == END
-      && end_pos - start_pos >= 6
-      && (STRNCASEEQ ((char *) output_paragraph + start_pos, "*Note:", 6)
-          || STRNCASEEQ ((char *) output_paragraph + start_pos, "*Note ", 6)))
-    {
-      /* Translators: "Note:" is literal here and should not be
-         translated.  @strong{Nota}, say, does not cause the problem.  */
-      warning (_("@strong{Note...} produces a spurious cross-reference in Info; reword to avoid that"));
-      /* Adjust the output to avoid writing the bad xref.  */
-      output_paragraph[start_pos + 5] = '_';
-    }
-}
-
-void
-cm_cite (int arg, int position)
-{
-  if (xml)
-    xml_insert_element (CITE, arg);        
-  else if (html)
-    insert_html_tag (arg, "cite");
-  else
-    {
-      if (arg == START)
-        add_char ('`');
-      else
-        add_char ('\'');
-    }
-}
-
-/* No highlighting, but argument switches fonts.  */
-void
-cm_not_fixed_width (int arg, int start, int end)
-{
-  if (xml)
-    xml_insert_element (NOTFIXEDWIDTH, arg);
-  not_fixed_width (arg);
-}
-
-void
-cm_i (int arg)
-{
-  /* Make use of <lineannotation> of Docbook, if we are
-     inside an @example or similar.  */
-  extern int printing_index;
-  if (docbook && !filling_enabled && !printing_index)
-    xml_insert_element (LINEANNOTATION, arg);
-  else if (xml)
-    xml_insert_element (I, arg);
-  else if (html)
-    insert_html_tag (arg, "i");
-  else
-    not_fixed_width (arg);
-}
-
-void
-cm_slanted (int arg)
-{
-  /* Make use of <lineannotation> of Docbook, if we are
-     inside an @example or similar.  */
-  extern int printing_index;
-  if (docbook && !filling_enabled && !printing_index)
-    xml_insert_element (LINEANNOTATION, arg);
-  else if (xml)
-    xml_insert_element (SLANTED, arg);
-  else if (html)
-    insert_html_tag (arg, "i");
-  else
-    not_fixed_width (arg);
-}
-
-void
-cm_b (int arg)
-{
-  /* See cm_i comments.  */
-  extern int printing_index;
-  if (docbook && !filling_enabled && !printing_index)
-    xml_insert_element (LINEANNOTATION, arg);
-  else if (docbook && arg == START)
-    xml_insert_element_with_attribute (B, arg, "role=\"bold\"");
-  else if (xml)
-    xml_insert_element (B, arg);
-  else if (html)
-    insert_html_tag (arg, "b");
-  else
-    not_fixed_width (arg);
-}
-
-void
-cm_r (int arg)
-{
-  /* See cm_i comments.  */
-  extern int printing_index;
-  if (docbook && !filling_enabled && !printing_index)
-    xml_insert_element (LINEANNOTATION, arg);
-  else if (xml)
-    xml_insert_element (R, arg);
-  else if (html)
-    insert_html_tag_with_attribute (arg, "span", "class=\"roman\"");
-  else
-    not_fixed_width (arg);
-}
-
-void
-cm_sansserif (int arg)
-{
-  /* See cm_i comments.  */
-  extern int printing_index;
-  if (docbook && !filling_enabled && !printing_index)
-    xml_insert_element (LINEANNOTATION, arg);
-  else if (xml)
-    xml_insert_element (SANSSERIF, arg);
-  else if (html)
-    insert_html_tag_with_attribute (arg, "span", "class=\"sansserif\"");
-  else
-    not_fixed_width (arg);
-}
-
-void
-cm_titlefont (int arg)
-{
-  if (xml)
-    xml_insert_element (TITLEFONT, arg);
-  else
-   {
-     not_fixed_width (arg);
-     if (html)
-	{
-	  html_title_written = 1; /* suppress title from @settitle */
-	  if (arg == START)
-	    add_word ("<h1 class=\"titlefont\">");
-	  else
-	    add_word ("</h1>\n");
-	}
-   }
-}
-
-
-/* Unfortunately, we cannot interpret @math{} contents like TeX does.  We just
-   pass them through.  */
-void
-cm_math (int arg)
-{
-  if (xml && !docbook)
-    xml_insert_element (MATH, arg);
-}
-
-/* Various commands are no-op's. */
-void
-cm_no_op (void)
-{
-}
-
-
-/* For proofing single chapters, etc.  */
-void
-cm_novalidate (void)
-{
-  validating = 0;
-}
-
-
-/* Prevent the argument from being split across two lines. */
-void
-cm_w (int arg)
-{
-  if (arg == START)
-    non_splitting_words++;
-  else
-    {
-      if (docbook || html || xml)
-        /* This is so @w{$}Log$ doesn't end up as <dollar>Log<dollar>
-           in the output.  */
-        insert_string ("<!-- /@w -->");
-        
-      non_splitting_words--;
-    }
-}
-
-
-/* An unbreakable word space.  Same as @w{ } for makeinfo, but different
-   for TeX (the space stretches and stretches, and does not inhibit
-   hyphenation).  */
-void
-cm_tie (int arg)
-{
-  if (arg == START)
-    {
-      cm_w (START);
-      add_char (' ');
-    }
-  else
-    cm_w (END);
-}
-
-/* Explain that this command is obsolete, thus the user shouldn't
-   do anything with it. */
-static void
-cm_obsolete (int arg, int start, int end)
-{
-  if (arg == START)
-    warning (_("%c%s is obsolete"), COMMAND_PREFIX, command);
-}
-
-
-/* Inhibit the indentation of the next paragraph, but not of following
-   paragraphs.  */
-void
-cm_noindent (void)
-{
-  if (!inhibit_paragraph_indentation)
-    inhibit_paragraph_indentation = -1;
-}
-
-void
-cm_noindent_cmd (void)
-{
-  cm_noindent ();
-  xml_no_indent = 1;
-  skip_whitespace_and_newlines();
-
-  if (xml)
-    xml_start_para ();
-  else if (html && !paragraph_is_open)
-    add_html_block_elt ("<p class=\"noindent\">");
-  else
-    {
-      paragraph_is_open = 0;
-      start_paragraph ();
-    }
-}
-
-/* Force indentation of the next paragraph. */
-void
-cm_indent (void)
-{
-  inhibit_paragraph_indentation = 0;
-  xml_no_indent = 0;
-  skip_whitespace_and_newlines();
-  
-  if (xml)
-    xml_start_para ();
-  else if (html && !paragraph_is_open)
-    add_html_block_elt ("<p class=\"indent\">");
-  else
-    start_paragraph ();
-}
-
-/* I don't know exactly what to do with this.  Should I allow
-   someone to switch filenames in the middle of output?  Since the
-   file could be partially written, this doesn't seem to make sense.
-   Another option: ignore it, since they don't really want to
-   switch files.  Finally, complain, or at least warn.  It doesn't
-   really matter, anyway, since this doesn't get executed.  */
-void
-cm_setfilename (void)
-{
-  char *filename;
-  get_rest_of_line (1, &filename);
-  /* warning ("`@%s %s' encountered and ignored", command, filename); */
-  if (xml)
-    add_word_args ("<setfilename>%s</setfilename>", filename);
-  free (filename);
-}
-
-void
-cm_settitle (void)
-{
-  if (xml)
-    {
-      xml_begin_document (current_output_filename);
-      xml_insert_element (SETTITLE, START);
-      xml_in_book_title = 1;
-      get_rest_of_line (0, &title);
-      execute_string ("%s", title);
-      xml_in_book_title = 0;
-      xml_insert_element (SETTITLE, END);
-    }
-  else
-    get_rest_of_line (0, &title);
-}
-
-
-/* Ignore argument in braces.  */
-void
-cm_ignore_arg (int arg, int start_pos, int end_pos)
-{
-  if (arg == END)
-    output_paragraph_offset = start_pos;
-}
-
-/* Ignore argument on rest of line.  */
-void
-cm_ignore_line (void)
-{
-  discard_until ("\n");
-}
-
-/* Insert the number of blank lines passed as argument. */
-void
-cm_sp (void)
-{
-  int lines;
-  char *line;
-
-  /* Due to tricky stuff in execute_string(), @value{} can't be expanded.
-     So there is really no reason to enable expansion for @sp parameters.  */
-  get_rest_of_line (0, &line);
-
-  if (sscanf (line, "%d", &lines) != 1 || lines <= 0)
-    line_error (_("@sp requires a positive numeric argument, not `%s'"), line);
-  else
-    {
-      if (xml)
-	{
-          /* @sp can appear between @item and @itemx, @deffn and @deffnx.  */
-          xml_dont_touch_items_defs++;
-	  xml_insert_element_with_attribute (SP, START, "lines=\"%s\"", line);
-	  /*	  insert_string (line);*/
-	  xml_insert_element (SP, END);
-          xml_dont_touch_items_defs--;
-	}
-      else
-        {
-          /* Must disable filling since otherwise multiple newlines is like
-             multiple spaces.  Must close paragraph since that's what the
-             manual says and that's what TeX does.  */
-          int save_filling_enabled = filling_enabled;
-          filling_enabled = 0;
-
-          /* close_paragraph generates an extra blank line.  */
-          close_single_paragraph ();
-
-          if (lines && html && !executing_string)
-            html_output_head ();
-
-          if (html)
-            add_html_block_elt ("<pre class=\"sp\">\n");
-
-          while (lines--)
-            add_char ('\n');
-
-          if (html)
-            add_html_block_elt ("</pre>\n");
-
-          filling_enabled = save_filling_enabled;
-        }
-    }
-  free (line);
-}
-
-/* @dircategory LINE outputs INFO-DIR-SECTION LINE, unless --no-headers.  */ 
-void
-cm_dircategory (void)
-{
-  char *line;
-
-  if (html || docbook)
-    cm_ignore_line ();
-  else if (xml)
-    {
-      xml_insert_element (DIRCATEGORY, START);
-      get_rest_of_line (1, &line);
-      insert_string (line);
-      free (line);
-      xml_insert_element (DIRCATEGORY, END);
-    }
-  else
-    {
-      get_rest_of_line (1, &line);
-
-      if (!no_headers && !html)
-        {
-          kill_self_indent (-1); /* make sure there's no indentation */
-          insert_string ("INFO-DIR-SECTION ");
-          insert_string (line);
-          insert ('\n');
-        }
-
-      free (line);
-    }
-}
-
-/* Start a new line with just this text on it.
-   Then center the line of text.
-   */
-void
-cm_center (void)
-{
-  if (xml)
-    {
-      char *line;
-      xml_insert_element (CENTER, START);
-      get_rest_of_line (0, &line);
-      execute_string ("%s", line);
-      free (line);
-      xml_insert_element (CENTER, END);
-    }
-  else
-    {
-      int i, start, length;
-      char *line;
-      int save_indented_fill = indented_fill;
-      int save_filling_enabled = filling_enabled;
-      int fudge_factor = 1;
-
-      filling_enabled = indented_fill = 0;
-      cm_noindent ();
-      start = output_paragraph_offset;
-
-      if (html)
-        add_html_block_elt ("<div align=\"center\">");
-
-      inhibit_output_flushing ();
-      get_rest_of_line (0, &line);
-      execute_string ("%s", line);
-      free (line);
-      uninhibit_output_flushing ();
-      if (html)
-        add_html_block_elt ("</div>");
-
-       else
-         {
-           i = output_paragraph_offset - 1;
-           while (i > (start - 1) && output_paragraph[i] == '\n')
-             i--;
-
-           output_paragraph_offset = ++i;
-           length = output_paragraph_offset - start;
-
-           if (length < (fill_column - fudge_factor))
-             {
-               line = xmalloc (1 + length);
-               memcpy (line, (char *)(output_paragraph + start), length);
-
-               i = (fill_column - fudge_factor - length) / 2;
-               output_paragraph_offset = start;
-
-               while (i--)
-                 insert (' ');
-
-               for (i = 0; i < length; i++)
-                 insert (line[i]);
-
-               free (line);
-             }
-         }
-
-      insert ('\n');
-      filling_enabled = save_filling_enabled;
-      indented_fill = save_indented_fill;
-      close_single_paragraph ();
-      if (looking_at("\n"))
-        insert ('\n');
-    }
-}
-
-/* Show what an expression returns. */
-void
-cm_result (int arg)
-{
-  if (arg == END)
-    add_word (html ? "=&gt;" : "=>");
-}
-
-/* What an expression expands to. */
-void
-cm_expansion (int arg)
-{
-  if (arg == END)
-    add_word (html ? "==&gt;" : "==>");
-}
-
-/* Indicates two expressions are equivalent. */
-void
-cm_equiv (int arg)
-{
-  if (arg == END)
-    add_word ("==");
-}
-
-/* What an expression may print. */
-void
-cm_print (int arg)
-{
-  if (arg == END)
-    add_word ("-|");
-}
-
-/* An error signaled. */
-void
-cm_error (int arg)
-{
-  if (arg == END)
-    add_word (html ? "error--&gt;" : "error-->");
-}
-
-/* The location of point in an example of a buffer. */
-void
-cm_point (int arg)
-{
-  if (arg == END)
-    add_word ("-!-");
-}
-
-/* @exdent: Start a new line with just this text on it.
-   The text is outdented one level if possible. */
-void
-cm_exdent (void)
-{
-  char *line;
-  int save_indent = current_indent;
-  int save_in_fixed_width_font = in_fixed_width_font;
-
-  /* Read argument.  */
-  get_rest_of_line (0, &line);
-
-  /* Exdent the output.  Actually this may be a no-op.   */
-  if (current_indent)
-    current_indent -= default_indentation_increment;
-
-  /* @exdent arg is supposed to be in roman.  */
-  in_fixed_width_font = 0;
-  
-  /* The preceding newline already inserted the `current_indent'.
-     Remove one level's worth.  */
-  kill_self_indent (default_indentation_increment);
-
-  if (html)
-    add_word ("<br>");
-  else if (docbook)
-    xml_insert_element (LINEANNOTATION, START);
-  else if (xml)
-    xml_insert_element (EXDENT, START);
-
-  /* Can't close_single_paragraph, then we lose preceding blank lines.  */
-  flush_output ();
-  execute_string ("%s", line);
-  free (line);
-
-  if (html)
-    add_word ("<br>");
-  else if (xml)
-    {
-      xml_insert_element (docbook ? LINEANNOTATION : EXDENT, END);
-      insert ('\n');
-    }
-
-  close_single_paragraph ();
-
-  current_indent = save_indent;
-  in_fixed_width_font = save_in_fixed_width_font;
-  if (!xml)
-    start_paragraph ();
-}
-
-/* 
-  Read include-filename, process the include-file:
-    verbatim_include == 0: process through reader_loop
-    verbatim_include != 0: process through handle_verbatim_environment
- */
-static void
-handle_include (int verbatim_include)
-{
-  char *arg, *filename;
-
-  if (macro_expansion_output_stream && !executing_string)
-    me_append_before_this_command ();
-
-  if (!insertion_stack)
-    close_paragraph ();  /* No blank lines etc. if not at outer level.  */
-    
-  get_rest_of_line (0, &arg);
-  /* We really only want to expand @value, but it's easier to just do
-     everything.  TeX will only work with @value.  */
-  filename = text_expansion (arg);
-  free (arg);
-
-  if (macro_expansion_output_stream && !executing_string)
-    remember_itext (input_text, input_text_offset);
-
-  pushfile ();
-
-  /* In verbose mode we print info about including another file. */
-  if (verbose_mode)
-    {
-      int i = 0;
-      FSTACK *stack = filestack;
-
-      for (i = 0, stack = filestack; stack; stack = stack->next, i++);
-
-      i *= 2;
-
-      printf ("%*s", i, "");
-      printf ("%c%s `%s'\n", COMMAND_PREFIX, command, filename);
-      fflush (stdout);
-    }
-
-  if (!find_and_load (filename, 1))
-    {
-      popfile ();
-      line_number--;
-
-      /* /wh/bar:5: @include/@verbatiminclude `foo': No such file or dir */
-      line_error ("%c%s `%s': %s", COMMAND_PREFIX, command, filename,
-                  strerror (errno));
-
-      free (filename);
-      return;
-    }
-  else
-    {
-      if (macro_expansion_output_stream && !executing_string)
-	remember_itext (input_text, input_text_offset);
-
-      if (!verbatim_include)
-	reader_loop ();
-      else
-	handle_verbatim_environment (0);
-    }
-  free (filename);
-  popfile ();
-}
-
-
-/* Include file as if put in @verbatim environment */
-void
-cm_verbatiminclude (void)
-{
-  handle_include (1); 
-}
-
-
-/* Remember this file, and move onto the next. */
-void
-cm_include (void)
-{
-  handle_include (0); 
-}
-
-
-/* @bye: Signals end of processing.  Easy to make this happen. */
-
-void
-cm_bye (void)
-{
-  discard_braces (); /* should not have any unclosed braces left */
-  input_text_offset = input_text_length;
-}
-
-/* @paragraphindent */
-
-static void
-cm_paragraphindent (void)
-{
-  char *arg;
-
-  get_rest_of_line (1, &arg);
-  if (set_paragraph_indent (arg) != 0)
-    line_error (_("Bad argument to %c%s"), COMMAND_PREFIX, command);
-
-  free (arg);
-}
-
-
-/* @exampleindent: change indentation of example-like environments.   */
-static int
-set_example_indentation_increment (char *string)
-{
-  if (strcmp (string, "asis") == 0 || strcmp (string, _("asis")) == 0)
-    ;
-  else if (strcmp (string, "none") == 0 || strcmp (string, _("none")) == 0)
-    example_indentation_increment = 0;
-  else if (sscanf (string, "%d", &example_indentation_increment) != 1)
-    return -1;
-  return 0;
-}
-
-static void
-cm_exampleindent (void)
-{
-  char *arg;
-  
-  get_rest_of_line (1, &arg);
-  if (set_example_indentation_increment (arg) != 0)
-    line_error (_("Bad argument to @%s"), command);
-
-  if (input_text[input_text_offset] == '\n')
-    close_single_paragraph ();
-
-  free (arg);
-}
-
-
-/* @firstparagraphindent: suppress indentation in first paragraphs after
-   headings. */
-static int
-set_firstparagraphindent (char *string)
-{
-  if (STREQ (string, "insert") || STREQ (string, _("insert")))
-    do_first_par_indent = 1;
-  else if (STREQ (string, "none") || STREQ (string, _("none")))
-    do_first_par_indent = 0;
-  else
-    return -1;
-  return 0;
-}
-
-static void
-cm_firstparagraphindent (void)
-{
-  char *arg;
-
-  get_rest_of_line (1, &arg);
-  if (set_firstparagraphindent (arg) != 0)
-    line_error (_("Bad argument to %c%s"), COMMAND_PREFIX, command);
-
-  free (arg);
-}
-
-/* For DocBook and XML, produce &period; for `.@:'. This gives the processing
-   software a fighting chance to treat it specially by not adding extra space.
-  
-   Do this also for ?, !, and :.  */
-void
-cm_colon (void)
-{
-  if (xml)
-    {
-      if (strchr (".?!:", input_text[input_text_offset-3]) != NULL)
-        {
-          /* Erase literal character that's there, except `>', which is
-             part of the XML tag.  */
-          if (output_paragraph[output_paragraph_offset-1] != '>')
-            output_paragraph_offset--;
-
-          switch (input_text[input_text_offset-3])
-            {
-            case '.':
-              xml_insert_entity ("period");
-              break;
-            case '?':
-              xml_insert_entity ("quest");
-              break;
-            case '!':
-              xml_insert_entity ("excl");
-              break;
-            case ':':
-              xml_insert_entity ("colon");
-              break;
-            }
-        }
-    }
-}
-
-/* Ending sentences explicitly.  Currently, only outputs entities for XML
-   output, for other formats it calls insert_self.  */
-void
-cm_punct (int arg)
-{
-  if (xml && !docbook)
-    {
-      switch (input_text[input_text_offset-1])
-        {
-        case '.':
-          xml_insert_entity ("eosperiod");
-          break;
-        case '?':
-          xml_insert_entity ("eosquest");
-          break;
-        case '!':
-          xml_insert_entity ("eosexcl");
-          break;
-        }
-    }
-  else
-    {
-      insert_self (arg);
-    }
-}

Property changes on: head/contrib/texinfo/makeinfo/cmds.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/toc.c
===================================================================
--- head/contrib/texinfo/makeinfo/toc.c	(revision 276550)
+++ head/contrib/texinfo/makeinfo/toc.c	(nonexistent)
@@ -1,388 +0,0 @@
-/* toc.c -- table of contents handling.
-   $Id: toc.c,v 1.6 2004/04/11 17:56:47 karl Exp $
-
-   Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Originally written by Karl Heinz Marbaise <kama@hippo.fido.de>.  */
-
-#include "system.h"
-#include "makeinfo.h"
-#include "cmds.h"
-#include "files.h"
-#include "macro.h"
-#include "node.h"
-#include "html.h"
-#include "lang.h"
-#include "makeinfo.h"
-#include "sectioning.h"
-#include "toc.h"
-#include "xml.h"
-
-/* array of toc entries */
-static TOC_ENTRY_ELT **toc_entry_alist = NULL;
-
-/* toc_counter start from 0 ... n for every @chapter, @section ... */
-static int toc_counter = 0;
-
-/* Routine to add an entry to the table of contents */
-int
-toc_add_entry (char *tocname, int level, char *node_name, char *anchor)
-{
-  char *tocname_and_node, *expanded_node, *d;
-  char *s = NULL;
-  char *filename = NULL;
-
-  if (!node_name)
-    node_name = "";
-
-  /* I assume that xrealloc behaves like xmalloc if toc_entry_alist is
-     NULL */
-  toc_entry_alist = xrealloc (toc_entry_alist,
-                              (toc_counter + 1) * sizeof (TOC_ENTRY_ELT *));
-
-  toc_entry_alist[toc_counter] = xmalloc (sizeof (TOC_ENTRY_ELT));
-
-  if (html)
-    {
-      /* We need to insert the expanded node name into the toc, so
-         that when we eventually output the toc, its <a ref= link will
-         point to the <a name= tag created by cm_node in the navigation
-         bar.  We cannot expand the containing_node member, for the
-         reasons explained in the WARNING below.  We also cannot wait
-         with the node name expansion until the toc is actually output,
-         since by that time the macro definitions may have been changed.
-         So instead we store in the tocname member the expanded node
-         name and the toc name concatenated together (with the necessary
-         html markup), since that's how they are output.  */
-      if (!anchor)
-        s = expanded_node = expand_node_name (node_name);
-      else
-        expanded_node = anchor;
-      if (splitting)
-	{
-	  if (!anchor)
-	    filename = nodename_to_filename (expanded_node);
-	  else
-	    filename = filename_part (current_output_filename);
-	}
-      /* Sigh...  Need to HTML-escape the expanded node name like
-         add_anchor_name does, except that we are not writing this to
-         the output, so can't use add_anchor_name...  */
-      /* The factor 5 in the next allocation is because the maximum
-         expansion of HTML-escaping is for the & character, which is
-         output as "&amp;".  2 is for "> that separates node from tocname.  */
-      d = tocname_and_node = (char *)xmalloc (2 + 5 * strlen (expanded_node)
-                                              + strlen (tocname) + 1);
-      if (!anchor)
-        {
-          for (; *s; s++)
-            {
-              if (cr_or_whitespace (*s))
-                *d++ = '-';
-              else if (! URL_SAFE_CHAR (*s))
-                {
-                  sprintf (d, "_00%x", (unsigned char) *s);
-                  /* do this manually since sprintf returns char * on
-                     SunOS 4 and other old systems.  */
-                  while (*d)
-                    d++;
-                }
-              else
-                *d++ = *s;
-            }
-          strcpy (d, "\">");
-        }
-      else
-        /* Section outside any node, they provided explicit anchor.  */
-        strcpy (d, anchor);
-      strcat (d, tocname);
-      free (tocname);       /* it was malloc'ed by substring() */
-      free (expanded_node);
-      toc_entry_alist[toc_counter]->name = tocname_and_node;
-    }
-  else
-    toc_entry_alist[toc_counter]->name = tocname;
-  /* WARNING!  The node name saved in containing_node member must
-     be the node name with _only_ macros expanded (the macros in
-     the node name are expanded by cm_node when it grabs the name
-     from the @node directive).  Non-macros, like @value, @@ and
-     other @-commands must NOT be expanded in containing_node,
-     because toc_find_section_of_node looks up the node name where
-     they are also unexpanded.  You *have* been warned!  */
-  toc_entry_alist[toc_counter]->containing_node = xstrdup (node_name);
-  toc_entry_alist[toc_counter]->level = level;
-  toc_entry_alist[toc_counter]->number = toc_counter;
-  toc_entry_alist[toc_counter]->html_file = filename;
-
-  /* have to be done at least */
-  return toc_counter++;
-}
-
-/* Return the name of a chapter/section/subsection etc. that
-   corresponds to the node NODE.  If the node isn't found,
-   return NULL.
-
-   WARNING!  This function relies on NODE being unexpanded
-   except for macros (i.e., @value, @@, and other non-macros
-   should NOT be expanded), because the containing_node member
-   stores unexpanded node names.
-
-   Note that this function returns the first section whose
-   containing node is NODE.  Thus, they will lose if they use
-   more than a single chapter structioning command in a node,
-   or if they have a node without any structuring commands.  */
-char *
-toc_find_section_of_node (char *node)
-{
-  int i;
-
-  if (!node)
-    node = "";
-  for (i = 0; i < toc_counter; i++)
-    if (STREQ (node, toc_entry_alist[i]->containing_node))
-      return toc_entry_alist[i]->name;
-
-  return NULL;
-}
-
-/* free up memory used by toc entries */
-void
-toc_free (void)
-{
-  int i;
-
-  if (toc_counter)
-    {
-      for (i = 0; i < toc_counter; i++)
-        {
-          free (toc_entry_alist[i]->name);
-          free (toc_entry_alist[i]->containing_node);
-          free (toc_entry_alist[i]);
-        }
-
-      free (toc_entry_alist);
-      toc_entry_alist = NULL; /* to be sure ;-) */
-      toc_counter = 0; /* to be absolutley sure ;-) */
-    }
-}
-
-/* Print table of contents in HTML.  */
-
-static void
-contents_update_html (void)
-{
-  int i;
-  int k;
-  int last_level;
-
-  /* does exist any toc? */
-  if (!toc_counter)
-      /* no, so return to sender ;-) */
-      return;
-
-  add_html_block_elt_args ("\n<div class=\"contents\">\n<h2>%s</h2>\n<ul>\n", _("Table of Contents"));
-
-  last_level = toc_entry_alist[0]->level;
-
-  for (i = 0; i < toc_counter; i++)
-    {
-      if (toc_entry_alist[i]->level > last_level)
-        {
-          /* unusual, but it is possible
-             @chapter ...
-             @subsubsection ...      ? */
-          for (k = 0; k < (toc_entry_alist[i]->level-last_level); k++)
-            add_html_block_elt ("<ul>\n");
-        }
-      else if (toc_entry_alist[i]->level < last_level)
-        {
-          /* @subsubsection ...
-             @chapter ... this IS usual.*/
-          for (k = 0; k < (last_level-toc_entry_alist[i]->level); k++)
-            add_word ("</li></ul>\n");
-        }
-
-      /* No double entries in TOC.  */
-      if (!(i && strcmp (toc_entry_alist[i]->name,
-			 toc_entry_alist[i-1]->name) == 0))
-        {
-          /* each toc entry is a list item.  */
-          add_word ("<li>");
-
-          /* Insert link -- to an external file if splitting, or
-             within the current document if not splitting.  */
-	  add_word ("<a ");
-          /* For chapters (only), insert an anchor that the short contents
-             will link to.  */
-          if (toc_entry_alist[i]->level == 0)
-	    {
-	      char *p = toc_entry_alist[i]->name;
-
-	      /* toc_entry_alist[i]->name has the form `foo">bar',
-		 that is, it includes both the node name and anchor
-		 text.  We need to find where `foo', the node name,
-		 ends, and use that in toc_FOO.  */
-	      while (*p && *p != '"')
-		p++;
-	      add_word_args ("name=\"toc_%.*s\" ",
-		       p - toc_entry_alist[i]->name, toc_entry_alist[i]->name);
-	    }
-	  add_word_args ("href=\"%s#%s</a>\n",
-		   splitting ? toc_entry_alist[i]->html_file : "",
-		   toc_entry_alist[i]->name);
-        }
-
-      last_level = toc_entry_alist[i]->level;
-    }
-
-  /* Go back to start level. */
-  if (toc_entry_alist[0]->level < last_level)
-    for (k = 0; k < (last_level-toc_entry_alist[0]->level); k++)
-      add_word ("</li></ul>\n");
-
-  add_word ("</li></ul>\n</div>\n\n");
-}
-
-/* print table of contents in ASCII (--no-headers)
-   May be we should create a new command line switch --ascii ? */
-static void
-contents_update_info (void)
-{
-  int i;
-  int k;
-
-  if (!toc_counter)
-      return;
-
-  insert_string ((char *) _("Table of Contents"));
-  insert ('\n');
-  for (i = 0; i < strlen (_("Table of Contents")); i++)
-    insert ('*');
-  insert_string ("\n\n");
-
-  for (i = 0; i < toc_counter; i++)
-    {
-      if (toc_entry_alist[i]->level == 0)
-        add_char ('\n');
-
-      /* indention with two spaces per level, should this
-         changed? */
-      for (k = 0; k < toc_entry_alist[i]->level; k++)
-        insert_string ("  ");
-
-      insert_string (toc_entry_alist[i]->name);
-      insert ('\n');
-    }
-  insert_string ("\n\n");
-}
-
-/* shortcontents in HTML; Should this produce a standalone file? */
-static void
-shortcontents_update_html (char *contents_filename)
-{
-  int i;
-  char *toc_file = NULL;
-
-  /* does exist any toc? */
-  if (!toc_counter)
-    return;
-
-  add_html_block_elt_args ("\n<div class=\"shortcontents\">\n<h2>%s</h2>\n<ul>\n", _("Short Contents"));
-
-  if (contents_filename)
-    toc_file = filename_part (contents_filename);
-
-  for (i = 0; i < toc_counter; i++)
-    {
-      char *name = toc_entry_alist[i]->name;
-
-      if (toc_entry_alist[i]->level == 0)
-	{
-	  if (contents_filename)
-	    add_word_args ("<li><a href=\"%s#toc_%s</a></li>\n",
-		     splitting ? toc_file : "", name);
-	  else
-	    add_word_args ("<a href=\"%s#%s</a>\n",
-		     splitting ? toc_entry_alist[i]->html_file : "", name);
-	}
-    }
-  add_word ("</ul>\n</div>\n\n");
-  if (contents_filename)
-    free (toc_file);
-}
-
-/* short contents in ASCII (--no-headers).  */
-static void
-shortcontents_update_info (void)
-{
-  int i;
-
-  if (!toc_counter)
-      return;
-
-  insert_string ((char *) _("Short Contents"));
-  insert ('\n');
-  for (i = 0; i < strlen (_("Short Contents")); i++)
-    insert ('*');
-  insert_string ("\n\n");
-
-  for (i = 0; i < toc_counter; i++)
-    {
-      if (toc_entry_alist[i]->level == 0)
-        {
-          insert_string (toc_entry_alist[i]->name);
-          insert ('\n');
-        }
-    }
-  insert_string ("\n\n");
-}
-
-void
-cm_contents (int arg)
-{
-  /* the file where we found the @contents directive */
-  static char *contents_filename;
-
-  /* No need to mess with delayed stuff for XML and Docbook.  */
-  if (xml)
-    {
-      if (arg == START)
-        {
-          int elt = STREQ (command, "contents") ? CONTENTS : SHORTCONTENTS;
-          xml_insert_element (elt, START);
-          xml_insert_element (elt, END);
-        }
-    }
-  else if (!handling_delayed_writes)
-    {
-      register_delayed_write (STREQ (command, "contents")
-          ? "@contents" : "@shortcontents");
-
-      if (html && STREQ (command, "contents"))
-        {
-          if (contents_filename)
-            free (contents_filename);
-          contents_filename = xstrdup (current_output_filename);
-        }
-    }
-  else if (html)
-    STREQ (command, "contents")
-      ? contents_update_html () : shortcontents_update_html (contents_filename);
-  else if (no_headers)
-    STREQ (command, "contents")
-      ? contents_update_info () : shortcontents_update_info ();
-}

Property changes on: head/contrib/texinfo/makeinfo/toc.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/cmds.h
===================================================================
--- head/contrib/texinfo/makeinfo/cmds.h	(revision 276550)
+++ head/contrib/texinfo/makeinfo/cmds.h	(nonexistent)
@@ -1,213 +0,0 @@
-/* cmds.h -- declarations for cmds.c.
-   $Id: cmds.h,v 1.9 2004/11/26 00:48:35 karl Exp $
-
-   Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation,
-   Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef CMDS_H
-#define CMDS_H
-
-/* The three arguments a command can get are a flag saying whether it is
-   before argument parsing (START) or after (END), the starting position
-   of the arguments, and the ending position.  */
-typedef void COMMAND_FUNCTION (); /* So we can say COMMAND_FUNCTION *foo; */
-
-/* Each command has an associated function.  When the command is
-   encountered in the text, the associated function is called with START
-   as the argument.  If the function expects arguments in braces, it
-   remembers itself on the stack.  When the corresponding close brace is
-   encountered, the function is called with END as the argument. */
-#define START 0
-#define END 1
-
-/* Does the command expect braces?  */
-#define NO_BRACE_ARGS 0
-#define BRACE_ARGS 1
-#define MAYBE_BRACE_ARGS 2
-
-typedef struct
-{
-  char *name;
-  COMMAND_FUNCTION *proc;
-  int argument_in_braces;
-} COMMAND;
-
-extern COMMAND command_table[];
-
-typedef struct acronym_desc
-{
-  struct acronym_desc *next;
-  char *acronym;
-  char *description;
-} ACRONYM_DESC;
-
-/* Texinfo commands.  */
-extern void insert_self (int arg),
-  insert_space (int arg),
-  cm_ignore_line (void),
-  cm_ignore_arg (int arg, int start_pos, int end_pos),
-  cm_comment (void),
-  cm_no_op (void);
-
-/* Document structure and meta information.  */
-extern void cm_setfilename (void),
-  cm_settitle (void),
-  cm_documentdescription (void),
-  cm_node (void),
-  cm_menu (void),
-  cm_detailmenu (void),
-  cm_dircategory (void),
-  cm_direntry (void),
-  cm_bye (void);
-
-/* File inclusion.  */
-extern void cm_include (void),
-  cm_verbatiminclude (void);
-
-/* Cross referencing commands.  */
-extern void cm_anchor (int arg),
-  cm_xref (int arg),
-  cm_pxref (int arg),
-  cm_ref (int arg),
-  cm_inforef (int arg),
-  cm_uref (int arg);
-
-/* Special insertions.  */
-extern void cm_LaTeX (int arg),
-  cm_TeX (int arg),
-  cm_bullet (int arg),
-  cm_colon (void),
-  cm_comma (int arg),
-  cm_copyright (int arg),
-  cm_dots (int arg),
-  cm_enddots (int arg),
-  cm_equiv (int arg),
-  cm_error (int arg),
-  cm_expansion (int arg),
-  cm_image (int arg),
-  cm_insert_copying (void),
-  cm_minus (int arg),
-  cm_point (int arg),
-  cm_print (int arg),
-  cm_punct (int arg),
-  cm_registeredsymbol (int arg),
-  cm_result (int arg);
-
-/* Emphasis and markup.  */
-extern void cm_acronym (int arg),
-  cm_abbr (int arg),
-  cm_b (int arg),
-  cm_cite (int arg, int position),
-  cm_code (int arg),
-  cm_dfn (int arg, int position),
-  cm_dmn (int arg),
-  cm_email (int arg),
-  cm_emph (int arg),
-  cm_i (int arg),
-  cm_kbd (int arg),
-  cm_key (int arg),
-  cm_math (int arg),
-  cm_not_fixed_width (int arg, int start, int end),
-  cm_r (int arg),
-  cm_sansserif (int arg),
-  cm_sc (int arg, int start_pos, int end_pos),
-  cm_slanted (int arg),
-  cm_strong (int arg, int start_pos, int end_pos),
-  cm_tt (int arg),
-  cm_indicate_url (int arg, int start, int end),
-  cm_var (int arg, int start_pos, int end_pos),
-  cm_verb (int arg);
-
-/* Block environments.  */
-extern void cm_cartouche (void),
-  cm_group (void),
-  cm_display (void),
-  cm_smalldisplay (void),
-  cm_example (void),
-  cm_smallexample (void),
-  cm_smalllisp (void),
-  cm_lisp (void),
-  cm_format (void),
-  cm_smallformat (void),
-  cm_quotation (void),
-  cm_copying (void),
-  cm_flushleft (void),
-  cm_flushright (void),
-  cm_verbatim (void),
-  cm_end (void);
-
-/* Tables, lists, enumerations.  */
-extern void cm_table (void),
-  cm_ftable (void),
-  cm_vtable (void),
-  cm_itemize (void),
-  cm_enumerate (void),
-  cm_multitable (void),
-  cm_headitem (void),
-  cm_item (void),
-  cm_itemx (void),
-  cm_tab (void);
-
-extern void cm_center (void),
-  cm_exdent (void),
-  cm_indent (void),
-  cm_noindent (void),
-  cm_noindent_cmd (void);
-
-/* Line and page breaks.  */
-extern void cm_asterisk (void),
-  cm_sp (void),
-  cm_page (void);
-
-/* Non breaking words.  */
-extern void cm_tie (int arg),
-  cm_w (int arg);
-
-/* Title page creation.  */
-extern void cm_titlepage (void),
-  cm_author (void),
-  cm_titlepage_cmds (void),
-  cm_titlefont (int arg),
-  cm_today (int arg);
-
-/* Floats.  */
-extern void cm_float (void),
-  cm_caption (int arg),
-  cm_shortcaption (void),
-  cm_listoffloats (void);
-
-/* Indices.  */
-extern void cm_kindex (void),
-  cm_cindex (void),
-  cm_findex (void),
-  cm_pindex (void),
-  cm_vindex (void),
-  cm_tindex (void),
-  cm_defindex (void),
-  cm_defcodeindex (void),
-  cm_synindex (void),
-  cm_printindex (void);
-
-/* Conditionals. */
-extern void cm_set (void),
-  cm_clear (void),
-  cm_ifset (void),
-  cm_ifclear (void),
-  cm_ifeq (void),
-  cm_value (int arg, int start_pos, int end_pos);
-
-#endif /* !CMDS_H */

Property changes on: head/contrib/texinfo/makeinfo/cmds.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/toc.h
===================================================================
--- head/contrib/texinfo/makeinfo/toc.h	(revision 276550)
+++ head/contrib/texinfo/makeinfo/toc.h	(nonexistent)
@@ -1,45 +0,0 @@
-/* toc.h -- table of contents handling.
-   $Id: toc.h,v 1.2 2004/04/11 17:56:47 karl Exp $
-
-   Copyright (C) 1999 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Karl Heinz Marbaise <kama@hippo.fido.de>.  */
-
-#ifndef TOC_H
-#define TOC_H
-
-/* Structure to hold one entry for the toc. */
-typedef struct toc_entry_elt {
-  char *name;
-  char *containing_node; /* Name of node containing this section.  */
-  char *html_file;       /* Name of HTML node-file in split-HTML mode */
-  int number;            /* counting number from 0...n independent from
-                            chapter/section can be used for anchors or
-                            references to it.  */
-  int level;             /* level: chapter, section, subsection... */
-} TOC_ENTRY_ELT;
-
-/* all routines which have relationship with TOC should start with
-   toc_ (this is a kind of name-space) */
-extern int toc_add_entry (char *tocname, int level,
-    char *node_name, char *anchor); /* return the number for the toc-entry */
-extern void toc_free (void);
-extern char *toc_find_section_of_node (char *node);
-
-extern void cm_contents (int arg);
-
-#endif /* not TOC_H */

Property changes on: head/contrib/texinfo/makeinfo/toc.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/html.c
===================================================================
--- head/contrib/texinfo/makeinfo/html.c	(revision 276550)
+++ head/contrib/texinfo/makeinfo/html.c	(nonexistent)
@@ -1,822 +0,0 @@
-/* html.c -- html-related utilities.
-   $Id: html.c,v 1.28 2004/12/06 01:13:06 karl Exp $
-
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "system.h"
-#include "cmds.h"
-#include "files.h"
-#include "html.h"
-#include "lang.h"
-#include "makeinfo.h"
-#include "node.h"
-#include "sectioning.h"
-
-
-/* Append CHAR to BUFFER, (re)allocating as necessary.  We don't handle
-   null characters.  */
-
-typedef struct
-{
-  unsigned size;    /* allocated */
-  unsigned length;  /* used */
-  char *buffer;
-} buffer_type;
-
-static buffer_type *
-init_buffer (void)
-{
-  buffer_type *buf = xmalloc (sizeof (buffer_type));
-  buf->length = 0;
-  buf->size = 0;
-  buf->buffer = NULL;
-
-  return buf;
-}
-
-static void
-append_char (buffer_type *buf, int c)
-{
-  buf->length++;
-  if (buf->length >= buf->size)
-    {
-      buf->size += 100;
-      buf->buffer = xrealloc (buf->buffer, buf->size);
-    }
-  buf->buffer[buf->length - 1] = c;
-  buf->buffer[buf->length] = 0;
-}
-
-/* Read the cascading style-sheet file FILENAME.  Write out any @import
-   commands, which must come first, by the definition of css.  If the
-   file contains any actual css code following the @imports, return it;
-   else return NULL.  */
-static char *
-process_css_file (char *filename)
-{
-  int c;
-  int lastchar = 0;
-  FILE *f;
-  buffer_type *import_text = init_buffer ();
-  buffer_type *inline_text = init_buffer ();
-  unsigned lineno = 1;
-  enum { null_state, comment_state, import_state, inline_state } state
-    = null_state, prev_state;
-
-  prev_state = null_state;
-
-  /* read from stdin if `-' is the filename.  */
-  f = STREQ (filename, "-") ? stdin : fopen (filename, "r");
-  if (!f)
-    {
-      error (_("%s: could not open --css-file: %s"), progname, filename);
-      return NULL;
-    }
-
-  /* Read the file.  The @import statements must come at the beginning,
-     with only whitespace and comments allowed before any inline css code.  */
-  while ((c = getc (f)) >= 0)
-    {
-      if (c == '\n')
-        lineno++;
-
-      switch (state)
-        {
-        case null_state: /* between things */
-          if (c == '@')
-            { /* Only @import and @charset should switch into
-                 import_state, other @-commands, such as @media, should
-                 put us into inline_state.  I don't think any other css
-                 @-commands start with `i' or `c', although of course
-                 this will break when such a command is defined.  */
-              int nextchar = getc (f);
-              if (nextchar == 'i' || nextchar == 'c')
-                {
-                  append_char (import_text, c);
-                  state = import_state;
-                }
-              else
-                {
-                  ungetc (nextchar, f);  /* wasn't an @import */
-                  state = inline_state;
-                }
-            }
-          else if (c == '/')
-            { /* possible start of a comment */
-              int nextchar = getc (f);
-              if (nextchar == '*')
-                state = comment_state;
-              else
-                {
-                  ungetc (nextchar, f); /* wasn't a comment */
-                  state = inline_state;
-                }
-            }
-          else if (isspace (c))
-            ; /* skip whitespace; maybe should use c_isspace?  */
-
-          else
-            /* not an @import, not a comment, not whitespace: we must
-               have started the inline text.  */
-            state = inline_state;
-
-          if (state == inline_state)
-            append_char (inline_text, c);
-
-          if (state != null_state)
-            prev_state = null_state;
-          break;
-
-        case comment_state:
-          if (c == '/' && lastchar == '*')
-            state = prev_state;  /* end of comment */
-          break;  /* else ignore this comment char */
-
-        case import_state:
-          append_char (import_text, c);  /* include this import char */
-          if (c == ';')
-            { /* done with @import */
-              append_char (import_text, '\n');  /* make the output nice */
-              state = null_state;
-              prev_state = import_state;
-            }
-          break;
-
-        case inline_state:
-          /* No harm in writing out comments, so don't bother parsing
-             them out, just append everything.  */
-          append_char (inline_text, c);
-          break;
-        }
-
-      lastchar = c;
-    }
-
-  /* Reached the end of the file.  We should not be still in a comment.  */
-  if (state == comment_state)
-    warning (_("%s:%d: --css-file ended in comment"), filename, lineno);
-
-  /* Write the @import text, if any.  */
-  if (import_text->buffer)
-    {
-      add_word (import_text->buffer);
-      free (import_text->buffer);
-      free (import_text);
-    }
-
-  /* We're wasting the buffer struct memory, but so what.  */
-  return inline_text->buffer;
-}
-
-HSTACK *htmlstack = NULL;
-
-/* See html.h.  */
-int html_output_head_p = 0;
-int html_title_written = 0;
-
-void
-html_output_head (void)
-{
-  static const char *html_title = NULL;
-  char *encoding;
-
-  if (html_output_head_p)
-    return;
-  html_output_head_p = 1;
-
-  encoding = current_document_encoding ();
-
-  /* The <title> should not have markup, so use text_expansion.  */
-  if (!html_title)
-    html_title = escape_string (title ?
-        text_expansion (title) : (char *) _("Untitled"));
-
-  /* Make sure this is the very first string of the output document.  */
-  output_paragraph_offset = 0;
-
-  add_html_block_elt_args ("<html lang=\"%s\">\n<head>\n",
-      language_table[language_code].abbrev);
-
-  /* When splitting, add current node's name to title if it's available and not
-     Top.  */
-  if (splitting && current_node && !STREQ (current_node, "Top"))
-    add_word_args ("<title>%s - %s</title>\n",
-        escape_string (xstrdup (current_node)), html_title);
-  else
-    add_word_args ("<title>%s</title>\n",  html_title);
-
-  add_word ("<meta http-equiv=\"Content-Type\" content=\"text/html");
-  if (encoding && *encoding)
-    add_word_args ("; charset=%s", encoding);
-                   
-  add_word ("\">\n");
-
-  if (!document_description)
-    document_description = html_title;
-
-  add_word_args ("<meta name=\"description\" content=\"%s\">\n",
-                 document_description);
-  add_word_args ("<meta name=\"generator\" content=\"makeinfo %s\">\n",
-                 VERSION);
-
-  /* Navigation bar links.  */
-  if (!splitting)
-    add_word ("<link title=\"Top\" rel=\"top\" href=\"#Top\">\n");
-  else if (tag_table)
-    {
-      /* Always put a top link.  */
-      add_word ("<link title=\"Top\" rel=\"start\" href=\"index.html#Top\">\n");
-
-      /* We already have a top link, avoid duplication.  */
-      if (tag_table->up && !STREQ (tag_table->up, "Top"))
-        add_link (tag_table->up, "rel=\"up\"");
-
-      if (tag_table->prev)
-        add_link (tag_table->prev, "rel=\"prev\"");
-
-      if (tag_table->next)
-        add_link (tag_table->next, "rel=\"next\"");
-
-      /* fixxme: Look for a way to put links to various indices in the
-         document.  Also possible candidates to be added here are First and
-         Last links.  */
-    }
-  else
-    {
-      /* We are splitting, but we neither have a tag_table.  So this must be
-         index.html.  So put a link to Top. */
-      add_word ("<link title=\"Top\" rel=\"start\" href=\"#Top\">\n");
-    }
-
-  add_word ("<link href=\"http://www.gnu.org/software/texinfo/\" \
-rel=\"generator-home\" title=\"Texinfo Homepage\">\n");
-
-  if (copying_text)
-    { /* It is not ideal that we include the html markup here within
-         <head>, so we use text_expansion.  */
-      insert_string ("<!--\n");
-      insert_string (text_expansion (copying_text));
-      insert_string ("-->\n");
-    }
-
-  /* Put the style definitions in a comment for the sake of browsers
-     that don't support <style>.  */
-  add_word ("<meta http-equiv=\"Content-Style-Type\" content=\"text/css\">\n");
-  add_word ("<style type=\"text/css\"><!--\n");
-
-  {
-    char *css_inline = NULL;
-
-    if (css_include)
-      /* This writes out any @import commands from the --css-file,
-         and returns any actual css code following the imports.  */
-      css_inline = process_css_file (css_include);
-
-    /* This seems cleaner than adding <br>'s at the end of each line for
-       these "roman" displays.  It's hardly the end of the world if the
-       browser doesn't do <style>s, in any case; they'll just come out in
-       typewriter.  */
-#define CSS_FONT_INHERIT "font-family:inherit"
-    add_word_args ("  pre.display { %s }\n", CSS_FONT_INHERIT);
-    add_word_args ("  pre.format  { %s }\n", CSS_FONT_INHERIT);
-
-    /* Alternatively, we could do <font size=-1> in insertion.c, but this
-       way makes it easier to override.  */
-#define CSS_FONT_SMALLER "font-size:smaller"
-    add_word_args ("  pre.smalldisplay { %s; %s }\n", CSS_FONT_INHERIT,
-                   CSS_FONT_SMALLER);
-    add_word_args ("  pre.smallformat  { %s; %s }\n", CSS_FONT_INHERIT,
-                   CSS_FONT_SMALLER);
-    add_word_args ("  pre.smallexample { %s }\n", CSS_FONT_SMALLER);
-    add_word_args ("  pre.smalllisp    { %s }\n", CSS_FONT_SMALLER);
-
-    /* Since HTML doesn't have a sc element, we use span with a bit of
-       CSS spice instead.  */
-#define CSS_FONT_SMALL_CAPS "font-variant:small-caps"
-    add_word_args ("  span.sc    { %s }\n", CSS_FONT_SMALL_CAPS);
-
-    /* Roman (default) font class, closest we can come.  */
-#define CSS_FONT_ROMAN "font-family:serif; font-weight:normal;"
-    add_word_args ("  span.roman { %s } \n", CSS_FONT_ROMAN);
-
-    /* Sans serif font class.  */
-#define CSS_FONT_SANSSERIF "font-family:sans-serif; font-weight:normal;"
-    add_word_args ("  span.sansserif { %s } \n", CSS_FONT_SANSSERIF);
-
-    /* Write out any css code from the user's --css-file.  */
-    if (css_inline)
-      insert_string (css_inline);
-
-    add_word ("--></style>\n");
-  }
-
-  add_word ("</head>\n<body>\n");
-
-  if (title && !html_title_written && titlepage_cmd_present)
-    {
-      add_word_args ("<h1 class=\"settitle\">%s</h1>\n", html_title);
-      html_title_written = 1;
-    }
-
-  free (encoding);
-}
-
-/* Escape HTML special characters in the string if necessary,
-   returning a pointer to a possibly newly-allocated one. */
-char *
-escape_string (char *string)
-{
-  char *newstring;
-  int i = 0, newlen = 0;
-
-  do
-    {
-      /* Find how much to allocate. */
-      switch (string[i])
-        {
-        case '"':
-          newlen += 6;          /* `&quot;' */
-          break;
-        case '&':
-          newlen += 5;          /* `&amp;' */
-          break;
-        case '<':
-        case '>':
-          newlen += 4;          /* `&lt;', `&gt;' */
-          break;
-        default:
-          newlen++;
-        }
-    }
-  while (string[i++]);
-
-  if (newlen == i) return string; /* Already OK. */
-
-  newstring = xmalloc (newlen);
-  i = 0;
-  do
-    {
-      switch (string[i])
-        {
-        case '"':
-          strcpy (newstring, "&quot;");
-          newstring += 6;
-          break;
-        case '&':
-          strcpy (newstring, "&amp;");
-          newstring += 5;
-          break;
-        case '<':
-          strcpy (newstring, "&lt;");
-          newstring += 4;
-          break;
-        case '>':
-          strcpy (newstring, "&gt;");
-          newstring += 4;
-          break;
-        default:
-          newstring[0] = string[i];
-          newstring++;
-        }
-    }
-  while (string[i++]);
-  free (string);
-  return newstring - newlen;
-}
-
-/* Save current tag.  */
-static void
-push_tag (char *tag, char *attribs)
-{
-  HSTACK *newstack = xmalloc (sizeof (HSTACK));
-
-  newstack->tag = tag;
-  newstack->attribs = xstrdup (attribs);
-  newstack->next = htmlstack;
-  htmlstack = newstack;
-}
-
-/* Get last tag.  */
-static void
-pop_tag (void)
-{
-  HSTACK *tos = htmlstack;
-
-  if (!tos)
-    {
-      line_error (_("[unexpected] no html tag to pop"));
-      return;
-    }
-
-  free (htmlstack->attribs);
-
-  htmlstack = htmlstack->next;
-  free (tos);
-}
-
-/* Check if tag is an empty or a whitespace only element.
-   If so, remove it, keeping whitespace intact.  */
-int
-rollback_empty_tag (char *tag)
-{
-  int check_position = output_paragraph_offset;
-  int taglen = strlen (tag);
-  int rollback_happened = 0;
-  char *contents = "";
-  char *contents_canon_white = "";
-
-  /* If output_paragraph is empty, we cannot rollback :-\  */
-  if (output_paragraph_offset <= 0)
-    return 0;
-
-  /* Find the end of the previous tag.  */
-  while (output_paragraph[check_position-1] != '>' && check_position > 0)
-    check_position--;
-
-  /* Save stuff between tag's end to output_paragraph's end.  */
-  if (check_position != output_paragraph_offset)
-    {
-      contents = xmalloc (output_paragraph_offset - check_position + 1);
-      memcpy (contents, output_paragraph + check_position,
-          output_paragraph_offset - check_position);
-
-      contents[output_paragraph_offset - check_position] = '\0';
-
-      contents_canon_white = xstrdup (contents);
-      canon_white (contents_canon_white);
-    }
-
-  /* Find the start of the previous tag.  */
-  while (output_paragraph[check_position-1] != '<' && check_position > 0)
-    check_position--;
-
-  /* Check to see if this is the tag.  */
-  if (strncmp ((char *) output_paragraph + check_position, tag, taglen) == 0
-      && (whitespace (output_paragraph[check_position + taglen])
-          || output_paragraph[check_position + taglen] == '>'))
-    {
-      if (!contents_canon_white || !*contents_canon_white)
-        {
-          /* Empty content after whitespace removal, so roll it back.  */
-          output_paragraph_offset = check_position - 1;
-          rollback_happened = 1;
-
-          /* Original contents may not be empty (whitespace.)  */
-          if (contents && *contents)
-            {
-              insert_string (contents);
-              free (contents);
-            }
-        }
-    }
-
-  return rollback_happened;
-}
-
-/* Open or close TAG according to START_OR_END. */
-void
-#if defined (VA_FPRINTF) && __STDC__
-insert_html_tag_with_attribute (int start_or_end, char *tag, char *format, ...)
-#else
-insert_html_tag_with_attribute (start_or_end, tag, format, va_alist)
-     int start_or_end;
-     char *tag;
-     char *format;
-     va_dcl
-#endif
-{
-  char *old_tag = NULL;
-  char *old_attribs = NULL;
-  char formatted_attribs[2000]; /* xx no fixed limits */
-  int do_return = 0;
-  extern int in_html_elt;
-
-  if (start_or_end != START)
-    pop_tag ();
-
-  if (htmlstack)
-    {
-      old_tag = htmlstack->tag;
-      old_attribs = htmlstack->attribs;
-    }
-  
-  if (format)
-    {
-#ifdef VA_SPRINTF
-      va_list ap;
-#endif
-
-      VA_START (ap, format);
-#ifdef VA_SPRINTF
-      VA_SPRINTF (formatted_attribs, format, ap);
-#else
-      sprintf (formatted_attribs, format, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif
-      va_end (ap);
-    }
-  else
-    formatted_attribs[0] = '\0';
-
-  /* Exception: can nest multiple spans.  */
-  if (htmlstack
-      && STREQ (htmlstack->tag, tag)
-      && !(STREQ (tag, "span") && STREQ (old_attribs, formatted_attribs)))
-    do_return = 1;
-
-  if (start_or_end == START)
-    push_tag (tag, formatted_attribs);
-
-  if (do_return)
-    return;
-
-  in_html_elt++;
-
-  /* texinfo.tex doesn't support more than one font attribute
-     at the same time.  */
-  if ((start_or_end == START) && old_tag && *old_tag
-      && !rollback_empty_tag (old_tag))
-    add_word_args ("</%s>", old_tag);
-
-  if (*tag)
-    {
-      if (start_or_end == START)
-        add_word_args (format ? "<%s %s>" : "<%s>", tag, formatted_attribs);
-      else if (!rollback_empty_tag (tag))
-        /* Insert close tag only if we didn't rollback,
-           in which case the opening tag is removed.  */
-        add_word_args ("</%s>", tag);
-    }
-
-  if ((start_or_end != START) && old_tag && *old_tag)
-    add_word_args (strlen (old_attribs) > 0 ? "<%s %s>" : "<%s>",
-        old_tag, old_attribs);
-
-  in_html_elt--;
-}
-
-void
-insert_html_tag (int start_or_end, char *tag)
-{
-  insert_html_tag_with_attribute (start_or_end, tag, NULL);
-}
-
-/* Output an HTML <link> to the filename for NODE, including the
-   other string as extra attributes. */
-void
-add_link (char *nodename, char *attributes)
-{
-  if (nodename)
-    {
-      add_html_elt ("<link ");
-      add_word_args ("%s", attributes);
-      add_word_args (" href=\"");
-      add_anchor_name (nodename, 1);
-      add_word_args ("\" title=\"%s\">\n", nodename);
-    }
-}
-
-/* Output NAME with characters escaped as appropriate for an anchor
-   name, i.e., escape URL special characters with our _00hh convention
-   if OLD is zero.  (See the manual for details on the new scheme.)
-   
-   If OLD is nonzero, generate the node name with the 4.6-and-earlier
-   convention of %hh (and more special characters output as-is, notably
-   - and *).  This is only so that external references to old names can
-   still work with HTML generated by the new makeinfo; the gcc folks
-   needed this.  Our own HTML does not refer to these names.  */
-
-void
-add_escaped_anchor_name (char *name, int old)
-{
-  canon_white (name);
-
-  if (!old && !strchr ("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
-                       *name))
-    { /* XHTML does not allow anything but an ASCII letter to start an
-         identifier.  Therefore kludge in this constant string if we
-         have a nonletter.  */
-      add_word ("g_t");
-    }
-
-  for (; *name; name++)
-    {
-      if (cr_or_whitespace (*name))
-        add_char ('-');
-
-      else if (!old && !URL_SAFE_CHAR (*name))
-        /* Cast so characters with the high bit set are treated as >128,
-           for example o-umlaut should be 246, not -10.  */
-        add_word_args ("_00%x", (unsigned char) *name);
-
-      else if (old && !URL_SAFE_CHAR (*name) && !OLD_URL_SAFE_CHAR (*name))
-        /* Different output convention, but still cast as above.  */
-        add_word_args ("%%%x", (unsigned char) *name);
-
-      else
-        add_char (*name);
-    }
-}
-
-/* Insert the text for the name of a reference in an HTML anchor
-   appropriate for NODENAME.
-   
-   If HREF is zero, generate text for name= in the new node name
-     conversion convention.
-   If HREF is negative, generate text for name= in the old convention.
-   If HREF is positive, generate the name for an href= attribute, i.e.,
-     including the `#' if it's an internal reference.   */
-void
-add_anchor_name (char *nodename, int href)
-{
-  if (href > 0)
-    {
-      if (splitting)
-	add_url_name (nodename, href);
-      add_char ('#');
-    }
-  /* Always add NODENAME, so that the reference would pinpoint the
-     exact node on its file.  This is so several nodes could share the
-     same file, in case of file-name clashes, but also for more
-     accurate browser positioning.  */
-  if (strcasecmp (nodename, "(dir)") == 0)
-    /* Strip the parens, but keep the original letter-case.  */
-    add_word_args ("%.3s", nodename + 1);
-  else if (strcasecmp (nodename, "top") == 0)
-    add_word ("Top");
-  else
-    add_escaped_anchor_name (nodename, href < 0);
-}
-
-/* Insert the text for the name of a reference in an HTML url, aprropriate
-   for NODENAME */
-void
-add_url_name (char *nodename, int href)
-{
-    add_nodename_to_filename (nodename, href);
-}
-
-/* Convert non [A-Za-z0-9] to _00xx, where xx means the hexadecimal
-   representation of the ASCII character.  Also convert spaces and
-   newlines to dashes.  */
-static void
-fix_filename (char *filename)
-{
-  int i;
-  int len = strlen (filename);
-  char *oldname = xstrdup (filename);
-
-  *filename = '\0';
-
-  for (i = 0; i < len; i++)
-    {
-      if (cr_or_whitespace (oldname[i]))
-        strcat (filename, "-");
-      else if (URL_SAFE_CHAR (oldname[i]))
-        strncat (filename, (char *) oldname + i, 1);
-      else
-        {
-          char *hexchar = xmalloc (6 * sizeof (char));
-          sprintf (hexchar, "_00%x", (unsigned char) oldname[i]);
-          strcat (filename, hexchar);
-          free (hexchar);
-        }
-
-      /* Check if we are nearing boundaries.  */
-      if (strlen (filename) >= PATH_MAX - 20)
-        break;
-    }
-
-  free (oldname);
-}
-
-/* As we can't look-up a (forward-referenced) nodes' html filename
-   from the tentry, we take the easy way out.  We assume that
-   nodenames are unique, and generate the html filename from the
-   nodename, that's always known.  */
-static char *
-nodename_to_filename_1 (char *nodename, int href)
-{
-  char *p;
-  char *filename;
-  char dirname[PATH_MAX];
-
-  if (strcasecmp (nodename, "Top") == 0)
-    {
-      /* We want to convert references to the Top node into
-	 "index.html#Top".  */
-      if (href)
-	filename = xstrdup ("index.html"); /* "#Top" is added by our callers */
-      else
-	filename = xstrdup ("Top");
-    }
-  else if (strcasecmp (nodename, "(dir)") == 0)
-    /* We want to convert references to the (dir) node into
-       "../index.html".  */
-    filename = xstrdup ("../index.html");
-  else
-    {
-      filename = xmalloc (PATH_MAX);
-      dirname[0] = '\0';
-      *filename = '\0';
-
-      /* Check for external reference: ``(info-document)node-name''
-	 Assume this node lives at: ``../info-document/node-name.html''
-
-	 We need to handle the special case (sigh): ``(info-document)'',
-	 ie, an external top-node, which should translate to:
-	 ``../info-document/info-document.html'' */
-
-      p = nodename;
-      if (*nodename == '(')
-	{
-	  int length;
-
-	  p = strchr (nodename, ')');
-	  if (p == NULL)
-	    {
-	      line_error (_("[unexpected] invalid node name: `%s'"), nodename);
-	      xexit (1);
-	    }
-
-	  length = p - nodename - 1;
-	  if (length > 5 &&
-	      FILENAME_CMPN (p - 5, ".info", 5) == 0)
-	    length -= 5;
-	  /* This is for DOS, and also for Windows and GNU/Linux
-	     systems that might have Info files copied from a DOS 8+3
-	     filesystem.  */
-	  if (length > 4 &&
-	      FILENAME_CMPN (p - 4, ".inf", 4) == 0)
-	    length -= 4;
-	  strcpy (filename, "../");
-	  strncpy (dirname, nodename + 1, length);
-	  *(dirname + length) = '\0';
-	  fix_filename (dirname);
-	  strcat (filename, dirname);
-	  strcat (filename, "/");
-	  p++;
-	}
-
-      /* In the case of just (info-document), there will be nothing
-	 remaining, and we will refer to ../info-document/, which will
-	 work fine.  */
-      strcat (filename, p);
-      if (*p)
-	{
-	  /* Hmm */
-	  fix_filename (filename + strlen (filename) - strlen (p));
-	  strcat (filename, ".html");
-	}
-    }
-
-  /* Produce a file name suitable for the underlying filesystem.  */
-  normalize_filename (filename);
-
-#if 0
-  /* We add ``#Nodified-filename'' anchor to external references to be
-     prepared for non-split HTML support.  Maybe drop this. */
-  if (href && *dirname)
-    {
-      strcat (filename, "#");
-      strcat (filename, p);
-      /* Hmm, again */
-      fix_filename (filename + strlen (filename) - strlen (p));
-    }
-#endif
-
-  return filename;
-}
-
-/* If necessary, ie, if current filename != filename of node, output
-   the node name.  */
-void
-add_nodename_to_filename (char *nodename, int href)
-{
-  /* for now, don't check: always output filename */
-  char *filename = nodename_to_filename_1 (nodename, href);
-  add_word (filename);
-  free (filename);
-}
-
-char *
-nodename_to_filename (char *nodename)
-{
-  /* The callers of nodename_to_filename use the result to produce
-     <a href=, so call nodename_to_filename_1 with last arg non-zero.  */
-  return nodename_to_filename_1 (nodename, 1);
-}

Property changes on: head/contrib/texinfo/makeinfo/html.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/node.c
===================================================================
--- head/contrib/texinfo/makeinfo/node.c	(revision 276550)
+++ head/contrib/texinfo/makeinfo/node.c	(nonexistent)
@@ -1,1943 +0,0 @@
-/* node.c -- nodes for Texinfo.
-   $Id: node.c,v 1.27 2004/12/20 23:56:07 karl Exp $
-
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "system.h"
-#include "cmds.h"
-#include "files.h"
-#include "float.h"
-#include "footnote.h"
-#include "macro.h"
-#include "makeinfo.h"
-#include "node.h"
-#include "html.h"
-#include "sectioning.h"
-#include "insertion.h"
-#include "xml.h"
-
-/* See comments in node.h.  */
-NODE_REF *node_references = NULL;
-NODE_REF *node_node_references = NULL;
-TAG_ENTRY *tag_table = NULL;
-int node_number = -1;
-int node_order = 0;
-int current_section = 0;
-int outstanding_node = 0;
-
-/* Adding nodes, and making tags.  */
-
-/* Start a new tag table. */
-void
-init_tag_table (void)
-{
-  while (tag_table)
-    {
-      TAG_ENTRY *temp = tag_table;
-      free (temp->node);
-      free (temp->prev);
-      free (temp->next);
-      free (temp->up);
-      tag_table = tag_table->next_ent;
-      free (temp);
-    }
-}
-
-/* Write out the contents of the existing tag table.
-   INDIRECT_P says how to format the output (it depends on whether the
-   table is direct or indirect).  */
-static void
-write_tag_table_internal (int indirect_p)
-{
-  TAG_ENTRY *node;
-  int old_indent = no_indent;
-
-  if (xml)
-    {
-      flush_output ();
-      return;
-    }
-
-  no_indent = 1;
-  filling_enabled = 0;
-  must_start_paragraph = 0;
-  close_paragraph ();
-
-  if (!indirect_p)
-    {
-      no_indent = 1;
-      insert ('\n');
-    }
-
-  add_word_args ("\037\nTag Table:\n%s", indirect_p ? "(Indirect)\n" : "");
-
-  /* Do not collapse -- to -, etc., in node names.  */
-  in_fixed_width_font++;
-
-  for (node = tag_table; node; node = node->next_ent)
-    {
-      if (node->flags & TAG_FLAG_ANCHOR)
-        { /* This reference is to an anchor.  */
-          execute_string ("Ref: %s", node->node);
-        }
-      else
-        { /* This reference is to a node.  */
-          execute_string ("Node: %s", node->node);
-        }
-      add_word_args ("\177%d\n", node->position);
-    }
-
-  add_word ("\037\nEnd Tag Table\n");
-
-  /* Do not collapse -- to -, etc., in node names.  */
-  in_fixed_width_font--;
-
-  flush_output ();
-  no_indent = old_indent;
-}
-
-void
-write_tag_table (char *filename)
-{
-  output_stream = fopen (filename, "a");
-  if (!output_stream)
-    {
-      fs_error (filename);
-      return;
-    }
-
-  write_tag_table_internal (0); /* Not indirect. */
-
-  if (fclose (output_stream) != 0)
-    fs_error (filename);
-}
-
-static void
-write_tag_table_indirect (void)
-{
-  write_tag_table_internal (1);
-}
-
-/* Convert "top" and friends into "Top". */
-static void
-normalize_node_name (char *string)
-{
-  if (strcasecmp (string, "Top") == 0)
-    strcpy (string, "Top");
-}
-
-static char *
-get_node_token (int expand)
-{
-  char *string;
-
-  get_until_in_line (expand, ",", &string);
-
-  if (curchar () == ',')
-    input_text_offset++;
-
-  fix_whitespace (string);
-
-  /* Force all versions of "top" to be "Top". */
-  normalize_node_name (string);
-
-  return string;
-}
-
-/* Expand any macros and other directives in a node name, and
-   return the expanded name as an malloc'ed string.  */
-char *
-expand_node_name (char *node)
-{
-  char *result = node;
-
-  if (node)
-    {
-      /* Don't expand --, `` etc., in case somebody will want
-         to print the result.  */
-      in_fixed_width_font++;
-      result = expansion (node, 0);
-      in_fixed_width_font--;
-      fix_whitespace (result);
-      normalize_node_name (result);
-    }
-  return result;
-}
-
-/* Look up NAME in the tag table, and return the associated
-   tag_entry.  If the node is not in the table return NULL. */
-TAG_ENTRY *
-find_node (char *name)
-{
-  TAG_ENTRY *tag = tag_table;
-  char *expanded_name;
-  char n1 = name[0];
-
-  while (tag)
-    {
-      if (tag->node[0] == n1 && strcmp (tag->node, name) == 0)
-        return tag;
-      tag = tag->next_ent;
-    }
-
-  if (!expensive_validation)
-    return NULL;
-
-  /* Try harder.  Maybe TAG_TABLE has the expanded NAME, or maybe NAME
-     is expanded while TAG_TABLE has its unexpanded form.  This may
-     slow down the search, but if they want this feature, let them
-     pay!  If they want it fast, they should write every node name
-     consistently (either always expanded or always unexpaned).  */
-  expanded_name = expand_node_name (name);
-  for (tag = tag_table; tag; tag = tag->next_ent)
-    {
-      if (STREQ (tag->node, expanded_name))
-        break;
-      /* If the tag name doesn't have the command prefix, there's no
-         chance it could expand into anything but itself.  */
-      if (strchr (tag->node, COMMAND_PREFIX))
-        {
-          char *expanded_node = expand_node_name (tag->node);
-
-          if (STREQ (expanded_node, expanded_name))
-            {
-              free (expanded_node);
-              break;
-            }
-          free (expanded_node);
-        }
-    }
-  free (expanded_name);
-  return tag;
-}
-
-/* Look in the tag table for a node whose file name is FNAME, and
-   return the associated tag_entry.  If there's no such node in the
-   table, return NULL. */
-static TAG_ENTRY *
-find_node_by_fname (char *fname)
-{
-  TAG_ENTRY *tag = tag_table;
-  while (tag)
-    {
-      if (tag->html_fname && FILENAME_CMP (tag->html_fname, fname) == 0)
-	return tag;
-      tag = tag->next_ent;
-    }
-
-  return tag;
-}
-
-/* Remember next, prev, etc. references in a @node command, where we
-   don't care about most of the entries. */
-static void
-remember_node_node_reference (char *node)
-{
-  NODE_REF *temp = xmalloc (sizeof (NODE_REF));
-  int number;
-
-  if (!node) return;
-  temp->next = node_node_references;
-  temp->node = xstrdup (node);
-  temp->type = followed_reference;
-  number = number_of_node (node);
-  if (number)
-    temp->number = number;      /* Already assigned. */
-  else
-    {
-      node_number++;
-      temp->number = node_number;
-    }
-  node_node_references = temp;
-}
-
-/* Remember NODE and associates. */
-static void
-remember_node (char *node, char *prev, char *next, char *up,
-    int position, int line_no, char *fname, int flags)
-{
-  /* Check for existence of this tag already. */
-  if (validating)
-    {
-      TAG_ENTRY *tag = find_node (node);
-      if (tag)
-        {
-          line_error (_("Node `%s' previously defined at line %d"),
-                      node, tag->line_no);
-          return;
-        }
-    }
-
-  if (!(flags & TAG_FLAG_ANCHOR))
-    {
-      /* Make this the current node. */
-      current_node = node;
-    }
-
-  /* Add it to the list. */
-  {
-    int number = number_of_node (node);
-
-    TAG_ENTRY *new = xmalloc (sizeof (TAG_ENTRY));
-    new->node = node;
-    new->prev = prev;
-    new->next = next;
-    new->up = up;
-    new->position = position;
-    new->line_no = line_no;
-    new->filename = node_filename;
-    new->touched = 0;
-    new->flags = flags;
-    if (number)
-      new->number = number;     /* Already assigned. */
-    else
-      {
-        node_number++;
-        new->number = node_number;
-      }
-    if (fname)
-      new->html_fname = fname;
-    else
-      /* This happens for Top node under split-HTML, for example.  */
-      new->html_fname
-	= normalize_filename (filename_part (current_output_filename));
-    new->next_ent = tag_table;
-
-    /* Increment the order counter, and save it.  */
-    node_order++;
-    new->order = node_order;
-
-    tag_table = new;
-  }
-
-  if (html)
-    { /* Note the references to the next etc. nodes too.  */
-      remember_node_node_reference (next);
-      remember_node_node_reference (prev);
-      remember_node_node_reference (up);
-    }
-}
-
-/* Remember this node name for later validation use.  This is used to
-   remember menu references while reading the input file.  After the
-   output file has been written, if validation is on, then we use the
-   contents of `node_references' as a list of nodes to validate.  */
-void
-remember_node_reference (char *node, int line, enum reftype type)
-{
-  NODE_REF *temp = xmalloc (sizeof (NODE_REF));
-  int number = number_of_node (node);
-
-  temp->next = node_references;
-  temp->node = xstrdup (node);
-  temp->line_no = line;
-  temp->section = current_section;
-  temp->type = type;
-  temp->containing_node = xstrdup (current_node ? current_node : "");
-  temp->filename = node_filename;
-  if (number)
-    temp->number = number;      /* Already assigned. */
-  else
-    {
-      node_number++;
-      temp->number = node_number;
-    }
-
-  node_references = temp;
-}
-
-static void
-isolate_nodename (char *nodename)
-{
-  int i, c;
-  int paren_seen, paren;
-
-  if (!nodename)
-    return;
-
-  canon_white (nodename);
-  paren_seen = paren = i = 0;
-
-  if (*nodename == '.' || !*nodename)
-    {
-      *nodename = 0;
-      return;
-    }
-
-  if (*nodename == '(')
-    {
-      paren++;
-      paren_seen++;
-      i++;
-    }
-
-  for (; (c = nodename[i]); i++)
-    {
-      if (paren)
-        {
-          if (c == '(')
-            paren++;
-          else if (c == ')')
-            paren--;
-
-          continue;
-        }
-
-      /* If the character following the close paren is a space, then this
-         node has no more characters associated with it. */
-      if (c == '\t' ||
-          c == '\n' ||
-          c == ','  ||
-          ((paren_seen && nodename[i - 1] == ')') &&
-           (c == ' ' || c == '.')) ||
-          (c == '.' &&
-           ((!nodename[i + 1] ||
-             (cr_or_whitespace (nodename[i + 1])) ||
-             (nodename[i + 1] == ')')))))
-        break;
-    }
-  nodename[i] = 0;
-}
-
-/* This function gets called at the start of every line while inside a
-   menu.  It checks to see if the line starts with "* ", and if so and
-   REMEMBER_REF is nonzero, remembers the node reference as type
-   REF_TYPE that this menu refers to.  input_text_offset is at the \n
-   just before the menu line.  If REMEMBER_REF is zero, REF_TYPE is unused.  */
-#define MENU_STARTER "* "
-char *
-glean_node_from_menu (int remember_ref, enum reftype ref_type)
-{
-  int i, orig_offset = input_text_offset;
-  char *nodename;
-  char *line, *expanded_line;
-  char *old_input = input_text;
-  int old_size = input_text_length;
-
-  if (strncmp (&input_text[input_text_offset + 1],
-               MENU_STARTER,
-               strlen (MENU_STARTER)) != 0)
-    return NULL;
-  else
-    input_text_offset += strlen (MENU_STARTER) + 1;
-
-  /* The menu entry might include macro calls, so we need to expand them.  */
-  get_until ("\n", &line);
-  only_macro_expansion++;       /* only expand macros in menu entries */
-  expanded_line = expansion (line, 0);
-  only_macro_expansion--;
-  free (line);
-  input_text = expanded_line;
-  input_text_offset = 0;
-  input_text_length = strlen (expanded_line);
-
-  get_until_in_line (0, ":", &nodename);
-  if (curchar () == ':')
-    input_text_offset++;
-
-  if (curchar () != ':')
-    {
-      free (nodename);
-      get_until_in_line (0, "\n", &nodename);
-      isolate_nodename (nodename);
-    }
-
-  input_text = old_input;
-  input_text_offset = orig_offset;
-  input_text_length = old_size;
-  free (expanded_line);
-  fix_whitespace (nodename);
-  normalize_node_name (nodename);
-  i = strlen (nodename);
-  if (i && nodename[i - 1] == ':')
-    nodename[i - 1] = 0;
-
-  if (remember_ref)
-    remember_node_reference (nodename, line_number, ref_type);
-
-  return nodename;
-}
-
-/* Set the name of the current output file.  */
-void
-set_current_output_filename (const char *fname)
-{
-  if (current_output_filename)
-    free (current_output_filename);
-  current_output_filename = xstrdup (fname);
-}
-
-
-/* Output the <a name="..."></a> constructs for NODE.  We output both
-   the new-style conversion and the old-style, if they are different.
-   See comments at `add_escaped_anchor_name' in html.c.  */
-
-static void
-add_html_names (char *node)
-{
-  char *tem = expand_node_name (node);
-  char *otem = xstrdup (tem);
-
-  /* Determine if the old and new schemes come up with different names;
-     only output the old scheme if that is so.  We don't want to output
-     the same name twice.  */
-  canon_white (otem);
-  {
-    char *optr = otem;
-    int need_old = 0;
-    
-    for (; *optr; optr++)
-      {
-        if (!cr_or_whitespace (*optr) && !URL_SAFE_CHAR (*optr))
-          {
-            need_old = 1;
-            break;
-          }
-      }
-    
-    if (need_old)
-      {
-        add_word ("<a name=\"");
-        add_anchor_name (otem, -1);  /* old anchor name conversion */
-        add_word ("\"></a>\n");
-      }
-    free (otem);
-  }
-
-  /* Always output the new scheme.  */
-  canon_white (tem);
-  add_word ("<a name=\"");
-  add_anchor_name (tem, 0);
-  add_word ("\"></a>\n");
-
-  free (tem);
-}
-
-
-/* The order is: nodename, nextnode, prevnode, upnode.
-   If all of the NEXT, PREV, and UP fields are empty, they are defaulted.
-   You must follow a node command which has those fields defaulted
-   with a sectioning command (e.g., @chapter) giving the "level" of that node.
-   It is an error not to do so.
-   The defaults come from the menu in this node's parent. */
-void
-cm_node (void)
-{
-  static long epilogue_len = 0L;
-  char *node, *prev, *next, *up;
-  int new_node_pos, defaulting, this_section;
-  int no_warn = 0;
-  char *fname_for_this_node = NULL;
-  char *tem;
-  TAG_ENTRY *tag = NULL;
-
-  if (strcmp (command, "nwnode") == 0)
-    no_warn = TAG_FLAG_NO_WARN;
-
-  /* Get rid of unmatched brace arguments from previous commands. */
-  discard_braces ();
-
-  /* There also might be insertions left lying around that haven't been
-     ended yet.  Do that also. */
-  discard_insertions (1);
-
-  if (!html && !already_outputting_pending_notes)
-    {
-      close_paragraph ();
-      output_pending_notes ();
-    }
-
-  new_node_pos = output_position;
-
-  if (macro_expansion_output_stream && !executing_string)
-    append_to_expansion_output (input_text_offset + 1);
-
-  /* Do not collapse -- to -, etc., in node names.  */
-  in_fixed_width_font++;
-
-  /* While expanding the @node line, leave any non-macros
-     intact, so that the macro-expanded output includes them.  */
-  only_macro_expansion++;
-  node = get_node_token (1);
-  only_macro_expansion--;
-  next = get_node_token (0);
-  prev = get_node_token (0);
-  up = get_node_token (0);
-
-  if (html && splitting
-      /* If there is a Top node, it always goes into index.html.  So
-	 don't start a new HTML file for Top.  */
-      && (top_node_seen || strcasecmp (node, "Top") != 0))
-    {
-      /* We test *node here so that @node without a valid name won't
-	 start a new file name with a bogus name such as ".html".
-	 This could happen if we run under "--force", where we cannot
-	 simply bail out.  Continuing to use the same file sounds like
-	 the best we can do in such cases.  */
-      if (current_output_filename && output_stream && *node)
-	{
-	  char *fname_for_prev_node;
-
-	  if (current_node)
-	    {
-	      /* NOTE: current_node at this point still holds the name
-		 of the previous node.  */
-	      tem = expand_node_name (current_node);
-	      fname_for_prev_node = nodename_to_filename (tem);
-	      free (tem);
-	    }
-	  else /* could happen if their top node isn't named "Top" */
-	    fname_for_prev_node = filename_part (current_output_filename);
-	  tem = expand_node_name (node);
-	  fname_for_this_node = nodename_to_filename (tem);
-	  free (tem);
-	  /* Don't close current output file, if next output file is
-             to have the same name.  This may happen at top level, or
-             if two nodes produce the same file name under --split.  */
-	  if (FILENAME_CMP (fname_for_this_node, fname_for_prev_node) != 0)
-	    {
-	      long pos1 = 0;
-
-	      /* End the current split output file. */
-	      close_paragraph ();
-	      output_pending_notes ();
-	      start_paragraph ();
-	      /* Compute the length of the HTML file's epilogue.  We
-		 cannot know the value until run time, due to the
-		 text/binary nuisance on DOS/Windows platforms, where
-		 2 `\r' characters could be added to the epilogue when
-		 it is written in text mode.  */
-	      if (epilogue_len == 0)
-		{
-		  flush_output ();
-		  pos1 = ftell (output_stream);
-		}
-	      add_word ("</body></html>\n");
-	      close_paragraph ();
-	      if (epilogue_len == 0)
-		epilogue_len = ftell (output_stream) - pos1;
-	      fclose (output_stream);
-	      output_stream = NULL;
-              output_position = 0;
-	      tag = find_node_by_fname (fname_for_this_node);
-	    }
-	  free (fname_for_prev_node);
-	}
-    }
-
-  filling_enabled = indented_fill = 0;
-  if (!html || (html && splitting))
-    current_footnote_number = 1;
-
-  if (verbose_mode)
-    printf (_("Formatting node %s...\n"), node);
-
-  if (macro_expansion_output_stream && !executing_string)
-    remember_itext (input_text, input_text_offset);
-
-  /* Reset the line number in each node for Info output, so that
-     index entries will save the line numbers of parent node.  */
-  node_line_number = 0;
-
-  no_indent = 1;
-  if (xml)
-    {
-      xml_begin_document (current_output_filename);
-      xml_begin_node ();
-      if (!docbook)
-	{
-	  xml_insert_element (NODENAME, START);
-	  if (macro_expansion_output_stream && !executing_string)
-	    me_execute_string (node);
-	  else
-	    execute_string ("%s", node);
-	  xml_insert_element (NODENAME, END);
-	}
-      else
-	xml_node_id = xml_id (node);
-    }
-  else if (!no_headers && !html)
-    {
-      /* Emacs Info reader cannot grok indented escape sequence.  */
-      kill_self_indent (-1);
-
-      add_word_args ("\037\nFile: %s,  Node: ", pretty_output_filename);
-
-      if (macro_expansion_output_stream && !executing_string)
-        me_execute_string (node);
-      else
-        execute_string ("%s", node);
-      filling_enabled = indented_fill = 0;
-    }
-
-  /* Check for defaulting of this node's next, prev, and up fields. */
-  defaulting = (*next == 0 && *prev == 0 && *up == 0);
-
-  this_section = what_section (input_text + input_text_offset, NULL);
-
-  /* If we are defaulting, then look at the immediately following
-     sectioning command (error if none) to determine the node's
-     level.  Find the node that contains the menu mentioning this node
-     that is one level up (error if not found).  That node is the "Up"
-     of this node.  Default the "Next" and "Prev" from the menu. */
-  if (defaulting)
-    {
-      NODE_REF *last_ref = NULL;
-      NODE_REF *ref = node_references;
-
-      if (this_section < 0 && !STREQ (node, "Top"))
-        {
-          char *polite_section_name = "top";
-          int i;
-
-          for (i = 0; section_alist[i].name; i++)
-            if (section_alist[i].level == current_section + 1)
-              {
-                polite_section_name = section_alist[i].name;
-                break;
-              }
-
-          line_error
-            (_("Node `%s' requires a sectioning command (e.g., %c%s)"),
-             node, COMMAND_PREFIX, polite_section_name);
-        }
-      else
-        {
-          if (strcmp (node, "Top") == 0)
-            {
-              /* Default the NEXT pointer to be the first menu item in
-                 this node, if there is a menu in this node.  We have to
-                 try very hard to find the menu, as it may be obscured
-                 by execution_strings which are on the filestack.  For
-                 every member of the filestack which has a FILENAME
-                 member which is identical to the current INPUT_FILENAME,
-                 search forward from that offset. */
-              int saved_input_text_offset = input_text_offset;
-              int saved_input_text_length = input_text_length;
-              char *saved_input_text = input_text;
-              FSTACK *next_file = filestack;
-
-              int orig_offset, orig_size;
-
-              int bye_offset = search_forward ("\n@bye", input_text_offset);
-
-              /* No matter what, make this file point back at `(dir)'. */
-              free (up);
-              up = xstrdup ("(dir)"); /* html fixxme */
-
-              while (1)
-                {
-                  orig_offset = input_text_offset;
-                  orig_size =
-                    search_forward (node_search_string, orig_offset);
-
-                  if (orig_size < 0)
-                    orig_size = input_text_length;
-
-                  input_text_offset = search_forward ("\n@menu", orig_offset);
-                  if (input_text_offset > -1
-                      && (bye_offset > -1 && input_text_offset < bye_offset)
-                      && cr_or_whitespace (input_text[input_text_offset + 6]))
-                    {
-                      char *nodename_from_menu = NULL;
-
-                      input_text_offset =
-                        search_forward ("\n* ", input_text_offset);
-
-                      if (input_text_offset != -1)
-                        nodename_from_menu = glean_node_from_menu (0, 0);
-
-                      if (nodename_from_menu)
-                        {
-                          free (next);
-                          next = nodename_from_menu;
-                          break;
-                        }
-                    }
-
-                  /* We got here, so it hasn't been found yet.  Try
-                     the next file on the filestack if there is one. */
-                  if (next_file
-                      && FILENAME_CMP (next_file->filename, input_filename)
-                          == 0)
-                    {
-                      input_text = next_file->text;
-                      input_text_offset = next_file->offset;
-                      input_text_length = next_file->size;
-                      next_file = next_file->next;
-                    }
-                  else
-                    { /* No more input files to check. */
-                      break;
-                    }
-                }
-
-              input_text = saved_input_text;
-              input_text_offset = saved_input_text_offset;
-              input_text_length = saved_input_text_length;
-            }
-        }
-
-      /* Fix the level of the menu references in the Top node, iff it
-         was declared with @top, and no subsequent reference was found. */
-      if (top_node_seen && !non_top_node_seen)
-        {
-          /* Then this is the first non-@top node seen. */
-          int level;
-
-          level = set_top_section_level (this_section - 1);
-          non_top_node_seen = 1;
-
-          while (ref)
-            {
-              if (ref->section == level)
-                ref->section = this_section - 1;
-              ref = ref->next;
-            }
-
-          ref = node_references;
-        }
-
-      while (ref)
-        {
-          if (ref->section == (this_section - 1)
-              && ref->type == menu_reference
-              && strcmp (ref->node, node) == 0)
-            {
-              char *containing_node = ref->containing_node;
-
-              free (up);
-              up = xstrdup (containing_node);
-
-              if (last_ref
-                  && last_ref->type == menu_reference
-                  && strcmp (last_ref->containing_node, containing_node) == 0)
-                {
-                  free (next);
-                  next = xstrdup (last_ref->node);
-                }
-
-              while (ref->section == this_section - 1
-                     && ref->next
-                     && ref->next->type != menu_reference)
-                ref = ref->next;
-
-              if (ref->next && ref->type == menu_reference
-                  && strcmp (ref->next->containing_node, containing_node) == 0)
-                {
-                  free (prev);
-                  prev = xstrdup (ref->next->node);
-                }
-              else if (!ref->next
-                       && strcasecmp (ref->containing_node, "Top") == 0)
-                {
-                  free (prev);
-                  prev = xstrdup (ref->containing_node);
-                }
-              break;
-            }
-          last_ref = ref;
-          ref = ref->next;
-        }
-    }
-
-  /* Insert the correct args if we are expanding macros, and the node's
-     pointers weren't defaulted. */
-  if (macro_expansion_output_stream && !executing_string && !defaulting)
-    {
-      char *temp;
-      int op_orig = output_paragraph_offset;
-      int meta_pos_orig = meta_char_pos;
-      int extra = html ? strlen (node) : 0;
-
-      temp = xmalloc (7 + extra + strlen (next) + strlen (prev) + strlen (up));
-      sprintf (temp, "%s, %s, %s, %s", html ? node : "", next, prev, up);
-      me_execute_string (temp);
-      free (temp);
-
-      output_paragraph_offset = op_orig;
-      meta_char_pos = meta_pos_orig;
-    }
-
-  if (!*node)
-    {
-      line_error (_("No node name specified for `%c%s' command"),
-                  COMMAND_PREFIX, command);
-      free (node);
-      free (next); next = NULL;
-      free (prev); prev= NULL;
-      free (up);   up = NULL;
-      node_number++;            /* else it doesn't get bumped */
-    }
-  else
-    {
-      if (!*next) { free (next); next = NULL; }
-      if (!*prev) { free (prev); prev = NULL; }
-      if (!*up)   { free (up);   up = NULL;   }
-      remember_node (node, prev, next, up, new_node_pos, line_number,
-		     fname_for_this_node, no_warn);
-      outstanding_node = 1;
-    }
-
-  if (html)
-    {
-      if (splitting && *node && output_stream == NULL)
-        {
-	  char *dirname;
-	  char filename[PATH_MAX];
-
-	  dirname = pathname_part (current_output_filename);
-	  strcpy (filename, dirname);
-	  strcat (filename, fname_for_this_node);
-	  free (dirname);
-
-	  /* See if the node name converted to a file name clashes
-	     with other nodes or anchors.  If it clashes with an
-	     anchor, we complain and nuke that anchor's file.  */
-	  if (!tag)
-	    {
-	      output_stream = fopen (filename, "w");
-	      html_output_head_p = 0; /* so that we generate HTML preamble */
-	      html_output_head ();
-	    }
-	  else if ((tag->flags & TAG_FLAG_ANCHOR) != 0)
-	    {
-	      line_error (_("Anchor `%s' and node `%s' map to the same file name"),
-			  tag->node, node);
-	      file_line_error (tag->filename, tag->line_no,
-			       _("This @anchor command ignored; references to it will not work"));
-	      file_line_error (tag->filename, tag->line_no,
-			       _("Rename this anchor or use the `--no-split' option"));
-	      /* Nuke the file name recorded in anchor's tag.
-		 Since we are about to nuke the file itself, we
-		 don't want find_node_by_fname to consider this
-		 anchor anymore.  */
-	      free (tag->html_fname);
-	      tag->html_fname = NULL;
-	      output_stream = fopen (filename, "w");
-	      html_output_head_p = 0; /* so that we generate HTML preamble */
-	      html_output_head ();
-	    }
-	  else
-	    {
-	      /* This node's file name clashes with another node.
-		 We put them both on the same file.  */
-	      output_stream = fopen (filename, "r+");
-	      if (output_stream)
-		{
-		  static char html_end[] = "</body></html>\n";
-		  char end_line[sizeof(html_end)];
-		  int fpos = fseek (output_stream, -epilogue_len,
-				    SEEK_END);
-
-		  if (fpos < 0
-		      || fgets (end_line, sizeof (html_end),
-				output_stream) == NULL
-		      /* Paranoia: did someone change the way HTML
-			 files are finished up?  */
-		      || strcasecmp (end_line, html_end) != 0)
-		    {
-		      line_error (_("Unexpected string at end of split-HTML file `%s'"),
-				  fname_for_this_node);
-		      fclose (output_stream);
-		      xexit (1);
-		    }
-		  fseek (output_stream, -epilogue_len, SEEK_END);
-		}
-	    }
-          if (output_stream == NULL)
-            {
-              fs_error (filename);
-              xexit (1);
-            }
-          set_current_output_filename (filename);
-        }
-
-      if (!splitting && no_headers)
-	{ /* cross refs need a name="#anchor" even if not writing headers */ 
-          add_html_names (node);
-	}
-
-      if (splitting || !no_headers)
-        { /* Navigation bar. */
-          add_html_block_elt ("<div class=\"node\">\n");
-          /* The <p> avoids the links area running on with old Lynxen. */
-          add_word_args ("<p>%s\n", splitting ? "" : "<hr>");
-
-          /* In the split HTML case, the filename is wrong for the 
-             old-style converted names, but we'll add them anyway, for
-             consistency.  (And we need them in the normal (not
-             no_headers) nonsplit case.)  */
-          add_html_names (node);
-
-          if (next)
-            {
-              tem = expansion (next, 0);
-	      add_word ((char *) _("Next:"));
-              add_word ("&nbsp;");
-              
-	      add_word ("<a rel=\"next\" accesskey=\"n\" href=\"");
-	      add_anchor_name (tem, 1);
-              tem = escape_string (tem);
-	      add_word_args ("\">%s</a>", tem);
-	      
-              free (tem);
-
-	      if (prev || up)
-		add_word (",\n");
-            }
-          if (prev)
-            {
-              tem = expansion (prev, 0);
-	      add_word ((char *) _("Previous:"));
-              add_word ("&nbsp;");
-	      add_word ("<a rel=\"previous\" accesskey=\"p\" href=\"");
-	      add_anchor_name (tem, 1);
-              tem = escape_string (tem);
-	      add_word_args ("\">%s</a>", tem);
-              free (tem);
-
-	      if (up)
-		add_word (",\n");
-            }
-          if (up)
-            {
-              tem = expansion (up, 0);
-	      add_word ((char *) _("Up:"));
-              add_word ("&nbsp;");
-	      add_word ("<a rel=\"up\" accesskey=\"u\" href=\"");
-	      add_anchor_name (tem, 1);
-              tem = escape_string (tem);
-	      add_word_args ("\">%s</a>", tem);
-              free (tem);
-            }
-          /* html fixxme: we want a `top' or `contents' link here.  */
-
-          add_word_args ("\n%s\n", splitting ? "<hr>" : "");
-      	  add_word ("</div>\n");
-        }
-    }
-  else if (docbook)
-    ;
-  else if (xml)
-    {
-      if (next)
-	{
-	  xml_insert_element (NODENEXT, START);
-	  execute_string ("%s", next);
-	  xml_insert_element (NODENEXT, END);
-	}
-      if (prev)
-	{
-	  xml_insert_element (NODEPREV, START);
-	  execute_string ("%s", prev);
-	  xml_insert_element (NODEPREV, END);
-	}
-      if (up)
-	{
-	  xml_insert_element (NODEUP, START);
-	  execute_string ("%s", up);
-	  xml_insert_element (NODEUP, END);
-	}
-    }
-  else if (!no_headers)
-    {
-      if (macro_expansion_output_stream)
-        me_inhibit_expansion++;
-
-      /* These strings are not translatable.  */
-      if (next)
-        {
-          execute_string (",  Next: %s", next);
-          filling_enabled = indented_fill = 0;
-        }
-      if (prev)
-        {
-          execute_string (",  Prev: %s", prev);
-          filling_enabled = indented_fill = 0;
-        }
-      if (up)
-        {
-          execute_string (",  Up: %s", up);
-          filling_enabled = indented_fill = 0;
-        }
-      if (macro_expansion_output_stream)
-        me_inhibit_expansion--;
-    }
-
-  close_paragraph ();
-  no_indent = 0;
-
-  /* Change the section only if there was a sectioning command. */
-  if (this_section >= 0)
-    current_section = this_section;
-
-  if (current_node && STREQ (current_node, "Top"))
-    top_node_seen = 1;
-
-  filling_enabled = 1;
-  in_fixed_width_font--;
-}
-
-/* Cross-reference target at an arbitrary spot.  */
-void
-cm_anchor (int arg)
-{
-  char *anchor;
-  char *fname_for_anchor = NULL;
-
-  if (arg == END)
-    return;
-
-  /* Parse the anchor text.  */
-  anchor = get_xref_token (1);
-
-  /* Force all versions of "top" to be "Top". */
-  normalize_node_name (anchor);
-
-  /* In HTML mode, need to actually produce some output.  */
-  if (html)
-    {
-      /* If this anchor is at the beginning of a new paragraph, make
-	 sure a new paragraph is indeed started.  */
-      if (!paragraph_is_open)
-	{
-	  if (!executing_string && html)
-	    html_output_head ();
-	  start_paragraph ();
-	  if (!in_fixed_width_font || in_menu || in_detailmenu)
-	    {
-	      insert_string ("<p>");
-	      in_paragraph = 1;
-	    }
-	}
-      add_word ("<a name=\"");
-      add_anchor_name (anchor, 0);
-      add_word ("\"></a>");
-      if (splitting)
-	{
-	  /* If we are splitting, cm_xref will produce a reference to
-	     a file whose name is derived from the anchor name.  So we
-	     must create a file when we see an @anchor, otherwise
-	     xref's to anchors won't work.  The file we create simply
-	     redirects to the file of this anchor's node.  */
-	  TAG_ENTRY *tag;
-
-	  fname_for_anchor = nodename_to_filename (anchor);
-	  /* See if the anchor name converted to a file name clashes
-	     with other anchors or nodes.  */
-	  tag = find_node_by_fname (fname_for_anchor);
-	  if (tag)
-	    {
-	      if ((tag->flags & TAG_FLAG_ANCHOR) != 0)
-		line_error (_("Anchors `%s' and `%s' map to the same file name"),
-			    anchor, tag->node);
-	      else
-		line_error (_("Anchor `%s' and node `%s' map to the same file name"),
-			    anchor, tag->node);
-	      line_error (_("@anchor command ignored; references to it will not work"));
-	      line_error (_("Rename this anchor or use the `--no-split' option"));
-	      free (fname_for_anchor);
-	      /* We will not be creating a file for this anchor, so
-		 set its name to NULL, so that remember_node stores a
-		 NULL and find_node_by_fname won't consider this
-		 anchor for clashes.  */
-	      fname_for_anchor = NULL;
-	    }
-	  else
-	    {
-	      char *dirname, *p;
-	      char filename[PATH_MAX];
-	      FILE *anchor_stream;
-
-	      dirname = pathname_part (current_output_filename);
-	      strcpy (filename, dirname);
-	      strcat (filename, fname_for_anchor);
-	      free (dirname);
-
-	      anchor_stream = fopen (filename, "w");
-	      if (anchor_stream == NULL)
-		{
-		  fs_error (filename);
-		  xexit (1);
-		}
-	      /* The HTML magic below will cause the browser to
-		 immediately go to the anchor's node's file.  Lynx
-		 seems not to support this redirection, but it looks
-		 like a bug in Lynx, and they can work around it by
-		 clicking on the link once more.  */
-	      fputs ("<meta http-equiv=\"refresh\" content=\"0; url=",
-		     anchor_stream);
-	      /* Make the indirect link point to the current node's
-		 file and anchor's "<a name" label.  If we don't have
-		 a valid node name, refer to the current output file
-		 instead.  */
-	      if (current_node && *current_node)
-		{
-		  char *fn, *tem;
-
-		  tem = expand_node_name (current_node);
-		  fn = nodename_to_filename (tem);
-		  free (tem);
-		  fputs (fn, anchor_stream);
-		  free (fn);
-		}
-	      else
-		{
-		  char *base = filename_part (current_output_filename);
-
-		  fputs (base, anchor_stream);
-		  free (base);
-		}
-	      fputs ("#", anchor_stream);
-	      for (p = anchor; *p; p++)
-		{
-		  if (*p == '&')
-		    fputs ("&amp;", anchor_stream);
-		  else if (!URL_SAFE_CHAR (*p))
-		    fprintf (anchor_stream, "%%%x", (unsigned char) *p);
-		  else
-		    fputc (*p, anchor_stream);
-		}
-	      fputs ("\">\n", anchor_stream);
-	      fclose (anchor_stream);
-	    }
-	}
-    }
-  else if (xml)
-    {
-      xml_insert_element_with_attribute (ANCHOR, START, "name=\"%s\"", anchor);
-      xml_insert_element (ANCHOR, END);
-    }
-  /* Save it in the tag table.  */
-  remember_node (anchor, NULL, NULL, NULL,
-                 output_position + output_paragraph_offset,
-                 line_number, fname_for_anchor, TAG_FLAG_ANCHOR);
-}
-
-/* Find NODE in REF_LIST. */
-static NODE_REF *
-find_node_reference (char *node, NODE_REF *ref_list)
-{
-  NODE_REF *orig_ref_list = ref_list;
-  char *expanded_node;
-
-  while (ref_list)
-    {
-      if (strcmp (node, ref_list->node) == 0)
-        break;
-      ref_list = ref_list->next;
-    }
-
-  if (ref_list || !expensive_validation)
-    return ref_list;
-
-  /* Maybe NODE is not expanded yet.  This may be SLOW.  */
-  expanded_node = expand_node_name (node);
-  for (ref_list = orig_ref_list; ref_list; ref_list = ref_list->next)
-    {
-      if (STREQ (expanded_node, ref_list->node))
-        break;
-      if (strchr (ref_list->node, COMMAND_PREFIX))
-        {
-          char *expanded_ref = expand_node_name (ref_list->node);
-
-          if (STREQ (expanded_node, expanded_ref))
-            {
-              free (expanded_ref);
-              break;
-            }
-          free (expanded_ref);
-        }
-    }
-  free (expanded_node);
-  return ref_list;
-}
-
-void
-free_node_references (void)
-{
-  NODE_REF *list, *temp;
-
-  list = node_references;
-
-  while (list)
-    {
-      temp = list;
-      free (list->node);
-      free (list->containing_node);
-      list = list->next;
-      free (temp);
-    }
-  node_references = NULL;
-}
-
-void
-free_node_node_references (void)
-{
-  NODE_REF *list, *temp;
-
-  list = node_references;
-
-  while (list)
-    {
-      temp = list;
-      free (list->node);
-      list = list->next;
-      free (temp);
-    }
-  node_node_references = NULL;
-}
-
-/* Return the number assigned to a named node in either the tag_table
-   or node_references list or zero if no number has been assigned. */
-int
-number_of_node (char *node)
-{
-  NODE_REF *temp_ref;
-  TAG_ENTRY *temp_node = find_node (node);
-
-  if (temp_node)
-    return temp_node->number;
-  else if ((temp_ref = find_node_reference (node, node_references)))
-    return temp_ref->number;
-  else if ((temp_ref = find_node_reference (node, node_node_references)))
-    return temp_ref->number;
-  else
-    return 0;
-}
-
-/* validation */
-
-/* Return 1 if TAG (at LINE) correctly validated, or 0 if not.
-   LABEL is the (translated) description of the type of reference --
-   Menu, Cross, Next, etc.  */
-
-static int
-validate (char *tag, int line, const char *label)
-{
-  TAG_ENTRY *result;
-
-  /* If there isn't a tag to verify, or if the tag is in another file,
-     then it must be okay. */
-  if (!tag || !*tag || *tag == '(')
-    return 1;
-
-  /* Otherwise, the tag must exist. */
-  result = find_node (tag);
-
-  if (!result)
-    {
-      line_number = line;
-      line_error (_("%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"), label, tag);
-      return 0;
-    }
-  result->touched++;
-  return 1;
-}
-
-/* The strings here are followed in the message by `reference to...' in
-   the `validate' routine.  They are only used in messages, thus are
-   translated.  */
-static const char *
-reftype_type_string (enum reftype type)
-{
-  switch (type)
-    {
-    case menu_reference:
-      return _("Menu");
-    case followed_reference:
-      return _("Cross");
-    default:
-      return "Internal-bad-reference-type";
-    }
-}
-
-static void
-validate_other_references (NODE_REF *ref_list)
-{
-  char *old_input_filename = input_filename;
-
-  while (ref_list)
-    {
-      input_filename = ref_list->filename;
-      validate (ref_list->node, ref_list->line_no,
-                reftype_type_string (ref_list->type));
-      ref_list = ref_list->next;
-    }
-  input_filename = old_input_filename;
-}
-
-/* Validation of an info file.
-   Scan through the list of tag entries touching the Prev, Next, and Up
-   elements of each.  It is an error not to be able to touch one of them,
-   except in the case of external node references, such as "(DIR)".
-
-   If the Prev is different from the Up,
-   then the Prev node must have a Next pointing at this node.
-
-   Every node except Top must have an Up.
-   The Up node must contain some sort of reference, other than a Next,
-   to this node.
-
-   If the Next is different from the Next of the Up,
-   then the Next node must have a Prev pointing at this node. */
-void
-validate_file (TAG_ENTRY *tag_table)
-{
-  char *old_input_filename = input_filename;
-  TAG_ENTRY *tags = tag_table;
-
-  while (tags)
-    {
-      TAG_ENTRY *temp_tag;
-      char *tem1, *tem2;
-
-      input_filename = tags->filename;
-      line_number = tags->line_no;
-
-      /* If this is a "no warn" node, don't validate it in any way. */
-      if (tags->flags & TAG_FLAG_NO_WARN)
-        {
-          tags = tags->next_ent;
-          continue;
-        }
-
-      /* If this node has a Next, then make sure that the Next exists. */
-      if (tags->next)
-        {
-          validate (tags->next, tags->line_no, _("Next"));
-
-          /* If the Next node exists, and there is no Up, then make sure
-             that the Prev of the Next points back.  But do nothing if
-             we aren't supposed to issue warnings about this node. */
-          temp_tag = find_node (tags->next);
-          if (temp_tag && !(temp_tag->flags & TAG_FLAG_NO_WARN))
-            {
-              char *prev = temp_tag->prev;
-              int you_lose = !prev || !STREQ (prev, tags->node);
-
-              if (you_lose && expensive_validation)
-                {
-                  tem1 = expand_node_name (prev);
-                  tem2 = expand_node_name (tags->node);
-
-                  if (tem1 && tem2 && STREQ (tem1, tem2))
-                    you_lose = 0;
-                  free (tem1);
-                  free (tem2);
-                }
-              if (you_lose)
-                {
-                  line_error (_("Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"),
-                              tags->node);
-                  file_line_error (temp_tag->filename, temp_tag->line_no,
-				   _("This node (%s) has the bad Prev"),
-				   temp_tag->node);
-                  temp_tag->flags |= TAG_FLAG_PREV_ERROR;
-                }
-            }
-        }
-
-      /* Validate the Prev field if there is one, and we haven't already
-         complained about it in some way.  You don't have to have a Prev
-         field at this stage. */
-      if (!(tags->flags & TAG_FLAG_PREV_ERROR) && tags->prev)
-        {
-          int valid_p = validate (tags->prev, tags->line_no, _("Prev"));
-
-          if (!valid_p)
-            tags->flags |= TAG_FLAG_PREV_ERROR;
-          else
-            { /* If the Prev field is not the same as the Up field,
-                 then the node pointed to by the Prev field must have
-                 a Next field which points to this node. */
-              int prev_equals_up = !tags->up || STREQ (tags->prev, tags->up);
-
-              if (!prev_equals_up && expensive_validation)
-                {
-                  tem1 = expand_node_name (tags->prev);
-                  tem2 = expand_node_name (tags->up);
-                  prev_equals_up = STREQ (tem1, tem2);
-                  free (tem1);
-                  free (tem2);
-                }
-              if (!prev_equals_up)
-                {
-                  temp_tag = find_node (tags->prev);
-
-                  /* If we aren't supposed to issue warnings about the
-                     target node, do nothing. */
-                  if (!temp_tag || (temp_tag->flags & TAG_FLAG_NO_WARN))
-                    /* Do nothing. */ ;
-                  else
-                    {
-                      int you_lose = !temp_tag->next
-                        || !STREQ (temp_tag->next, tags->node);
-
-                      if (temp_tag->next && you_lose && expensive_validation)
-                        {
-                          tem1 = expand_node_name (temp_tag->next);
-                          tem2 = expand_node_name (tags->node);
-                          if (STREQ (tem1, tem2))
-                            you_lose = 0;
-                          free (tem1);
-                          free (tem2);
-                        }
-                      if (you_lose)
-                        {
-                          line_error
-                            (_("Prev field of node `%s' not pointed to"),
-                             tags->node);
-                          file_line_error (temp_tag->filename,
-					   temp_tag->line_no,
-					   _("This node (%s) has the bad Next"),
-					   temp_tag->node);
-                          temp_tag->flags |= TAG_FLAG_NEXT_ERROR;
-                        }
-                    }
-                }
-            }
-        }
-
-      if (!tags->up
-          && !(tags->flags & TAG_FLAG_ANCHOR)
-          && strcasecmp (tags->node, "Top") != 0)
-        line_error (_("`%s' has no Up field (perhaps incorrect sectioning?)"), tags->node);
-      else if (tags->up)
-        {
-          int valid_p = validate (tags->up, tags->line_no, _("Up"));
-
-          /* If node X has Up: Y, then warn if Y fails to have a menu item
-             or note pointing at X, if Y isn't of the form "(Y)". */
-          if (valid_p && *tags->up != '(')
-            {
-              NODE_REF *nref;
-              NODE_REF *tref = NULL;
-              NODE_REF *list = node_references;
-
-              for (;;)
-                {
-                  nref = find_node_reference (tags->node, list);
-                  if (!nref)
-                    break;
-
-                  if (strcmp (nref->containing_node, tags->up) == 0)
-                    {
-                      if (nref->type != menu_reference)
-                        {
-                          tref = nref;
-                          list = nref->next;
-                        }
-                      else
-                        break;
-                    }
-                  list = nref->next;
-                }
-
-              if (!nref)
-                {
-		  if (!tref && expensive_validation)
-		    {
-		      /* Sigh...  This might be AWFULLY slow, but if
-		         they want this feature, they'll have to pay!
-		         We do all the loop again expanding each
-		         containing_node reference as we go.  */
-		      char *tags_up = expand_node_name (tags->up);
-		      char *tem;
-
-		      list = node_references;
-
-		      for (;;)
-			{
-			  nref = find_node_reference (tags->node, list);
-			  if (!nref)
-			    break;
-			  tem = expand_node_name (nref->containing_node);
-			  if (STREQ (tem, tags_up))
-			    {
-			      if (nref->type != menu_reference)
-				tref = nref;
-			      else
-				{
-				  free (tem);
-				  break;
-				}
-			    }
-			  free (tem);
-			  list = nref->next;
-			}
-		    }
-                  if (!nref && !tref)
-                    {
-                      temp_tag = find_node (tags->up);
-                      file_line_error (temp_tag->filename, temp_tag->line_no,
-           _("Node `%s' lacks menu item for `%s' despite being its Up target"),
-                                  tags->up, tags->node);
-                    }
-                }
-            }
-        }
-      tags = tags->next_ent;
-    }
-
-  validate_other_references (node_references);
-  /* We have told the user about the references which didn't exist.
-     Now tell him about the nodes which aren't referenced. */
-
-  for (tags = tag_table; tags; tags = tags->next_ent)
-    {
-      /* If this node is a "no warn" node, do nothing. */
-      if (tags->flags & TAG_FLAG_NO_WARN)
-        {
-          tags = tags->next_ent;
-          continue;
-        }
-
-      /* Special hack.  If the node in question appears to have
-         been referenced more than REFERENCE_WARNING_LIMIT times,
-         give a warning. */
-      if (tags->touched > reference_warning_limit)
-        {
-          input_filename = tags->filename;
-          line_number = tags->line_no;
-          warning (_("node `%s' has been referenced %d times"),
-                   tags->node, tags->touched);
-        }
-
-      if (tags->touched == 0)
-        {
-          input_filename = tags->filename;
-          line_number = tags->line_no;
-
-          /* Notice that the node "Top" is special, and doesn't have to
-             be referenced.   Anchors don't have to be referenced
-             either, you might define them for another document.  */
-          if (strcasecmp (tags->node, "Top") != 0
-              && !(tags->flags & TAG_FLAG_ANCHOR))
-            warning (_("unreferenced node `%s'"), tags->node);
-        }
-    }
-  input_filename = old_input_filename;
-}
-
-
-/* Splitting */
-
-/* Return true if the tag entry pointed to by TAGS is the last node.
-   This means only anchors follow.  */
-
-static int
-last_node_p (TAG_ENTRY *tags)
-{
-  int last = 1;
-  while (tags->next_ent) {
-    tags = tags->next_ent;
-    if (tags->flags & TAG_FLAG_ANCHOR)
-      ;
-    else
-      {
-        last = 0;
-        break;
-      }
-  }
-
-  return last;
-}
-
-
-static char *
-enumerate_filename (char *pathname, char *basename, int number)
-{
-  /* Do we need to generate names of subfiles which don't exceed 8+3 limits? */
-  const int dos_file_names = !HAVE_LONG_FILENAMES (pathname ? pathname : ".");
-  unsigned name_len = strlen (basename);
-  char *filename = xmalloc (10 + strlen (pathname) + name_len);
-  char *base_filename = xmalloc (10 + name_len);
-
-  sprintf (base_filename, "%s-%d", basename, number);
-
-  if (dos_file_names)
-    {
-      char *dot = strchr (base_filename, '.');
-      unsigned base_len = strlen (base_filename);
-
-      if (dot)
-        { /* Make foobar.i1, .., foobar.i99, foobar.100, ... */
-          dot[1] = 'i';
-          memmove (number <= 99 ? dot + 2 : dot + 1,
-              base_filename + name_len + 1,
-              strlen (base_filename + name_len + 1) + 1);
-        }
-      else if (base_len > 8)
-        {
-          /* Make foobar-1, .., fooba-10, .., foob-100, ... */
-          unsigned numlen = base_len - name_len;
-
-          memmove (base_filename + 8 - numlen, base_filename + name_len, numlen + 1);
-        }
-    }
-
-  sprintf (filename, "%s%s", pathname, base_filename);
-
-  return filename;
-}
-
-/* Remove previously split files, to avoid
-   lingering parts of shrinked documents.  */
-void
-clean_old_split_files (char *filename)
-{
-  char *root_filename = filename_part (filename);
-  char *root_pathname = pathname_part (filename);
-  int i;
-
-  /* We break as soon as we hit an inexistent file,
-     so looping until large numbers is harmless.  */
-  for (i = 1; i < 1000; i++)
-    {
-      struct stat st;
-      char *check_file = enumerate_filename (root_pathname, root_filename, i);
-
-      if (stat (check_file, &st) != 0)
-        break;
-      else if (!S_ISDIR (st.st_mode))
-        {
-          /* Give feedback if requested, removing a file is important.  */
-          if (verbose_mode)
-            printf (_("Removing %s\n"), check_file);
-
-          /* Warn user that we cannot remove the file.  */
-          if (unlink (check_file) != 0)
-            warning (_("Can't remove file `%s': %s"), check_file, strerror (errno));
-        }
-
-      free (check_file);
-    }
-}
-
-
-/* Split large output files into a series of smaller files.  Each file
-   is pointed to in the tag table, which then gets written out as the
-   original file.  The new files have the same name as the original file
-   with a "-num" attached.  SIZE is the largest number of bytes to allow
-   in any single split file. */
-void
-split_file (char *filename, int size)
-{
-  char *root_filename, *root_pathname;
-  char *the_file;
-  struct stat fileinfo;
-  long file_size;
-  char *the_header;
-  int header_size;
-
-  /* Can only do this to files with tag tables. */
-  if (!tag_table)
-    return;
-
-  if (size == 0)
-    size = DEFAULT_SPLIT_SIZE;
-
-  if ((stat (filename, &fileinfo) != 0)
-      || (((long) fileinfo.st_size) < size))
-    return;
-  file_size = (long) fileinfo.st_size;
-
-  the_file = find_and_load (filename, 0);
-  if (!the_file)
-    return;
-
-  root_filename = filename_part (filename);
-  root_pathname = pathname_part (filename);
-
-  if (!root_pathname)
-    root_pathname = xstrdup ("");
-
-  /* Start splitting the file.  Walk along the tag table
-     outputting sections of the file.  When we have written
-     all of the nodes in the tag table, make the top-level
-     pointer file, which contains indirect pointers and
-     tags for the nodes. */
-  {
-    int which_file = 1;
-    TAG_ENTRY *tags = tag_table;
-    char *indirect_info = NULL;
-
-    /* Maybe we want a Local Variables section.  */
-    char *trailer = info_trailer ();
-    int trailer_len = trailer ? strlen (trailer) : 0;
-
-    /* Remember the `header' of this file.  The first tag in the file is
-       the bottom of the header; the top of the file is the start. */
-    the_header = xmalloc (1 + (header_size = tags->position));
-    memcpy (the_header, the_file, header_size);
-
-    while (tags)
-      {
-        int file_top, file_bot, limit;
-
-        /* Have to include the Control-_. */
-        file_top = file_bot = tags->position;
-        limit = file_top + size;
-
-        /* If the rest of this file is only one node, then
-           that is the entire subfile. */
-        if (last_node_p (tags))
-          {
-            int i = tags->position + 1;
-            char last_char = the_file[i];
-
-            while (i < file_size)
-              {
-                if ((the_file[i] == '\037') &&
-                    ((last_char == '\n') ||
-                     (last_char == '\014')))
-                  break;
-                else
-                  last_char = the_file[i];
-                i++;
-              }
-            file_bot = i;
-            tags = tags->next_ent;
-            goto write_region;
-          }
-
-        /* Otherwise, find the largest number of nodes that can fit in
-           this subfile. */
-        for (; tags; tags = tags->next_ent)
-          {
-            if (last_node_p (tags))
-              {
-                /* This entry is the last node.  Search forward for the end
-                   of this node, and that is the end of this file. */
-                int i = tags->position + 1;
-                char last_char = the_file[i];
-
-                while (i < file_size)
-                  {
-                    if ((the_file[i] == '\037') &&
-                        ((last_char == '\n') ||
-                         (last_char == '\014')))
-                      break;
-                    else
-                      last_char = the_file[i];
-                    i++;
-                  }
-                file_bot = i;
-
-                if (file_bot < limit)
-                  {
-                    tags = tags->next_ent;
-                    goto write_region;
-                  }
-                else
-                  {
-                    /* Here we want to write out everything before the last
-                       node, and then write the last node out in a file
-                       by itself. */
-                    file_bot = tags->position;
-                    goto write_region;
-                  }
-              }
-
-            /* Write region only if this was a node, not an anchor.  */
-            if (tags->next_ent->position > limit
-                && !(tags->flags & TAG_FLAG_ANCHOR))
-              {
-                if (tags->position == file_top)
-                  tags = tags->next_ent;
-
-                file_bot = tags->position;
-
-              write_region:
-                {
-                  int fd;
-                  char *split_filename = enumerate_filename (root_pathname,
-                      root_filename, which_file);
-                  char *split_basename = filename_part (split_filename);
-
-                  fd = open (split_filename, O_WRONLY|O_TRUNC|O_CREAT, 0666);
-                  if (fd < 0
-                      || write (fd, the_header, header_size) != header_size
-                      || write (fd, the_file + file_top, file_bot - file_top)
-                         != (file_bot - file_top)
-                      || (trailer_len
-                          && write (fd, trailer, trailer_len) != trailer_len)
-                      || close (fd) < 0)
-                    {
-                      perror (split_filename);
-                      if (fd != -1)
-                        close (fd);
-                      xexit (1);
-                    }
-
-                  if (!indirect_info)
-                    {
-                      indirect_info = the_file + file_top;
-                      sprintf (indirect_info, "\037\nIndirect:\n");
-                      indirect_info += strlen (indirect_info);
-                    }
-
-                  sprintf (indirect_info, "%s: %d\n",
-                           split_basename, file_top);
-
-                  free (split_basename);
-                  free (split_filename);
-                  indirect_info += strlen (indirect_info);
-                  which_file++;
-                  break;
-                }
-              }
-          }
-      }
-
-    /* We have sucessfully created the subfiles.  Now write out the
-       original again.  We must use `output_stream', or
-       write_tag_table_indirect () won't know where to place the output. */
-    output_stream = fopen (filename, "w");
-    if (!output_stream)
-      {
-        perror (filename);
-        xexit (1);
-      }
-
-    {
-      int distance = indirect_info - the_file;
-      fwrite (the_file, 1, distance, output_stream);
-
-      /* Inhibit newlines. */
-      paragraph_is_open = 0;
-
-      /* Write the indirect tag table.  */
-      write_tag_table_indirect ();
-
-      /* preserve local variables in info output.  */
-      if (trailer)
-        {
-          fwrite (trailer, 1, trailer_len, output_stream);
-          free (trailer);
-        }
-
-      fclose (output_stream);
-      free (the_header);
-      free (the_file);
-      return;
-    }
-  }
-}

Property changes on: head/contrib/texinfo/makeinfo/node.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/html.h
===================================================================
--- head/contrib/texinfo/makeinfo/html.h	(revision 276550)
+++ head/contrib/texinfo/makeinfo/html.h	(nonexistent)
@@ -1,65 +0,0 @@
-/* html.h -- declarations for html-related utilities.
-   $Id: html.h,v 1.6 2004/11/30 02:03:23 karl Exp $
-
-   Copyright (C) 1999, 2000, 2002, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef HTML_H
-#define HTML_H
-
-/* A stack of font tags.  */
-typedef struct hstack
-{
-  struct hstack *next;
-  char *tag;
-  char *attribs;
-} HSTACK;
-
-/* Nonzero if we have output the <head>.  */
-extern int html_output_head_p;
-
-/* Nonzero if we have output a title, from @titlefont or @settitle.  */
-extern int html_title_written;
-
-/* Perform the <head> output.  */
-extern void html_output_head (void);
-
-/* Escape &<>.  */
-extern char *escape_string (char *);
-
-/* Open or close TAG according to START_OR_END.  */
-extern void insert_html_tag (int start_or_end, char *tag);
-
-/* Output HTML <link> to NODE, plus extra ATTRIBUTES.  */
-extern void add_link (char *nodename, char *attributes);
-
-/* Escape URL-special characters.  */
-extern void add_escaped_anchor_name (char *name, int old);
-
-/* See html.c.  */
-extern void add_anchor_name (char *nodename, int href);
-extern void add_url_name (char *nodename, int href);
-extern void add_nodename_to_filename (char *nodename, int href);
-extern char *nodename_to_filename (char *nodename);
-extern int rollback_empty_tag (char *tag);
-
-#if defined (VA_FPRINTF) && __STDC__
-extern void insert_html_tag_with_attribute (int start_or_end, char *tag, char *format, ...);
-#else
-extern void insert_html_tag_with_attribute ();
-#endif
-
-#endif /* !HTML_H */

Property changes on: head/contrib/texinfo/makeinfo/html.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/lang.c
===================================================================
--- head/contrib/texinfo/makeinfo/lang.c	(revision 276550)
+++ head/contrib/texinfo/makeinfo/lang.c	(nonexistent)
@@ -1,1020 +0,0 @@
-/* lang.c -- language-dependent support.
-   $Id: lang.c,v 1.14 2004/11/22 23:57:33 karl Exp $
-
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Originally written by Karl Heinz Marbaise <kama@hippo.fido.de>.  */
-
-#include "system.h"
-#include "cmds.h"
-#include "files.h"
-#include "lang.h"
-#include "makeinfo.h"
-#include "xml.h"
-
-/* Current document encoding.  */
-encoding_code_type document_encoding_code = no_encoding;
-
-/* Current language code; default is English.  */
-language_code_type language_code = en;
-
-/* By default, unsupported encoding is an empty string.  */
-char *unknown_encoding = NULL;
-
-static iso_map_type us_ascii_map [] = {{NULL, 0, 0}}; /* ASCII map is trivial */
-
-/* Translation table between HTML and ISO Codes.  The last item is
-   hopefully the Unicode. It might be possible that those Unicodes are
-   not correct, cause I didn't check them. kama */
-static iso_map_type iso8859_1_map [] = {
-  { "nbsp",   0xA0, 0x00A0 },
-  { "iexcl",  0xA1, 0x00A1 },
-  { "cent",   0xA2, 0x00A2 },
-  { "pound",  0xA3, 0x00A3 },
-  { "curren", 0xA4, 0x00A4 },
-  { "yen",    0xA5, 0x00A5 },
-  { "brkbar", 0xA6, 0x00A6 },
-  { "sect",   0xA7, 0x00A7 },
-  { "uml",    0xA8, 0x00A8 },
-  { "copy",   0xA9, 0x00A9 },
-  { "ordf",   0xAA, 0x00AA },
-  { "laquo",  0xAB, 0x00AB },
-  { "not",    0xAC, 0x00AC },
-  { "shy",    0xAD, 0x00AD },
-  { "reg",    0xAE, 0x00AE },
-  { "hibar",  0xAF, 0x00AF },
-  { "deg",    0xB0, 0x00B0 },
-  { "plusmn", 0xB1, 0x00B1 },
-  { "sup2",   0xB2, 0x00B2 },
-  { "sup3",   0xB3, 0x00B3 },
-  { "acute",  0xB4, 0x00B4 },
-  { "micro",  0xB5, 0x00B5 },
-  { "para",   0xB6, 0x00B6 },
-  { "middot", 0xB7, 0x00B7 },
-  { "cedil",  0xB8, 0x00B8 },
-  { "sup1",   0xB9, 0x00B9 },
-  { "ordm",   0xBA, 0x00BA },
-  { "raquo",  0xBB, 0x00BB },
-  { "frac14", 0xBC, 0x00BC },
-  { "frac12", 0xBD, 0x00BD },
-  { "frac34", 0xBE, 0x00BE },
-  { "iquest", 0xBF, 0x00BF },
-  { "Agrave", 0xC0, 0x00C0 },
-  { "Aacute", 0xC1, 0x00C1 },
-  { "Acirc",  0xC2, 0x00C2 },
-  { "Atilde", 0xC3, 0x00C3 },
-  { "Auml",   0xC4, 0x00C4 },
-  { "Aring",  0xC5, 0x00C5 },
-  { "AElig",  0xC6, 0x00C6 },
-  { "Ccedil", 0xC7, 0x00C7 },
-  { "Ccedil", 0xC7, 0x00C7 },
-  { "Egrave", 0xC8, 0x00C8 },
-  { "Eacute", 0xC9, 0x00C9 },
-  { "Ecirc",  0xCA, 0x00CA },
-  { "Euml",   0xCB, 0x00CB },
-  { "Igrave", 0xCC, 0x00CC },
-  { "Iacute", 0xCD, 0x00CD },
-  { "Icirc",  0xCE, 0x00CE },
-  { "Iuml",   0xCF, 0x00CF },
-  { "ETH",    0xD0, 0x00D0 },
-  { "Ntilde", 0xD1, 0x00D1 },
-  { "Ograve", 0xD2, 0x00D2 },
-  { "Oacute", 0xD3, 0x00D3 },
-  { "Ocirc",  0xD4, 0x00D4 },
-  { "Otilde", 0xD5, 0x00D5 },
-  { "Ouml",   0xD6, 0x00D6 },
-  { "times",  0xD7, 0x00D7 },
-  { "Oslash", 0xD8, 0x00D8 },
-  { "Ugrave", 0xD9, 0x00D9 },
-  { "Uacute", 0xDA, 0x00DA },
-  { "Ucirc",  0xDB, 0x00DB },
-  { "Uuml",   0xDC, 0x00DC },
-  { "Yacute", 0xDD, 0x00DD },
-  { "THORN",  0xDE, 0x00DE },
-  { "szlig",  0xDF, 0x00DF },
-  { "agrave", 0xE0, 0x00E0 },
-  { "aacute", 0xE1, 0x00E1 },
-  { "acirc",  0xE2, 0x00E2 },
-  { "atilde", 0xE3, 0x00E3 },
-  { "auml",   0xE4, 0x00E4 },
-  { "aring",  0xE5, 0x00E5 },
-  { "aelig",  0xE6, 0x00E6 },
-  { "ccedil", 0xE7, 0x00E7 },
-  { "egrave", 0xE8, 0x00E8 },
-  { "eacute", 0xE9, 0x00E9 },
-  { "ecirc",  0xEA, 0x00EA },
-  { "euml",   0xEB, 0x00EB },
-  { "igrave", 0xEC, 0x00EC },
-  { "iacute", 0xED, 0x00ED },
-  { "icirc",  0xEE, 0x00EE },
-  { "iuml",   0xEF, 0x00EF },
-  { "eth",    0xF0, 0x00F0 },
-  { "ntilde", 0xF1, 0x00F1 },
-  { "ograve", 0xF2, 0x00F2 },
-  { "oacute", 0xF3, 0x00F3 },
-  { "ocirc",  0xF4, 0x00F4 },
-  { "otilde", 0xF5, 0x00F5 },
-  { "ouml",   0xF6, 0x00F6 },
-  { "divide", 0xF7, 0x00F7 },
-  { "oslash", 0xF8, 0x00F8 },
-  { "ugrave", 0xF9, 0x00F9 },
-  { "uacute", 0xFA, 0x00FA },
-  { "ucirc",  0xFB, 0x00FB },
-  { "uuml",   0xFC, 0x00FC },
-  { "yacute", 0xFD, 0x00FD },
-  { "thorn",  0xFE, 0x00FE },
-  { "yuml",   0xFF, 0x00FF },
-  { NULL, 0, 0 }
-};
-
-
-/* ISO 8859-15, also known as Latin 9, differs from Latin 1 in only a
-   few positions.  http://www.cs.tut.fi/~jkorpela/latin9.html has a good
-   explanation and listing, summarized here.  The names are abbreviated
-   from the official Unicode names, to fit in a decent line length.
-
-  code position
-  dec	oct   hex   latin1 latin1 name	      latin9 latin9 name
-
-  164  0244  0xA4   U+00A4 currency symbol    U+20AC euro sign
-  166  0246  0xA6   U+00A6 broken bar	      U+0160 S with caron
-  168  0250  0xA8   U+00A8 diaeresis	      U+0161 s with caron
-  180  0264  0xB4   U+00B4 acute accent	      U+017D Z with caron
-  184  0270  0xB8   U+00B8 cedilla	      U+017E z with caron
-  188  0274  0xBC   U+00BC fraction 1/4	      U+0152 ligature OE
-  189  0275  0xBD   U+00BD fraction 1/2	      U+0153 ligature oe
-  190  0276  0xBE   U+00BE fraction 3/4	      U+0178 Y with diaeresis
-*/
-
-static iso_map_type iso8859_15_map [] = {
-  { "nbsp",   0xA0, 0x00A0 },
-  { "iexcl",  0xA1, 0x00A1 },
-  { "cent",   0xA2, 0x00A2 },
-  { "pound",  0xA3, 0x00A3 },
-  { "euro",   0xA4, 0x20AC },
-  { "yen",    0xA5, 0x00A5 },
-  { "Scaron", 0xA6, 0x0160 },
-  { "sect",   0xA7, 0x00A7 },
-  { "scaron", 0xA8, 0x0161 },
-  { "copy",   0xA9, 0x00A9 },
-  { "ordf",   0xAA, 0x00AA },
-  { "laquo",  0xAB, 0x00AB },
-  { "not",    0xAC, 0x00AC },
-  { "shy",    0xAD, 0x00AD },
-  { "reg",    0xAE, 0x00AE },
-  { "hibar",  0xAF, 0x00AF },
-  { "deg",    0xB0, 0x00B0 },
-  { "plusmn", 0xB1, 0x00B1 },
-  { "sup2",   0xB2, 0x00B2 },
-  { "sup3",   0xB3, 0x00B3 },
-  { "Zcaron", 0xB4, 0x017D },
-  { "micro",  0xB5, 0x00B5 },
-  { "para",   0xB6, 0x00B6 },
-  { "middot", 0xB7, 0x00B7 },
-  { "zcaron", 0xB8, 0x017E },
-  { "sup1",   0xB9, 0x00B9 },
-  { "ordm",   0xBA, 0x00BA },
-  { "raquo",  0xBB, 0x00BB },
-  { "OElig",  0xBC, 0x0152 },
-  { "oelig",  0xBD, 0x0153 },
-  { "Yuml",   0xBE, 0x0178 },
-  { "iquest", 0xBF, 0x00BF },
-  { "Agrave", 0xC0, 0x00C0 },
-  { "Aacute", 0xC1, 0x00C1 },
-  { "Acirc",  0xC2, 0x00C2 },
-  { "Atilde", 0xC3, 0x00C3 },
-  { "Auml",   0xC4, 0x00C4 },
-  { "Aring",  0xC5, 0x00C5 },
-  { "AElig",  0xC6, 0x00C6 },
-  { "Ccedil", 0xC7, 0x00C7 },
-  { "Ccedil", 0xC7, 0x00C7 },
-  { "Egrave", 0xC8, 0x00C8 },
-  { "Eacute", 0xC9, 0x00C9 },
-  { "Ecirc",  0xCA, 0x00CA },
-  { "Euml",   0xCB, 0x00CB },
-  { "Igrave", 0xCC, 0x00CC },
-  { "Iacute", 0xCD, 0x00CD },
-  { "Icirc",  0xCE, 0x00CE },
-  { "Iuml",   0xCF, 0x00CF },
-  { "ETH",    0xD0, 0x00D0 },
-  { "Ntilde", 0xD1, 0x00D1 },
-  { "Ograve", 0xD2, 0x00D2 },
-  { "Oacute", 0xD3, 0x00D3 },
-  { "Ocirc",  0xD4, 0x00D4 },
-  { "Otilde", 0xD5, 0x00D5 },
-  { "Ouml",   0xD6, 0x00D6 },
-  { "times",  0xD7, 0x00D7 },
-  { "Oslash", 0xD8, 0x00D8 },
-  { "Ugrave", 0xD9, 0x00D9 },
-  { "Uacute", 0xDA, 0x00DA },
-  { "Ucirc",  0xDB, 0x00DB },
-  { "Uuml",   0xDC, 0x00DC },
-  { "Yacute", 0xDD, 0x00DD },
-  { "THORN",  0xDE, 0x00DE },
-  { "szlig",  0xDF, 0x00DF },
-  { "agrave", 0xE0, 0x00E0 },
-  { "aacute", 0xE1, 0x00E1 },
-  { "acirc",  0xE2, 0x00E2 },
-  { "atilde", 0xE3, 0x00E3 },
-  { "auml",   0xE4, 0x00E4 },
-  { "aring",  0xE5, 0x00E5 },
-  { "aelig",  0xE6, 0x00E6 },
-  { "ccedil", 0xE7, 0x00E7 },
-  { "egrave", 0xE8, 0x00E8 },
-  { "eacute", 0xE9, 0x00E9 },
-  { "ecirc",  0xEA, 0x00EA },
-  { "euml",   0xEB, 0x00EB },
-  { "igrave", 0xEC, 0x00EC },
-  { "iacute", 0xED, 0x00ED },
-  { "icirc",  0xEE, 0x00EE },
-  { "iuml",   0xEF, 0x00EF },
-  { "eth",    0xF0, 0x00F0 },
-  { "ntilde", 0xF1, 0x00F1 },
-  { "ograve", 0xF2, 0x00F2 },
-  { "oacute", 0xF3, 0x00F3 },
-  { "ocirc",  0xF4, 0x00F4 },
-  { "otilde", 0xF5, 0x00F5 },
-  { "ouml",   0xF6, 0x00F6 },
-  { "divide", 0xF7, 0x00F7 },
-  { "oslash", 0xF8, 0x00F8 },
-  { "ugrave", 0xF9, 0x00F9 },
-  { "uacute", 0xFA, 0x00FA },
-  { "ucirc",  0xFB, 0x00FB },
-  { "uuml",   0xFC, 0x00FC },
-  { "yacute", 0xFD, 0x00FD },
-  { "thorn",  0xFE, 0x00FE },
-  { "yuml",   0xFF, 0x00FF },
-  { NULL, 0, 0 }
-};
-
-
-
-/* Date: Mon, 31 Mar 2003 00:19:28 +0200
-   From: Wojciech Polak <polak@gnu.org>
-...
- * Primary Polish site for ogonki is http://www.agh.edu.pl/ogonki/,
-   but it's only in Polish language (it has some interesting links).
-
- * A general site about ISO 8859-2 at http://nl.ijs.si/gnusl/cee/iso8859-2.html
-
- * ISO 8859-2 Character Set at http://nl.ijs.si/gnusl/cee/charset.html
-   This site provides almost all information about iso-8859-2,
-   including the character table!!! (must see!)
-
- * ISO 8859-2 and even HTML entities !!! (must see!)
-   http://people.ssh.fi/mtr/genscript/88592.txt
-
- * (minor) http://www.agh.edu.pl/ogonki/plchars.html
-   One more table, this time it includes even information about Polish
-   characters in Unicode.
-*/
-
-static iso_map_type iso8859_2_map [] = {
-  { "nbsp",	0xA0, 0x00A0 }, /* NO-BREAK SPACE */
-  { "",	0xA1, 0x0104 }, /* LATIN CAPITAL LETTER A WITH OGONEK */
-  { "",	0xA2, 0x02D8 }, /* BREVE */
-  { "",	0xA3, 0x0141 }, /* LATIN CAPITAL LETTER L WITH STROKE */
-  { "curren",	0xA4, 0x00A4 }, /* CURRENCY SIGN */
-  { "",	0xA5, 0x013D }, /* LATIN CAPITAL LETTER L WITH CARON */
-  { "",	0xA6, 0x015A }, /* LATIN CAPITAL LETTER S WITH ACUTE */
-  { "sect",	0xA7, 0x00A7 }, /* SECTION SIGN */
-  { "uml",	0xA8, 0x00A8 }, /* DIAERESIS */
-  { "",	0xA9, 0x0160 }, /* LATIN CAPITAL LETTER S WITH CARON */
-  { "",	0xAA, 0x015E }, /* LATIN CAPITAL LETTER S WITH CEDILLA */
-  { "",	0xAB, 0x0164 }, /* LATIN CAPITAL LETTER T WITH CARON */
-  { "",	0xAC, 0x0179 }, /* LATIN CAPITAL LETTER Z WITH ACUTE */
-  { "shy",	0xAD, 0x00AD }, /* SOFT HYPHEN */
-  { "",	0xAE, 0x017D }, /* LATIN CAPITAL LETTER Z WITH CARON */
-  { "",	0xAF, 0x017B }, /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */
-  { "deg",	0xB0, 0x00B0 }, /* DEGREE SIGN */
-  { "",	0xB1, 0x0105 }, /* LATIN SMALL LETTER A WITH OGONEK */
-  { "",	0xB2, 0x02DB }, /* OGONEK */
-  { "",	0xB3, 0x0142 }, /* LATIN SMALL LETTER L WITH STROKE */
-  { "acute",	0xB4, 0x00B4 }, /* ACUTE ACCENT */
-  { "",	0xB5, 0x013E }, /* LATIN SMALL LETTER L WITH CARON */
-  { "",	0xB6, 0x015B }, /* LATIN SMALL LETTER S WITH ACUTE */
-  { "",	0xB7, 0x02C7 }, /* CARON (Mandarin Chinese third tone) */
-  { "cedil",	0xB8, 0x00B8 }, /* CEDILLA */
-  { "",	0xB9, 0x0161 }, /* LATIN SMALL LETTER S WITH CARON */
-  { "",	0xBA, 0x015F }, /* LATIN SMALL LETTER S WITH CEDILLA */
-  { "",	0xBB, 0x0165 }, /* LATIN SMALL LETTER T WITH CARON */
-  { "",	0xBC, 0x017A }, /* LATIN SMALL LETTER Z WITH ACUTE */
-  { "",	0xBD, 0x02DD }, /* DOUBLE ACUTE ACCENT */
-  { "",	0xBE, 0x017E }, /* LATIN SMALL LETTER Z WITH CARON */
-  { "",	0xBF, 0x017C }, /* LATIN SMALL LETTER Z WITH DOT ABOVE */
-  { "",	0xC0, 0x0154 }, /* LATIN CAPITAL LETTER R WITH ACUTE */
-  { "",	0xC1, 0x00C1 }, /* LATIN CAPITAL LETTER A WITH ACUTE */
-  { "",	0xC2, 0x00C2 }, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
-  { "",	0xC3, 0x0102 }, /* LATIN CAPITAL LETTER A WITH BREVE */
-  { "",	0xC4, 0x00C4 }, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
-  { "",	0xC5, 0x0139 }, /* LATIN CAPITAL LETTER L WITH ACUTE */
-  { "",	0xC6, 0x0106 }, /* LATIN CAPITAL LETTER C WITH ACUTE */
-  { "",	0xC7, 0x00C7 }, /* LATIN CAPITAL LETTER C WITH CEDILLA */
-  { "",	0xC8, 0x010C }, /* LATIN CAPITAL LETTER C WITH CARON */
-  { "",	0xC9, 0x00C9 }, /* LATIN CAPITAL LETTER E WITH ACUTE */
-  { "",	0xCA, 0x0118 }, /* LATIN CAPITAL LETTER E WITH OGONEK */
-  { "",	0xCB, 0x00CB }, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
-  { "",	0xCC, 0x011A }, /* LATIN CAPITAL LETTER E WITH CARON */
-  { "",	0xCD, 0x00CD }, /* LATIN CAPITAL LETTER I WITH ACUTE */
-  { "",	0xCE, 0x00CE }, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
-  { "",	0xCF, 0x010E }, /* LATIN CAPITAL LETTER D WITH CARON */
-  { "",	0xD0, 0x0110 }, /* LATIN CAPITAL LETTER D WITH STROKE */
-  { "",	0xD1, 0x0143 }, /* LATIN CAPITAL LETTER N WITH ACUTE */
-  { "",	0xD2, 0x0147 }, /* LATIN CAPITAL LETTER N WITH CARON */
-  { "",	0xD3, 0x00D3 }, /* LATIN CAPITAL LETTER O WITH ACUTE */
-  { "",	0xD4, 0x00D4 }, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
-  { "",	0xD5, 0x0150 }, /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
-  { "",	0xD6, 0x00D6 }, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
-  { "times",	0xD7, 0x00D7 }, /* MULTIPLICATION SIGN */
-  { "",	0xD8, 0x0158 }, /* LATIN CAPITAL LETTER R WITH CARON */
-  { "",	0xD9, 0x016E }, /* LATIN CAPITAL LETTER U WITH RING ABOVE */
-  { "",	0xDA, 0x00DA }, /* LATIN CAPITAL LETTER U WITH ACUTE */
-  { "",	0xDB, 0x0170 }, /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
-  { "",	0xDC, 0x00DC }, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
-  { "",	0xDD, 0x00DD }, /* LATIN CAPITAL LETTER Y WITH ACUTE */
-  { "",	0xDE, 0x0162 }, /* LATIN CAPITAL LETTER T WITH CEDILLA */
-  { "",	0xDF, 0x00DF }, /* LATIN SMALL LETTER SHARP S (German) */
-  { "",	0xE0, 0x0155 }, /* LATIN SMALL LETTER R WITH ACUTE */
-  { "",	0xE1, 0x00E1 }, /* LATIN SMALL LETTER A WITH ACUTE */
-  { "",	0xE2, 0x00E2 }, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
-  { "",	0xE3, 0x0103 }, /* LATIN SMALL LETTER A WITH BREVE */
-  { "",	0xE4, 0x00E4 }, /* LATIN SMALL LETTER A WITH DIAERESIS */
-  { "",	0xE5, 0x013A }, /* LATIN SMALL LETTER L WITH ACUTE */
-  { "",	0xE6, 0x0107 }, /* LATIN SMALL LETTER C WITH ACUTE */
-  { "",	0xE7, 0x00E7 }, /* LATIN SMALL LETTER C WITH CEDILLA */
-  { "",	0xE8, 0x010D }, /* LATIN SMALL LETTER C WITH CARON */
-  { "",	0xE9, 0x00E9 }, /* LATIN SMALL LETTER E WITH ACUTE */
-  { "",	0xEA, 0x0119 }, /* LATIN SMALL LETTER E WITH OGONEK */
-  { "",	0xEB, 0x00EB }, /* LATIN SMALL LETTER E WITH DIAERESIS */
-  { "",	0xEC, 0x011B }, /* LATIN SMALL LETTER E WITH CARON */
-  { "",	0xED, 0x00ED }, /* LATIN SMALL LETTER I WITH ACUTE */
-  { "",	0xEE, 0x00EE }, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
-  { "",	0xEF, 0x010F }, /* LATIN SMALL LETTER D WITH CARON */
-  { "",	0xF0, 0x0111 }, /* LATIN SMALL LETTER D WITH STROKE */
-  { "",	0xF1, 0x0144 }, /* LATIN SMALL LETTER N WITH ACUTE */
-  { "",	0xF2, 0x0148 }, /* LATIN SMALL LETTER N WITH CARON */
-  { "",	0xF3, 0x00F3 }, /* LATIN SMALL LETTER O WITH ACUTE */
-  { "",	0xF4, 0x00F4 }, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
-  { "",	0xF5, 0x0151 }, /* LATIN SMALL LETTER O WITH DOUBLE ACUTE */
-  { "",	0xF6, 0x00F6 }, /* LATIN SMALL LETTER O WITH DIAERESIS */
-  { "divide",	0xF7, 0x00F7 }, /* DIVISION SIGN */
-  { "",	0xF8, 0x0159 }, /* LATIN SMALL LETTER R WITH CARON */
-  { "",	0xF9, 0x016F }, /* LATIN SMALL LETTER U WITH RING ABOVE */
-  { "",	0xFA, 0x00FA }, /* LATIN SMALL LETTER U WITH ACUTE */
-  { "",	0xFB, 0x0171 }, /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */
-  { "",	0xFC, 0x00FC }, /* LATIN SMALL LETTER U WITH DIAERESIS */
-  { "",	0xFD, 0x00FD }, /* LATIN SMALL LETTER Y WITH ACUTE */
-  { "",	0xFE, 0x0163 }, /* LATIN SMALL LETTER T WITH CEDILLA */
-  { "",	0xFF, 0x02D9 }, /* DOT ABOVE (Mandarin Chinese light tone) */
-  { NULL, 0, 0 }
-};
-
-encoding_type encoding_table[] = {
-  { no_encoding, "(no encoding)", NULL },
-  { US_ASCII,    "US-ASCII",    us_ascii_map },
-  { ISO_8859_1,  "iso-8859-1",  (iso_map_type *) iso8859_1_map },
-  { ISO_8859_2,  "iso-8859-2",  (iso_map_type *) iso8859_2_map },
-  { ISO_8859_3,  "iso-8859-3",  NULL },
-  { ISO_8859_4,  "iso-8859-4",  NULL },
-  { ISO_8859_5,  "iso-8859-5",  NULL },
-  { ISO_8859_6,  "iso-8859-6",  NULL },
-  { ISO_8859_7,  "iso-8859-7",  NULL },
-  { ISO_8859_8,  "iso-8859-8",  NULL },
-  { ISO_8859_9,  "iso-8859-9",  NULL },
-  { ISO_8859_10, "iso-8859-10", NULL },
-  { ISO_8859_11, "iso-8859-11", NULL },
-  { ISO_8859_12, "iso-8859-12", NULL },
-  { ISO_8859_13, "iso-8859-13", NULL },
-  { ISO_8859_14, "iso-8859-14", NULL },
-  { ISO_8859_15, "iso-8859-15", (iso_map_type *) iso8859_15_map },
-  { last_encoding_code, NULL, NULL }
-};
-
-
-language_type language_table[] = {
-  { aa, "aa", "Afar" },
-  { ab, "ab", "Abkhazian" },
-  { af, "af", "Afrikaans" },
-  { am, "am", "Amharic" },
-  { ar, "ar", "Arabic" },
-  { as, "as", "Assamese" },
-  { ay, "ay", "Aymara" },
-  { az, "az", "Azerbaijani" },
-  { ba, "ba", "Bashkir" },
-  { be, "be", "Byelorussian" },
-  { bg, "bg", "Bulgarian" },
-  { bh, "bh", "Bihari" },
-  { bi, "bi", "Bislama" },
-  { bn, "bn", "Bengali; Bangla" },
-  { bo, "bo", "Tibetan" },
-  { br, "br", "Breton" },
-  { ca, "ca", "Catalan" },
-  { co, "co", "Corsican" },
-  { cs, "cs", "Czech" },
-  { cy, "cy", "Welsh" },
-  { da, "da", "Danish" },
-  { de, "de", "German" },
-  { dz, "dz", "Bhutani" },
-  { el, "el", "Greek" },
-  { en, "en", "English" },
-  { eo, "eo", "Esperanto" },
-  { es, "es", "Spanish" },
-  { et, "et", "Estonian" },
-  { eu, "eu", "Basque" },
-  { fa, "fa", "Persian" },
-  { fi, "fi", "Finnish" },
-  { fj, "fj", "Fiji" },
-  { fo, "fo", "Faroese" },
-  { fr, "fr", "French" },
-  { fy, "fy", "Frisian" },
-  { ga, "ga", "Irish" },
-  { gd, "gd", "Scots Gaelic" },
-  { gl, "gl", "Galician" },
-  { gn, "gn", "Guarani" },
-  { gu, "gu", "Gujarati" },
-  { ha, "ha", "Hausa" },
-  { he, "he", "Hebrew" } /* (formerly iw) */,
-  { hi, "hi", "Hindi" },
-  { hr, "hr", "Croatian" },
-  { hu, "hu", "Hungarian" },
-  { hy, "hy", "Armenian" },
-  { ia, "ia", "Interlingua" },
-  { id, "id", "Indonesian" } /* (formerly in) */,
-  { ie, "ie", "Interlingue" },
-  { ik, "ik", "Inupiak" },
-  { is, "is", "Icelandic" },
-  { it, "it", "Italian" },
-  { iu, "iu", "Inuktitut" },
-  { ja, "ja", "Japanese" },
-  { jw, "jw", "Javanese" },
-  { ka, "ka", "Georgian" },
-  { kk, "kk", "Kazakh" },
-  { kl, "kl", "Greenlandic" },
-  { km, "km", "Cambodian" },
-  { kn, "kn", "Kannada" },
-  { ko, "ko", "Korean" },
-  { ks, "ks", "Kashmiri" },
-  { ku, "ku", "Kurdish" },
-  { ky, "ky", "Kirghiz" },
-  { la, "la", "Latin" },
-  { ln, "ln", "Lingala" },
-  { lo, "lo", "Laothian" },
-  { lt, "lt", "Lithuanian" },
-  { lv, "lv", "Latvian, Lettish" },
-  { mg, "mg", "Malagasy" },
-  { mi, "mi", "Maori" },
-  { mk, "mk", "Macedonian" },
-  { ml, "ml", "Malayalam" },
-  { mn, "mn", "Mongolian" },
-  { mo, "mo", "Moldavian" },
-  { mr, "mr", "Marathi" },
-  { ms, "ms", "Malay" },
-  { mt, "mt", "Maltese" },
-  { my, "my", "Burmese" },
-  { na, "na", "Nauru" },
-  { ne, "ne", "Nepali" },
-  { nl, "nl", "Dutch" },
-  { no, "no", "Norwegian" },
-  { oc, "oc", "Occitan" },
-  { om, "om", "(Afan) Oromo" },
-  { or, "or", "Oriya" },
-  { pa, "pa", "Punjabi" },
-  { pl, "pl", "Polish" },
-  { ps, "ps", "Pashto, Pushto" },
-  { pt, "pt", "Portuguese" },
-  { qu, "qu", "Quechua" },
-  { rm, "rm", "Rhaeto-Romance" },
-  { rn, "rn", "Kirundi" },
-  { ro, "ro", "Romanian" },
-  { ru, "ru", "Russian" },
-  { rw, "rw", "Kinyarwanda" },
-  { sa, "sa", "Sanskrit" },
-  { sd, "sd", "Sindhi" },
-  { sg, "sg", "Sangro" },
-  { sh, "sh", "Serbo-Croatian" },
-  { si, "si", "Sinhalese" },
-  { sk, "sk", "Slovak" },
-  { sl, "sl", "Slovenian" },
-  { sm, "sm", "Samoan" },
-  { sn, "sn", "Shona" },
-  { so, "so", "Somali" },
-  { sq, "sq", "Albanian" },
-  { sr, "sr", "Serbian" },
-  { ss, "ss", "Siswati" },
-  { st, "st", "Sesotho" },
-  { su, "su", "Sundanese" },
-  { sv, "sv", "Swedish" },
-  { sw, "sw", "Swahili" },
-  { ta, "ta", "Tamil" },
-  { te, "te", "Telugu" },
-  { tg, "tg", "Tajik" },
-  { th, "th", "Thai" },
-  { ti, "ti", "Tigrinya" },
-  { tk, "tk", "Turkmen" },
-  { tl, "tl", "Tagalog" },
-  { tn, "tn", "Setswana" },
-  { to, "to", "Tonga" },
-  { tr, "tr", "Turkish" },
-  { ts, "ts", "Tsonga" },
-  { tt, "tt", "Tatar" },
-  { tw, "tw", "Twi" },
-  { ug, "ug", "Uighur" },
-  { uk, "uk", "Ukrainian" },
-  { ur, "ur", "Urdu" },
-  { uz, "uz", "Uzbek" },
-  { vi, "vi", "Vietnamese" },
-  { vo, "vo", "Volapuk" },
-  { wo, "wo", "Wolof" },
-  { xh, "xh", "Xhosa" },
-  { yi, "yi", "Yiddish" } /* (formerly ji) */,
-  { yo, "yo", "Yoruba" },
-  { za, "za", "Zhuang" },
-  { zh, "zh", "Chinese" },
-  { zu, "zu", "Zulu" },
-  { last_language_code, NULL, NULL }
-};
-
-/* @documentlanguage.  Maybe we'll do something useful with this in the
-   future.  For now, we just recognize it.  */
-
-/* XML documents can make use of this data.  Unfortunately, it clashes with
-   the structure currently used.  So instead of enclosing content into
-   a language block, we just output an empty element.  Anyways, a stream based
-   parser can make good use of it.  */
-void
-cm_documentlanguage (void)
-{
-  language_code_type c;
-  char *lang_arg;
-
-  /* Read the line with the language code on it.  */
-  get_rest_of_line (0, &lang_arg);
-
-  /* Linear search is fine these days.  */
-  for (c = aa; c != last_language_code; c++)
-    {
-      if (strcmp (lang_arg, language_table[c].abbrev) == 0)
-        { /* Set current language code.  */
-          language_code = c;
-          break;
-        }
-    }
-
-  /* If we didn't find this code, complain.  */
-  if (c == last_language_code)
-    warning (_("%s is not a valid ISO 639 language code"), lang_arg);
-
-  if (xml && !docbook)
-    {
-      xml_insert_element_with_attribute (DOCUMENTLANGUAGE, START, "xml:lang=\"%s\"", lang_arg);
-      xml_insert_element (DOCUMENTLANGUAGE, END);
-    }
-
-  free (lang_arg);
-}
-
-
-
-/* Search through the encoding table for the given character, returning
-   its equivalent.  */
-
-static int
-cm_search_iso_map (char *html)
-{
-  int i;
-  iso_map_type *iso = encoding_table[document_encoding_code].isotab;
-
-  /* If no conversion table for this encoding, quit.  */
-  if (!iso)
-    return -1;
-
-  for (i = 0; iso[i].html; i++)
-    {
-      if (strcmp (html, iso[i].html) == 0)
-        return i;
-    }
-
-  return -1;
-}
-
-
-/* @documentencoding.  Set the translation table.  */
-
-void
-cm_documentencoding (void)
-{
-  if (!handling_delayed_writes)
-    {
-      encoding_code_type enc;
-      char *enc_arg;
-
-      /* This is ugly and probably needs to apply to other commands'
-         argument parsing as well.  When we're doing @documentencoding,
-         we're generally in the frontmatter of the document, and so the.
-         expansion in html/xml/docbook would generally be the empty string.
-         (Because those modes wait until the first normal text of the
-         document to start outputting.)  The result would thus be a warning
-         "unrecognized encoding name `'".  Sigh.  */
-      int save_html = html;
-      int save_xml = xml;
-
-      html = 0;
-      xml = 0;
-      get_rest_of_line (1, &enc_arg);
-      html = save_html;
-      xml = save_xml;
-
-      /* See if we have this encoding.  */
-      for (enc = no_encoding+1; enc != last_encoding_code; enc++)
-        {
-          if (strcasecmp (enc_arg, encoding_table[enc].encname) == 0)
-            {
-              document_encoding_code = enc;
-              break;
-            }
-        }
-
-      /* If we didn't find this code, complain.  */
-      if (enc == last_encoding_code)
-        {
-          warning (_("unrecognized encoding name `%s'"), enc_arg);
-          /* Let the previous one go.  */
-          if (unknown_encoding && *unknown_encoding)
-            free (unknown_encoding);
-          unknown_encoding = xstrdup (enc_arg);
-        }
-
-      else if (encoding_table[document_encoding_code].isotab == NULL)
-        warning (_("sorry, encoding `%s' not supported"), enc_arg);
-
-      free (enc_arg);
-    }
-  else if (xml)
-    {
-      char *encoding = current_document_encoding ();
-
-      if (encoding && *encoding)
-        {
-          insert_string (" encoding=\"");
-          insert_string (encoding);
-          insert_string ("\"");
-        }
-
-      free (encoding);
-    }
-}
-
-char *
-current_document_encoding (void)
-{
-  if (document_encoding_code != no_encoding)
-    return xstrdup (encoding_table[document_encoding_code].encname);
-  else if (unknown_encoding && *unknown_encoding)
-    return xstrdup (unknown_encoding);
-  else
-    return xstrdup ("");
-}
-
-
-/* If html or xml output, add &HTML_STR; to the output.  If not html and
-   the user requested encoded output, add the real 8-bit character
-   corresponding to HTML_STR from the translation tables.  Otherwise,
-   add INFO_STR.  */
-
-static void
-add_encoded_char (char *html_str, char *info_str)
-{
-  if (html)
-    add_word_args ("&%s;", html_str);
-  else if (xml)
-    xml_insert_entity (html_str);
-  else if (enable_encoding)
-    {
-      /* Look for HTML_STR in the current translation table.  */
-      int rc = cm_search_iso_map (html_str);
-      if (rc >= 0)
-        /* We found it, add the real character.  */
-        add_char (encoding_table[document_encoding_code].isotab[rc].bytecode);
-      else
-        { /* We didn't find it, that seems bad.  */
-          warning (_("invalid encoded character `%s'"), html_str);
-          add_word (info_str);
-        }
-    }
-  else
-    add_word (info_str);
-}
-
-
-
-/* Output an accent for HTML or XML. */
-
-static void
-cm_accent_generic_html (int arg, int start, int end, char *html_supported,
-    int single, int html_solo_standalone, char *html_solo)
-{
-  static int valid_html_accent; /* yikes */
-
-  if (arg == START)
-    { /* If HTML has good support for this character, use it.  */
-      if (strchr (html_supported, curchar ()))
-        { /* Yes; start with an ampersand.  The character itself
-             will be added later in read_command (makeinfo.c).  */
-	  int saved_escape_html = escape_html;
-	  escape_html = 0;
-          valid_html_accent = 1;
-          add_char ('&');
-	  escape_html = saved_escape_html;
-        }
-      else
-        { /* @dotless{i} is not listed in html_supported but HTML entities
-	     starting with `i' can be used, such as &icirc;.  */
-	  int save_input_text_offset = input_text_offset;
-	  char *accent_contents;
-
-	  get_until_in_braces ("\n", &accent_contents);
-	  canon_white (accent_contents);
-
-	  if (strstr (accent_contents, "@dotless{i"))
-	    {
-	      add_word_args ("&%c", accent_contents[9]);
-	      valid_html_accent = 1;
-	    }
-	  else
-	    {
-	      /* Search for @dotless{} wasn't successful, so rewind.  */
-	      input_text_offset = save_input_text_offset;
-	      valid_html_accent = 0;
-	      if (html_solo_standalone)
-		{ /* No special HTML support, so produce standalone char.  */
-		  if (xml)
-		    xml_insert_entity (html_solo);
-		  else
-		    add_word_args ("&%s;", html_solo);
-		}
-	      else
-		/* If the html_solo does not exist as standalone character
-		   (namely &circ; &grave; &tilde;), then we use
-		   the single character version instead.  */
-		add_char (single);
-	    }
-
-	  free (accent_contents);
-        }
-    }
-  else if (arg == END)
-    { /* Only if we saw a valid_html_accent can we use the full
-         HTML accent (umlaut, grave ...).  */
-      if (valid_html_accent)
-        {
-          add_word (html_solo);
-          add_char (';');
-        }
-    }
-}
-
-
-static void
-cm_accent_generic_no_headers (int arg, int start, int end, int single,
-    char *html_solo)
-{
-  if (arg == END)
-    {
-      if (no_encoding)
-        add_char (single);
-      else
-        {
-          int rc;
-          char *buffer = xmalloc (1 + strlen (html_solo) + 1);
-          buffer[0] = output_paragraph[end - 1];
-          buffer[1] = 0;
-          strcat (buffer, html_solo);
-
-          rc = cm_search_iso_map (buffer);
-          if (rc >= 0)
-            /* A little bit tricky ;-)
-               Here we replace the character which has
-               been inserted in read_command with
-               the value we have found in converting table
-               Does there exist a better way to do this?  kama. */
-            output_paragraph[end - 1]
-              = encoding_table[document_encoding_code].isotab[rc].bytecode;
-          else
-            { /* If we didn't find a translation for this character,
-                 put the single instead. E.g., &Xuml; does not exist so X&uml;
-                 should be produced. */
-              /* When the below warning is issued, an author has nothing
-                 wrong in their document, let alone anything ``fixable''
-                 on their side.  So it is commented out for now.  */
-              /* warning (_("%s is an invalid ISO code, using %c"),
-                       buffer, single); */
-              add_char (single);
-            }
-
-          free (buffer);
-        }
-    }
-}
-
-
-
-/* Accent commands that take explicit arguments and don't have any
-   special HTML support.  */
-
-void
-cm_accent (int arg)
-{
-  int old_escape_html = escape_html;
-  escape_html = 0;
-  if (arg == START)
-    {
-      /* Must come first to avoid ambiguity with overdot.  */
-      if (strcmp (command, "udotaccent") == 0)      /* underdot */
-        add_char ('.');
-    }
-  else if (arg == END)
-    {
-      if (strcmp (command, "=") == 0)               /* macron */
-        add_word ((html || xml) ? "&macr;" : "=");
-      else if (strcmp (command, "H") == 0)          /* Hungarian umlaut */
-        add_word ("''");
-      else if (strcmp (command, "dotaccent") == 0)  /* overdot */
-        add_meta_char ('.');
-      else if (strcmp (command, "ringaccent") == 0) /* ring */
-        add_char ('*');
-      else if (strcmp (command, "tieaccent") == 0)  /* long tie */
-        add_char ('[');
-      else if (strcmp (command, "u") == 0)          /* breve */
-        add_char ('(');
-      else if (strcmp (command, "ubaraccent") == 0) /* underbar */
-        add_char ('_');
-      else if (strcmp (command, "v") == 0)          /* hacek/check */
-        add_word ((html || xml) ? "&lt;" : "<");
-    }
-  escape_html = old_escape_html;
-}
-
-/* Common routine for the accent characters that have support in HTML.
-   If the character being accented is in the HTML_SUPPORTED set, then
-   produce &CHTML_SOLO;, for example, &Auml; for an A-umlaut.  If not in
-   HTML_SUPPORTED, just produce &HTML_SOLO;X for the best we can do with
-   at an X-umlaut.  If not producing HTML, just use SINGLE, a
-   character such as " which is the best plain text representation we
-   can manage.  If HTML_SOLO_STANDALONE is nonzero the given HTML_SOLO
-   exists as valid standalone character in HTML, e.g., &uml;.  */
-
-static void
-cm_accent_generic (int arg, int start, int end, char *html_supported,
-    int single, int html_solo_standalone, char *html_solo)
-{
-  /* Accentuating space characters makes no sense, so issue a warning.  */
-  if (arg == START && isspace (input_text[input_text_offset]))
-    warning ("Accent command `@%s' must not be followed by whitespace",
-        command);
-
-  if (html || xml)
-    cm_accent_generic_html (arg, start, end, html_supported,
-                            single, html_solo_standalone, html_solo);
-  else if (no_headers)
-    cm_accent_generic_no_headers (arg, start, end, single, html_solo);
-  else if (arg == END)
-    {
-      if (enable_encoding)
-        /* use 8-bit if available */
-        cm_accent_generic_no_headers (arg, start, end, single, html_solo);
-      else
-        /* use regular character */
-        add_char (single);
-    }
-}
-
-void
-cm_accent_umlaut (int arg, int start, int end)
-{
-  cm_accent_generic (arg, start, end, "aouAOUEeIiy", '"', 1, "uml");
-}
-
-void
-cm_accent_acute (int arg, int start, int end)
-{
-  cm_accent_generic (arg, start, end, "AEIOUYaeiouy", '\'', 1, "acute");
-}
-
-void
-cm_accent_cedilla (int arg, int start, int end)
-{
-  cm_accent_generic (arg, start, end, "Cc", ',', 1, "cedil");
-}
-
-void
-cm_accent_hat (int arg, int start, int end)
-{
-  cm_accent_generic (arg, start, end, "AEIOUaeiou", '^', 0, "circ");
-}
-
-void
-cm_accent_grave (int arg, int start, int end)
-{
-  cm_accent_generic (arg, start, end, "AEIOUaeiou", '`', 0, "grave");
-}
-
-void
-cm_accent_tilde (int arg, int start, int end)
-{
-  cm_accent_generic (arg, start, end, "ANOano", '~', 0, "tilde");
-}
-
-
-
-/* Non-English letters/characters that don't insert themselves.  */
-void
-cm_special_char (int arg)
-{
-  int old_escape_html = escape_html;
-  escape_html = 0;
-
-  if (arg == START)
-    {
-      if ((*command == 'L' || *command == 'l'
-           || *command == 'O' || *command == 'o')
-          && command[1] == 0)
-        { /* Lslash lslash Oslash oslash.
-             Lslash and lslash aren't supported in HTML.  */
-          if (command[0] == 'O')
-            add_encoded_char ("Oslash", "/O");
-          else if (command[0] == 'o')
-            add_encoded_char ("oslash", "/o");
-          else
-            add_word_args ("/%c", command[0]);
-        }
-      else if (strcmp (command, "exclamdown") == 0)
-        add_encoded_char ("iexcl", "!");
-      else if (strcmp (command, "questiondown") == 0)
-        add_encoded_char ("iquest", "?");
-      else if (strcmp (command, "euro") == 0)
-        /* http://www.cs.tut.fi/~jkorpela/html/euro.html suggests that
-           &euro; degrades best in old browsers.  */
-        add_encoded_char ("euro", "Euro ");
-      else if (strcmp (command, "pounds") == 0)
-        add_encoded_char ("pound" , "#");
-      else if (strcmp (command, "ordf") == 0)
-        add_encoded_char ("ordf" , "a");
-      else if (strcmp (command, "ordm") == 0)
-        add_encoded_char ("ordm" , "o");
-      else if (strcmp (command, "AE") == 0)
-        add_encoded_char ("AElig", command);
-      else if (strcmp (command, "ae") == 0)
-        add_encoded_char ("aelig",  command);
-      else if (strcmp (command, "OE") == 0)
-        add_encoded_char ("OElig", command);
-      else if (strcmp (command, "oe") == 0)
-        add_encoded_char ("oelig", command);
-      else if (strcmp (command, "AA") == 0)
-        add_encoded_char ("Aring", command);
-      else if (strcmp (command, "aa") == 0)
-        add_encoded_char ("aring", command);
-      else if (strcmp (command, "ss") == 0)
-        add_encoded_char ("szlig", command);
-      else
-        line_error ("cm_special_char internal error: command=@%s", command);
-    }
-  escape_html = old_escape_html;
-}
-
-/* Dotless i or j.  */
-void
-cm_dotless (int arg, int start, int end)
-{
-  if (arg == END)
-    {
-      xml_no_para --;
-      if (output_paragraph[start] != 'i' && output_paragraph[start] != 'j')
-        /* This error message isn't perfect if the argument is multiple
-           characters, but it doesn't seem worth getting right.  */
-        line_error (_("%c%s expects `i' or `j' as argument, not `%c'"),
-                    COMMAND_PREFIX, command, output_paragraph[start]);
-
-      else if (end - start != 1)
-        line_error (_("%c%s expects a single character `i' or `j' as argument"),
-                    COMMAND_PREFIX, command);
-
-      /* We've already inserted the `i' or `j', so nothing to do.  */
-    }
-  else
-    xml_no_para ++;
-}

Property changes on: head/contrib/texinfo/makeinfo/lang.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/defun.c
===================================================================
--- head/contrib/texinfo/makeinfo/defun.c	(revision 276550)
+++ head/contrib/texinfo/makeinfo/defun.c	(nonexistent)
@@ -1,720 +0,0 @@
-/* defun.c -- @defun and friends.
-   $Id: defun.c,v 1.11 2004/04/11 17:56:46 karl Exp $
-
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "system.h"
-#include "defun.h"
-#include "xml.h"
-#include "insertion.h"
-#include "makeinfo.h"
-#include "cmds.h"
-#include "html.h"
-
-
-#define DEFUN_SELF_DELIMITING(c) \
-  ((c) == '(' || (c) == ')' || (c) == '[' || (c) == ']')
-
-struct token_accumulator
-{
-  unsigned int length;
-  unsigned int index;
-  char **tokens;
-};
-
-static void
-initialize_token_accumulator (struct token_accumulator *accumulator)
-{
-  accumulator->length = 0;
-  accumulator->index = 0;
-  accumulator->tokens = NULL;
-}
-
-static void
-accumulate_token (struct token_accumulator *accumulator, char *token)
-{
-  if (accumulator->index >= accumulator->length)
-    {
-      accumulator->length += 10;
-      accumulator->tokens = xrealloc (accumulator->tokens,
-                                      (accumulator->length * sizeof (char *)));
-    }
-  accumulator->tokens[accumulator->index] = token;
-  accumulator->index += 1;
-}
-
-/* Given STRING_POINTER pointing at an open brace, skip forward and return a
-   pointer to just past the matching close brace. */
-static int
-scan_group_in_string (char **string_pointer)
-{
-  char *scan_string = (*string_pointer) + 1;
-  unsigned int level = 1;
-  int started_command = 0;
-
-  for (;;)
-    {
-      int c;
-      if (level == 0)
-        {
-          *string_pointer = scan_string;
-          return 1;
-        }
-      c = *scan_string++;
-      if (c == 0)
-        {
-          /* Tweak line_number to compensate for fact that
-             we gobbled the whole line before coming here. */
-          line_number--;
-          line_error (_("Missing `}' in @def arg"));
-          line_number++;
-          *string_pointer = scan_string - 1;
-          return 0;
-        }
-
-      if (c == '{' && !started_command)
-        level++;
-      if (c == '}' && !started_command)
-        level--;
-
-      /* remember if at @.  */
-      started_command = (c == '@' && !started_command);
-    }
-}
-
-/* Return a list of tokens from the contents of STRING.
-   Commands and brace-delimited groups count as single tokens.
-   Contiguous whitespace characters are converted to a token
-   consisting of a single space. */
-static char **
-args_from_string (char *string)
-{
-  struct token_accumulator accumulator;
-  char *token_start, *token_end;
-  char *scan_string = string;
-
-  initialize_token_accumulator (&accumulator);
-
-  while (*scan_string)
-    { /* Replace arbitrary whitespace by a single space. */
-      if (whitespace (*scan_string))
-        {
-          scan_string += 1;
-          while (whitespace (*scan_string))
-            scan_string += 1;
-          accumulate_token ((&accumulator), (xstrdup (" ")));
-          continue;
-        }
-
-      /* Commands count as single tokens. */
-      if (*scan_string == COMMAND_PREFIX)
-        {
-          token_start = scan_string;
-          scan_string += 1;
-          if (self_delimiting (*scan_string))
-            scan_string += 1;
-          else
-            {
-              int c;
-              while (1)
-                {
-                  c = *scan_string++;
-
-                  if ((c == 0) || (c == '{') || (whitespace (c)))
-                    {
-                      scan_string -= 1;
-                      break;
-                    }
-                }
-
-              if (*scan_string == '{')
-                {
-                  char *s = scan_string;
-                  (void) scan_group_in_string (&s);
-                  scan_string = s;
-                }
-            }
-          token_end = scan_string;
-        }
-
-      /* Parentheses and brackets are self-delimiting. */
-      else if (DEFUN_SELF_DELIMITING (*scan_string))
-        {
-          token_start = scan_string;
-          scan_string += 1;
-          token_end = scan_string;
-        }
-
-      /* Open brace introduces a group that is a single token. */
-      else if (*scan_string == '{')
-        {
-          char *s = scan_string;
-          int balanced = scan_group_in_string (&s);
-
-          token_start = scan_string + 1;
-          scan_string = s;
-          token_end = balanced ? (scan_string - 1) : scan_string;
-        }
-
-      /* Make commas separate tokens so to differentiate them from
-         parameter types in XML output. */
-      else if (*scan_string == ',')
-	{
-          token_start = scan_string;
-          scan_string += 1;
-          token_end = scan_string;
-	}
-
-      /* Otherwise a token is delimited by whitespace, parentheses,
-         brackets, or braces.  A token is also ended by a command. */
-      else
-        {
-          token_start = scan_string;
-
-          for (;;)
-            {
-              int c;
-
-              c = *scan_string++;
-
-              /* Do not back up if we're looking at a }; since the only
-                 valid }'s are those matched with {'s, we want to give
-                 an error.  If we back up, we go into an infinite loop.  */
-              if (!c || whitespace (c) || DEFUN_SELF_DELIMITING (c)
-                  || c == '{')
-                {
-                  scan_string--;
-                  break;
-                }
-
-	      /* End token if we are looking at a comma, as commas are
-		 delimiters too. */
-	      if (c == ',')
-		{
-		  scan_string--;
-		  break;
-		}
-
-              /* If we encounter a command embedded within a token,
-                 then end the token. */
-              if (c == COMMAND_PREFIX)
-                {
-                  scan_string--;
-                  break;
-                }
-            }
-          token_end = scan_string;
-        }
-
-      accumulate_token (&accumulator, substring (token_start, token_end));
-    }
-  accumulate_token (&accumulator, NULL);
-  return accumulator.tokens;
-}
-
-static void
-process_defun_args (char **defun_args, int auto_var_p)
-{
-  int pending_space = 0;
-
-  if (xml)
-    {
-      xml_process_defun_args (defun_args, auto_var_p);
-      return;
-    }
-
-  for (;;)
-    {
-      char *defun_arg = *defun_args++;
-
-      if (defun_arg == NULL)
-        break;
-
-      if (defun_arg[0] == ' ')
-        {
-          pending_space = 1;
-          continue;
-        }
-
-      if (pending_space)
-        {
-          add_char (' ');
-          pending_space = 0;
-        }
-
-      if (DEFUN_SELF_DELIMITING (defun_arg[0]))
-        {
-          /* Within @deffn and friends, texinfo.tex makes parentheses
-             sans serif and brackets bold.  We use roman instead.  */
-          if (html)
-            insert_html_tag (START, "");
-            
-          add_char (defun_arg[0]);
-          
-          if (html)
-            insert_html_tag (END, "");
-        }
-      /* else if (defun_arg[0] == '&' || defun_arg[0] == COMMAND_PREFIX) */
-        /* execute_string ("%s", defun_arg); */
-      /* else if (auto_var_p) */
-        /* execute_string ("%s", defun_arg); */
-      else
-        execute_string ("%s", defun_arg);
-    }
-}
-
-static char *
-next_nonwhite_defun_arg (char ***arg_pointer)
-{
-  char **scan = (*arg_pointer);
-  char *arg = (*scan++);
-
-  if ((arg != 0) && (*arg == ' '))
-    arg = *scan++;
-
-  if (arg == 0)
-    scan -= 1;
-
-  *arg_pointer = scan;
-
-  return (arg == 0) ? "" : arg;
-}
-
-
-/* This is needed also in insertion.c.  */
-
-enum insertion_type
-get_base_type (int type)
-{
-  int base_type;
-  switch (type)
-    {
-    case defivar:	base_type = defcv; break;
-    case defmac:	base_type = deffn; break;
-    case defmethod:	base_type = defop; break;
-    case defopt:	base_type = defvr; break;
-    case defspec:	base_type = deffn; break;
-    case deftypecv:	base_type = deftypecv; break;
-    case deftypefun:	base_type = deftypefn; break;
-    case deftypeivar:	base_type = deftypeivar; break;
-    case deftypemethod:	base_type = deftypemethod; break;
-    case deftypeop:	base_type = deftypeop; break;
-    case deftypevar:	base_type = deftypevr; break;
-    case defun:		base_type = deffn; break;
-    case defvar:	base_type = defvr; break;
-    default:
-      base_type = type;
-      break;
-    }
-
-  return base_type;
-}
-
-/* Make the defun type insertion.
-   TYPE says which insertion this is.
-   X_P, if nonzero, says not to start a new insertion. */
-static void
-defun_internal (int type, int x_p)
-{
-  int base_type;
-  char **defun_args, **scan_args;
-  const char *category;
-  char *defined_name;
-  char *type_name = NULL;
-  char *type_name2 = NULL;
-
-  {
-    char *line;
-
-    /* The @def.. line is the only place in Texinfo where you are
-       allowed to use unquoted braces that don't delimit arguments of
-       a command or a macro; in any other place it will trigger an
-       error message from the reader loop.  The special handling of
-       this case inside `args_from_string' is an extra special hack
-       which allows this.  The side effect is that if we try to expand
-       the rest of the line below, the recursive reader loop will
-       signal an error if there are brace-delimited arguments on that line.
-
-       The best solution to this would be to change the syntax of
-       @def.. commands so that it doesn't violate Texinfo's own rules.
-       But it's probably too late for this now, as it will break a lot
-       of existing manuals.
-
-       Unfortunately, this means that you can't call macros, use @value, etc.
-       inside @def.. commands, sigh.  */
-    get_rest_of_line (0, &line);
-
-    /* Basic line continuation.  If a line ends with \s*@\s* concatanate
-       the next line. */
-    {
-      char *next_line, *new_line;
-      int i;
-
-      line_continuation:
-        i = strlen (line) - 1;
-
-        if (line[i] == '@' && line[i-1] != '@')
-          {
-            get_rest_of_line (0, &next_line);
-            new_line = (char *) xmalloc (i + strlen (next_line) + 2);
-            strncpy (new_line, line, i);
-            new_line[i] = '\0';
-            free (line);
-            strcat (new_line, " ");
-            strcat (new_line, next_line);
-            line = xstrdup (new_line);
-            free (next_line);
-            free (new_line);
-
-            goto line_continuation;
-          }
-    }
-
-    defun_args = (args_from_string (line));
-    free (line);
-  }
-
-  scan_args = defun_args;
-
-  /* Get base type and category string.  */
-  base_type = get_base_type (type);
-
-  /* xx all these const strings should be determined upon
-     documentlanguage argument and NOT via gettext  (kama).  */
-  switch (type)
-    {
-    case defun:
-    case deftypefun:
-      category = _("Function");
-      break;
-    case defmac:
-      category = _("Macro");
-      break;
-    case defspec:
-      category = _("Special Form");
-      break;
-    case defvar:
-    case deftypevar:
-      category = _("Variable");
-      break;
-    case defopt:
-      category = _("User Option");
-      break;
-    case defivar:
-    case deftypeivar:
-      category = _("Instance Variable");
-      break;
-    case defmethod:
-    case deftypemethod:
-      category = _("Method");
-      break;
-    default:
-      category = next_nonwhite_defun_arg (&scan_args);
-      break;
-    }
-
-  /* The class name.  */
-  if ((base_type == deftypecv)
-      || (base_type == deftypefn)
-      || (base_type == deftypevr)
-      || (base_type == defcv)
-      || (base_type == defop)
-      || (base_type == deftypeivar)
-      || (base_type == deftypemethod)
-      || (base_type == deftypeop)
-     )
-    type_name = next_nonwhite_defun_arg (&scan_args);
-
-  /* The type name for typed languages.  */
-  if ((base_type == deftypecv)
-      || (base_type == deftypeivar)
-      || (base_type == deftypemethod)
-      || (base_type == deftypeop)
-     )
-    type_name2 = next_nonwhite_defun_arg (&scan_args);
-
-  /* The function or whatever that's actually being defined.  */
-  defined_name = next_nonwhite_defun_arg (&scan_args);
-
-  /* This hack exists solely for the purposes of formatting the Texinfo
-     manual.  I couldn't think of a better way.  The token might be a
-     simple @@ followed immediately by more text.  If this is the case,
-     then the next defun arg is part of this one, and we should
-     concatenate them. */
-  if (*scan_args && **scan_args && !whitespace (**scan_args)
-       && STREQ (defined_name, "@@"))
-    {
-      char *tem = xmalloc (3 + strlen (scan_args[0]));
-
-      sprintf (tem, "@@%s", scan_args[0]);
-
-      free (scan_args[0]);
-      scan_args[0] = tem;
-      scan_args++;
-      defined_name = tem;
-    }
-
-  /* It's easy to write @defun foo(arg1 arg2), but a following ( is
-     misparsed by texinfo.tex and this is next to impossible to fix.
-     Warn about it.  */
-  if (*scan_args && **scan_args && **scan_args == '(')
-    warning ("`%c' follows defined name `%s' instead of whitespace",
-             **scan_args, defined_name);
-
-  if (!x_p)
-    begin_insertion (type);
-
-  /* Write the definition header line.
-     This should start at the normal indentation.  */
-  current_indent -= default_indentation_increment;
-  start_paragraph ();
-
-  if (!html && !xml)
-    switch (base_type)
-      {
-      case deffn:
-      case defvr:
-      case deftp:
-        execute_string (" --- %s: %s", category, defined_name);
-        break;
-      case deftypefn:
-      case deftypevr:
-        execute_string (" --- %s: %s %s", category, type_name, defined_name);
-        break;
-      case defcv:
-        execute_string (" --- %s %s %s: %s", category, _("of"), type_name,
-                        defined_name);
-        break;
-      case deftypecv:
-      case deftypeivar:
-        execute_string (" --- %s %s %s: %s %s", category, _("of"), type_name,
-                        type_name2, defined_name);
-        break;
-      case defop:
-        execute_string (" --- %s %s %s: %s", category, _("on"), type_name,
-                        defined_name);
-        break;
-      case deftypeop:
-        execute_string (" --- %s %s %s: %s %s", category, _("on"), type_name,
-                        type_name2, defined_name);
-        break;
-      case deftypemethod:
-        execute_string (" --- %s %s %s: %s %s", category, _("on"), type_name,
-                        type_name2, defined_name);
-        break;
-      }
-  else if (html)
-    {
-      /* If this is not a @def...x version, it could only
-         be a normal version @def.... So start the table here.  */
-      if (!x_p)
-        insert_string ("<div class=\"defun\">\n");
-      else
-        rollback_empty_tag ("blockquote");
-
-      /* xx The single words (on, off) used here, should depend on
-         documentlanguage and NOT on gettext  --kama.  */
-      switch (base_type)
-        {
-        case deffn:
-        case defvr:
-        case deftp:
-        case deftypefn:
-        case deftypevr:
-          execute_string ("--- %s: ", category);
-          break;
-
-        case defcv:
-        case deftypecv:
-        case deftypeivar:
-	  execute_string ("--- %s %s %s: ", category, _("of"), type_name);
-	  break;
-
-        case defop:
-        case deftypemethod:
-        case deftypeop:
-	  execute_string ("--- %s %s %s: ", category, _("on"), type_name);
-	  break;
-	} /* switch (base_type)... */
-
-      switch (base_type)
-        {
-        case deffn:
-        case defvr:
-        case deftp:
-          /* <var> is for the following function arguments.  */
-          insert_html_tag (START, "b");
-          execute_string ("%s", defined_name);
-          insert_html_tag (END, "b");
-          insert_html_tag (START, "var");
-          break;
-        case deftypefn:
-        case deftypevr:
-          execute_string ("%s ", type_name);
-          insert_html_tag (START, "b");
-          execute_string ("%s", defined_name);
-          insert_html_tag (END, "b");
-          insert_html_tag (START, "var");
-          break;
-        case defcv:
-        case defop:
-          insert_html_tag (START, "b");
-          execute_string ("%s", defined_name);
-          insert_html_tag (END, "b");
-          insert_html_tag (START, "var");
-          break;
-        case deftypecv:
-        case deftypeivar:
-        case deftypemethod:
-        case deftypeop:
-          execute_string ("%s ", type_name2);
-          insert_html_tag (START, "b");
-          execute_string ("%s", defined_name);
-          insert_html_tag (END, "b");
-          insert_html_tag (START, "var");
-          break;
-        }
-    }
-  else if (xml)
-    xml_begin_def_term (base_type, category, defined_name, type_name,
-	type_name2);
-
-  current_indent += default_indentation_increment;
-
-  /* Now process the function arguments, if any.  If these carry onto
-     the next line, they should be indented by two increments to
-     distinguish them from the body of the definition, which is indented
-     by one increment.  */
-  current_indent += default_indentation_increment;
-
-  switch (base_type)
-    {
-    case deffn:
-    case defop:
-      process_defun_args (scan_args, 1);
-      break;
-
-      /* Through Makeinfo 1.67 we processed remaining args only for deftp,
-         deftypefn, and deftypemethod.  But the libc manual, for example,
-         needs to say:
-            @deftypevar {char *} tzname[2]
-         And simply allowing the extra text seems far simpler than trying
-         to invent yet more defn commands.  In any case, we should either
-         output it or give an error, not silently ignore it.  */
-    default:
-      process_defun_args (scan_args, 0);
-      break;
-    }
-
-  current_indent -= default_indentation_increment;
-  if (!html)
-    close_single_paragraph ();
-
-  /* Make an entry in the appropriate index.  (XML and
-     Docbook already got their entries, so skip them.)  */
-  if (!xml)
-    switch (base_type)
-      {
-      case deffn:
-      case deftypefn:
-	execute_string ("@findex %s\n", defined_name);
-	break;
-      case defcv:
-      case deftypecv:
-      case deftypevr:
-      case defvr:
-	execute_string ("@vindex %s\n", defined_name);
-	break;
-      case deftypeivar:
-	execute_string ("@vindex %s %s %s\n", defined_name, _("of"),
-                        type_name);
-	break;
-      case defop:
-      case deftypeop:
-      case deftypemethod:
-	execute_string ("@findex %s %s %s\n", defined_name, _("on"),
-                        type_name);
-	break;
-      case deftp:
-	execute_string ("@tindex %s\n", defined_name);
-	break;
-      }
-
-  if (xml)
-    xml_end_def_term ();
-  else if (html)
-    {
-      inhibit_paragraph_indentation = 1;
-      no_indent = 1;
-      insert_html_tag (END, "var");
-      insert_string ("<br>\n");
-      /* Indent the definition a bit.  */
-      add_html_block_elt ("<blockquote>");
-      no_indent = 0;
-      inhibit_paragraph_indentation = 0;
-      paragraph_is_open = 0;
-    }
-
-  /* Deallocate the token list. */
-  scan_args = defun_args;
-  while (1)
-    {
-      char * arg = (*scan_args++);
-      if (arg == NULL)
-        break;
-      free (arg);
-    }
-  free (defun_args);
-}
-
-/* Add an entry for a function, macro, special form, variable, or option.
-   If the name of the calling command ends in `x', then this is an extra
-   entry included in the body of an insertion of the same type. */
-void
-cm_defun (void)
-{
-  int type;
-  char *base_command = xstrdup (command);  /* command with any `x' removed */
-  int x_p = (command[strlen (command) - 1] == 'x');
-
-  if (x_p)
-    base_command[strlen (base_command) - 1] = 0;
-
-  type = find_type_from_name (base_command);
-
-  /* If we are adding to an already existing insertion, then make sure
-     that we are already in an insertion of type TYPE. */
-  if (x_p)
-    {
-      INSERTION_ELT *i = insertion_stack;
-      /* Skip over ifclear and ifset conditionals.  */
-      while (i && (i->insertion == ifset || i->insertion == ifclear))
-        i = i->next;
-        
-      if (!i || i->insertion != type)
-        {
-          line_error (_("Must be in `@%s' environment to use `@%s'"),
-                      base_command, command);
-          discard_until ("\n");
-          return;
-        }
-    }
-
-  defun_internal (type, x_p);
-  free (base_command);
-}

Property changes on: head/contrib/texinfo/makeinfo/defun.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/node.h
===================================================================
--- head/contrib/texinfo/makeinfo/node.h	(revision 276550)
+++ head/contrib/texinfo/makeinfo/node.h	(nonexistent)
@@ -1,129 +0,0 @@
-/* node.h -- declarations for Node.
-   $Id: node.h,v 1.2 2004/04/11 17:56:47 karl Exp $
-
-   Copyright (C) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Brian Fox (bfox@ai.mit.edu). */
-
-#ifndef NODE_H
-#define NODE_H
-
-#include "xref.h"
-
-/* The various references that we know about. */
-/* What we remember for each node. */
-typedef struct tentry
-{
-  struct tentry *next_ent;
-  char *node;           /* Name of this node. */
-  char *prev;           /* Name of "Prev:" for this node. */
-  char *next;           /* Name of "Next:" for this node. */
-  char *up;             /* Name of "Up:" for this node.   */
-  int position;         /* Output file position of this node. */
-  int line_no;          /* Defining line in source file. */
-  char *filename;       /* The file that this node was found in. */
-  int touched;          /* Nonzero means this node has been referenced. */
-  int flags;
-  int number;           /* Number for this node, relevant for HTML
-                           splitting -- from use+define order, not just
-                           define. */
-  int order;            /* The order of the tag, starting from zero.  */
-  char *html_fname;	/* The HTML file to which this node is written
-			   (non-NULL only for HTML splitting).  */
-} TAG_ENTRY;
-
-/* If node-a has a "Next" for node-b, but node-b has no "Prev" for node-a,
-   we turn on this flag bit in node-b's tag entry.  This means that when
-   it is time to validate node-b, we don't report an additional error
-   if there was no "Prev" field. */
-#define TAG_FLAG_PREV_ERROR  1
-#define TAG_FLAG_NEXT_ERROR  2
-#define TAG_FLAG_UP_ERROR    4
-#define TAG_FLAG_NO_WARN     8
-#define TAG_FLAG_IS_TOP     16
-#define TAG_FLAG_ANCHOR     32
-
-/* Menu reference, *note reference, and validation hacking. */
-
-/* A structure to remember references with.  A reference to a node is
-   either an entry in a menu, or a cross-reference made with [px]ref. */
-typedef struct node_ref
-{
-  struct node_ref *next;
-  char *node;                   /* Name of node referred to. */
-  char *containing_node;        /* Name of node containing this reference. */
-  int line_no;                  /* Line number where the reference occurs. */
-  int section;                  /* Section level where the reference occurs. */
-  char *filename;               /* Name of file where the reference occurs. */
-  enum reftype type;            /* Type of reference, either menu or note. */
-  int number;                   /* Number for this node, relevant for
-                                   HTML splitting -- from use+define
-                                   order, not just define. */
-} NODE_REF;
-
-/* The linked list of such structures. */
-extern NODE_REF *node_references;
-
-/* A similar list for references occuring in @node next
-   and similar references, needed for HTML. */
-extern NODE_REF *node_node_references;
-
-/* List of all nodes.  */
-extern TAG_ENTRY *tag_table;
-
-/* Counter for setting node_ref.number; zero is Top. */
-extern int node_number;
-
-/* Node order counter.  */
-extern int node_order;
-
-/* The current node's section level. */
-extern int current_section;
-
-/* Nonzero when the next sectioning command should generate an anchor
-   corresponding to the current node in HTML mode. */
-extern int outstanding_node;
-
-extern TAG_ENTRY *find_node (char *name);
-
-/* A search string which is used to find a line defining a node. */
-DECLARE (char *, node_search_string, "\n@node ");
-
-/* Extract node name from a menu item. */
-extern char *glean_node_from_menu (int remember_ref, enum reftype ref_type);
-
-/* Remember a node for later validation.  */
-extern void remember_node_reference (char *node, int line, enum reftype type);
-
-/* Remember the name of the current output file.  */
-extern void set_current_output_filename (const char *fname);
-
-/* Expand macros and commands in the node name and canonicalize
-   whitespace in the resulting expansion.  */
-extern char *expand_node_name (char *node);
-
-extern int number_of_node (char *node);
-
-extern void init_tag_table (void);
-extern void write_tag_table (char *filename);
-extern void free_node_references (void);
-extern void free_node_node_references (void);
-extern void validate_file (TAG_ENTRY *tag_table);
-extern void split_file (char *filename, int size);
-extern void clean_old_split_files (char *filename);
-
-#endif /* NODE_H */

Property changes on: head/contrib/texinfo/makeinfo/node.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/lang.h
===================================================================
--- head/contrib/texinfo/makeinfo/lang.h	(revision 276550)
+++ head/contrib/texinfo/makeinfo/lang.h	(nonexistent)
@@ -1,148 +0,0 @@
-/* lang.h -- declarations for language codes etc.
-   $Id: lang.h,v 1.6 2004/04/11 17:56:47 karl Exp $
-
-   Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Originally written by Karl Heinz Marbaise <kama@hippo.fido.de>.  */
-
-#ifndef LANG_H
-#define LANG_H
-
-/* The language code which can be changed through @documentlanguage
- * Actually we don't currently support this (may be in the future) ;-)
- * These code are the ISO-639 two letter codes.
- */
-typedef enum
-{
-  aa,  ab,  af,  am,  ar,  as,  ay,  az,
-  ba,  be,  bg,  bh,  bi,  bn,  bo,  br,
-  ca,  co,  cs,  cy,
-  da,  de,  dz,
-  el,  en,  eo,  es,  et,  eu,
-  fa,  fi,  fj,  fo,  fr,  fy,
-  ga,  gd,  gl,  gn,  gu,
-  ha,  he,  hi,  hr,  hu,  hy,
-  ia,  id,  ie,  ik,  is,  it,  iu,
-  ja,  jw,
-  ka,  kk,  kl,  km,  kn,  ko,  ks,  ku,  ky,
-  la,  ln,  lo,  lt,  lv,
-  mg,  mi,  mk,  ml,  mn,  mo,  mr,  ms,  mt,  my,
-  na,  ne,  nl,  no,
-  oc,  om,  or,
-  pa,  pl,  ps,  pt,
-  qu,
-  rm,  rn,  ro,  ru,  rw,
-  sa,  sd,  sg,  sh,  si,  sk,  sl,  sm,  sn,  so,  sq,  sr,  ss,  st,  su,  sv,  sw,
-  ta,  te,  tg,  th,  ti,  tk,  tl,  tn,  to,  tr,  ts,  tt,  tw,
-  ug,  uk,  ur,  uz,
-  vi,  vo,
-  wo,
-  xh,
-  yi,  yo,
-  za,  zh,  zu,
-  last_language_code
-} language_code_type;
-
-/* The current language code.  */
-extern language_code_type language_code;
-
-
-/* Information for each language.  */
-typedef struct
-{
-  language_code_type lc; /* language code as enum type */
-  char *abbrev;          /* two letter language code */
-  char *desc;            /* full name for language code */
-} language_type;
-
-extern language_type language_table[];
-
-
-
-/* The document encoding. This is useful to produce true 8-bit
-   characters according to the @documentencoding.  */
-
-typedef enum {
-  no_encoding,
-  US_ASCII,
-  ISO_8859_1,
-  ISO_8859_2,
-  ISO_8859_3,    /* this and none of the rest are supported. */
-  ISO_8859_4,
-  ISO_8859_5,
-  ISO_8859_6,
-  ISO_8859_7,
-  ISO_8859_8,
-  ISO_8859_9,
-  ISO_8859_10,
-  ISO_8859_11,
-  ISO_8859_12,
-  ISO_8859_13,
-  ISO_8859_14,
-  ISO_8859_15,
-  last_encoding_code
-} encoding_code_type;
-
-/* The current document encoding, or null if not set.  */
-extern encoding_code_type document_encoding_code;
-
-/* If an encoding is not supported, just keep it as a string.  */
-extern char *unknown_encoding;
-
-/* Maps an HTML abbreviation to ISO and Unicode codes for a given code.  */
-
-typedef unsigned short int unicode_t; /* should be 16 bits */
-typedef unsigned char byte_t;
-
-typedef struct
-{
-  char *html;        /* HTML equivalent like umlaut auml => &auml; */
-  byte_t bytecode;   /* 8-Bit Code (ISO 8859-1,...) */
-  unicode_t unicode; /* Unicode in U+ convention */
-} iso_map_type;
-
-/* Information about the document encoding. */
-typedef struct
-{
-  encoding_code_type ec; /* document encoding type (see above enum) */
-  char *encname;         /* encoding name like "iso-8859-1", valid in
-                            HTML and Emacs */
-  iso_map_type *isotab;  /* address of ISO translation table */
-} encoding_type;
-
-/* Table with all the encoding codes that we recognize.  */
-extern encoding_type encoding_table[];
-
-
-/* The commands.  */
-extern void cm_documentlanguage (void),
-     cm_documentencoding (void);
-
-/* Accents, other non-English characters.  */
-void cm_accent (int arg), cm_special_char (int arg),
-     cm_dotless (int arg, int start, int end);
-
-extern void cm_accent_umlaut (int arg, int start, int end),
-     cm_accent_acute (int arg, int start, int end),
-     cm_accent_cedilla (int arg, int start, int end),
-     cm_accent_hat (int arg, int start, int end),
-     cm_accent_grave (int arg, int start, int end),
-     cm_accent_tilde (int arg, int start, int end);
-
-extern char *current_document_encoding (void);
-
-#endif /* not LANG_H */

Property changes on: head/contrib/texinfo/makeinfo/lang.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/defun.h
===================================================================
--- head/contrib/texinfo/makeinfo/defun.h	(revision 276550)
+++ head/contrib/texinfo/makeinfo/defun.h	(nonexistent)
@@ -1,31 +0,0 @@
-/* defun.h -- declaration for defuns.
-   $Id: defun.h,v 1.2 2004/04/11 17:56:47 karl Exp $
-
-   Copyright (C) 1999 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by Karl Heinz Marbaise <kama@hippo.fido.de>.  */
-
-#ifndef DEFUN_H
-#define DEFUN_H
-
-#include "insertion.h"
-
-extern enum insertion_type get_base_type (int type);
-extern void cm_defun (void);
-
-#endif /* !DEFUN_H */
-

Property changes on: head/contrib/texinfo/makeinfo/defun.h
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/xref.c
===================================================================
--- head/contrib/texinfo/makeinfo/xref.c	(revision 276550)
+++ head/contrib/texinfo/makeinfo/xref.c	(nonexistent)
@@ -1,620 +0,0 @@
-/* xref.c -- cross references for Texinfo.
-   $Id: xref.c,v 1.4 2004/12/21 17:28:35 karl Exp $
-
-   Copyright (C) 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "system.h"
-#include "cmds.h"
-#include "float.h"
-#include "html.h"
-#include "index.h"
-#include "macro.h"
-#include "makeinfo.h"
-#include "node.h"
-#include "xml.h"
-#include "xref.h"
-
-/* Flags which control initial output string for xrefs. */
-int px_ref_flag = 0;
-int ref_flag = 0;
-
-/* Called in the multiple-argument case to make sure we generate a valid
-   Info reference.  In the single-argument case, the :: we output
-   suffices for the Info readers to find the end of the reference.  */
-static void
-add_xref_punctuation (void)
-{
-  if (px_ref_flag || ref_flag)  /* user inserts punct after @xref */
-    {
-      /* Check if there's already punctuation.  */
-      int next_char = next_nonwhitespace_character ();
-
-      if (next_char == -1)
-        /* EOF while looking for punctuation, let's
-           insert a period instead of crying.  */
-        add_char ('.');
-      else if (next_char != ',' && next_char != '.')
-        /* period and comma terminate xrefs, and nothing else.  Instead
-           of generating an Info reference that can't be followed,
-           though, just insert a period.  Not pretty, but functional.  */
-        add_char ('.');
-    }
-}
-
-/* Return next comma-delimited argument, but do not cross a close-brace
-   boundary.  Clean up whitespace, too.  If EXPAND is nonzero, replace
-   the entire brace-delimited argument list with its expansion before
-   looking for the next comma.  */
-char *
-get_xref_token (int expand)
-{
-  char *string = 0;
-
-  if (docbook)
-    xml_in_xref_token = 1;
-
-  if (expand)
-    {
-      int old_offset = input_text_offset;
-      int old_lineno = line_number;
-
-      get_until_in_braces ("}", &string);
-      if (curchar () == '}')    /* as opposed to end of text */
-        input_text_offset++;
-      if (input_text_offset > old_offset)
-        {
-          int limit = input_text_offset;
-
-          input_text_offset = old_offset;
-          line_number = old_lineno;
-          only_macro_expansion++;
-          replace_with_expansion (input_text_offset, &limit);
-          only_macro_expansion--;
-        }
-      free (string);
-    }
-
-  get_until_in_braces (",", &string);
-  if (curchar () == ',')
-    input_text_offset++;
-  fix_whitespace (string);
-
-  if (docbook)
-    xml_in_xref_token = 0;
-
-  return string;
-}
-
-
-/* NOTE: If you wonder why the HTML output is produced with such a
-   peculiar mix of calls to add_word and execute_string, here's the
-   reason.  get_xref_token (1) expands all macros in a reference, but
-   any other commands, like @value, @@, etc., are left intact.  To
-   expand them, we need to run the arguments through execute_string.
-   However, characters like <, &, > and others cannot be let into
-   execute_string, because they will be escaped.  See the mess?  */
-
-/* Make a cross reference. */
-void
-cm_xref (int arg)
-{
-  if (arg == START)
-    {
-      char *arg1 = get_xref_token (1); /* expands all macros in xref */
-      char *arg2 = get_xref_token (0);
-      char *arg3 = get_xref_token (0);
-      char *arg4 = get_xref_token (0);
-      char *arg5 = get_xref_token (0);
-      char *tem;
-
-      /* "@xref{,Foo,, Bar, Baz} is not valid usage of @xref.  The
-         first argument must never be blank." --rms.
-         We hereby comply by disallowing such constructs.  */
-      if (!*arg1)
-        line_error (_("First argument to cross-reference may not be empty"));
-
-      if (docbook)
-        {
-          if (!ref_flag)
-            add_word (px_ref_flag || printing_index
-                ? (char *) _("see ") : (char *) _("See "));
-
-          if (!*arg4 && !*arg5)
-            {
-              char *arg1_id = xml_id (arg1);
-
-              if (*arg2 || *arg3)
-                {
-                  xml_insert_element_with_attribute (XREFNODENAME, START,
-                                                     "linkend=\"%s\"", arg1_id);
-                  free (arg1_id);
-                  execute_string ("%s", *arg3 ? arg3 : arg2);
-                  xml_insert_element (XREFNODENAME, END);
-                }
-              else
-                {
-                  xml_insert_element_with_attribute (XREF, START,
-                                                     "linkend=\"%s\"", arg1_id);
-                  xml_insert_element (XREF, END);
-                  free (arg1_id);
-                }
-            }
-          else if (*arg5)
-            {
-              add_word_args (_("See section ``%s'' in "), *arg3 ? arg3 : arg1);
-              xml_insert_element (CITE, START);
-              add_word (arg5);
-              xml_insert_element (CITE, END);
-            }
-          else if (*arg4)
-            {
-              /* Very sad, we are losing xrefs made to ``info only'' books.  */
-            }
-        }
-      else if (xml)
-        {
-          if (!ref_flag)
-            add_word_args ("%s", px_ref_flag ? _("see ") : _("See "));
-
-          xml_insert_element (XREF, START);
-          xml_insert_element (XREFNODENAME, START);
-          execute_string ("%s", arg1);
-          xml_insert_element (XREFNODENAME, END);
-          if (*arg2)
-            {
-              xml_insert_element (XREFINFONAME, START);
-              execute_string ("%s", arg2);
-              xml_insert_element (XREFINFONAME, END);
-            }
-          if (*arg3)
-            {
-              xml_insert_element (XREFPRINTEDDESC, START);
-              execute_string ("%s", arg3);
-              xml_insert_element (XREFPRINTEDDESC, END);
-            }
-          if (*arg4)
-            {
-              xml_insert_element (XREFINFOFILE, START);
-              execute_string ("%s", arg4);
-              xml_insert_element (XREFINFOFILE, END);
-            }
-          if (*arg5)
-            {
-              xml_insert_element (XREFPRINTEDNAME, START);
-              execute_string ("%s", arg5);
-              xml_insert_element (XREFPRINTEDNAME, END);
-            }
-          xml_insert_element (XREF, END);
-        }
-      else if (html)
-        {
-          if (!ref_flag)
-            add_word_args ("%s", px_ref_flag ? _("see ") : _("See "));
-        }
-      else
-        add_word_args ("%s", px_ref_flag ? "*note " : "*Note ");
-
-      if (!xml)
-        {
-          if (*arg5 || *arg4)
-            {
-              /* arg1 - node name
-                 arg2 - reference name
-                 arg3 - title or topic (and reference name if arg2 is NULL)
-                 arg4 - info file name
-                 arg5 - printed manual title  */
-              char *ref_name;
-
-              if (!*arg2)
-                {
-                  if (*arg3)
-                    ref_name = arg3;
-                  else
-                    ref_name = arg1;
-                }
-              else
-                ref_name = arg2;
-
-              if (html)
-                { /* More to do eventually, down to Unicode
-                     Normalization Form C.  See the HTML Xref nodes in
-                     the manual.  */
-                  char *file_arg = arg4;
-                  add_html_elt ("<a href=");
-
-                  {
-                    /* If there's a directory part, ignore it.  */
-                    char *p = strrchr (file_arg, '/');
-                    if (p)
-                      file_arg = p + 1;
-
-                  /* If there's a dot, make it a NULL terminator, so the
-                     extension does not get into the way.  */
-                    p = strrchr (file_arg , '.');
-                    if (p != NULL)
-                      *p = 0;
-                  }
-                  
-                  if (! *file_arg)
-                warning (_("Empty file name for HTML cross reference in `%s'"),
-                           arg4);
-
-                  /* Note that if we are splitting, and the referenced
-                     tag is an anchor rather than a node, we will
-                     produce a reference to a file whose name is
-                     derived from the anchor name.  However, only
-                     nodes create files, so we are referencing a
-                     non-existent file.  cm_anchor, which see, deals
-                     with that problem.  */
-                  if (splitting)
-                    execute_string ("\"../%s/", file_arg);
-                  else
-                    execute_string ("\"%s.html", file_arg);
-                  /* Do not collapse -- to -, etc., in references.  */
-                  in_fixed_width_font++;
-                  tem = expansion (arg1, 0); /* expand @-commands in node */
-                  in_fixed_width_font--;
-                  add_anchor_name (tem, 1);
-                  free (tem);
-                  add_word ("\">");
-                  execute_string ("%s",ref_name);
-                  add_word ("</a>");
-                }
-              else
-                {
-                  execute_string ("%s:", ref_name);
-                  in_fixed_width_font++;
-                  execute_string (" (%s)%s", arg4, arg1);
-                  add_xref_punctuation ();
-                  in_fixed_width_font--;
-                }
-
-              /* Free all of the arguments found. */
-              if (arg1) free (arg1);
-              if (arg2) free (arg2);
-              if (arg3) free (arg3);
-              if (arg4) free (arg4);
-              if (arg5) free (arg5);
-              return;
-            }
-          else
-            remember_node_reference (arg1, line_number, followed_reference);
-
-          if (*arg3)
-            {
-              if (html)
-                {
-                  add_html_elt ("<a href=\"");
-                  in_fixed_width_font++;
-                  tem = expansion (arg1, 0);
-                  in_fixed_width_font--;
-                  add_anchor_name (tem, 1);
-                  free (tem);
-                  add_word ("\">");
-                  execute_string ("%s", *arg2 ? arg2 : arg3);
-                  add_word ("</a>");
-                }
-              else
-                {
-                  execute_string ("%s:", *arg2 ? arg2 : arg3);
-                  in_fixed_width_font++;
-                  execute_string (" %s", arg1);
-                  add_xref_punctuation ();
-                  in_fixed_width_font--;
-                }
-            }
-          else
-            {
-              if (html)
-                {
-                  add_html_elt ("<a href=\"");
-                  in_fixed_width_font++;
-                  tem = expansion (arg1, 0);
-                  in_fixed_width_font--;
-                  add_anchor_name (tem, 1);
-                  free (tem);
-                  add_word ("\">");
-                  if (*arg2)
-                    execute_string ("%s", arg2);
-                  else
-                    {
-                      char *fref = get_float_ref (arg1);
-                      execute_string ("%s", fref ? fref : arg1);
-                      free (fref);
-                    }
-                  add_word ("</a>");
-                }
-              else
-                {
-                  if (*arg2)
-                    {
-                      execute_string ("%s:", arg2);
-                      in_fixed_width_font++;
-                      execute_string (" %s", arg1);
-                      add_xref_punctuation ();
-                      in_fixed_width_font--;
-                    }
-                  else
-                    {
-                      char *fref = get_float_ref (arg1);
-                      if (fref)
-                        { /* Reference is being made to a float.  */
-                          execute_string ("%s:", fref);
-                          in_fixed_width_font++;
-                          execute_string (" %s", arg1);
-                          add_xref_punctuation ();
-                          in_fixed_width_font--;
-                        }
-                      else
-                        {
-                          in_fixed_width_font++;
-                          execute_string ("%s::", arg1);
-                          in_fixed_width_font--;
-                        }
-                    }
-                }
-            }
-        }
-      /* Free all of the arguments found. */
-      if (arg1) free (arg1);
-      if (arg2) free (arg2);
-      if (arg3) free (arg3);
-      if (arg4) free (arg4);
-      if (arg5) free (arg5);
-    }
-  else
-    { /* Check that the next non-whitespace character is valid to follow
-         an xref (so Info readers can find the node names).
-         `input_text_offset' is pointing at the "}" which ended the xref
-         command.  This is not used for @pxref or @ref, since we insert
-         the necessary punctuation above, if needed.  */
-      int temp = next_nonwhitespace_character ();
-
-      if (temp == -1)
-        warning (_("End of file reached while looking for `.' or `,'"));
-      else if (temp != '.' && temp != ',')
-        warning (_("`.' or `,' must follow @%s, not `%c'"), command, temp);
-    }
-}
-
-void
-cm_pxref (int arg)
-{
-  if (arg == START)
-    {
-      px_ref_flag++;
-      cm_xref (arg);
-      px_ref_flag--;
-    }
-  /* cm_xref isn't called with arg == END, which disables the code near
-     the end of cm_xref that checks for `.' or `,' after the
-     cross-reference.  This is because cm_xref generates the required
-     character itself (when needed) if px_ref_flag is set.  */
-}
-
-void
-cm_ref (int arg)
-{
-  /* See the comments in cm_pxref about the checks for punctuation.  */
-  if (arg == START)
-    {
-      ref_flag++;
-      cm_xref (arg);
-      ref_flag--;
-    }
-}
-
-void
-cm_inforef (int arg)
-{
-  if (arg == START)
-    {
-      char *node = get_xref_token (1); /* expands all macros in inforef */
-      char *pname = get_xref_token (0);
-      char *file = get_xref_token (0);
-
-      /* (see comments at cm_xref).  */
-      if (!*node)
-        line_error (_("First argument to @inforef may not be empty"));
-
-      if (xml && !docbook)
-        {
-          xml_insert_element (INFOREF, START);
-          xml_insert_element (INFOREFNODENAME, START);
-          execute_string ("%s", node);
-          xml_insert_element (INFOREFNODENAME, END);
-          if (*pname)
-            {
-              xml_insert_element (INFOREFREFNAME, START);
-              execute_string ("%s", pname);
-              xml_insert_element (INFOREFREFNAME, END);
-            }
-          xml_insert_element (INFOREFINFONAME, START);
-          execute_string ("%s", file);
-          xml_insert_element (INFOREFINFONAME, END);
-
-          xml_insert_element (INFOREF, END);
-        }
-      else if (html)
-        {
-          char *tem;
-
-          add_word ((char *) _("see "));
-          /* html fixxme: revisit this */
-          add_html_elt ("<a href=");
-          if (splitting)
-            execute_string ("\"../%s/", file);
-          else
-            execute_string ("\"%s.html", file);
-          tem = expansion (node, 0);
-          add_anchor_name (tem, 1);
-          add_word ("\">");
-          execute_string ("%s", *pname ? pname : tem);
-          add_word ("</a>");
-          free (tem);
-        }
-      else
-        {
-          if (*pname)
-            execute_string ("*note %s: (%s)%s", pname, file, node);
-          else
-            execute_string ("*note (%s)%s::", file, node);
-        }
-
-      free (node);
-      free (pname);
-      free (file);
-    }
-}
-
-/* A URL reference.  */
-void
-cm_uref (int arg)
-{
-  if (arg == START)
-    {
-      extern int printing_index;
-      char *url  = get_xref_token (1); /* expands all macros in uref */
-      char *desc = get_xref_token (0);
-      char *replacement = get_xref_token (0);
-
-      if (docbook)
-        {
-          xml_insert_element_with_attribute (UREF, START, "url=\"%s\"",
-              text_expansion (url));
-          if (*replacement)
-            execute_string ("%s", replacement);
-          else if (*desc)
-            execute_string ("%s", desc);
-          else
-            execute_string ("%s", url);
-          xml_insert_element (UREF, END);
-        }
-      else if (xml)
-        {
-          xml_insert_element (UREF, START);
-          xml_insert_element (UREFURL, START);
-          execute_string ("%s", url);
-          xml_insert_element (UREFURL, END);
-          if (*desc)
-            {
-              xml_insert_element (UREFDESC, START);
-              execute_string ("%s", desc);
-              xml_insert_element (UREFDESC, END);
-            }
-          if (*replacement)
-            {
-              xml_insert_element (UREFREPLACEMENT, START);
-              execute_string ("%s", replacement);
-              xml_insert_element (UREFREPLACEMENT, END);
-            }
-          xml_insert_element (UREF, END);
-        }
-      else if (html)
-        { /* never need to show the url */
-          add_html_elt ("<a href=");
-          /* don't collapse `--' etc. in the url */
-          in_fixed_width_font++;
-          execute_string ("\"%s\"", url);
-          in_fixed_width_font--;
-          add_word (">");
-          execute_string ("%s", *replacement ? replacement
-                                : (*desc ? desc : url));
-          add_word ("</a>");
-        }
-      else if (*replacement) /* do not show the url */
-        execute_string ("%s", replacement);
-      else if (*desc)        /* show both text and url */
-        {
-          execute_string ("%s ", desc);
-          in_fixed_width_font++;
-          execute_string ("(%s)", url);
-          in_fixed_width_font--;
-        }
-      else /* no text at all, so have the url to show */
-        {
-          in_fixed_width_font++;
-          execute_string ("%s%s%s",
-                          printing_index ? "" : "`",
-                          url,
-                          printing_index ? "" : "'");
-          in_fixed_width_font--;
-        }
-      if (url)
-        free (url);
-      if (desc)
-        free (desc);
-      if (replacement)
-        free (replacement);
-    }
-}
-
-/* An email reference.  */
-void
-cm_email (int arg)
-{
-  if (arg == START)
-    {
-      char *addr = get_xref_token (1); /* expands all macros in email */
-      char *name = get_xref_token (0);
-
-      if (xml && docbook)
-        {
-          xml_insert_element_with_attribute (EMAIL, START, "url=\"mailto:%s\"", addr);
-          if (*name)
-              execute_string ("%s", name);
-          xml_insert_element (EMAIL, END);
-        }
-      else if (xml)
-        {
-          xml_insert_element (EMAIL, START);
-          xml_insert_element (EMAILADDRESS, START);
-          execute_string ("%s", addr);
-          xml_insert_element (EMAILADDRESS, END);
-          if (*name)
-            {
-              xml_insert_element (EMAILNAME, START);
-              execute_string ("%s", name);
-              xml_insert_element (EMAILNAME, END);
-            }
-          xml_insert_element (EMAIL, END);
-        }
-      else if (html)
-        {
-          add_html_elt ("<a href=");
-          /* don't collapse `--' etc. in the address */
-          in_fixed_width_font++;
-          execute_string ("\"mailto:%s\"", addr);
-          in_fixed_width_font--;
-          add_word (">");
-          execute_string ("%s", *name ? name : addr);
-          add_word ("</a>");
-        }
-      else
-        {
-          execute_string ("%s%s", name, *name ? " "  : "");
-          in_fixed_width_font++;
-          execute_string ("<%s>", addr);
-          in_fixed_width_font--;
-        }
-
-      if (addr)
-        free (addr);
-      if (name)
-        free (name);
-    }
-}

Property changes on: head/contrib/texinfo/makeinfo/xref.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/makeinfo/multi.c
===================================================================
--- head/contrib/texinfo/makeinfo/multi.c	(revision 276550)
+++ head/contrib/texinfo/makeinfo/multi.c	(nonexistent)
@@ -1,638 +0,0 @@
-/* multi.c -- multiple-column tables (@multitable) for makeinfo.
-   $Id: multi.c,v 1.8 2004/04/11 17:56:47 karl Exp $
-
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-   
-   Originally written by phr@gnu.org (Paul Rubin).  */
-
-#include "system.h"
-#include "cmds.h"
-#include "insertion.h"
-#include "makeinfo.h"
-#include "multi.h"
-#include "xml.h"
-
-#define MAXCOLS 100             /* remove this limit later @@ */
-
-
-/*
- * Output environments.  This is a hack grafted onto existing
- * structure.  The "output environment" used to consist of the
- * global variables `output_paragraph', `fill_column', etc.
- * Routines like add_char would manipulate these variables.
- *
- * Now, when formatting a multitable, we maintain separate environments
- * for each column.  That way we can build up the columns separately
- * and write them all out at once.  The "current" output environment"
- * is still kept in those global variables, so that the old output
- * routines don't have to change.  But we provide routines to save
- * and restore these variables in an "environment table".  The
- * `select_output_environment' function switches from one output
- * environment to another.
- *
- * Environment #0 (i.e., element #0 of the table) is the regular
- * environment that is used when we're not formatting a multitable.
- *
- * Environment #N (where N = 1,2,3,...) is the env. for column #N of
- * the table, when a multitable is active.
- */
-
-/* contents of an output environment */
-/* some more vars may end up being needed here later @@ */
-struct env
-{
-  unsigned char *output_paragraph;
-  int output_paragraph_offset;
-  int meta_char_pos;
-  int output_column;
-  int paragraph_is_open;
-  int current_indent;
-  int fill_column;
-} envs[MAXCOLS];                /* the environment table */
-
-/* index in environment table of currently selected environment */
-static int current_env_no;
-
-/* current column number */
-static int current_column_no;
-
-/* We need to make a difference between template based widths and
-   @columnfractions for HTML tables' sake.  Sigh.  */
-static int seen_column_fractions;
-
-/* column number of last column in current multitable */
-static int last_column;
-
-/* flags indicating whether horizontal and vertical separators need
-   to be drawn, separating rows and columns in the current multitable. */
-static int hsep, vsep;
-
-/* whether this is the first row. */
-static int first_row;
-
-/* Called to handle a {...} template on the @multitable line.
-   We're at the { and our first job is to find the matching }; as a side
-   effect, we change *PARAMS to point to after it.  Our other job is to
-   expand the template text and return the width of that string.  */
-static unsigned
-find_template_width (char **params)
-{
-  char *template, *xtemplate;
-  unsigned len;
-  char *start = *params;
-  int brace_level = 0;
-
-  /* The first character should be a {.  */
-  if (!params || !*params || **params != '{')
-    {
-      line_error ("find_template width internal error: passed %s",
-                  params ? *params : "null");
-      return 0;
-    }
-
-  do
-    {
-      if (**params == '{' && (*params == start || (*params)[-1] != '@'))
-        brace_level++;
-      else if (**params == '}' && (*params)[-1] != '@')
-        brace_level--;
-      else if (**params == 0)
-        {
-          line_error (_("Missing } in @multitable template"));
-          return 0;
-        }
-      (*params)++;
-    }
-  while (brace_level > 0);
-  
-  template = substring (start + 1, *params - 1); /* omit braces */
-  xtemplate = expansion (template, 0);
-  len = strlen (xtemplate);
-  
-  free (template);
-  free (xtemplate);
-  
-  return len;
-}
-
-/* Direct current output to environment number N.  Used when
-   switching work from one column of a multitable to the next.
-   Returns previous environment number. */
-static int 
-select_output_environment (int n)
-{
-  struct env *e = &envs[current_env_no];
-  int old_env_no = current_env_no;
-
-  /* stash current env info from global vars into the old environment */
-  e->output_paragraph = output_paragraph;
-  e->output_paragraph_offset = output_paragraph_offset;
-  e->meta_char_pos = meta_char_pos;
-  e->output_column = output_column;
-  e->paragraph_is_open = paragraph_is_open;
-  e->current_indent = current_indent;
-  e->fill_column = fill_column;
-
-  /* now copy new environment into global vars */
-  current_env_no = n;
-  e = &envs[current_env_no];
-  output_paragraph = e->output_paragraph;
-  output_paragraph_offset = e->output_paragraph_offset;
-  meta_char_pos = e->meta_char_pos;
-  output_column = e->output_column;
-  paragraph_is_open = e->paragraph_is_open;
-  current_indent = e->current_indent;
-  fill_column = e->fill_column;
-  return old_env_no;
-}
-
-/* Initialize environment number ENV_NO, of width WIDTH.
-   The idea is that we're going to use one environment for each column of
-   a multitable, so we can build them up separately and print them
-   all out at the end. */
-static int
-setup_output_environment (int env_no, int width)
-{
-  int old_env = select_output_environment (env_no);
-
-  /* clobber old environment and set width of new one */
-  init_paragraph ();
-
-  /* make our change */
-  fill_column = width;
-
-  /* Save new environment and restore previous one. */
-  select_output_environment (old_env);
-
-  return env_no;
-}
-
-/* Read the parameters for a multitable from the current command
-   line, save the parameters away, and return the
-   number of columns. */
-static int
-setup_multitable_parameters (void)
-{
-  char *params = insertion_stack->item_function;
-  int nchars;
-  float columnfrac;
-  char command[200]; /* xx no fixed limits */
-  int i = 1;
-
-  /* We implement @hsep and @vsep even though TeX doesn't.
-     We don't get mixing of @columnfractions and templates right,
-     but TeX doesn't either.  */
-  hsep = vsep = 0;
-
-  /* Assume no @columnfractions per default.  */
-  seen_column_fractions = 0;
-
-  while (*params) {
-    while (whitespace (*params))
-      params++;
-
-    if (*params == '@') {
-      sscanf (params, "%200s", command);
-      nchars = strlen (command);
-      params += nchars;
-      if (strcmp (command, "@hsep") == 0)
-        hsep++;
-      else if (strcmp (command, "@vsep") == 0)
-        vsep++;
-      else if (strcmp (command, "@columnfractions") == 0) {
-        seen_column_fractions = 1;
-        /* Clobber old environments and create new ones, starting at #1.
-           Environment #0 is the normal output, so don't mess with it. */
-        for ( ; i <= MAXCOLS; i++) {
-          if (sscanf (params, "%f", &columnfrac) < 1)
-            goto done;
-          /* Unfortunately, can't use %n since m68k-hp-bsd libc (at least)
-             doesn't support it.  So skip whitespace (preceding the
-             number) and then non-whitespace (the number).  */
-          while (*params && (*params == ' ' || *params == '\t'))
-            params++;
-          /* Hmm, but what about @columnfractions 3foo.  Oh well, 
-             it's invalid input anyway.  */
-          while (*params && *params != ' ' && *params != '\t'
-                 && *params != '\n' && *params != '@')
-            params++;
-
-          {
-            /* For html/xml/docbook, translate fractions into integer
-               percentages, adding .005 to avoid rounding problems.  For
-               info, we want the character width.  */
-            int width = xml || html ? (columnfrac + .005) * 100
-                        : (columnfrac * (fill_column - current_indent) + .5);
-            setup_output_environment (i, width);
-          }
-        }
-      }
-
-    } else if (*params == '{') {
-      unsigned template_width = find_template_width (&params);
-
-      /* This gives us two spaces between columns.  Seems reasonable.
-         How to take into account current_indent here?  */
-      setup_output_environment (i++, template_width + 2);
-      
-    } else {
-      warning (_("ignoring stray text `%s' after @multitable"), params);
-      break;
-    }
-  }
-
-done:
-  flush_output ();
-  inhibit_output_flushing ();
-
-  last_column = i - 1;
-  return last_column;
-}
-
-/* Output a row.  Calls insert, but also flushes the buffered output
-   when we see a newline, since in multitable every line is a separate
-   paragraph.  */
-static void
-out_char (int ch)
-{
-  if (html || xml)
-    add_char (ch);
-  else
-    {
-      int env = select_output_environment (0);
-      insert (ch);
-      if (ch == '\n')
-	{
-	  uninhibit_output_flushing ();
-	  flush_output ();
-	  inhibit_output_flushing ();
-	}
-      select_output_environment (env);
-    }
-}
-
-
-static void
-draw_horizontal_separator (void)
-{
-  int i, j, s;
-
-  if (html)
-    {
-      add_word ("<hr>");
-      return;
-    }
-  if (xml)
-    return;
-
-  for (s = 0; s < envs[0].current_indent; s++)
-    out_char (' ');
-  if (vsep)
-    out_char ('+');
-  for (i = 1; i <= last_column; i++) {
-    for (j = 0; j <= envs[i].fill_column; j++)
-      out_char ('-');
-    if (vsep)
-      out_char ('+');
-  }
-  out_char (' ');
-  out_char ('\n');
-}
-
-
-/* multitable strategy:
-    for each item {
-       for each column in an item {
-        initialize a new paragraph
-        do ordinary formatting into the new paragraph
-        save the paragraph away
-        repeat if there are more paragraphs in the column
-      }
-      dump out the saved paragraphs and free the storage
-    }
-
-   For HTML we construct a simple HTML 3.2 table with <br>s inserted
-   to help non-tables browsers.  `@item' inserts a <tr> and `@tab'
-   inserts <td>; we also try to close <tr>.  The only real
-   alternative is to rely on the info formatting engine and present
-   preformatted text.  */
-
-void
-do_multitable (void)
-{
-  int ncolumns;
-
-  if (multitable_active)
-    {
-      line_error ("Multitables cannot be nested");
-      return;
-    }
-
-  close_single_paragraph ();
-
-  if (xml)
-    {
-      xml_no_para = 1;
-      if (output_paragraph[output_paragraph_offset-1] == '\n')
-        output_paragraph_offset--;
-    }
-
-  /* scan the current item function to get the field widths
-     and number of columns, and set up the output environment list
-     accordingly. */
-  ncolumns = setup_multitable_parameters ();
-  first_row = 1;
-
-  /* <p> for non-tables browsers.  @multitable implicitly ends the
-     current paragraph, so this is ok.  */
-  if (html)
-    add_html_block_elt ("<p><table summary=\"\">");
-  /*  else if (docbook)*/ /* 05-08 */
-  else if (xml)
-    {
-      int *widths = xmalloc (ncolumns * sizeof (int));
-      int i;
-      for (i=0; i<ncolumns; i++)
-	widths[i] = envs[i+1].fill_column;
-      xml_begin_multitable (ncolumns, widths);
-      free (widths);
-    }
-
-  if (hsep)
-    draw_horizontal_separator ();
-
-  /* The next @item command will direct stdout into the first column
-     and start processing.  @tab will then switch to the next column,
-     and @item will flush out the saved output and return to the first
-     column.  Environment #1 is the first column.  (Environment #0 is
-     the normal output) */
-
-  ++multitable_active;
-}
-
-/* advance to the next environment number */
-static void
-nselect_next_environment (void)
-{
-  if (current_env_no >= last_column) {
-    line_error (_("Too many columns in multitable item (max %d)"), last_column);
-    return;
-  }
-  select_output_environment (current_env_no + 1);
-}
-
-
-/* do anything needed at the beginning of processing a
-   multitable column. */
-static void
-init_column (void)
-{
-  /* don't indent 1st paragraph in the item */
-  cm_noindent ();
-
-  /* throw away possible whitespace after @item or @tab command */
-  skip_whitespace ();
-}
-
-static void
-output_multitable_row (void)
-{
-  /* offset in the output paragraph of the next char needing
-     to be output for that column. */
-  int offset[MAXCOLS];
-  int i, j, s, remaining;
-  int had_newline = 0;
-
-  for (i = 0; i <= last_column; i++)
-    offset[i] = 0;
-
-  /* select the current environment, to make sure the env variables
-     get updated */
-  select_output_environment (current_env_no);
-
-#define CHAR_ADDR(n) (offset[i] + (n))
-#define CHAR_AT(n) (envs[i].output_paragraph[CHAR_ADDR(n)])
-
-  /* remove trailing whitespace from each column */
-  for (i = 1; i <= last_column; i++) {
-    if (envs[i].output_paragraph_offset)
-      while (cr_or_whitespace (CHAR_AT (envs[i].output_paragraph_offset - 1)))
-        envs[i].output_paragraph_offset--;
-
-    if (i == current_env_no)
-      output_paragraph_offset = envs[i].output_paragraph_offset;
-  }
-
-  /* read the current line from each column, outputting them all
-     pasted together.  Do this til all lines are output from all
-     columns.  */
-  for (;;) {
-    remaining = 0;
-    /* first, see if there is any work to do */
-    for (i = 1; i <= last_column; i++) {
-      if (CHAR_ADDR (0) < envs[i].output_paragraph_offset) {
-        remaining = 1;
-        break;
-      }
-    }
-    if (!remaining)
-      break;
-    
-    for (s = 0; s < envs[0].current_indent; s++)
-      out_char (' ');
-    
-    if (vsep)
-      out_char ('|');
-
-    for (i = 1; i <= last_column; i++) {
-      for (s = 0; s < envs[i].current_indent; s++)
-        out_char (' ');
-      for (j = 0; CHAR_ADDR (j) < envs[i].output_paragraph_offset; j++) {
-        if (CHAR_AT (j) == '\n')
-          break;
-        out_char (CHAR_AT (j));
-      }
-      offset[i] += j + 1;       /* skip last text plus skip the newline */
-      
-      /* Do not output trailing blanks if we're in the last column and
-         there will be no trailing |.  */
-      if (i < last_column && !vsep)
-        for (; j <= envs[i].fill_column; j++)
-          out_char (' ');
-      if (vsep)
-        out_char ('|'); /* draw column separator */
-    }
-    out_char ('\n');    /* end of line */
-    had_newline = 1;
-  }
-  
-  /* If completely blank item, get blank line despite no other output.  */
-  if (!had_newline)
-    out_char ('\n');    /* end of line */
-
-  if (hsep)
-    draw_horizontal_separator ();
-
-  /* Now dispose of the buffered output. */
-  for (i = 1; i <= last_column; i++) {
-    select_output_environment (i);
-    init_paragraph ();
-  }
-}
-
-int after_headitem = 0;
-int headitem_row = 0;
-
-/* start a new item (row) of a multitable */
-int
-multitable_item (void)
-{
-  if (!multitable_active) {
-    line_error ("multitable_item internal error: no active multitable");
-    xexit (1);
-  }
-
-  current_column_no = 1;
-
-  if (html)
-    {
-      if (!first_row)
-        /* <br> for non-tables browsers. */
-	add_word_args ("<br></%s></tr>", after_headitem ? "th" : "td");
-
-      if (seen_column_fractions)
-        add_word_args ("<tr align=\"left\"><%s valign=\"top\" width=\"%d%%\">",
-            headitem_flag ? "th" : "td",
-            envs[current_column_no].fill_column);
-      else
-        add_word_args ("<tr align=\"left\"><%s valign=\"top\">",
-            headitem_flag ? "th" : "td");
-
-      if (headitem_flag)
-        after_headitem = 1;
-      else
-        after_headitem = 0;
-      first_row = 0;
-      headitem_row = headitem_flag;
-      headitem_flag = 0;
-      return 0;
-    }
-  /*  else if (docbook)*/ /* 05-08 */
-  else if (xml)
-    {
-      xml_end_multitable_row (first_row);
-      if (headitem_flag)
-        after_headitem = 1;
-      else
-        after_headitem = 0;
-      first_row = 0;
-      headitem_flag = 0;
-      return 0;
-    }
-  first_row = 0;
-
-  if (current_env_no > 0) {
-    output_multitable_row ();
-  }
-  /* start at column 1 */
-  select_output_environment (1);
-  if (!output_paragraph) {
-    line_error (_("[unexpected] cannot select column #%d in multitable"),
-                current_env_no);
-    xexit (1);
-  }
-
-  init_column ();
-
-  if (headitem_flag)
-    hsep = 1;
-  else
-    hsep = 0;
-
-  if (headitem_flag)
-    after_headitem = 1;
-  else
-    after_headitem = 0;
-  headitem_flag = 0;
-
-  return 0;
-}
-
-#undef CHAR_AT
-#undef CHAR_ADDR
-
-/* select a new column in current row of multitable */
-void
-cm_tab (void)
-{
-  if (!multitable_active)
-    error (_("ignoring @tab outside of multitable"));
-
-  current_column_no++;
-  
-  if (html)
-    {
-      if (seen_column_fractions)
-        add_word_args ("</%s><%s valign=\"top\" width=\"%d%%\">",
-            headitem_row ? "th" : "td",
-            headitem_row ? "th" : "td",
-            envs[current_column_no].fill_column);
-      else
-        add_word_args ("</%s><%s valign=\"top\">",
-            headitem_row ? "th" : "td",
-            headitem_row ? "th" : "td");
-    }
-  /*  else if (docbook)*/ /* 05-08 */
-  else if (xml)
-    xml_end_multitable_column ();
-  else
-    nselect_next_environment ();
-
-  init_column ();
-}
-
-/* close a multitable, flushing its output and resetting
-   whatever needs resetting */
-void
-end_multitable (void)
-{
-  if (!html && !docbook) 
-    output_multitable_row ();
-
-  /* Multitables cannot be nested.  Otherwise, we'd have to save the
-     previous output environment number on a stack somewhere, and then
-     restore to that environment.  */
-  select_output_environment (0);
-  multitable_active = 0;
-  uninhibit_output_flushing ();
-  close_insertion_paragraph ();
-
-  if (html)
-    add_word_args ("<br></%s></tr></table>\n", headitem_row ? "th" : "td");
-  /*  else if (docbook)*/ /* 05-08 */
-  else if (xml)
-    xml_end_multitable ();
-
-#if 0
-  printf (_("** Multicolumn output from last row:\n"));
-  for (i = 1; i <= last_column; i++) {
-    select_output_environment (i);
-    printf (_("* column #%d: output = %s\n"), i, output_paragraph);
-  }
-#endif
-}

Property changes on: head/contrib/texinfo/makeinfo/multi.c
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/config.h.in
===================================================================
--- head/contrib/texinfo/config.h.in	(revision 276550)
+++ head/contrib/texinfo/config.h.in	(nonexistent)
@@ -1,420 +0,0 @@
-/* config.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-#undef CRAY_STACKSEG_END
-
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
-
-/* Define to 1 if translation of program messages to the user's native
-   language is requested. */
-#undef ENABLE_NLS
-
-/* Define to 1 if `TIOCGWINSZ' requires <sys/ioctl.h>. */
-#undef GWINSZ_IN_SYS_IOCTL
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#undef HAVE_ALLOCA_H
-
-/* Define to 1 if you have the <argz.h> header file. */
-#undef HAVE_ARGZ_H
-
-/* Define to 1 if you have the `asprintf' function. */
-#undef HAVE_ASPRINTF
-
-/* Define to 1 if you have the `bzero' function. */
-#undef HAVE_BZERO
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
-   */
-#undef HAVE_DCGETTEXT
-
-/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
-   don't. */
-#undef HAVE_DECL_FEOF_UNLOCKED
-
-/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
-   you don't. */
-#undef HAVE_DECL_FGETS_UNLOCKED
-
-/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
-   don't. */
-#undef HAVE_DECL_GETC_UNLOCKED
-
-/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
-   */
-#undef HAVE_DECL_GETENV
-
-/* Define to 1 if you have the declaration of `memchr', and to 0 if you don't.
-   */
-#undef HAVE_DECL_MEMCHR
-
-/* Define to 1 if you have the declaration of `strcoll', and to 0 if you
-   don't. */
-#undef HAVE_DECL_STRCOLL
-
-/* Define to 1 if you have the declaration of `strerror', and to 0 if you
-   don't. */
-#undef HAVE_DECL_STRERROR
-
-/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
-   don't. */
-#undef HAVE_DECL__SNPRINTF
-
-/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
-   don't. */
-#undef HAVE_DECL__SNWPRINTF
-
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#undef HAVE_DOPRNT
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
-/* Define to 1 if you have the `fwprintf' function. */
-#undef HAVE_FWPRINTF
-
-/* Define to 1 if you have the `getcwd' function. */
-#undef HAVE_GETCWD
-
-/* Define to 1 if you have the `getegid' function. */
-#undef HAVE_GETEGID
-
-/* Define to 1 if you have the `geteuid' function. */
-#undef HAVE_GETEUID
-
-/* Define to 1 if you have the `getgid' function. */
-#undef HAVE_GETGID
-
-/* Define to 1 if you have the `getpagesize' function. */
-#undef HAVE_GETPAGESIZE
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#undef HAVE_GETTIMEOFDAY
-
-/* Define to 1 if you have the `getuid' function. */
-#undef HAVE_GETUID
-
-/* Define if you have the iconv() function. */
-#undef HAVE_ICONV
-
-/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
-#undef HAVE_INTMAX_T
-
-/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
-#undef HAVE_INTTYPES_H
-
-/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
-   declares uintmax_t. */
-#undef HAVE_INTTYPES_H_WITH_UINTMAX
-
-/* Define to 1 if you have the <io.h> header file. */
-#undef HAVE_IO_H
-
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#undef HAVE_LANGINFO_CODESET
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#undef HAVE_LC_MESSAGES
-
-/* Define to 1 if you have the `bsd' library (-lbsd). */
-#undef HAVE_LIBBSD
-
-/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
-
-/* Define to 1 if you have the <locale.h> header file. */
-#undef HAVE_LOCALE_H
-
-/* Define if you have the 'long double' type. */
-#undef HAVE_LONG_DOUBLE
-
-/* Define if you have the 'long long' type. */
-#undef HAVE_LONG_LONG
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
-/* Define to 1 if you have the `memcpy' function. */
-#undef HAVE_MEMCPY
-
-/* Define to 1 if you have the `memmove' function. */
-#undef HAVE_MEMMOVE
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `mempcpy' function. */
-#undef HAVE_MEMPCPY
-
-/* Define to 1 if you have the `memset' function. */
-#undef HAVE_MEMSET
-
-/* Define to 1 if you have the `mkstemp' function. */
-#undef HAVE_MKSTEMP
-
-/* Define to 1 if you have a working `mmap' system call. */
-#undef HAVE_MMAP
-
-/* Define to 1 if you have the `munmap' function. */
-#undef HAVE_MUNMAP
-
-/* Define to 1 if you have the <ncurses/termcap.h> header file. */
-#undef HAVE_NCURSES_TERMCAP_H
-
-/* Define to 1 if you have the <nl_types.h> header file. */
-#undef HAVE_NL_TYPES_H
-
-/* Define if your printf() function supports format strings with positions. */
-#undef HAVE_POSIX_PRINTF
-
-/* Define to 1 if you have the `putenv' function. */
-#undef HAVE_PUTENV
-
-/* Define to 1 if you have the <pwd.h> header file. */
-#undef HAVE_PWD_H
-
-/* Define to 1 if you have the `setenv' function. */
-#undef HAVE_SETENV
-
-/* Define to 1 if you have the `setlocale' function. */
-#undef HAVE_SETLOCALE
-
-/* Define to 1 if you have the `setvbuf' function. */
-#undef HAVE_SETVBUF
-
-/* Define to 1 if you have the `sigaction' function. */
-#undef HAVE_SIGACTION
-
-/* Define to 1 if you have the `sigprocmask' function. */
-#undef HAVE_SIGPROCMASK
-
-/* Define to 1 if you have the `sigsetmask' function. */
-#undef HAVE_SIGSETMASK
-
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#undef HAVE_STDDEF_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
-   uintmax_t. */
-#undef HAVE_STDINT_H_WITH_UINTMAX
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `stpcpy' function. */
-#undef HAVE_STPCPY
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
-/* Define to 1 if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
-/* Define to 1 if you have the `strcoll' function and it is properly defined.
-   */
-#undef HAVE_STRCOLL
-
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strncasecmp' function. */
-#undef HAVE_STRNCASECMP
-
-/* Define to 1 if you have the `strtoul' function. */
-#undef HAVE_STRTOUL
-
-/* Define to 1 if you have the <sys/fcntl.h> header file. */
-#undef HAVE_SYS_FCNTL_H
-
-/* Define to 1 if you have the <sys/file.h> header file. */
-#undef HAVE_SYS_FILE_H
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
-
-/* Define to 1 if you have the <sys/ptem.h> header file. */
-#undef HAVE_SYS_PTEM_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/stream.h> header file. */
-#undef HAVE_SYS_STREAM_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/ttold.h> header file. */
-#undef HAVE_SYS_TTOLD_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <sys/wait.h> header file. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define to 1 if you have the <termcap.h> header file. */
-#undef HAVE_TERMCAP_H
-
-/* Define to 1 if you have the <termios.h> header file. */
-#undef HAVE_TERMIOS_H
-
-/* Define to 1 if you have the <termio.h> header file. */
-#undef HAVE_TERMIO_H
-
-/* Define to 1 if you have the `tsearch' function. */
-#undef HAVE_TSEARCH
-
-/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-#undef HAVE_UINTMAX_T
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define if you have the 'unsigned long long' type. */
-#undef HAVE_UNSIGNED_LONG_LONG
-
-/* Define to 1 if you have the `vprintf' function. */
-#undef HAVE_VPRINTF
-
-/* Define if you have the 'wchar_t' type. */
-#undef HAVE_WCHAR_T
-
-/* Define to 1 if you have the `wcslen' function. */
-#undef HAVE_WCSLEN
-
-/* Define if you have the 'wint_t' type. */
-#undef HAVE_WINT_T
-
-/* Define to 1 if you have the `__argz_count' function. */
-#undef HAVE___ARGZ_COUNT
-
-/* Define to 1 if you have the `__argz_next' function. */
-#undef HAVE___ARGZ_NEXT
-
-/* Define to 1 if you have the `__argz_stringify' function. */
-#undef HAVE___ARGZ_STRINGIFY
-
-/* Define to 1 if you have the `__fsetlocking' function. */
-#undef HAVE___FSETLOCKING
-
-/* Define to 1 if you have the `__secure_getenv' function. */
-#undef HAVE___SECURE_GETENV
-
-/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
-
-/* Define if integer division by zero raises signal SIGFPE. */
-#undef INTDIV0_RAISES_SIGFPE
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
-#undef PRI_MACROS_BROKEN
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
-/* Define as the maximum value of type 'size_t', if the system doesn't define
-   it. */
-#undef SIZE_MAX
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
-
-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-#undef STAT_MACROS_BROKEN
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-#undef TM_IN_SYS_TIME
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to rpl_mkstemp if the replacement function should be used. */
-#undef mkstemp
-
-/* Define to `long' if <sys/types.h> does not define. */
-#undef off_t
-
-/* Define as the type of the result of subtracting two pointers, if the system
-   doesn't define it. */
-#undef ptrdiff_t
-
-/* Define to empty if the C compiler doesn't support this keyword. */
-#undef signed
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-#undef size_t
-
-/* Define to unsigned long or unsigned long long if <stdint.h> and
-   <inttypes.h> don't define. */
-#undef uintmax_t

Property changes on: head/contrib/texinfo/config.h.in
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/contrib/texinfo/AUTHORS
===================================================================
--- head/contrib/texinfo/AUTHORS	(revision 276550)
+++ head/contrib/texinfo/AUTHORS	(nonexistent)
@@ -1,31 +0,0 @@
-$Id: AUTHORS,v 1.10 2004/04/11 17:56:45 karl Exp $
-Texinfo authors.
-
-  Copyright (C) 2003 Free Software Foundation, Inc.
-  
-  Copying and distribution of this file, with or without modification,
-  are permitted in any medium without royalty provided the copyright
-  notice and this notice are preserved.
-
-Akim Demaille		texi2dvi.
-Alper Ersoy		makeinfo: enhancements in all files, especially
-                          html-, xml-, and docbook-related.
-Andreas Schwab		texinfo.tex, configure.ac, most makeinfo files.
-Bob Chassell		texinfo.tex, original texinfo.txi.
-Brian Fox		all makeinfo/* and info/* files, info-stnd.texi.
-Dave Love		original makeinfo/html.[ch].
-Eli Zaretskii		all files.
-Karl Berry		all files.
-Karl Heinz Marbaise	original makeinfo language support, most files.
-Noah Friedman		original texi2dvi.
-Paul Rubin		original makeinfo/multi.c.
-Philippe Martin		original makeinfo xml/docbook output.
-Richard Stallman	original texinfo.tex, install-info.c,
-			texindex.c, texinfo.txi.
-Zack Weinberg		texinfo.tex: @macro implementation.
-
-See http://www.iro.umontreal.ca/contrib/po/HTML/team-LL.html for the
-translation teams for a given language LL.
-
-Many files included in the Texinfo distribution are copied from other
-locations, no author information is given for those.  See util/srclist*.

Property changes on: head/contrib/texinfo/AUTHORS
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/texinfo/texindex/Makefile
===================================================================
--- head/gnu/usr.bin/texinfo/texindex/Makefile	(revision 276550)
+++ head/gnu/usr.bin/texinfo/texindex/Makefile	(nonexistent)
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-PROG=	texindex
-
-DPADD=	${LIBTXI}
-LDADD=	${LIBTXI}
-
-.include <bsd.prog.mk>
-
-.PATH:	${TXIDIR}/util ${TXIDIR}/doc

Property changes on: head/gnu/usr.bin/texinfo/texindex/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/texinfo/Makefile.inc
===================================================================
--- head/gnu/usr.bin/texinfo/Makefile.inc	(revision 276550)
+++ head/gnu/usr.bin/texinfo/Makefile.inc	(nonexistent)
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-TXIDIR=		${.CURDIR}/../../../../contrib/texinfo
-LIBTXI=		${.OBJDIR}/../libtxi/libtxi.a
-
-CFLAGS+=	-DHAVE_CONFIG_H -DLOCALEDIR=\"/usr/share/locale\" \
-		-I${TXIDIR} -I${TXIDIR}/lib
-
-.include "../Makefile.inc"

Property changes on: head/gnu/usr.bin/texinfo/Makefile.inc
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/texinfo/infokey/Makefile
===================================================================
--- head/gnu/usr.bin/texinfo/infokey/Makefile	(revision 276550)
+++ head/gnu/usr.bin/texinfo/infokey/Makefile	(nonexistent)
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-PROG=	infokey
-SRCS=	infokey.c key.c
-
-DPADD=	${LIBTXI}
-LDADD=	${LIBTXI}
-
-.include <bsd.prog.mk>
-
-.PATH:	${TXIDIR}/info ${TXIDIR}/doc

Property changes on: head/gnu/usr.bin/texinfo/infokey/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/texinfo/install-info/Makefile
===================================================================
--- head/gnu/usr.bin/texinfo/install-info/Makefile	(revision 276550)
+++ head/gnu/usr.bin/texinfo/install-info/Makefile	(nonexistent)
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-PROG=	install-info
-
-DPADD=	${LIBTXI}
-LDADD=	${LIBTXI}
-
-.include <bsd.prog.mk>
-
-.PATH:	${TXIDIR}/util ${TXIDIR}/doc

Property changes on: head/gnu/usr.bin/texinfo/install-info/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/texinfo/doc/Makefile
===================================================================
--- head/gnu/usr.bin/texinfo/doc/Makefile	(revision 276550)
+++ head/gnu/usr.bin/texinfo/doc/Makefile	(nonexistent)
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-INFO=	info info-stnd texinfo
-SRCDIR=	${TXIDIR}/doc
-
-CLEANFILES=	texinfo.texi
-
-texinfo.texi: texinfo.txi
-	ln -fs ${.ALLSRC} ${.TARGET}
-
-.include <bsd.info.mk>

Property changes on: head/gnu/usr.bin/texinfo/doc/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/texinfo/info/Makefile
===================================================================
--- head/gnu/usr.bin/texinfo/info/Makefile	(revision 276550)
+++ head/gnu/usr.bin/texinfo/info/Makefile	(nonexistent)
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-PROG=	info
-MAN=	info.1 info.5 texinfo.5
-
-SRCS=	dir.c display.c doc.c dribble.c echo-area.c filesys.c \
-	footnotes.c gc.c indices.c info-utils.c info.c infodoc.c \
-	infomap.c m-x.c man.c nodemenu.c nodes.c search.c session.c \
-	signals.c terminal.c tilde.c variables.c window.c
-
-CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\"
-
-DPADD=	${LIBTERMCAPW} ${LIBTXI}
-LDADD=	-ltermcapw ${LIBTXI}
-
-.include <bsd.prog.mk>
-
-.PATH:	${TXIDIR}/info ${TXIDIR}/doc

Property changes on: head/gnu/usr.bin/texinfo/info/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/texinfo/Makefile
===================================================================
--- head/gnu/usr.bin/texinfo/Makefile	(revision 276550)
+++ head/gnu/usr.bin/texinfo/Makefile	(nonexistent)
@@ -1,7 +0,0 @@
-#
-# $FreeBSD$
-#
-
-SUBDIR= libtxi makeinfo info infokey install-info texindex doc
-
-.include <bsd.subdir.mk>

Property changes on: head/gnu/usr.bin/texinfo/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/texinfo/libtxi/Makefile
===================================================================
--- head/gnu/usr.bin/texinfo/libtxi/Makefile	(revision 276550)
+++ head/gnu/usr.bin/texinfo/libtxi/Makefile	(nonexistent)
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-LIB=	txi
-INTERNALLIB=
-
-SRCS=   substring.c xexit.c xmalloc.c xstrdup.c
-
-.include <bsd.lib.mk>
-
-.PATH: ${TXIDIR}/lib

Property changes on: head/gnu/usr.bin/texinfo/libtxi/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/texinfo/makeinfo/Makefile
===================================================================
--- head/gnu/usr.bin/texinfo/makeinfo/Makefile	(revision 276550)
+++ head/gnu/usr.bin/texinfo/makeinfo/Makefile	(nonexistent)
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-PROG=	makeinfo
-SRCS=	cmds.c defun.c files.c float.c footnote.c html.c \
-	index.c insertion.c lang.c macro.c makeinfo.c multi.c \
-	node.c sectioning.c toc.c xml.c xref.c
-
-DPADD=	${LIBTXI}
-LDADD=	${LIBTXI}
-
-.include <bsd.prog.mk>
-
-.PATH:	$(TXIDIR)/makeinfo $(TXIDIR)/doc

Property changes on: head/gnu/usr.bin/texinfo/makeinfo/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/Makefile
===================================================================
--- head/gnu/usr.bin/Makefile	(revision 276550)
+++ head/gnu/usr.bin/Makefile	(revision 276551)
@@ -1,57 +1,52 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 SUBDIR= ${_binutils} \
 	${_cc} \
 	dialog \
 	diff \
 	diff3 \
 	${_dtc} \
 	${_gdb} \
 	${_gperf} \
 	grep \
 	${_groff} \
 	${_rcs} \
 	sdiff \
-	${_tests} \
-	${_texinfo}
+	${_tests}
 
 .if ${MK_CXX} != "no"
 .if ${MK_GCC} != "no"
 _gperf=		gperf
 .endif
 .if ${MK_GROFF} != "no"
 _groff=		groff
 .endif
 .endif
 
 .if ${MK_GPL_DTC} != "no"
 _dtc=		dtc
-.endif
-
-.if ${MK_INFO} != "no"
-_texinfo=	texinfo
 .endif
 
 .if ${MK_RCS} != "no"
 _rcs=		rcs
 .endif
 
 .if ${MK_TESTS} != "no"
 _tests=		tests
 .endif
 
 .if ${MK_BINUTILS} != "no"
 _binutils=	binutils
 .endif
 .if ${MK_GCC} != "no"
 _cc=		cc
 .endif
 .if ${MK_GDB} != "no"
 _gdb=		gdb
 .endif
 
 SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>
Index: head/gnu/usr.bin/binutils/doc/asconfig.texi
===================================================================
--- head/gnu/usr.bin/binutils/doc/asconfig.texi	(revision 276550)
+++ head/gnu/usr.bin/binutils/doc/asconfig.texi	(nonexistent)
@@ -1,90 +0,0 @@
-@c $FreeBSD$
-@c Copyright 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001, 2002,
-@c 2003, 2005
-@c Free Software Foundation, Inc.
-@c This file is part of the documentation for the GAS manual
-
-@c Configuration settings for all-inclusive version of manual
-
-@c switches:------------------------------------------------------------
-@c Properties of the manual
-@c ========================
-@c Discuss all architectures?
-@clear ALL-ARCH
-@c A generic form of manual (not tailored to specific target)?
-@clear GENERIC
-@c Include text on assembler internals?
-@set INTERNALS
-@c Many object formats supported in this config?
-@clear MULTI-OBJ
-
-@c Object formats of interest
-@c ==========================
-@clear AOUT
-@clear COFF
-@set ELF
-@clear SOM
-
-@c CPUs of interest
-@c ================
-@clear ALPHA
-@clear ARC
-@set ARM
-@clear BFIN
-@clear CRIS
-@clear D10V
-@clear D30V
-@clear H8/300
-@clear HPPA
-@clear I370
-@set I80386
-@clear I860
-@clear I960
-@set IA64
-@clear IP2K
-@clear M32C
-@clear M32R
-@clear xc16x
-@clear M68HC11
-@clear M680X0
-@clear MCORE
-@set MIPS
-@clear MMIX
-@clear MS1
-@clear MSP430
-@clear PDP11
-@clear PJ
-@set PPC
-@clear SH
-@set SPARC
-@clear TIC54X
-@clear V850
-@clear VAX
-@clear XTENSA
-@clear Z80
-@clear Z8000
-
-@c Does this version of the assembler use the difference-table kludge?
-@clear DIFF-TBL-KLUGE
-
-@c Do all machines described use IEEE floating point?
-@clear IEEEFLOAT
-
-@c Is a word 32 bits, or 16?
-@set W32
-@clear W16
-
-@c Do symbols have different characters than usual?
-@clear SPECIAL-SYMS
-
-@c strings:------------------------------------------------------------
-@c Name of the assembler:
-@set AS as
-@c Name of C compiler:
-@set GCC gcc
-@c Name of linker:
-@set LD ld
-@c Text for target machine (best not used in generic case; but just in case...)
-@set TARGET machine specific
-@c Name of object format NOT SET in generic version
-@set OBJ-NAME ELF

Property changes on: head/gnu/usr.bin/binutils/doc/asconfig.texi
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/binutils/doc/Makefile
===================================================================
--- head/gnu/usr.bin/binutils/doc/Makefile	(revision 276550)
+++ head/gnu/usr.bin/binutils/doc/Makefile	(nonexistent)
@@ -1,31 +0,0 @@
-# $FreeBSD$
-
-.include "../Makefile.inc0"
-
-.PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc
-
-INFO=	as ld binutils
-INFOSECTION=	"Programming & development tools."
-INFOENTRY_as=	"* As: (as).            The GNU assembler."
-INFOENTRY_ld=	"* Ld: (ld).		The GNU linker."
-INFOENTRY_binutils= "* Binutils: (binutils).		The GNU Binary Utilities."
-
-MAKEINFOFLAGS+= --no-validate
-MAKEINFOFLAGS+= -I ${SRCDIR}/libiberty
-MAKEINFOFLAGS+= -I ${SRCDIR}/bfd/doc
-
-CLEANFILES=	bfdver.texi configdoc.texi config.texi gasver.texi ldver.texi
-
-as.info:	as.texinfo asconfig.texi bfdver.texi c-i386.texi gasver.texi
-ld.info:	ld.texinfo bfdsumm.texi ldver.texi configdoc.texi
-
-configdoc.texi: gen-doc.texi
-	ln -sf ${.ALLSRC} ${.TARGET}
-
-.PATH: ${SRCDIR}/binutils/doc
-binutils.info: binutils.texi config.texi
-
-bfdver.texi config.texi gasver.texi ldver.texi:
-	echo "@set VERSION ${VERSION}" > ${.TARGET}
-
-.include <bsd.info.mk>

Property changes on: head/gnu/usr.bin/binutils/doc/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/binutils/Makefile
===================================================================
--- head/gnu/usr.bin/binutils/Makefile	(revision 276550)
+++ head/gnu/usr.bin/binutils/Makefile	(revision 276551)
@@ -1,29 +1,28 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 SUBDIR=	libiberty \
 	libbfd \
 	libopcodes \
 	libbinutils \
 	${_addr2line} \
 	as \
 	ld \
 	${_nm} \
 	objcopy \
 	objdump \
 	readelf \
 	${_size} \
 	${_strings} \
-	${_strip} \
-	doc
-	
+	${_strip}
+
 .if ${MK_ELFTOOLCHAIN_TOOLS} == "no"
 _addr2line=	addr2line
 _nm=		nm
 _size=		size
 _strings=	strings
 _strip=		strip
 .endif
 
 .include <bsd.subdir.mk>
Index: head/gnu/usr.bin/cc/doc/Makefile
===================================================================
--- head/gnu/usr.bin/cc/doc/Makefile	(revision 276550)
+++ head/gnu/usr.bin/cc/doc/Makefile	(nonexistent)
@@ -1,52 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-.include "../Makefile.inc"
-.include "../Makefile.ver"
-
-.PATH: ${GCCDIR}/doc ${GCCDIR}/doc/include
-
-INFO=	gcc cpp gccint cppinternals
-
-INFOSECTION=    "Gcc Documentation"
-INFOENTRY_gcc=  "* gcc: (gcc).			The GNU C compiler."
-INFOENTRY_cpp=  "* cpp: (cpp).			The GNU C pre-processor."
-INFOENTRY_gccint= "* gccint: (gccint).		The GNU compiler family internal documentation."
-INFOENTRY_cppinternals= "* cppinternals: (cppinternals).		The GNU compiler preprocessor internal documentation."
-
-gcc.info: gcc.texi gcc-common.texi gcc-vers.texi frontends.texi		\
-	 standards.texi invoke.texi extend.texi md.texi			\
-	 gcov.texi trouble.texi bugreport.texi service.texi		\
-	 contribute.texi compat.texi funding.texi gnu.texi gpl.texi	\
-	 fdl.texi contrib.texi cppenv.texi cppopts.texi			\
-	 implement-c.texi
-
-gccint.info: gccint.texi gcc-common.texi gcc-vers.texi			\
-	 contribute.texi makefile.texi configterms.texi options.texi	\
-	 portability.texi interface.texi passes.texi c-tree.texi	\
-	 rtl.texi md.texi tm.texi hostconfig.texi fragments.texi	\
-	 configfiles.texi collect2.texi headerdirs.texi funding.texi	\
-	 gnu.texi gpl.texi fdl.texi contrib.texi languages.texi		\
-	 sourcebuild.texi gty.texi libgcc.texi cfg.texi tree-ssa.texi	\
-	 loop.texi
-
-cpp.info: cpp.texi fdl.texi cppenv.texi cppopts.texi gcc-common.texi \
-	gcc-vers.texi
-
-cppinternals.info:  cppinternals.texi gcc-common.texi gcc-vers.texi
-
-MAKEINFOFLAGS+= -I ${GCCDIR}/doc -I ${GCCDIR}/doc/include
-
-gcc-vers.texi:
-	(echo "@set version-GCC $(BASEVER)"; \
-	if [ "$(DEVPHASE)" = "experimental" ]; then \
-		echo "@set DEVELOPMENT"; \
-	else \
-		echo "@clear DEVELOPMENT"; \
-	fi; \
-	echo "@set srcdir $(GCCLIB)/libiberty" ) > ${.TARGET}
-
-CLEANFILES+=    gcc-vers.texi
-
-.include <bsd.info.mk>

Property changes on: head/gnu/usr.bin/cc/doc/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/cc/Makefile
===================================================================
--- head/gnu/usr.bin/cc/Makefile	(revision 276550)
+++ head/gnu/usr.bin/cc/Makefile	(revision 276551)
@@ -1,22 +1,22 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 # The order of some of these are rather important.  Some depend on previous
 # subdirs.
 
-SUBDIR= cc_tools libiberty libcpp libdecnumber cc_int cc cc1 include doc
+SUBDIR= cc_tools libiberty libcpp libdecnumber cc_int cc cc1 include
 
 .if ${MK_CPP} != "no"
 SUBDIR+= cpp
 .endif
 
 .if ${MK_CXX} != "no"
 SUBDIR+= cc1plus c++ c++filt
 .endif
 
 .if ${MK_GCOV} != "no"
 SUBDIR+= gcov
 .endif
 
 .include <bsd.subdir.mk>
Index: head/gnu/usr.bin/gdb/doc/inc-hist.diff
===================================================================
--- head/gnu/usr.bin/gdb/doc/inc-hist.diff	(revision 276550)
+++ head/gnu/usr.bin/gdb/doc/inc-hist.diff	(nonexistent)
@@ -1,31 +0,0 @@
-$FreeBSD$
-
---- inc-hist.texinfo.orig	Wed Apr 11 08:20:01 2001
-+++ inc-hist.texinfo	Wed Apr 11 08:21:57 2001
-@@ -26,9 +26,9 @@
- @node Using History Interactively
- @chapter Using History Interactively
- 
--@ifclear BashFeatures
--@defcodeindex bt
--@end ifclear
-+@c @ifclear BashFeatures
-+@c @defcodeindex bt
-+@c @end ifclear
- 
- @ifset BashFeatures
- This chapter describes how to use the @sc{gnu} History Library
-@@ -39,9 +39,10 @@
- @end ifset
- @ifclear BashFeatures
- This chapter describes how to use the @sc{gnu} History Library interactively,
--from a user's standpoint.  It should be considered a user's guide.  For
--information on using the @sc{gnu} History Library in your own programs,
--@pxref{Programming with GNU History}.
-+from a user's standpoint.
-+@c It should be considered a user's guide.  For
-+@c information on using the @sc{gnu} History Library in your own programs,
-+@c @pxref{Programming with GNU History}.
- @end ifclear
- 
- @ifset BashFeatures

Property changes on: head/gnu/usr.bin/gdb/doc/inc-hist.diff
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/gdb/doc/Makefile
===================================================================
--- head/gnu/usr.bin/gdb/doc/Makefile	(revision 276550)
+++ head/gnu/usr.bin/gdb/doc/Makefile	(nonexistent)
@@ -1,32 +0,0 @@
-# $FreeBSD$
-
-INFO=	gdb gdbint stabs
-INFOSECTION= "Software development"
-
-MAKEINFOFLAGS+= --no-validate
-MAKEINFOFLAGS+= -I ${CNTRB_GDB}/gdb/doc
-MAKEINFOFLAGS+= -I ${CNTRB_GDB}/gdb/mi
-MAKEINFOFLAGS+= -I ${CNTRB_RL}/doc
-
-gdb.info: gdb.texinfo gdb-cfg.texi GDBvn.texi annotate.texinfo fdl.texi	\
-	gpl.texi inc-hist.texinfo rluser.texinfo
-
-gdbint.info: gdbint.texinfo gdb-cfg.texi fdl.texi observer.texi
-
-gdb-cfg.texi: all-cfg.texi
-	ln -sf ${.ALLSRC} ${.TARGET}
-
-GDBvn.texi: version.in
-	echo "@set GDBVN `sed q ${.ALLSRC}`" > ${.TARGET}
-
-inc-hist.texinfo: hsuser.texi inc-hist.diff
-	cp -f ${.ALLSRC:M*.texi} ${.TARGET}
-	patch < ${.ALLSRC:M*.diff}
-
-rluser.texinfo: rluser.texi
-	cp -f ${.ALLSRC:M*.texi} ${.TARGET}
-
-CLEANFILES= gdb-cfg.texi GDBvn.texi inc-hist.texinfo inc-hist.texinfo.orig \
-	rluser.texinfo
-
-.include <bsd.info.mk>

Property changes on: head/gnu/usr.bin/gdb/doc/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/gdb/Makefile
===================================================================
--- head/gnu/usr.bin/gdb/Makefile	(revision 276550)
+++ head/gnu/usr.bin/gdb/Makefile	(revision 276551)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-SUBDIR=	doc libgdb gdb gdbtui kgdb
+SUBDIR=	libgdb gdb gdbtui kgdb
 
 .if exists(${.CURDIR}/gdbserver/reg-${MACHINE_CPUARCH}.c)
 SUBDIR+=gdbserver
 .endif
 
 .include <bsd.subdir.mk>
Index: head/gnu/usr.bin/grep/doc/grep.texi
===================================================================
--- head/gnu/usr.bin/grep/doc/grep.texi	(revision 276550)
+++ head/gnu/usr.bin/grep/doc/grep.texi	(nonexistent)
@@ -1,2090 +0,0 @@
-\input texinfo  @c -*-texinfo-*-
-@c %**start of header
-@setfilename grep.info
-@settitle grep, print lines matching a pattern
-@c %**end of header
-
-@c This file has the new style title page commands.
-@c Run `makeinfo' rather than `texinfo-format-buffer'.
-
-@c smallbook
-
-@c tex
-@c \overfullrule=0pt
-@c end tex
-
-@include version.texi
-
-@c Combine indices.
-@syncodeindex ky cp
-@syncodeindex pg cp
-@syncodeindex tp cp
-
-@defcodeindex op
-@syncodeindex op fn
-@syncodeindex vr fn
-
-@ifinfo
-@direntry
-* grep: (grep).                   print lines matching a pattern.
-@end direntry
-This file documents @command{grep}, a pattern matching engine.
-
-
-Published by the Free Software Foundation,
-59 Temple Place - Suite 330
-Boston, MA 02111-1307, USA
-
-@c man begin COPYRIGHT
-Copyright @copyright{} 2000, 2001 Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-
-@ignore
-Permission is granted to process this file through TeX and print the
-results, provided the printed document carries a copying permission
-notice identical to this one except for the removal of this paragraph
-(this paragraph not being relevant to the printed manual).
-
-@end ignore
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``GNU General Public License'' and ``GNU Free
-Documentation License'', with no Front-Cover Texts, and with no
-Back-Cover Texts.  A copy of the license is included in the section
-entitled ``GNU Free Documentation License'' (@pxref{Copying}).
-@c man end
-@end ifinfo
-
-@setchapternewpage off
-
-@titlepage
-@title grep, searching for a pattern
-@subtitle version @value{VERSION}, @value{UPDATED}
-@author Alain Magloire et al.
-
-@page
-@vskip 0pt plus 1filll
-Copyright @copyright{} 2000, 2001 Free Software Foundation, Inc.
-
-@sp 2
-Published by the Free Software Foundation, @*
-59 Temple Place - Suite 330, @*
-Boston, MA 02111-1307, USA
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``GNU General Public License'' and ``GNU Free
-Documentation License'', with no Front-Cover Texts, and with no
-Back-Cover Texts.  A copy of the license is included in the section
-entitled ``GNU Free Documentation License''.
-@end titlepage
-
-
-@ifnottex
-@node Top
-@top Grep
-
-@command{grep} searches for lines matching a pattern.
-
-This document was produced for version @value{VERSION} of @sc{gnu}
-@command{grep}.
-@end ifnottex
-
-@menu
-* Introduction::                Introduction.
-* Invoking::                    Invoking @command{grep}; description of options.
-* Diagnostics::                 Exit status returned by @command{grep}.
-* Grep Programs::               @command{grep} programs.
-* Regular Expressions::         Regular Expressions.
-* Usage::                       Examples.
-* Reporting Bugs::              Reporting Bugs.
-* Copying::                     License terms.
-* Concept Index::               A menu with all the topics in this manual.
-* Index::                       A menu with all @command{grep} commands
-                                 and command-line options.
-@end menu
-
-
-@node Introduction, Invoking, Top, Top
-@chapter Introduction
-
-@cindex Searching for a pattern.
-
-@command{grep} searches the input files
-for lines containing a match to a given
-pattern list.  When it finds a match in a line, it copies the line to standard
-output (by default), or does whatever other sort of output you have requested
-with options.
-
-Though @command{grep} expects to do the matching on text,
-it has no limits on input line length other than available memory,
-and it can match arbitrary characters within a line.
-If the final byte of an input file is not a newline,
-@command{grep} silently supplies one.
-Since newline is also a separator for the list of patterns, there
-is no way to match newline characters in a text.
-
-@node Invoking
-@chapter Invoking @command{grep}
-
-@command{grep} comes with a rich set of options from @sc{posix.2} and @sc{gnu}
-extensions.
-
-@table @samp
-
-@item -c
-@itemx --count
-@opindex -c
-@opindex --count
-@cindex counting lines
-Suppress normal output; instead print a count of matching
-lines for each input file.  With the @samp{-v}, @samp{--invert-match} option,
-count non-matching lines.
-
-@item -e @var{pattern}
-@itemx --regexp=@var{pattern}
-@opindex -e
-@opindex --regexp=@var{pattern}
-@cindex pattern list
-Use @var{pattern} as the pattern; useful to protect patterns
-beginning with a @samp{-}.
-
-@item -f @var{file}
-@itemx --file=@var{file}
-@opindex -f
-@opindex --file
-@cindex pattern from file
-Obtain patterns from @var{file}, one per line.  The empty
-file contains zero patterns, and therefore matches nothing.
-
-@item -i
-@itemx --ignore-case
-@opindex -i
-@opindex --ignore-case
-@cindex case insensitive search
-Ignore case distinctions in both the pattern and the input files.
-
-@item -l
-@itemx --files-with-matches
-@opindex -l
-@opindex --files-with-matches
-@cindex names of matching files
-Suppress normal output; instead print the name of each input
-file from which output would normally have been printed.
-The scanning of every file will stop on the first match.
-
-@item -n
-@itemx --line-number
-@opindex -n
-@opindex --line-number
-@cindex line numbering
-Prefix each line of output with the line number within its input file.
-
-@item -o
-@itemx --only-matching
-@opindex -o
-@opindex --only-matching
-@cindex only matching
-Print only the part of matching lines that actually matches @var{pattern}.
-
-@item -q
-@itemx --quiet
-@itemx --silent
-@opindex -q
-@opindex --quiet
-@opindex --silent
-@cindex quiet, silent
-Quiet; do not write anything to standard output.  Exit immediately with
-zero status if any match is found, even if an error was detected.  Also
-see the @samp{-s} or @samp{--no-messages} option.
-
-@item -s
-@itemx --no-messages
-@opindex -s
-@opindex --no-messages
-@cindex suppress error messages
-Suppress error messages about nonexistent or unreadable files.
-Portability note: unlike @sc{gnu} @command{grep}, traditional
-@command{grep} did not conform to @sc{posix.2}, because traditional
-@command{grep} lacked a @samp{-q} option and its @samp{-s} option behaved
-like @sc{gnu} @command{grep}'s @samp{-q} option.  Shell scripts intended
-to be portable to traditional @command{grep} should avoid both
-@samp{-q} and @samp{-s} and should redirect
-output to @file{/dev/null} instead.
-
-@item -v
-@itemx --invert-match
-@opindex -v
-@opindex --invert-match
-@cindex invert matching
-@cindex print non-matching lines
-Invert the sense of matching, to select non-matching lines.
-
-@item -x
-@itemx --line-regexp
-@opindex -x
-@opindex --line-regexp
-@cindex match the whole line
-Select only those matches that exactly match the whole line.
-
-@end table
-
-@section @sc{gnu} Extensions
-
-@table @samp
-
-@item -A @var{num}
-@itemx --after-context=@var{num}
-@opindex -A
-@opindex --after-context
-@cindex after context
-@cindex context lines, after match
-Print @var{num} lines of trailing context after matching lines.
-
-@item -B @var{num}
-@itemx --before-context=@var{num}
-@opindex -B
-@opindex --before-context
-@cindex before context
-@cindex context lines, before match
-Print @var{num} lines of leading context before matching lines.
-
-@item -C @var{num}
-@itemx --context=@var{num}
-@opindex -C
-@opindex --context
-@cindex context
-Print @var{num} lines of output context.
-
-@item --colour[=@var{WHEN}]
-@itemx --color[=@var{WHEN}]
-@opindex --colour
-@cindex highlight, color, colour
-The matching string is surrounded by the marker specify in @var{GREP_COLOR}.
-@var{WHEN} may be `never', `always', or `auto'.
-
-@item -@var{num}
-@opindex -NUM
-Same as @samp{--context=@var{num}} lines of leading and trailing
-context.  However, grep will never print any given line more than once.
-
-
-@item -V
-@itemx --version
-@opindex -V
-@opindex --version
-@cindex Version, printing
-Print the version number of @command{grep} to the standard output stream.
-This version number should be included in all bug reports.
-
-@item --help
-@opindex --help
-@cindex Usage summary, printing
-Print a usage message briefly summarizing these command-line options
-and the bug-reporting address, then exit.
-
-@itemx --binary-files=@var{type}
-@opindex --binary-files
-@cindex binary files
-If the first few bytes of a file indicate that the file contains binary
-data, assume that the file is of type @var{type}.  By default,
-@var{type} is @samp{binary}, and @command{grep} normally outputs either
-a one-line message saying that a binary file matches, or no message if
-there is no match.  If @var{type} is @samp{without-match},
-@command{grep} assumes that a binary file does not match;
-this is equivalent to the @samp{-I} option.  If @var{type}
-is @samp{text}, @command{grep} processes a binary file as if it were
-text; this is equivalent to the @samp{-a} option.
-@emph{Warning:} @samp{--binary-files=text} might output binary garbage,
-which can have nasty side effects if the output is a terminal and if the
-terminal driver interprets some of it as commands.
-
-@item -b
-@itemx --byte-offset
-@opindex -b
-@opindex --byte-offset
-@cindex byte offset
-Print the byte offset within the input file before each line of output.
-When @command{grep} runs on @sc{ms-dos} or MS-Windows, the printed
-byte offsets
-depend on whether the @samp{-u} (@samp{--unix-byte-offsets}) option is
-used; see below.
-
-@item -D @var{action}
-@itemx --devices=@var{action}
-@opindex -D
-@opindex --devices
-@cindex device search
-If an input file is a device, FIFO or socket, use @var{action} to process it.
-By default, @var{action} is @samp{read}, which means that devices are
-read just as if they were ordinary files.
-If @var{action} is @samp{skip}, devices, FIFOs and sockets are silently
-skipped.
-
-@item -d @var{action}
-@itemx --directories=@var{action}
-@opindex -d
-@opindex --directories
-@cindex directory search
-If an input file is a directory, use @var{action} to process it.
-By default, @var{action} is @samp{read}, which means that directories are
-read just as if they were ordinary files (some operating systems
-and filesystems disallow this, and will cause @command{grep} to print error
-messages for every directory or silently skip them). If @var{action} is
-@samp{skip}, directories are silently skipped.  If @var{action} is
-@samp{recurse}, @command{grep} reads all files under each directory,
-recursively; this is equivalent to the @samp{-r} option.
-
-@item -H
-@itemx --with-filename
-@opindex -H
-@opindex --With-filename
-@cindex with filename prefix
-Print the filename for each match.
-
-@item -h
-@itemx --no-filename
-@opindex -h
-@opindex --no-filename
-@cindex no filename prefix
-Suppress the prefixing of filenames on output when multiple files are searched.
-
-@item --line-buffered
-@opindex --line-buffered
-@cindex line buffering
-Set the line buffering policy, this can be a performance penality.
-
-@item --label=@var{LABEL}
-@opindex --label
-@cindex changing name of standard input
-Displays input actually coming from standard input as input coming from file
-@var{LABEL}. This is especially useful for tools like zgrep, e.g.
-@command{gzip -cd foo.gz |grep --label=foo something}
-
-@item -L
-@itemx --files-without-match
-@opindex -L
-@opindex --files-without-match
-@cindex files which don't match
-Suppress normal output; instead print the name of each input
-file from which no output would normally have been printed.
-The scanning of every file will stop on the first match.
-
-@item -a
-@itemx --text
-@opindex -a
-@opindex --text
-@cindex suppress binary data
-@cindex binary files
-Process a binary file as if it were text; this is equivalent to the
-@samp{--binary-files=text} option.
-
-@item -I
-Process a binary file as if it did not contain matching data; this is
-equivalent to the @samp{--binary-files=without-match} option.
-
-@item -w
-@itemx --word-regexp
-@opindex -w
-@opindex --word-regexp
-@cindex matching whole words
-Select only those lines containing matches that form
-whole words.  The test is that the matching substring
-must either be at the beginning of the line, or preceded
-by a non-word constituent character.  Similarly,
-it must be either at the end of the line or followed by
-a non-word constituent character.  Word-constituent
-characters are letters, digits, and the underscore.
-
-@item -r
-@itemx -R
-@itemx --recursive
-@opindex -r
-@opindex --recursive
-@cindex recursive search
-@cindex searching directory trees
-For each directory mentioned in the command line, read and process all
-files in that directory, recursively.  This is the same as the
-@samp{--directories=recurse} option.
-
-@item --include=@var{file_pattern}
-@opindex --include
-@cindex include files
-@cindex searching directory trees
-When processing directories recursively, only files matching @var{file_pattern}
-will be search.
-
-@item --exclude=@var{file_pattern}
-@opindex --exclude
-@cindex exclude files
-@cindex searching directory trees
-When processing directories recursively, skip files matching @var{file_pattern}.
-
-@item -m @var{num}
-@itemx --max-count=@var{num}
-@opindex -m
-@opindex --max-count
-@cindex max-count
-Stop reading a file after @var{num} matching lines.  If the input is
-standard input from a regular file, and @var{num} matching lines are
-output, @command{grep} ensures that the standard input is positioned to
-just after the last matching line before exiting, regardless of the
-presence of trailing context lines.  This enables a calling process
-to resume a search.  For example, the following shell script makes use
-of it:
-
-@example
-while grep -m 1 PATTERN
-do
-  echo xxxx
-done < FILE
-@end example
-
-But the following probably will not work because a pipe is not a regular
-file:
-
-@example
-# This probably will not work.
-cat FILE |
-while grep -m 1 PATTERN
-do
-  echo xxxx
-done
-@end example
-
-When @command{grep} stops after NUM matching lines, it outputs
-any trailing context lines. Since context does not include matching
-lines, @command{grep} will stop when it encounters another matching line.
-When the @samp{-c} or @samp{--count} option is also used,
-@command{grep} does not output a count greater than @var{num}.
-When the @samp{-v} or @samp{--invert-match} option is
-also used, @command{grep} stops after outputting @var{num}
-non-matching lines.
-
-@item -y
-@opindex -y
-@cindex case insensitive search, obsolete option
-Obsolete synonym for @samp{-i}.
-
-@item -U
-@itemx --binary
-@opindex -U
-@opindex --binary
-@cindex DOS/Windows binary files
-@cindex binary files, DOS/Windows
-Treat the file(s) as binary.  By default, under @sc{ms-dos}
-and MS-Windows, @command{grep} guesses the file type by looking
-at the contents of the first 32kB read from the file.
-If @command{grep} decides the file is a text file, it strips the
-@code{CR} characters from the original file contents (to make
-regular expressions with @code{^} and @code{$} work correctly).
-Specifying @samp{-U} overrules this guesswork, causing all
-files to be read and passed to the matching mechanism
-verbatim; if the file is a text file with @code{CR/LF} pairs
-at the end of each line, this will cause some regular
-expressions to fail.  This option has no effect on platforms other than
-@sc{ms-dos} and MS-Windows.
-
-@item -u
-@itemx --unix-byte-offsets
-@opindex -u
-@opindex --unix-byte-offsets
-@cindex DOS byte offsets
-@cindex byte offsets, on DOS/Windows
-Report Unix-style byte offsets.  This switch causes
-@command{grep} to report byte offsets as if the file were Unix style
-text file, i.e., the byte offsets ignore the @code{CR} characters which were
-stripped.  This will produce results identical to running @command{grep} on
-a Unix machine.  This option has no effect unless @samp{-b}
-option is also used; it has no effect on platforms other than @sc{ms-dos} and
-MS-Windows.
-
-@item --mmap
-@opindex --mmap
-@cindex memory mapped input
-If possible, use the @code{mmap} system call to read input, instead of
-the default @code{read} system call.  In some situations, @samp{--mmap}
-yields better performance.  However, @samp{--mmap} can cause undefined
-behavior (including core dumps) if an input file shrinks while
-@command{grep} is operating, or if an I/O error occurs.
-
-@item -Z
-@itemx --null
-@opindex -Z
-@opindex --null
-@cindex zero-terminated file names
-Output a zero byte (the @sc{ascii} @code{NUL} character) instead of the
-character that normally follows a file name.  For example, @samp{grep
--lZ} outputs a zero byte after each file name instead of the usual
-newline.  This option makes the output unambiguous, even in the presence
-of file names containing unusual characters like newlines.  This option
-can be used with commands like @samp{find -print0}, @samp{perl -0},
-@samp{sort -z}, and @samp{xargs -0} to process arbitrary file names,
-even those that contain newline characters.
-
-@item -z
-@itemx --null-data
-@opindex -z
-@opindex --null-data
-@cindex zero-terminated lines
-Treat the input as a set of lines, each terminated by a zero byte (the
-@sc{ascii} @code{NUL} character) instead of a newline.  Like the @samp{-Z}
-or @samp{--null} option, this option can be used with commands like
-@samp{sort -z} to process arbitrary file names.
-
-@end table
-
-Several additional options control which variant of the @command{grep}
-matching engine is used.  @xref{Grep Programs}.
-
-@section Environment Variables
-
-Grep's behavior is affected by the following environment variables.
-
-A locale @code{LC_@var{foo}} is specified by examining the three
-environment variables @env{LC_ALL}, @env{LC_@var{foo}}, and @env{LANG},
-in that order.  The first of these variables that is set specifies the
-locale.  For example, if @env{LC_ALL} is not set, but @env{LC_MESSAGES}
-is set to @samp{pt_BR}, then Brazilian Portuguese is used for the
-@code{LC_MESSAGES} locale.  The C locale is used if none of these
-environment variables are set, or if the locale catalog is not
-installed, or if @command{grep} was not compiled with national language
-support (@sc{nls}).
-
-@cindex environment variables
-
-@table @env
-
-@item GREP_OPTIONS
-@vindex GREP_OPTIONS
-@cindex default options environment variable
-This variable specifies default options to be placed in front of any
-explicit options.  For example, if @code{GREP_OPTIONS} is
-@samp{--binary-files=without-match --directories=skip}, @command{grep}
-behaves as if the two options @samp{--binary-files=without-match} and
-@samp{--directories=skip} had been specified before
-any explicit options.  Option specifications are separated by
-whitespace.  A backslash escapes the next character, so it can be used to
-specify an option containing whitespace or a backslash.
-
-@item GREP_COLOR
-@vindex GREP_COLOR
-@cindex highlight markers
-This variable specifies the surrounding markers use to highlight the matching
-text.  The default is control ascii red.
-
-@item LC_ALL
-@itemx LC_COLLATE
-@itemx LANG
-@vindex LC_ALL
-@vindex LC_COLLATE
-@vindex LANG
-@cindex character type
-@cindex national language support
-@cindex NLS
-These variables specify the @code{LC_COLLATE} locale, which determines
-the collating sequence used to interpret range expressions like
-@samp{[a-z]}.
-
-@item LC_ALL
-@itemx LC_CTYPE
-@itemx LANG
-@vindex LC_ALL
-@vindex LC_CTYPE
-@vindex LANG
-@cindex character type
-@cindex national language support
-@cindex NLS
-These variables specify the @code{LC_CTYPE} locale, which determines the
-type of characters, e.g., which characters are whitespace.
-
-@item LC_ALL
-@itemx LC_MESSAGES
-@itemx LANG
-@vindex LC_ALL
-@vindex LC_MESSAGES
-@vindex LANG
-@cindex language of messages
-@cindex message language
-@cindex national language support
-@cindex NLS
-@cindex translation of message language
-These variables specify the @code{LC_MESSAGES} locale, which determines
-the language that @command{grep} uses for messages.  The default C
-locale uses American English messages.
-
-@item POSIXLY_CORRECT
-@vindex POSIXLY_CORRECT
-If set, @command{grep} behaves as @sc{posix.2} requires; otherwise,
-@command{grep} behaves more like other @sc{gnu} programs.  @sc{posix.2}
-requires that options that
-follow file names must be treated as file names; by default, such
-options are permuted to the front of the operand list and are treated as
-options.  Also, @sc{posix.2} requires that unrecognized options be
-diagnosed as
-``illegal'', but since they are not really against the law the default
-is to diagnose them as ``invalid''.  @code{POSIXLY_CORRECT} also
-disables @code{_@var{N}_GNU_nonoption_argv_flags_}, described below.
-
-@item _@var{N}_GNU_nonoption_argv_flags_
-@vindex _@var{N}_GNU_nonoption_argv_flags_
-(Here @code{@var{N}} is @command{grep}'s numeric process ID.)  If the
-@var{i}th character of this environment variable's value is @samp{1}, do
-not consider the @var{i}th operand of @command{grep} to be an option, even if
-it appears to be one.  A shell can put this variable in the environment
-for each command it runs, specifying which operands are the results of
-file name wildcard expansion and therefore should not be treated as
-options.  This behavior is available only with the @sc{gnu} C library, and
-only when @code{POSIXLY_CORRECT} is not set.
-
-@end table
-
-@node Diagnostics
-@chapter Diagnostics
-
-Normally, exit status is 0 if selected lines are found and 1 otherwise.
-But the exit status is 2 if an error occurred, unless the @option{-q} or
-@option{--quiet} or @option{--silent} option is used and a selected line
-is found.
-
-@node Grep Programs
-@chapter @command{grep} programs
-
-@command{grep} searches the named input files (or standard input if no
-files are named, or the file name @file{-} is given) for lines containing
-a match to the given pattern.  By default, @command{grep} prints the
-matching lines.  There are four major variants of @command{grep},
-controlled by the following options.
-
-@table @samp
-
-@item -G
-@itemx --basic-regexp
-@opindex -G
-@opindex --basic-regexp
-@cindex matching basic regular expressions
-Interpret the pattern as a basic regular expression.  This is the default.
-
-@item -E
-@itemx --extended-regexp
-@opindex -E
-@opindex --extended-regexp
-@cindex matching extended regular expressions
-Interpret the pattern as an extended regular expression.
-
-@item -F
-@itemx --fixed-strings
-@opindex -F
-@opindex --fixed-strings
-@cindex matching fixed strings
-Interpret the pattern as a list of fixed strings, separated
-by newlines, any of which is to be matched.
-
-@item -P
-@itemx --perl-regexp
-@opindex -P
-@opindex --perl-regexp
-@cindex matching Perl regular expressions
-Interpret the pattern as a Perl regular expression.
-
-@end table
-
-In addition, two variant programs @sc{egrep} and @sc{fgrep} are available.
-@sc{egrep} is the same as @samp{grep -E}.  @sc{fgrep} is the
-same as @samp{grep -F}.
-
-@node Regular Expressions
-@chapter Regular Expressions
-@cindex regular expressions
-
-A @dfn{regular expression} is a pattern that describes a set of strings.
-Regular expressions are constructed analogously to arithmetic expressions,
-by using various operators to combine smaller expressions.
-@command{grep} understands two different versions of regular expression
-syntax: ``basic''(BRE) and ``extended''(ERE).  In @sc{gnu} @command{grep},
-there is no difference in available functionality using either syntax.
-In other implementations, basic regular expressions are less powerful.
-The following description applies to extended regular expressions;
-differences for basic regular expressions are summarized afterwards.
-
-The fundamental building blocks are the regular expressions that match
-a single character.  Most characters, including all letters and digits,
-are regular expressions that match themselves.  Any metacharacter
-with special meaning may be quoted by preceding it with a backslash.
-
-A regular expression may be followed by one of several
-repetition operators:
-
-@table @samp
-
-@item .
-@opindex .
-@cindex dot
-@cindex period
-The period @samp{.} matches any single character.
-
-@item ?
-@opindex ?
-@cindex question mark
-@cindex match sub-expression at most once
-The preceding item is optional and will be matched at most once.
-
-@item *
-@opindex *
-@cindex asterisk
-@cindex match sub-expression zero or more times
-The preceding item will be matched zero or more times.
-
-@item +
-@opindex +
-@cindex plus sign
-The preceding item will be matched one or more times.
-
-@item @{@var{n}@}
-@opindex @{n@}
-@cindex braces, one argument
-@cindex match sub-expression n times
-The preceding item is matched exactly @var{n} times.
-
-@item @{@var{n},@}
-@opindex @{n,@}
-@cindex braces, second argument omitted
-@cindex match sub-expression n or more times
-The preceding item is matched n or more times.
-
-@item @{@var{n},@var{m}@}
-@opindex @{n,m@}
-@cindex braces, two arguments
-The preceding item is matched at least @var{n} times, but not more than
-@var{m} times.
-
-@end table
-
-Two regular expressions may be concatenated; the resulting regular
-expression matches any string formed by concatenating two substrings
-that respectively match the concatenated subexpressions.
-
-Two regular expressions may be joined by the infix operator @samp{|}; the
-resulting regular expression matches any string matching either subexpression.
-
-Repetition takes precedence over concatenation, which in turn
-takes precedence over alternation.  A whole subexpression may be
-enclosed in parentheses to override these precedence rules.
-
-@section Character Class
-
-@cindex bracket expression
-@cindex character class
-A @dfn{bracket expression} is a list of characters enclosed by @samp{[} and
-@samp{]}.  It matches any single character in that list; if the first
-character of the list is the caret @samp{^}, then it matches any character
-@strong{not} in the list.  For example, the regular expression
-@samp{[0123456789]} matches any single digit.
-
-@cindex range expression
-Within a bracket expression, a @dfn{range expression} consists of two
-characters separated by a hyphen.  It matches any single character that
-sorts between the two characters, inclusive, using the locale's
-collating sequence and character set.  For example, in the default C
-locale, @samp{[a-d]} is equivalent to @samp{[abcd]}.  Many locales sort
-characters in dictionary order, and in these locales @samp{[a-d]} is
-typically not equivalent to @samp{[abcd]}; it might be equivalent to
-@samp{[aBbCcDd]}, for example.  To obtain the traditional interpretation
-of bracket expressions, you can use the C locale by setting the
-@env{LC_ALL} environment variable to the value @samp{C}.
-
-Finally, certain named classes of characters are predefined within
-bracket expressions, as follows.
-Their interpretation depends on the @code{LC_CTYPE} locale; the
-interpretation below is that of the C locale, which is the default
-if no @code{LC_CTYPE} locale is specified.
-
-@cindex classes of characters
-@cindex character classes
-@table @samp
-
-@item [:alnum:]
-@opindex alnum
-@cindex alphanumeric characters
-Alphanumeric characters:
-@samp{[:alpha:]} and @samp{[:digit:]}.
-
-@item [:alpha:]
-@opindex alpha
-@cindex alphabetic characters
-Alphabetic characters:
-@samp{[:lower:]} and @samp{[:upper:]}.
-
-@item [:blank:]
-@opindex blank
-@cindex blank characters
-Blank characters:
-space and tab.
-
-@item [:cntrl:]
-@opindex cntrl
-@cindex control characters
-Control characters.  In @sc{ascii}, these characters have octal codes 000
-through 037, and 177 (@code{DEL}).  In other character sets, these are
-the equivalent characters, if any.
-
-@item [:digit:]
-@opindex digit
-@cindex digit characters
-@cindex numeric characters
-Digits: @code{0 1 2 3 4 5 6 7 8 9}.
-
-@item [:graph:]
-@opindex graph
-@cindex graphic characters
-Graphical characters:
-@samp{[:alnum:]} and @samp{[:punct:]}.
-
-@item [:lower:]
-@opindex lower
-@cindex lower-case letters
-Lower-case letters:
-@code{a b c d e f g h i j k l m n o p q r s t u v w x y z}.
-
-@item [:print:]
-@opindex print
-@cindex printable characters
-Printable characters:
-@samp{[:alnum:]}, @samp{[:punct:]}, and space.
-
-@item [:punct:]
-@opindex punct
-@cindex punctuation characters
-Punctuation characters:
-@code{!@: " # $ % & ' ( ) * + , - .@: / : ; < = > ?@: @@ [ \ ] ^ _ ` @{ | @} ~}.
-
-@item [:space:]
-@opindex space
-@cindex space characters
-@cindex whitespace characters
-Space characters:
-tab, newline, vertical tab, form feed, carriage return, and space.
-
-@item [:upper:]
-@opindex upper
-@cindex upper-case letters
-Upper-case letters:
-@code{A B C D E F G H I J K L M N O P Q R S T U V W X Y Z}.
-
-@item [:xdigit:]
-@opindex xdigit
-@cindex xdigit class
-@cindex hexadecimal digits
-Hexadecimal digits:
-@code{0 1 2 3 4 5 6 7 8 9 A B C D E F a b c d e f}.
-
-@end table
-For example, @samp{[[:alnum:]]} means @samp{[0-9A-Za-z]}, except the latter
-depends upon the C locale and the @sc{ascii} character
-encoding, whereas the former is independent of locale and character set.
-(Note that the brackets in these class names are
-part of the symbolic names, and must be included in addition to
-the brackets delimiting the bracket list.)
-
-Most metacharacters lose their special meaning inside lists.
-
-@table @samp
-@item ]
-ends the list if it's not the first list item.  So, if you want to make
-the @samp{]} character a list item, you must put it first.
-
-@item [.
-represents the open collating symbol.
-
-@item .]
-represents the close collating symbol.
-
-@item [=
-represents the open equivalence class.
-
-@item =]
-represents the close equivalence class.
-
-@item [:
-represents the open character class followed by a valid character class name.
-
-@item :]
-represents the close character class followed by a valid character class name.
-
-@item -
-represents the range if it's not first or last in a list or the ending point
-of a range.
-
-@item ^
-represents the characters not in the list.  If you want to make the @samp{^}
-character a list item, place it anywhere but first.
-
-@end table
-
-@section Backslash Character
-@cindex backslash
-
-The @samp{\} when followed by certain ordinary characters take a special
-meaning :
-
-@table @samp
-
-@item @samp{\b}
-Match the empty string at the edge of a word.
-
-@item @samp{\B}
-Match the empty string provided it's not at the edge of a word.
-
-@item @samp{\<}
-Match the empty string at the beginning of word.
-
-@item @samp{\>}
-Match the empty string at the end of word.
-
-@item @samp{\w}
-Match word constituent, it is a synonym for @samp{[[:alnum:]]}.
-
-@item @samp{\W}
-Match non word constituent, it is a synonym for @samp{[^[:alnum:]]}.
-
-@end table
-
-For example , @samp{\brat\b} matches the separate word @samp{rat},
-@samp{c\Brat\Be} matches @samp{crate}, but @samp{dirty \Brat} doesn't
-match @samp{dirty rat}.
-
-@section Anchoring
-@cindex anchoring
-
-The caret @samp{^} and the dollar sign @samp{$} are metacharacters that
-respectively match the empty string at the beginning and end of a line.
-
-@section Back-reference
-@cindex back-reference
-
-The back-reference @samp{\@var{n}}, where @var{n} is a single digit, matches
-the substring previously matched by the @var{n}th parenthesized subexpression
-of the regular expression. For example, @samp{(a)\1} matches @samp{aa}.
-When use with alternation if the group does not participate in the match, then
-the back-reference makes the whole match fail.  For example, @samp{a(.)|b\1}
-will not match @samp{ba}.  When multiple regular expressions are given with
-@samp{-e} or from a file @samp{-f file}, the back-referecences are local to
-each expression.
-
-@section Basic vs Extended
-@cindex basic regular expressions
-
-In basic regular expressions the metacharacters @samp{?}, @samp{+},
-@samp{@{}, @samp{|}, @samp{(}, and @samp{)} lose their special meaning;
-instead use the backslashed versions @samp{\?}, @samp{\+}, @samp{\@{},
-@samp{\|}, @samp{\(}, and @samp{\)}.
-
-@cindex interval specifications
-Traditional @command{egrep} did not support the @samp{@{} metacharacter,
-and some @command{egrep} implementations support @samp{\@{} instead, so
-portable scripts should avoid @samp{@{} in @samp{egrep} patterns and
-should use @samp{[@{]} to match a literal @samp{@{}.
-
-@sc{gnu} @command{egrep} attempts to support traditional usage by
-assuming that @samp{@{} is not special if it would be the start of an
-invalid interval specification.  For example, the shell command
-@samp{egrep '@{1'} searches for the two-character string @samp{@{1}
-instead of reporting a syntax error in the regular expression.
-@sc{posix.2} allows this behavior as an extension, but portable scripts
-should avoid it.
-
-@node Usage
-@chapter Usage
-
-@cindex Usage, examples
-Here is an example shell command that invokes @sc{gnu} @command{grep}:
-
-@example
-grep -i 'hello.*world' menu.h main.c
-@end example
-
-@noindent
-This lists all lines in the files @file{menu.h} and @file{main.c} that
-contain the string @samp{hello} followed by the string @samp{world};
-this is because @samp{.*} matches zero or more characters within a line.
-@xref{Regular Expressions}.  The @samp{-i} option causes @command{grep}
-to ignore case, causing it to match the line @samp{Hello, world!}, which
-it would not otherwise match.  @xref{Invoking}, for more details about
-how to invoke @command{grep}.
-
-@cindex Using @command{grep}, Q&A
-@cindex FAQ about @command{grep} usage
-Here are some common questions and answers about @command{grep} usage.
-
-@enumerate
-
-@item
-How can I list just the names of matching files?
-
-@example
-grep -l 'main' *.c
-@end example
-
-@noindent
-lists the names of all C files in the current directory whose contents
-mention @samp{main}.
-
-@item
-How do I search directories recursively?
-
-@example
-grep -r 'hello' /home/gigi
-@end example
-
-@noindent
-searches for @samp{hello} in all files under the directory
-@file{/home/gigi}.  For more control of which files are searched, use
-@command{find}, @command{grep} and @command{xargs}.  For example,
-the following command searches only C files:
-
-@smallexample
-find /home/gigi -name '*.c' -print | xargs grep 'hello' /dev/null
-@end smallexample
-
-This differs from the command:
-
-@example
-grep -r 'hello' *.c
-@end example
-
-which merely looks for @samp{hello} in all files in the current
-directory whose names end in @samp{.c}.  Here the @option{-r} is
-probably unnecessary, as recursion occurs only in the unlikely event
-that one of @samp{.c} files is a directory.
-
-@item
-What if a pattern has a leading @samp{-}?
-
-@example
-grep -e '--cut here--' *
-@end example
-
-@noindent
-searches for all lines matching @samp{--cut here--}.  Without @samp{-e},
-@command{grep} would attempt to parse @samp{--cut here--} as a list of
-options.
-
-@item
-Suppose I want to search for a whole word, not a part of a word?
-
-@example
-grep -w 'hello' *
-@end example
-
-@noindent
-searches only for instances of @samp{hello} that are entire words; it
-does not match @samp{Othello}.  For more control, use @samp{\<} and
-@samp{\>} to match the start and end of words.  For example:
-
-@example
-grep 'hello\>' *
-@end example
-
-@noindent
-searches only for words ending in @samp{hello}, so it matches the word
-@samp{Othello}.
-
-@item
-How do I output context around the matching lines?
-
-@example
-grep -C 2 'hello' *
-@end example
-
-@noindent
-prints two lines of context around each matching line.
-
-@item
-How do I force grep to print the name of the file?
-
-Append @file{/dev/null}:
-
-@example
-grep 'eli' /etc/passwd /dev/null
-@end example
-
-gets you:
-
-@smallexample
-/etc/passwd:eli:DNGUTF58.IMe.:98:11:Eli Smith:/home/do/eli:/bin/bash
-@end smallexample
-
-@item
-Why do people use strange regular expressions on @command{ps} output?
-
-@example
-ps -ef | grep '[c]ron'
-@end example
-
-If the pattern had been written without the square brackets, it would
-have matched not only the @command{ps} output line for @command{cron},
-but also the @command{ps} output line for @command{grep}.
-Note that some platforms @command{ps} limit the ouput to the width
-of the screen, grep does not have any limit on the length of a line
-except the available memory.
-
-@item
-Why does @command{grep} report ``Binary file matches''?
-
-If @command{grep} listed all matching ``lines'' from a binary file, it
-would probably generate output that is not useful, and it might even
-muck up your display.  So @sc{gnu} @command{grep} suppresses output from
-files that appear to be binary files.  To force @sc{gnu} @command{grep}
-to output lines even from files that appear to be binary, use the
-@samp{-a} or @samp{--binary-files=text} option.  To eliminate the
-``Binary file matches'' messages, use the @samp{-I} or
-@samp{--binary-files=without-match} option.
-
-@item
-Why doesn't @samp{grep -lv} print nonmatching file names?
-
-@samp{grep -lv} lists the names of all files containing one or more
-lines that do not match.  To list the names of all files that contain no
-matching lines, use the @samp{-L} or @samp{--files-without-match}
-option.
-
-@item
-I can do @sc{or} with @samp{|}, but what about @sc{and}?
-
-@example
-grep 'paul' /etc/motd | grep 'franc,ois'
-@end example
-
-@noindent
-finds all lines that contain both @samp{paul} and @samp{franc,ois}.
-
-@item
-How can I search in both standard input and in files?
-
-Use the special file name @samp{-}:
-
-@example
-cat /etc/passwd | grep 'alain' - /etc/motd
-@end example
-
-@item
-@cindex palindromes
-How to express palindromes in a regular expression?
-
-It can be done by using the back referecences, for example a palindrome
-of 4 chararcters can be written in BRE.
-
-@example
-grep -w -e '\(.\)\(.\).\2\1' file
-@end example
-
-It matches the word "radar" or "civic".
-
-Guglielmo Bondioni proposed a single RE that finds all the palindromes up to 19
-characters long.
-
-@example
-egrep -e '^(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?).?\9\8\7\6\5\4\3\2\1$' file
-@end example
-
-Note this is done by using GNU ERE extensions, it might not be portable on
-other greps.
-
-@item
-Why are my expressions whith the vertical bar fail?
-
-@example
-/bin/echo "ba" | egrep '(a)\1|(b)\1'
-@end example
-
-The first alternate branch fails then the first group was not in the match
-this will make the second alternate branch fails.  For example, "aaba" will
-match, the first group participate in the match and can be reuse in the
-second branch.
-
-@item
-What do @command{grep, fgrep, egrep} stand for ?
-
-grep comes from the way line editing was done on Unix.  For example,
-@command{ed} uses this syntax to print a list of matching lines on the screen.
-
-@example
-global/regular expression/print
-g/re/p
-@end example
-
-@command{fgrep} stands for Fixed @command{grep}, @command{egrep} Extended
-@command{grep}.
-
-@end enumerate
-
-@node Reporting Bugs, Copying, Usage, Top
-@chapter Reporting bugs
-
-@cindex Bugs, reporting
-Email bug reports to @email{bug-gnu-utils@@gnu.org}.
-Be sure to include the word ``grep'' somewhere in the ``Subject:'' field.
-
-Large repetition counts in the @samp{@{n,m@}} construct may cause
-@command{grep} to use lots of memory.  In addition, certain other
-obscure regular expressions require exponential time and
-space, and may cause grep to run out of memory.
-Back-references are very slow, and may require exponential time.
-
-@node Copying, GNU General Public License, Reporting Bugs, Top
-@chapter Copying
-@cindex Copying
-GNU grep is licensed under the GNU GPL, which makes it @dfn{free
-software}.
-
-Please note that ``free'' in ``free software'' refers to liberty, not
-price.  As some GNU project advocates like to point out, think of ``free
-speech'' rather than ``free beer''.  The exact and legally binding
-distribution terms are spelled out below; in short, you have the right
-(freedom) to run and change grep and distribute it to other people, and
-even---if you want---charge money for doing either.  The important
-restriction is that you have to grant your recipients the same rights
-and impose the same restrictions.
-
-This method of licensing software is also known as @dfn{open source}
-because, among other things, it makes sure that all recipients will
-receive the source code along with the program, and be able to improve
-it.  The GNU project prefers the term ``free software'' for reasons
-outlined at
-@url{http://www.gnu.org/philosophy/free-software-for-freedom.html}.
-
-The exact license terms are defined by this paragraph and the GNU
-General Public License it refers to:
-
-@quotation
-GNU grep is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-GNU grep is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License is included as part of this
-manual; if you did not receive it, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-@end quotation
-
-In addition to this, this manual is free in the same sense:
-
-@quotation
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``GNU General Public License'' and ``GNU Free
-Documentation License'', with no Front-Cover Texts, and with no
-Back-Cover Texts.  A copy of the license is included in the section
-entitled ``GNU Free Documentation License''.
-@end quotation
-
-@c #### Maybe we should wrap these licenses in ifinfo?  Stallman says
-@c that the GFDL needs to be present in the manual, and to me it would
-@c suck to include the license for the manual and not the license for
-@c the program.
-
-The full texts of the GNU General Public License and of the GNU Free
-Documentation License are available below.
-
-@menu
-* GNU General Public License:: GNU GPL
-* GNU Free Documentation License:: GNU FDL
-@end menu
-
-@node GNU General Public License, GNU Free Documentation License, Copying, Copying
-@section GNU General Public License
-@center Version 2, June 1991
-@cindex GPL, GNU General Public License
-
-@display
-Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
-675 Mass Ave, Cambridge, MA 02139, USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-@end display
-
-@unnumberedsec Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software---to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-@iftex
-@unnumberedsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-@end iftex
-@ifinfo
-@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-@end ifinfo
-
-@enumerate
-@item
-This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The ``Program'', below,
-refers to any such program or work, and a ``work based on the Program''
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term ``modification''.)  Each licensee is addressed as ``you''.
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-@item
-You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-@item
-You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-@enumerate a
-@item
-You must cause the modified files to carry prominent notices
-stating that you changed the files and the date of any change.
-
-@item
-You must cause any work that you distribute or publish, that in
-whole or in part contains or is derived from the Program or any
-part thereof, to be licensed as a whole at no charge to all third
-parties under the terms of this License.
-
-@item
-If the modified program normally reads commands interactively
-when run, you must cause it, when started running for such
-interactive use in the most ordinary way, to print or display an
-announcement including an appropriate copyright notice and a
-notice that there is no warranty (or else, saying that you provide
-a warranty) and that users may redistribute the program under
-these conditions, and telling the user how to view a copy of this
-License.  (Exception: if the Program itself is interactive but
-does not normally print such an announcement, your work based on
-the Program is not required to print an announcement.)
-@end enumerate
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-@item
-You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-@enumerate a
-@item
-Accompany it with the complete corresponding machine-readable
-source code, which must be distributed under the terms of Sections
-1 and 2 above on a medium customarily used for software interchange; or,
-
-@item
-Accompany it with a written offer, valid for at least three
-years, to give any third party, for a charge no more than your
-cost of physically performing source distribution, a complete
-machine-readable copy of the corresponding source code, to be
-distributed under the terms of Sections 1 and 2 above on a medium
-customarily used for software interchange; or,
-
-@item
-Accompany it with the information you received as to the offer
-to distribute corresponding source code.  (This alternative is
-allowed only for noncommercial distribution and only if you
-received the program in object code or executable form with such
-an offer, in accord with Subsection b above.)
-@end enumerate
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-@item
-You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-@item
-You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-@item
-Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-@item
-If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-@item
-If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-@item
-The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and ``any
-later version'', you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-@item
-If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-@iftex
-@heading NO WARRANTY
-@end iftex
-@ifinfo
-@center NO WARRANTY
-@end ifinfo
-@cindex no warranty
-
-@item
-BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM ``AS IS'' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-@item
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-@end enumerate
-
-@iftex
-@heading END OF TERMS AND CONDITIONS
-@end iftex
-@ifinfo
-@center END OF TERMS AND CONDITIONS
-@end ifinfo
-
-@page
-@unnumberedsec How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the ``copyright'' line and a pointer to where the full notice is found.
-
-@smallexample
-@var{one line to give the program's name and an idea of what it does.}
-Copyright (C) 19@var{yy}  @var{name of author}
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-@end smallexample
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-@smallexample
-Gnomovision version 69, Copyright (C) 19@var{yy} @var{name of author}
-Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
-type `show w'.  This is free software, and you are welcome
-to redistribute it under certain conditions; type `show c'
-for details.
-@end smallexample
-
-The hypothetical commands @samp{show w} and @samp{show c} should show
-the appropriate parts of the General Public License.  Of course, the
-commands you use may be called something other than @samp{show w} and
-@samp{show c}; they could even be mouse-clicks or menu items---whatever
-suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a ``copyright disclaimer'' for the program, if
-necessary.  Here is a sample; alter the names:
-
-@smallexample
-@group
-Yoyodyne, Inc., hereby disclaims all copyright
-interest in the program `Gnomovision'
-(which makes passes at compilers) written
-by James Hacker.
-
-@var{signature of Ty Coon}, 1 April 1989
-Ty Coon, President of Vice
-@end group
-@end smallexample
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-
-@node GNU Free Documentation License, Concept Index, GNU General Public License, Copying
-@section GNU Free Documentation License
-@center Version 1.1, March 2000
-@cindex FDL, GNU Free Documentation License
-
-@display
-Copyright (C) 2000  Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-@end display
-@sp 1
-@enumerate 0
-@item
-PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-written document ``free'' in the sense of freedom: to assure everyone
-the effective freedom to copy and redistribute it, with or without
-modifying it, either commercially or noncommercially.  Secondarily,
-this License preserves for the author and publisher a way to get
-credit for their work, while not being considered responsible for
-modifications made by others.
-
-This License is a kind of ``copyleft'', which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-@sp 1
-@item
-APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work that contains a
-notice placed by the copyright holder saying it can be distributed
-under the terms of this License.  The ``Document'', below, refers to any
-such manual or work.  Any member of the public is a licensee, and is
-addressed as ``you''.
-
-A ``Modified Version'' of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A ``Secondary Section'' is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject.  (For example, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The ``Invariant Sections'' are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.
-
-The ``Cover Texts'' are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.
-
-A ``Transparent'' copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, whose contents can be viewed and edited directly and
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup has been designed to thwart or discourage
-subsequent modification by readers is not Transparent.  A copy that is
-not ``Transparent'' is called ``Opaque''.
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML
-or XML using a publicly available DTD, and standard-conforming simple
-HTML designed for human modification.  Opaque formats include
-PostScript, PDF, proprietary formats that can be read and edited only
-by proprietary word processors, SGML or XML for which the DTD and/or
-processing tools are not generally available, and the
-machine-generated HTML produced by some word processors for output
-purposes only.
-
-The ``Title Page'' means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, ``Title Page'' means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-@sp 1
-@item
-VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-@sp 1
-@item
-COPYING IN QUANTITY
-
-If you publish printed copies of the Document numbering more than 100,
-and the Document's license notice requires Cover Texts, you must enclose
-the copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a publicly-accessible computer-network location containing a complete
-Transparent copy of the Document, free of added material, which the
-general network-using public has access to download anonymously at no
-charge using public-standard network protocols.  If you use the latter
-option, you must take reasonably prudent steps, when you begin
-distribution of Opaque copies in quantity, to ensure that this
-Transparent copy will remain thus accessible at the stated location
-until at least one year after the last time you distribute an Opaque
-copy (directly or through your agents or retailers) of that edition to
-the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
-@sp 1
-@item
-MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-A. Use in the Title Page (and on the covers, if any) a title distinct
-   from that of the Document, and from those of previous versions
-   (which should, if there were any, be listed in the History section
-   of the Document).  You may use the same title as a previous version
-   if the original publisher of that version gives permission.@*
-B. List on the Title Page, as authors, one or more persons or entities
-   responsible for authorship of the modifications in the Modified
-   Version, together with at least five of the principal authors of the
-   Document (all of its principal authors, if it has less than five).@*
-C. State on the Title page the name of the publisher of the
-   Modified Version, as the publisher.@*
-D. Preserve all the copyright notices of the Document.@*
-E. Add an appropriate copyright notice for your modifications
-   adjacent to the other copyright notices.@*
-F. Include, immediately after the copyright notices, a license notice
-   giving the public permission to use the Modified Version under the
-   terms of this License, in the form shown in the Addendum below.@*
-G. Preserve in that license notice the full lists of Invariant Sections
-   and required Cover Texts given in the Document's license notice.@*
-H. Include an unaltered copy of this License.@*
-I. Preserve the section entitled ``History'', and its title, and add to
-   it an item stating at least the title, year, new authors, and
-   publisher of the Modified Version as given on the Title Page.  If
-   there is no section entitled ``History'' in the Document, create one
-   stating the title, year, authors, and publisher of the Document as
-   given on its Title Page, then add an item describing the Modified
-   Version as stated in the previous sentence.@*
-J. Preserve the network location, if any, given in the Document for
-   public access to a Transparent copy of the Document, and likewise
-   the network locations given in the Document for previous versions
-   it was based on.  These may be placed in the ``History'' section.
-   You may omit a network location for a work that was published at
-   least four years before the Document itself, or if the original
-   publisher of the version it refers to gives permission.@*
-K. In any section entitled ``Acknowledgements'' or ``Dedications'',
-   preserve the section's title, and preserve in the section all the
-   substance and tone of each of the contributor acknowledgements
-   and/or dedications given therein.@*
-L. Preserve all the Invariant Sections of the Document,
-   unaltered in their text and in their titles.  Section numbers
-   or the equivalent are not considered part of the section titles.@*
-M. Delete any section entitled ``Endorsements''.  Such a section
-   may not be included in the Modified Version.@*
-N. Do not retitle any existing section as ``Endorsements''
-   or to conflict in title with any Invariant Section.@*
-@sp 1
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section entitled ``Endorsements'', provided it contains
-nothing but endorsements of your Modified Version by various
-parties--for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-@sp 1
-@item
-COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections entitled ``History''
-in the various original documents, forming one section entitled
-``History''; likewise combine any sections entitled ``Acknowledgements'',
-and any sections entitled ``Dedications''.  You must delete all sections
-entitled ``Endorsements.''
-@sp 1
-@item
-COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-@sp 1
-@item
-AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, does not as a whole count as a Modified Version
-of the Document, provided no compilation copyright is claimed for the
-compilation.  Such a compilation is called an ``aggregate'', and this
-License does not apply to the other self-contained works thus compiled
-with the Document, on account of their being thus compiled, if they
-are not themselves derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one quarter
-of the entire aggregate, the Document's Cover Texts may be placed on
-covers that surround only the Document within the aggregate.
-Otherwise they must appear on covers around the whole aggregate.
-@sp 1
-@item
-TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License provided that you also include the
-original English version of this License.  In case of a disagreement
-between the translation and the original English version of this
-License, the original English version will prevail.
-@sp 1
-@item
-TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License.  Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License.  However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
-@sp 1
-@item
-FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License ``or any later version'' applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
-
-@end enumerate
-
-@unnumberedsec ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-@smallexample
-@group
-
-  Copyright (C)  @var{year}  @var{your name}.
-  Permission is granted to copy, distribute and/or modify this document
-  under the terms of the GNU Free Documentation License, Version 1.1
-  or any later version published by the Free Software Foundation;
-  with the Invariant Sections being @var{list their titles}, with the
-  Front-Cover Texts being @var{list}, and with the Back-Cover Texts being @var{list}.
-  A copy of the license is included in the section entitled ``GNU
-  Free Documentation License''.
-@end group
-@end smallexample
-If you have no Invariant Sections, write ``with no Invariant Sections''
-instead of saying which ones are invariant.  If you have no
-Front-Cover Texts, write ``no Front-Cover Texts'' instead of
-``Front-Cover Texts being @var{list}''; likewise for Back-Cover Texts.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
-
-@page
-@node Concept Index, Index, GNU Free Documentation License, Top
-@unnumbered Concept Index
-
-This is a general index of all issues discussed in this manual, with the
-exception of the @command{grep} commands and command-line options.
-
-@printindex cp
-
-@page
-@node Index,, Concept Index, Top
-@unnumbered Index
-
-This is an alphabetical list of all @command{grep} commands, command-line
-options, and environment variables.
-
-@printindex fn
-
-@contents
-@bye

Property changes on: head/gnu/usr.bin/grep/doc/grep.texi
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/grep/doc/Makefile
===================================================================
--- head/gnu/usr.bin/grep/doc/Makefile	(revision 276550)
+++ head/gnu/usr.bin/grep/doc/Makefile	(nonexistent)
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-INFO=		grep
-INFOSECTION=	"System Utilities"
-
-.include <bsd.info.mk>

Property changes on: head/gnu/usr.bin/grep/doc/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/grep/doc/version.texi
===================================================================
--- head/gnu/usr.bin/grep/doc/version.texi	(revision 276550)
+++ head/gnu/usr.bin/grep/doc/version.texi	(nonexistent)
@@ -1,4 +0,0 @@
-@set UPDATED 23 January 2002
-@set UPDATED-MONTH January 2002
-@set EDITION 2.5.1
-@set VERSION 2.5.1

Property changes on: head/gnu/usr.bin/grep/doc/version.texi
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/grep/Makefile
===================================================================
--- head/gnu/usr.bin/grep/Makefile	(revision 276550)
+++ head/gnu/usr.bin/grep/Makefile	(revision 276551)
@@ -1,71 +1,69 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 GREP_LIBZ=YES
 
 .if ${MK_BSD_GREP} != "yes"
 PROG=	grep
 .else
 PROG=	gnugrep
 .endif
 SRCS=	closeout.c dfa.c error.c exclude.c grep.c grepmat.c hard-locale.c \
 	isdir.c kwset.c obstack.c quotearg.c savedir.c search.c xmalloc.c \
 	xstrtoumax.c
 CLEANFILES+=	gnugrep.1
 
 CFLAGS+=-I${.CURDIR} -I${DESTDIR}/usr/include/gnu -DHAVE_CONFIG_H
 
 .if ${MK_BSD_GREP} != "yes"
 LINKS+=	${BINDIR}/grep ${BINDIR}/egrep \
 	${BINDIR}/grep ${BINDIR}/fgrep
 MLINKS=	grep.1 egrep.1 grep.1 fgrep.1
 .endif
 
 LIBADD=	gnuregex bz2
 
 .if ${MK_BSD_GREP} != "yes"
 LINKS+=	${BINDIR}/grep ${BINDIR}/bzgrep \
 	${BINDIR}/grep ${BINDIR}/bzegrep \
 	${BINDIR}/grep ${BINDIR}/bzfgrep
 MLINKS+=grep.1 bzgrep.1 grep.1 bzegrep.1 grep.1 bzfgrep.1
 .endif
 
 .if defined(GREP_LIBZ) && !empty(GREP_LIBZ)
 LIBADD+=	z
 CFLAGS+=-DHAVE_LIBZ=1
 .if ${MK_BSD_GREP} != "yes"
 LINKS+=	${BINDIR}/grep ${BINDIR}/zgrep \
 	${BINDIR}/grep ${BINDIR}/zegrep \
 	${BINDIR}/grep ${BINDIR}/zfgrep
 MLINKS+=grep.1 zgrep.1 grep.1 zegrep.1 grep.1 zfgrep.1
 .endif
 .endif
 
 gnugrep.1: grep.1
 	cp ${.ALLSRC} ${.TARGET}
 
-SUBDIR+=doc
-
 check:	all
 	@failed=0; total=0; \
 	for tst in ${TESTS}; do \
 		total=$$(($$total+1)); \
 		if GREP=${.OBJDIR}/${PROG} srcdir=${.CURDIR}/tests \
 		   ${.CURDIR}/tests/$$tst; then \
 			echo "PASS: $$tst"; \
 		else \
 			failed=$$(($$failed+1)); \
 			echo "FAIL: $$tst"; \
 		fi; \
 	done; \
 	if [ "$$failed" -eq 0 ]; then \
 		echo "All $$total tests passed"; \
 	else \
 		echo "$$failed of $$total tests failed"; \
 	fi
 
 TESTS=	warning.sh khadafy.sh spencer1.sh bre.sh ere.sh status.sh empty.sh \
 	options.sh backref.sh file.sh
 
 .include <bsd.prog.mk>
Index: head/gnu/usr.bin/groff/doc/Makefile
===================================================================
--- head/gnu/usr.bin/groff/doc/Makefile	(revision 276550)
+++ head/gnu/usr.bin/groff/doc/Makefile	(nonexistent)
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-INFO=	groff
-SRCDIR=	${DIST_DIR}
-
-.include <bsd.info.mk>

Property changes on: head/gnu/usr.bin/groff/doc/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/gnu/usr.bin/groff/Makefile
===================================================================
--- head/gnu/usr.bin/groff/Makefile	(revision 276550)
+++ head/gnu/usr.bin/groff/Makefile	(revision 276551)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-SUBDIR=		contrib doc font man src tmac
+SUBDIR=		contrib font man src tmac
 
 .for subdir in ${SUBDIR:Nsrc}
 SUBDIR_DEPEND_${subdir}=	src
 .endfor
 
 .include <bsd.subdir.mk>
Index: head/kerberos5/doc/Makefile
===================================================================
--- head/kerberos5/doc/Makefile	(revision 276550)
+++ head/kerberos5/doc/Makefile	(nonexistent)
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-INFO=	heimdal
-SRCDIR=	${.CURDIR}/../../crypto/heimdal/doc
-
-.include <bsd.info.mk>

Property changes on: head/kerberos5/doc/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/kerberos5/Makefile
===================================================================
--- head/kerberos5/Makefile	(revision 276550)
+++ head/kerberos5/Makefile	(revision 276551)
@@ -1,31 +1,31 @@
 # $FreeBSD$
 
-SUBDIR=	doc lib libexec tools usr.bin usr.sbin
+SUBDIR=	lib libexec tools usr.bin usr.sbin
 
 # These are the programs which depend on Kerberos.
 KPROGS=	lib/libpam \
 	secure/lib/libssh secure/usr.bin/ssh secure/usr.sbin/sshd
 
 # This target is used to rebuild these programs WITH Kerberos.
 kerberize:
 .for entry in ${KPROGS}
 	cd ${.CURDIR}/../${entry}; \
 	${MAKE} cleandir; \
 	${MAKE} obj; \
 	${MAKE} depend; \
 	${MAKE} all; \
 	${MAKE} install
 .endfor
 
 # This target is used to rebuild these programs WITHOUT Kerberos.
 dekerberize:
 .for entry in ${KPROGS}
 	cd ${.CURDIR}/../${entry}; \
 	${MAKE} MK_KERBEROS=no cleandir; \
 	${MAKE} MK_KERBEROS=no obj; \
 	${MAKE} MK_KERBEROS=no depend; \
 	${MAKE} MK_KERBEROS=no all; \
 	${MAKE} MK_KERBEROS=no install
 .endfor
 
 .include <bsd.subdir.mk>
Index: head/lib/libcom_err/doc/com_err.texinfo
===================================================================
--- head/lib/libcom_err/doc/com_err.texinfo	(revision 276550)
+++ head/lib/libcom_err/doc/com_err.texinfo	(nonexistent)
@@ -1,615 +0,0 @@
-\input texinfo @c -*-texinfo-*-
-
-@c $FreeBSD$
-
-@c Note that although this source file is in texinfo format (more
-@c or less), it is not yet suitable for turning into an ``info''
-@c file.  Sorry, maybe next time.
-@c
-@c In order to produce hardcopy documentation from a texinfo file,
-@c run ``tex com_err.texinfo'' which will load in texinfo.tex,
-@c provided in this distribution.  (texinfo.tex is from the Free
-@c Software Foundation, and is under different copyright restrictions
-@c from the rest of this package.)
-
-@ifinfo
-@barfo
-@end ifinfo
-
-@iftex
-@tolerance 10000
-
-@c Mutate section headers...
-@begingroup
-  @catcode#=6
-  @gdef@secheading#1#2#3{@secheadingi {#3@enspace #1}}
-@endgroup
-@end iftex
-
-@c %**start of header (This is for running Texinfo on a region.)
-@setfilename com_err
-@settitle A Common Error Description Library for UNIX
-@c %**end of header (This is for running Texinfo on a region.)
-
-@ifinfo
-This file documents the use of the Common Error Description library.
-
-Copyright (C) 1987, 1988 Student Information Processing Board of the
-Massachusetts Institute of Technology.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, 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 names of M.I.T. and the M.I.T. S.I.P.B. not be
-used in advertising or publicity pertaining to distribution of the software
-without specific, written prior permission.  M.I.T. and the M.I.T. S.I.P.B.
-make no representations about the suitability of this software for any
-purpose.  It is provided "as is" without express or implied warranty.
-
-Note that the file texinfo.tex, provided with this distribution, is from
-the Free Software Foundation, and is under different copyright restrictions
-from the remainder of this package.
-
-@end ifinfo
-
-@ignore
-Permission is granted to process this file through Tex and print the
-results, provided the printed document carries copying permission
-notice identical to this one except for the removal of this paragraph
-(this paragraph not being relevant to the printed manual).
-
-@end ignore
-
-@setchapternewpage odd
-
-@titlepage
-@center @titlefont{A Common Error Description}
-@center @titlefont{Library for UNIX}
-@sp 2
-@center Ken Raeburn
-@center Bill Sommerfeld
-@sp 1
-@center MIT Student Information Processing Board
-@sp 3
-@center last updated 1 January 1989
-@center for version 1.2
-@center ***DRAFT COPY ONLY***
-
-@vskip 2in
-
-@center @b{Abstract}
-
-UNIX has always had a clean and simple system call interface, with a
-standard set of error codes passed between the kernel and user
-programs.  Unfortunately, the same cannot be said of many of the
-libraries layered on top of the primitives provided by the kernel.
-Typically, each one has used a different style of indicating errors to
-their callers, leading to a total hodgepodge of error handling, and
-considerable amounts of work for the programmer.  This paper describes
-a library and associated utilities which allows a more uniform way for
-libraries to return errors to their callers, and for programs to
-describe errors and exceptional conditions to their users.
-
-@page
-@vskip 0pt plus 1filll
-
-Copyright @copyright{} 1987, 1988 by the Student Information Processing
-Board of the Massachusetts Institute of Technology.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, 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 names of M.I.T. and the M.I.T. S.I.P.B. not be
-used in advertising or publicity pertaining to distribution of the software
-without specific, written prior permission.  M.I.T. and the M.I.T. S.I.P.B.
-make no representations about the suitability of this software for any
-purpose.  It is provided "as is" without express or implied warranty.
-
-Note that the file texinfo.tex, provided with this distribution, is from
-the Free Software Foundation, and is under different copyright restrictions
-from the remainder of this package.
-
-@end titlepage
-
-@ifinfo
-@node Top, Why com_err?, (dir), (dir)
-@comment  node-name,  next,  previous,  up
-@top General Introduction
-
-@menu
-* Why com_err?::                What is all this for?
-* Error codes::                 What's an error code, anyway?
-* Error table source file::     How to describe an error table.
-* The error-table compiler::    How to compile the table.
-* Run-time support routines::   How to use from within your program.
-* Coding Conventions::          Stylistic issues.
-* Building and Installation::   How to build and install.
-* Bug Reports::                 You have found a bug?  Report it.
-* Acknowledgements::            Whom to thank...
-
-@end menu
-
-@end ifinfo
-
-@page
-
-@ifinfo
-@node Why com_err?, Error codes, Top, (dir)
-@comment  node-name,  next,  previous,  up
-@end ifinfo
-
-@section Why com_err?
-
-In building application software packages, a programmer often has to
-deal with a number of libraries, each of which can use a different
-error-reporting mechanism.  Sometimes one of two values is returned,
-indicating simply SUCCESS or FAILURE, with no description of errors
-encountered.  Sometimes it is an index into a table of text strings,
-where the name of the table used is dependent on the library being
-used when the error is generated; since each table starts numbering at
-0 or 1, additional information as to the source of the error code is
-needed to determine which table to look at.  Sometimes no text messages are
-supplied at all, and the programmer must supply them at any point at which
-he may wish to report error conditions.
-Often, a global variable is assigned some value describing the error, but
-the programmer has to know in each case whether to look at @code{errno},
-@code{h_errno}, the return value from @code{hes_err()}, or whatever other
-variables or routines are specified.
-And what happens if something
-in the procedure of
-examining or reporting the error changes the same variable?
-
-The package we have developed is an attempt to present a common
-error-handling mechanism to manipulate the most common form of error code
-in a fashion that does not have the problems listed above.
-
-A list of up to 256 text messages is supplied to a translator we have
-written, along with the three- to four-character ``name'' of the error
-table.  The library using this error table need only call a routine
-generated from this error-table source to make the table ``known'' to the
-com_err library, and any error code the library generates can be converted
-to the corresponding error message.  There is also a default format for
-error codes accidentally returned before making the table known, which is
-of the form @samp{unknown code foo 32}, where @samp{foo} would be the name
-of the table.
-
-@ifinfo
-@node Error codes, Error table source file, Why com_err?, (dir)
-@comment  node-name,  next,  previous,  up
-@end ifinfo
-
-@section Error codes
-
-Error codes themselves are 32 bit (signed) integers, of which the high
-order 24 bits are an identifier of which error table the error code is
-from, and the low order 8 bits are a sequential error number within
-the table.  An error code may thus be easily decomposed into its component
-parts.  Only the lowest 32 bits of an error code are considered significant
-on systems which support wider values.
-
-Error table 0 is defined to match the UNIX system call error table
-(@code{sys_errlist}); this allows @code{errno} values to be used directly
-in the library (assuming that @code{errno} is of a type with the same width
-as @t{long}).  Other error table numbers are formed by compacting together
-the first four characters of the error table name.  The mapping between
-characters in the name and numeric values in the error code are defined in
-a system-independent fashion, so that two systems that can pass integral
-values between them can reliably pass error codes without loss of meaning;
-this should work even if the character sets used are not the same.
-(However, if this is to be done, error table 0 should be avoided, since the
-local system call error tables may differ.)
-
-Any variable which is to contain an error code should be declared @t{long}.
-The draft proposed American National Standard for C (as of May, 1988)
-requires that @t{long} variables be at least 32 bits; any system which does
-not support 32-bit @t{long} values cannot make use of this package (nor
-much other software that assumes an ANSI-C environment base) without
-significant effort.
-
-@ifinfo
-@node Error table source file, The error-table compiler, Error codes, (dir)
-@comment  node-name,  next,  previous,  up
-@end ifinfo
-
-@section Error table source file
-
-The error table source file begins with the declaration of the table name,
-as
-
-@example
-error_table @var{tablename}
-@end example
-
-Individual error codes are
-specified with
-
-@example
-error_code @var{ERROR_NAME}, @var{"text message"}
-@end example
-
-where @samp{ec} can also be used as a short form of @samp{error_code}.  To
-indicate the end of the table, use @samp{end}.  Thus, a (short) sample
-error table might be:
-
-@example
-
-        error_table     dsc
-
-        error_code      DSC_DUP_MTG_NAME,
-                        "Meeting already exists"
-
-        ec              DSC_BAD_PATH,
-                        "A bad meeting pathname was given"
-
-        ec              DSC_BAD_MODES,
-                        "Invalid mode for this access control list"
-
-        end
-
-@end example
-
-@ifinfo
-@node The error-table compiler, Run-time support routines, Error table source file, (dir)
-@comment  node-name,  next,  previous,  up
-@end ifinfo
-
-@section The error-table compiler
-
-The error table compiler is named @code{compile_et}.  It takes one
-argument, the pathname of a file (ending in @samp{.et}, e.g.,
-@samp{dsc_err.et}) containing an error table source file.  It parses the
-error table, and generates two output files -- a C header file
-(@samp{discuss_err.h}) which contains definitions of the numerical values
-of the error codes defined in the error table, and a C source file which
-should be compiled and linked with the executable.  The header file must be
-included in the source of a module which wishes to reference the error
-codes defined; the object module generated from the C code may be linked in
-to a program which wishes to use the printed forms of the error codes.
-
-This translator accepts a @kbd{-language @var{lang}} argument, which
-determines for which language (or language variant) the output should be
-written.  At the moment, @var{lang} is currently limited to @kbd{ANSI-C}
-and @kbd{K&R-C}, and some abbreviated forms of each.  Eventually, this will
-be extended to include some support for C++.  The default is currently
-@kbd{K&R-C}, though the generated sources will have ANSI-C code
-conditionalized on the symbol @t{__STDC__}.
-
-@ifinfo
-@node Run-time support routines, Coding Conventions, The error-table compiler, (dir)
-@comment  node-name,  next,  previous,  up
-@end ifinfo
-
-@section Run-time support routines
-
-Any source file which uses the routines supplied with or produced by the
-com_err package should include the header file @file{<com_err.h>}.  It
-contains declarations and definitions which may be needed on some systems.
-(Some functions cannot be referenced properly without the return type
-declarations in this file.  Some functions may work properly on most
-architectures even without the header file, but relying on this is not
-recommended.)
-
-The run-time support routines and variables provided via this package
-include the following:
-
-@example
-void initialize_@var{xxxx}_error_table (void);
-@end example
-
-One of these routines is built by the error compiler for each error table.
-It makes the @var{xxxx} error table ``known'' to the error reporting
-system.  By convention, this routine should be called in the initialization
-routine of the @var{xxxx} library.  If the library has no initialization
-routine, some combination of routines which form the core of the library
-should ensure that this routine is called.  It is not advised to leave it
-the caller to make this call.
-
-There is no harm in calling this routine more than once.
-
-@example
-#define ERROR_TABLE_BASE_@var{xxxx} @var{nnnnn}L
-@end example
-
-This symbol contains the value of the first error code entry in the
-specified table.
-This rarely needs be used by the
-programmer.
-
-@example
-const char *error_message (long code);
-@end example
-
-This routine returns the character string error message associated
-with @code{code}; if this is associated with an unknown error table, or
-if the code is associated with a known error table but the code is not
-in the table, a string of the form @samp{Unknown code @var{xxxx nn}} is
-returned, where @var{xxxx} is the error table name produced by
-reversing the compaction performed on the error table number implied
-by that error code, and @var{nn} is the offset from that base value.
-
-Although this routine is available for use when needed, its use should be
-left to circumstances which render @code{com_err} (below) unusable.
-
-@example
-void com_err (const char *whoami,  /* module reporting error */
-              long code,           /* error code */
-              const char *format,  /* format for additional detail */
-              ...);                /*  (extra parameters) */
-@end example
-
-This routine provides an alternate way to print error messages to
-standard error; it allows the error message to be passed in as a
-parameter, rather than in an external variable.  @emph{Provide grammatical
-context for ``message.''}
-
-If @var{format} is @code{(char *)NULL}, the formatted message will not be
-printed.  @var{format} may not be omitted.
-
-@example
-#include <stdarg.h>
-
-void com_err_va (const char *whoami,
-                 long code,
-                 const char *format,
-                 va_list args);
-@end example
-
-This routine provides an interface, equivalent to @code{com_err} above,
-which may be used by higher-level variadic functions (functions which
-accept variable numbers of arguments).
-
-@example
-#include <stdarg.h>
-
-void (*set_com_err_hook (void (*proc) ())) ();
-
-void (*@var{proc}) (const char *whoami, long code, va_list args);
-
-void reset_com_err_hook ();
-@end example
-
-These two routines allow a routine to be dynamically substituted for
-@samp{com_err}.  After @samp{set_com_err_hook} has been called,
-calls to @samp{com_err} will turn into calls to the new hook routine.
-@samp{reset_com_err_hook} turns off this hook.  This may intended to
-be used in daemons (to use a routine which calls @var{syslog(3)}), or
-in a window system application (which could pop up a dialogue box).
-
-If a program is to be used in an environment in which simply printing
-messages to the @code{stderr} stream would be inappropriate (such as in a
-daemon program which runs without a terminal attached),
-@code{set_com_err_hook} may be used to redirect output from @code{com_err}.
-The following is an example of an error handler which uses @var{syslog(3)}
-as supplied in BSD 4.3:
-
-@example
-#include <stdio.h>
-#include <stdarg.h>
-#include <syslog.h>
-
-/* extern openlog (const char * name, int logopt, int facility); */
-/* extern syslog (int priority, char * message, ...); */
-
-void hook (const char * whoami, long code,
-           const char * format, va_list args)
-@{
-    char buffer[BUFSIZ];
-    static int initialized = 0;
-    if (!initialized) @{
-        openlog (whoami,
-                 LOG_NOWAIT|LOG_CONS|LOG_PID|LOG_NDELAY,
-                 LOG_DAEMON);
-        initialized = 1;
-    @}
-    vsprintf (buffer, format, args);
-    syslog (LOG_ERR, "%s %s", error_message (code), buffer);
-@}
-@end example
-
-After making the call
-@code{set_com_err_hook (hook);},
-any calls to @code{com_err} will result in messages being sent to the
-@var{syslogd} daemon for logging.
-The name of the program, @samp{whoami}, is supplied to the
-@samp{openlog()} call, and the message is formatted into a buffer and
-passed to @code{syslog}.
-
-Note that since the extra arguments to @code{com_err} are passed by
-reference via the @code{va_list} value @code{args}, the hook routine may
-place any form of interpretation on them, including ignoring them.  For
-consistency, @code{printf}-style interpretation is suggested, via
-@code{vsprintf} (or @code{_doprnt} on BSD systems without full support for
-the ANSI C library).
-
-@ifinfo
-@node Coding Conventions, Building and Installation, Run-time support routines, (dir)
-@comment  node-name,  next,  previous,  up
-@end ifinfo
-
-@section Coding Conventions
-
-The following conventions are just some general stylistic conventions
-to follow when writing robust libraries and programs.  Conventions
-similar to this are generally followed inside the UNIX kernel and most
-routines in the Multics operating system.  In general, a routine
-either succeeds (returning a zero error code, and doing some side
-effects in the process), or it fails, doing minimal side effects; in
-any event, any invariant which the library assumes must be maintained.
-
-In general, it is not in the domain of non user-interface library
-routines to write error messages to the user's terminal, or halt the
-process.  Such forms of ``error handling'' should be reserved for
-failures of internal invariants and consistancy checks only, as it
-provides the user of the library no way to clean up for himself in the
-event of total failure.
-
-Library routines which can fail should be set up to return an error
-code.  This should usually be done as the return value of the
-function; if this is not acceptable, the routine should return a
-``null'' value, and put the error code into a parameter passed by
-reference.
-
-Routines which use the first style of interface can be used from
-user-interface levels of a program as follows:
-
-@example
-@{
-    if ((code = initialize_world(getuid(), random())) != 0) @{
-        com_err("demo", code,
-                "when trying to initialize world");
-        exit(1);
-    @}
-    if ((database = open_database("my_secrets", &code))==NULL) @{
-        com_err("demo", code,
-                "while opening my_secrets");
-        exit(1);
-    @}
-@}
-@end example
-
-A caller which fails to check the return status is in error.  It is
-possible to look for code which ignores error returns by using lint;
-look for error messages of the form ``foobar returns value which is
-sometimes ignored'' or ``foobar returns value which is always
-ignored.''
-
-Since libraries may be built out of other libraries, it is often necessary
-for the success of one routine to depend on another.  When a lower level
-routine returns an error code, the middle level routine has a few possible
-options.  It can simply return the error code to its caller after doing
-some form of cleanup, it can substitute one of its own, or it can take
-corrective action of its own and continue normally.  For instance, a
-library routine which makes a ``connect'' system call to make a network
-connection may reflect the system error code @code{ECONNREFUSED}
-(Connection refused) to its caller, or it may return a ``server not
-available, try again later,'' or it may try a different server.
-
-Cleanup which is typically necessary may include, but not be limited
-to, freeing allocated memory which will not be needed any more,
-unlocking concurrancy locks, dropping reference counts, closing file
-descriptors, or otherwise undoing anything which the procedure did up
-to this point.  When there are a lot of things which can go wrong, it
-is generally good to write one block of error-handling code which is
-branched to, using a goto, in the event of failure.  A common source
-of errors in UNIX programs is failing to close file descriptors on
-error returns; this leaves a number of ``zombied'' file descriptors
-open, which eventually causes the process to run out of file
-descriptors and fall over.
-
-@example
-@{
-    FILE *f1=NULL, *f2=NULL, *f3=NULL;
-    int status = 0;
-
-    if ( (f1 = fopen(FILE1, "r")) == NULL) @{
-        status = errno;
-        goto error;
-    @}
-
-    /*
-     * Crunch for a while
-     */
-
-    if ( (f2 = fopen(FILE2, "w")) == NULL) @{
-        status = errno;
-        goto error;
-    @}
-
-    if ( (f3 = fopen(FILE3, "a+")) == NULL) @{
-        status = errno;
-            goto error;
-    @}
-
-    /*
-     * Do more processing.
-     */
-    fclose(f1);
-    fclose(f2);
-    fclose(f3);
-    return 0;
-
-error:
-    if (f1) fclose(f1);
-    if (f2) fclose(f2);
-    if (f3) fclose(f3);
-    return status;
-@}
-@end example
-
-@ifinfo
-@node Building and Installation, Bug Reports, Coding Conventions, (dir)
-@comment  node-name,  next,  previous,  up
-@end ifinfo
-
-@section Building and Installation
-
-The distribution of this package will probably be done as a compressed
-``tar''-format file available via anonymous FTP from SIPB.MIT.EDU.
-Retrieve @samp{pub/com_err.tar.Z} and extract the contents.  A subdirectory
-@t{profiled} should be created to hold objects compiled for profiling.
-Running ``make all'' should then be sufficient to build the library and
-error-table compiler.  The files @samp{libcom_err.a},
-@samp{libcom_err_p.a}, @samp{com_err.h}, and @samp{compile_et} should be
-installed for use; @samp{com_err.3} and @samp{compile_et.1} can also be
-installed as manual pages.
-
-Potential problems:
-
-@itemize @bullet
-
-@item Use of @code{strcasecmp}, a routine provided in BSD for
-case-insensitive string comparisons.  If an equivalent routine is
-available, you can modify @code{CFLAGS} in the makefile to define
-@code{strcasecmp} to the name of that routine.
-
-@item Compilers that defined @code{__STDC__} without providing the header
-file @code{<stdarg.h>}.  One such example is Metaware's High ``C''
-compiler, as provided at Project Athena on the IBM RT/PC workstation; if
-@code{__HIGHC__} is defined, it is assumed that @code{<stdarg.h>} is not
-available, and therefore @code{<varargs.h>} must be used.  If the symbol
-@code{VARARGS} is defined (e.g., in the makefile), @code{<varargs.h>} will
-be used.
-
-@item If your linker rejects symbols that are simultaneously defined in two
-library files, edit @samp{Makefile} to remove @samp{perror.c} from the
-library.  This file contains a version of @var{perror(3)} which calls
-@code{com_err} instead of calling @code{write} directly.
-
-@end itemize
-
-As I do not have access to non-BSD systems, there are probably
-bugs present that may interfere with building or using this package on
-other systems.  If they are reported to me, they can probably be fixed for
-the next version.
-
-@ifinfo
-@node Bug Reports, Acknowledgements, Building and Installation, (dir)
-@comment  node-name,  next,  previous,  up
-@end ifinfo
-
-@section Bug Reports
-
-Please send any comments or bug reports to the principal author: Ken
-Raeburn, @t{Raeburn@@Athena.MIT.EDU}.
-
-@ifinfo
-@node Acknowledgements, , Bug Reports, (dir)
-@comment  node-name,  next,  previous,  up
-@end ifinfo
-
-@section Acknowledgements
-
-I would like to thank: Bill Sommerfeld, for his help with some of this
-documentation, and catching some of the bugs the first time around;
-Honeywell Information Systems, for not killing off the @emph{Multics}
-operating system before I had an opportunity to use it; Honeywell's
-customers, who persuaded them not to do so, for a while; Ted Anderson of
-CMU, for catching some problems before version 1.2 left the nest; Stan
-Zanarotti and several others of MIT's Student Information Processing Board,
-for getting us started with ``discuss,'' for which this package was
-originally written; and everyone I've talked into --- I mean, asked to read
-this document and the ``man'' pages.
-
-@bye

Property changes on: head/lib/libcom_err/doc/com_err.texinfo
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/lib/libcom_err/doc/Makefile
===================================================================
--- head/lib/libcom_err/doc/Makefile	(revision 276550)
+++ head/lib/libcom_err/doc/Makefile	(nonexistent)
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-INFO=	com_err
-INFOSECTION= "Programming & development tools."
-INFOENTRY_com_err= "* libcom_err: (com_err).        A Common Error Description Library for UNIX."
-
-.include <bsd.info.mk>

Property changes on: head/lib/libcom_err/doc/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/lib/libcom_err/Makefile
===================================================================
--- head/lib/libcom_err/Makefile	(revision 276550)
+++ head/lib/libcom_err/Makefile	(revision 276551)
@@ -1,17 +1,15 @@
 # $FreeBSD$
 
 LIB=	com_err
 SRCS=	com_err.c error.c
 INCS=	${COM_ERRDIR}/com_err.h ${COM_ERRDIR}/com_right.h
 MAN=	com_err.3
 COM_ERRDIR=	${.CURDIR}/../../contrib/com_err
 CFLAGS+=	-I${COM_ERRDIR}
 
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP=	${COM_ERRDIR}/version-script.map
 
-SUBDIR=	doc
-
 .include <bsd.lib.mk>
 
 .PATH:	${COM_ERRDIR}
Index: head/tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	(revision 276550)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	(revision 276551)
@@ -1,4773 +1,4739 @@
 #
 # $FreeBSD$
 #
 # This file add support for the WITHOUT_* and WITH_* knobs in src.conf(5) to
 # the check-old and delete-old* targets.
 #
 
 .if ${MK_ACCT} == no
 OLD_FILES+=etc/periodic/daily/310.accounting
 OLD_FILES+=usr/sbin/accton
 OLD_FILES+=usr/sbin/sa
 OLD_FILES+=usr/share/man/man8/accton.8.gz
 OLD_FILES+=usr/share/man/man8/sa.8.gz
 .endif
 
 .if ${MK_ACPI} == no
 OLD_FILES+=usr/sbin/acpiconf
 OLD_FILES+=usr/sbin/acpidb
 OLD_FILES+=usr/sbin/acpidump
 OLD_FILES+=usr/sbin/iasl
 OLD_FILES+=usr/share/man/man8/acpiconf.8.gz
 OLD_FILES+=usr/share/man/man8/acpidb.8.gz
 OLD_FILES+=usr/share/man/man8/acpidump.8.gz
 OLD_FILES+=usr/share/man/man8/iasl.8.gz
 .endif
 
 .if ${MK_AMD} == no
 OLD_FILES+=etc/amd.map
 OLD_FILES+=usr/bin/pawd
 OLD_FILES+=usr/sbin/amd
 OLD_FILES+=usr/sbin/amq
 OLD_FILES+=usr/sbin/fixmount
 OLD_FILES+=usr/sbin/fsinfo
 OLD_FILES+=usr/sbin/hlfsd
 OLD_FILES+=usr/sbin/mk-amd-map
 OLD_FILES+=usr/sbin/wire-test
 OLD_FILES+=usr/share/examples/etc/amd.map
 OLD_FILES+=usr/share/info/am-utils.info.gz
 OLD_FILES+=usr/share/man/man1/pawd.1.gz
 OLD_FILES+=usr/share/man/man5/amd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/amd.8.gz
 OLD_FILES+=usr/share/man/man8/amq.8.gz
 OLD_FILES+=usr/share/man/man8/fixmount.8.gz
 OLD_FILES+=usr/share/man/man8/fsinfo.8.gz
 OLD_FILES+=usr/share/man/man8/hlfsd.8.gz
 OLD_FILES+=usr/share/man/man8/mk-amd-map.8.gz
 OLD_FILES+=usr/share/man/man8/wire-test.8.gz
 .endif
 
 .if ${MK_APM} == no
 OLD_FILES+=etc/apmd.conf
 OLD_FILES+=usr/sbin/apm
 OLD_FILES+=usr/share/examples/etc/apmd.conf
 OLD_FILES+=usr/share/man/man8/amd64/apm.8.gz
 OLD_FILES+=usr/share/man/man8/amd64/apmconf.8.gz
 .endif
 
 .if ${MK_AT} == no
 OLD_FILES+=usr/bin/at
 OLD_FILES+=usr/bin/atq
 OLD_FILES+=usr/bin/atrm
 OLD_FILES+=usr/bin/batch
 OLD_FILES+=usr/libexec/atrun
 OLD_FILES+=usr/share/man/man1/at.1.gz
 OLD_FILES+=usr/share/man/man1/atq.1.gz
 OLD_FILES+=usr/share/man/man1/atrm.1.gz
 OLD_FILES+=usr/share/man/man1/batch.1.gz
 OLD_FILES+=usr/share/man/man8/atrun.8.gz
 .endif
 
 .if ${MK_ATM} == no
 OLD_FILES+=rescue/atmconfig
 OLD_FILES+=sbin/atmconfig
 OLD_FILES+=usr/bin/sscop
 OLD_FILES+=usr/include/bsnmp/snmp_atm.h
 OLD_FILES+=usr/include/netnatm/addr.h
 OLD_FILES+=usr/include/netnatm/api/atmapi.h
 OLD_FILES+=usr/include/netnatm/api/ccatm.h
 OLD_FILES+=usr/include/netnatm/api/unisap.h
 OLD_DIRS+=usr/include/netnatm/api
 OLD_FILES+=usr/include/netnatm/msg/uni_config.h
 OLD_FILES+=usr/include/netnatm/msg/uni_hdr.h
 OLD_FILES+=usr/include/netnatm/msg/uni_ie.h
 OLD_FILES+=usr/include/netnatm/msg/uni_msg.h
 OLD_FILES+=usr/include/netnatm/msg/unimsglib.h
 OLD_FILES+=usr/include/netnatm/msg/uniprint.h
 OLD_FILES+=usr/include/netnatm/msg/unistruct.h
 OLD_DIRS+=usr/include/netnatm/msg
 OLD_FILES+=usr/include/netnatm/saal/sscfu.h
 OLD_FILES+=usr/include/netnatm/saal/sscfudef.h
 OLD_FILES+=usr/include/netnatm/saal/sscop.h
 OLD_FILES+=usr/include/netnatm/saal/sscopdef.h
 OLD_DIRS+=usr/include/netnatm/saal
 OLD_FILES+=usr/include/netnatm/sig/uni.h
 OLD_FILES+=usr/include/netnatm/sig/unidef.h
 OLD_FILES+=usr/include/netnatm/sig/unisig.h
 OLD_DIRS+=usr/include/netnatm/sig
 OLD_FILES+=usr/include/netnatm/unimsg.h
 OLD_FILES+=usr/lib/libngatm.a
 OLD_FILES+=usr/lib/libngatm.so
 OLD_LIBS+=usr/lib/libngatm.so.4
 OLD_FILES+=usr/lib/libngatm_p.a
 OLD_FILES+=usr/lib/snmp_atm.so
 OLD_LIBS+=usr/lib/snmp_atm.so.6
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libngatm.a
 OLD_FILES+=usr/lib32/libngatm.so
 OLD_LIBS+=usr/lib32/libngatm.so.4
 OLD_FILES+=usr/lib32/libngatm_p.a
 .endif
 OLD_FILES+=usr/share/doc/atm/atmconfig.help
 OLD_FILES+=usr/share/doc/atm/atmconfig_device.help
 OLD_DIRS+=usr/share/doc/atm
 OLD_FILES+=usr/share/man/man1/sscop.1.gz
 OLD_FILES+=usr/share/man/man3/libngatm.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_atm.3.gz
 OLD_FILES+=usr/share/man/man3/uniaddr.3.gz
 OLD_FILES+=usr/share/man/man3/unifunc.3.gz
 OLD_FILES+=usr/share/man/man3/unimsg.3.gz
 OLD_FILES+=usr/share/man/man3/unisap.3.gz
 OLD_FILES+=usr/share/man/man3/unistruct.3.gz
 OLD_FILES+=usr/share/man/man8/atmconfig.8.gz
 OLD_FILES+=usr/share/snmp/defs/atm_freebsd.def
 OLD_FILES+=usr/share/snmp/defs/atm_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM-FREEBSD-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM.txt
 .endif
 
 .if ${MK_AUDIT} == no
 OLD_FILES+=usr/sbin/audit
 OLD_FILES+=usr/sbin/auditd
 OLD_FILES+=usr/sbin/auditreduce
 OLD_FILES+=usr/sbin/praudit
 OLD_FILES+=usr/share/man/man1/auditreduce.1.gz
 OLD_FILES+=usr/share/man/man1/praudit.1.gz
 OLD_FILES+=usr/share/man/man8/audit.8.gz
 OLD_FILES+=usr/share/man/man8/auditd.8.gz
 .endif
 
 .if ${MK_AUTHPF} == no
 OLD_FILES+=usr/sbin/authpf
 OLD_FILES+=usr/sbin/authpf-noip
 OLD_FILES+=usr/share/man/man8/authpf.8.gz
 OLD_FILES+=usr/share/man/man8/authpf-noip.8.gz
 .endif
 
 .if ${MK_BLUETOOTH} == no
 OLD_FILES+=etc/bluetooth/hcsecd.conf
 OLD_FILES+=etc/bluetooth/hosts
 OLD_FILES+=etc/bluetooth/protocols
 OLD_DIRS+=etc/bluetooth
 OLD_FILES+=usr/bin/bthost
 OLD_FILES+=usr/bin/btsockstat
 OLD_FILES+=usr/bin/rfcomm_sppd
 OLD_FILES+=usr/include/bluetooth.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_bluetooth.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_bt3c.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_l2cap.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_sco.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_h4.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_hci.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_l2cap.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_ubt.h
 OLD_DIRS+=usr/include/netgraph/bluetooth/include
 OLD_DIRS+=usr/include/netgraph/bluetooth
 OLD_FILES+=usr/include/sdp.h
 OLD_FILES+=usr/lib/libbluetooth.a
 OLD_FILES+=usr/lib/libbluetooth.so
 OLD_LIBS+=usr/lib/libbluetooth.so.4
 OLD_FILES+=usr/lib/libbluetooth_p.a
 OLD_FILES+=usr/lib/libsdp.a
 OLD_FILES+=usr/lib/libsdp.so
 OLD_LIBS+=usr/lib/libsdp.so.4
 OLD_FILES+=usr/lib/libsdp_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libbluetooth.a
 OLD_FILES+=usr/lib32/libbluetooth.so
 OLD_LIBS+=usr/lib32/libbluetooth.so.4
 OLD_FILES+=usr/lib32/libbluetooth_p.a
 OLD_FILES+=usr/lib32/libsdp.a
 OLD_FILES+=usr/lib32/libsdp.so
 OLD_LIBS+=usr/lib32/libsdp.so.4
 OLD_FILES+=usr/lib32/libsdp_p.a
 .endif
 OLD_FILES+=usr/sbin/bcmfw
 OLD_FILES+=usr/sbin/bt3cfw
 OLD_FILES+=usr/sbin/bthidcontrol
 OLD_FILES+=usr/sbin/bthidd
 OLD_FILES+=usr/sbin/btpand
 OLD_FILES+=usr/sbin/hccontrol
 OLD_FILES+=usr/sbin/hcsecd
 OLD_FILES+=usr/sbin/hcseriald
 OLD_FILES+=usr/sbin/l2control
 OLD_FILES+=usr/sbin/l2ping
 OLD_FILES+=usr/sbin/rfcomm_pppd
 OLD_FILES+=usr/sbin/sdpcontrol
 OLD_FILES+=usr/sbin/sdpd
 OLD_FILES+=usr/share/man/man1/bthost.1.gz
 OLD_FILES+=usr/share/man/man1/btsockstat.1.gz
 OLD_FILES+=usr/share/man/man1/rfcomm_sppd.1.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET128.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET16.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET32.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET64.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET8.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT128.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT16.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT32.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT64.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT8.3.gz
 OLD_FILES+=usr/share/man/man3/bdaddr_any.3.gz
 OLD_FILES+=usr/share/man/man3/bdaddr_copy.3.gz
 OLD_FILES+=usr/share/man/man3/bdaddr_same.3.gz
 OLD_FILES+=usr/share/man/man3/bluetooth.3.gz
 OLD_FILES+=usr/share/man/man3/bt_aton.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devaddr.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devclose.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devenum.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_evt_clr.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_evt_set.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_evt_tst.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_pkt_clr.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_pkt_set.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_pkt_tst.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devinfo.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devinquiry.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devname.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devopen.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devreq.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devsend.3.gz
 OLD_FILES+=usr/share/man/man3/bt_endhostent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_endprotoent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_gethostbyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/bt_gethostbyname.3.gz
 OLD_FILES+=usr/share/man/man3/bt_gethostent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_getprotobyname.3.gz
 OLD_FILES+=usr/share/man/man3/bt_getprotobynumber.3.gz
 OLD_FILES+=usr/share/man/man3/bt_getprotoent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_ntoa.3.gz
 OLD_FILES+=usr/share/man/man3/bt_sethostent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_setprotoent.3.gz
 OLD_FILES+=usr/share/man/man3/sdp.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_attr2desc.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_change_service.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_close.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_error.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_open.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_open_local.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_register_service.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_search.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_unregister_service.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_uuid2desc.3.gz
 OLD_FILES+=usr/share/man/man5/hcsecd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/bcmfw.8.gz
 OLD_FILES+=usr/share/man/man8/bt3cfw.8.gz
 OLD_FILES+=usr/share/man/man8/bthidcontrol.8.gz
 OLD_FILES+=usr/share/man/man8/bthidd.8.gz
 OLD_FILES+=usr/share/man/man8/btpand.8.gz
 OLD_FILES+=usr/share/man/man8/hccontrol.8.gz
 OLD_FILES+=usr/share/man/man8/hcsecd.8.gz
 OLD_FILES+=usr/share/man/man8/hcseriald.8.gz
 OLD_FILES+=usr/share/man/man8/l2control.8.gz
 OLD_FILES+=usr/share/man/man8/l2ping.8.gz
 OLD_FILES+=usr/share/man/man8/rfcomm_pppd.8.gz
 OLD_FILES+=usr/share/man/man8/sdpcontrol.8.gz
 OLD_FILES+=usr/share/man/man8/sdpd.8.gz
 .endif
 
 #.if ${MK_BOOT} == no
 # to be filled in
 #.endif
 
 .if ${MK_CALENDAR} == no
 OLD_FILES+=etc/periodic/daily/300.calendar
 OLD_FILES+=usr/bin/calendar
 OLD_FILES+=usr/share/calendar/calendar.all
 OLD_FILES+=usr/share/calendar/calendar.australia
 OLD_FILES+=usr/share/calendar/calendar.birthday
 OLD_FILES+=usr/share/calendar/calendar.brazilian
 OLD_FILES+=usr/share/calendar/calendar.christian
 OLD_FILES+=usr/share/calendar/calendar.computer
 OLD_FILES+=usr/share/calendar/calendar.croatian
 OLD_FILES+=usr/share/calendar/calendar.dutch
 OLD_FILES+=usr/share/calendar/calendar.freebsd
 OLD_FILES+=usr/share/calendar/calendar.french
 OLD_FILES+=usr/share/calendar/calendar.german
 OLD_FILES+=usr/share/calendar/calendar.history
 OLD_FILES+=usr/share/calendar/calendar.holiday
 OLD_FILES+=usr/share/calendar/calendar.hungarian
 OLD_FILES+=usr/share/calendar/calendar.judaic
 OLD_FILES+=usr/share/calendar/calendar.lotr
 OLD_FILES+=usr/share/calendar/calendar.music
 OLD_FILES+=usr/share/calendar/calendar.newzealand
 OLD_FILES+=usr/share/calendar/calendar.russian
 OLD_FILES+=usr/share/calendar/calendar.southafrica
 OLD_FILES+=usr/share/calendar/calendar.ukrainian
 OLD_FILES+=usr/share/calendar/calendar.usholiday
 OLD_FILES+=usr/share/calendar/calendar.world
 OLD_FILES+=usr/share/calendar/de_AT.ISO_8859-15/calendar.feiertag
 OLD_DIRS+=usr/share/calendar/de_AT.ISO_8859-15
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.feiertag
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.geschichte
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.kirche
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.literatur
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.musik
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.wissenschaft
 OLD_DIRS+=usr/share/calendar/de_DE.ISO8859-1
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-15
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.fetes
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.french
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.jferies
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.proverbes
 OLD_DIRS+=usr/share/calendar/fr_FR.ISO8859-1
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-15
 OLD_FILES+=usr/share/calendar/hr_HR.ISO8859-2/calendar.all
 OLD_FILES+=usr/share/calendar/hr_HR.ISO8859-2/calendar.praznici
 OLD_DIRS+=usr/share/calendar/hr_HR.ISO8859-2
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.all
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.nevnapok
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.unnepek
 OLD_DIRS+=usr/share/calendar/hu_HU.ISO8859-2
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.commemorative
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.holidays
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.mcommemorative
 OLD_DIRS+=usr/share/calendar/pt_BR.ISO8859-1
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.all
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.commemorative
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.holidays
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.mcommemorative
 OLD_DIRS+=usr/share/calendar/pt_BR.UTF-8
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.all
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.common
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.holiday
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.military
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.orthodox
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.pagan
 OLD_DIRS+=usr/share/calendar/ru_RU.KOI8-R
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.all
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.common
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.holiday
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.military
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.orthodox
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.pagan
 OLD_DIRS+=usr/share/calendar/ru_RU.UTF-8
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.all
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.holiday
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.misc
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.orthodox
 OLD_DIRS+=usr/share/calendar/uk_UA.KOI8-U
 OLD_DIRS+=usr/share/calendar
 OLD_FILES+=usr/share/man/man1/calendar.1.gz
 .endif
 
 .if ${MK_CASPER} == no
 OLD_FILES+=etc/rc.d/casperd
 OLD_LIBS+=lib/libcasper.so.0
 OLD_FILES+=sbin/casper
 OLD_FILES+=usr/lib/libcasper.a
 .endif
 
 .if ${MK_CDDL} == no
 OLD_LIBS+=lib/libavl.so.2
 OLD_LIBS+=lib/libctf.so.2
 OLD_LIBS+=lib/libdtrace.so.2
 OLD_LIBS+=lib/libnvpair.so.2
 OLD_LIBS+=lib/libumem.so.2
 OLD_LIBS+=lib/libuutil.so.2
 OLD_FILES+=usr/bin/ctfconvert
 OLD_FILES+=usr/bin/ctfdump
 OLD_FILES+=usr/bin/ctfmerge
 OLD_FILES+=usr/bin/sgsmsg
 OLD_FILES+=usr/lib/dtrace/drti.o
 OLD_FILES+=usr/lib/dtrace/errno.d
 OLD_FILES+=usr/lib/dtrace/io.d
 OLD_FILES+=usr/lib/dtrace/ip.d
 OLD_FILES+=usr/lib/dtrace/psinfo.d
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/lib/dtrace/regs_x86.d
 .endif
 OLD_FILES+=usr/lib/dtrace/signal.d
 OLD_FILES+=usr/lib/dtrace/tcp.d
 OLD_FILES+=usr/lib/dtrace/udp.d
 OLD_FILES+=usr/lib/dtrace/unistd.d
 OLD_DIRS+=usr/lib/dtrace
 OLD_FILES+=usr/lib/libavl.a
 OLD_FILES+=usr/lib/libavl.so
 OLD_FILES+=usr/lib/libavl_p.a
 OLD_FILES+=usr/lib/libctf.a
 OLD_FILES+=usr/lib/libctf.so
 OLD_FILES+=usr/lib/libctf_p.a
 OLD_FILES+=usr/lib/libdtrace.a
 OLD_FILES+=usr/lib/libdtrace.so
 OLD_FILES+=usr/lib/libdtrace_p.a
 OLD_FILES+=usr/lib/libnvpair.a
 OLD_FILES+=usr/lib/libnvpair.so
 OLD_FILES+=usr/lib/libnvpair_p.a
 OLD_FILES+=usr/lib/libumem.a
 OLD_FILES+=usr/lib/libumem.so
 OLD_FILES+=usr/lib/libumem_p.a
 OLD_FILES+=usr/lib/libuutil.a
 OLD_FILES+=usr/lib/libuutil.so
 OLD_FILES+=usr/lib/libuutil_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/dtrace/drti.o
 OLD_DIRS+=usr/lib32/dtrace
 OLD_FILES+=usr/lib32/libavl.a
 OLD_FILES+=usr/lib32/libavl.so
 OLD_LIBS+=usr/lib32/libavl.so.2
 OLD_FILES+=usr/lib32/libavl_p.a
 OLD_FILES+=usr/lib32/libctf.a
 OLD_FILES+=usr/lib32/libctf.so
 OLD_LIBS+=usr/lib32/libctf.so.2
 OLD_FILES+=usr/lib32/libctf_p.a
 OLD_FILES+=usr/lib32/libdtrace.a
 OLD_FILES+=usr/lib32/libdtrace.so
 OLD_LIBS+=usr/lib32/libdtrace.so.2
 OLD_FILES+=usr/lib32/libdtrace_p.a
 OLD_FILES+=usr/lib32/libnvpair.a
 OLD_FILES+=usr/lib32/libnvpair.so
 OLD_LIBS+=usr/lib32/libnvpair.so.2
 OLD_FILES+=usr/lib32/libnvpair_p.a
 OLD_FILES+=usr/lib32/libumem.a
 OLD_FILES+=usr/lib32/libumem.so
 OLD_LIBS+=usr/lib32/libumem.so.2
 OLD_FILES+=usr/lib32/libumem_p.a
 OLD_FILES+=usr/lib32/libuutil.a
 OLD_FILES+=usr/lib32/libuutil.so
 OLD_LIBS+=usr/lib32/libuutil.so.2
 OLD_FILES+=usr/lib32/libuutil_p.a
 .endif
 OLD_FILES+=usr/sbin/dtrace
 OLD_FILES+=usr/sbin/lockstat
 OLD_FILES+=usr/share/man/man1/dtrace.1.gz
 .endif
 
 .if ${MK_ZFS} == no
 OLD_FILES+=boot/gptzfsboot
 OLD_FILES+=boot/zfsboot
 OLD_FILES+=boot/zfsloader
 OLD_FILES+=etc/devd/zfs.conf
 OLD_FILES+=etc/periodic/daily/404.status-zfs
 OLD_FILES+=etc/periodic/daily/800.scrub-zfs
 OLD_LIBS+=lib/libzfs.so.2
 OLD_LIBS+=lib/libzfs_core.so.2
 OLD_LIBS+=lib/libzpool.so.2
 OLD_FILES+=rescue/zfs
 OLD_FILES+=rescue/zpool
 OLD_FILES+=sbin/zfs
 OLD_FILES+=sbin/zpool
 OLD_FILES+=usr/bin/zinject
 OLD_FILES+=usr/bin/ztest
 OLD_FILES+=usr/lib/libzfs.a
 OLD_FILES+=usr/lib/libzfs.so
 OLD_FILES+=usr/lib/libzfs_core.a
 OLD_FILES+=usr/lib/libzfs_core.so
 OLD_FILES+=usr/lib/libzfs_core_p.a
 OLD_FILES+=usr/lib/libzfs_p.a
 OLD_FILES+=usr/lib/libzpool.a
 OLD_FILES+=usr/lib/libzpool.so
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libzfs.a
 OLD_FILES+=usr/lib32/libzfs.so
 OLD_LIBS+=usr/lib32/libzfs.so.2
 OLD_FILES+=usr/lib32/libzfs_core.a
 OLD_FILES+=usr/lib32/libzfs_core.so
 OLD_LIBS+=usr/lib32/libzfs_core.so.2
 OLD_FILES+=usr/lib32/libzfs_core_p.a
 OLD_FILES+=usr/lib32/libzfs_p.a
 OLD_FILES+=usr/lib32/libzpool.a
 OLD_FILES+=usr/lib32/libzpool.so
 OLD_LIBS+=usr/lib32/libzpool.so.2
 .endif
 OLD_FILES+=usr/sbin/zdb
 OLD_FILES+=usr/share/man/man8/zdb.8.gz
 OLD_FILES+=usr/share/man/man8/zfs.8.gz
 OLD_FILES+=usr/share/man/man8/zpool.8.gz
 .endif
 
 .if ${MK_CLANG} == no
 OLD_FILES+=usr/bin/clang
 OLD_FILES+=usr/bin/clang++
 OLD_FILES+=usr/bin/clang-cpp
 OLD_FILES+=usr/bin/clang-tblgen
 OLD_FILES+=usr/bin/tblgen
 OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.5.0/altivec.h
 OLD_FILES+=usr/include/clang/3.5.0/ammintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/arm_acle.h
 OLD_FILES+=usr/include/clang/3.5.0/arm_neon.h
 OLD_FILES+=usr/include/clang/3.5.0/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/avxintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/cpuid.h
 OLD_FILES+=usr/include/clang/3.5.0/emmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/ia32intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/immintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.5.0/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.5.0/mmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/module.modulemap
 OLD_FILES+=usr/include/clang/3.5.0/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/shaintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/smmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/tbmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/x86intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.5.0
 OLD_DIRS+=usr/include/clang
 OLD_FILES+=usr/share/doc/llvm/clang/LICENSE.TXT
 OLD_DIRS+=usr/share/doc/llvm/clang
 OLD_FILES+=usr/share/doc/llvm/COPYRIGHT.regex
 OLD_FILES+=usr/share/doc/llvm/LICENSE.TXT
 OLD_DIRS+=usr/share/doc/llvm
 OLD_FILES+=usr/share/man/man1/clang.1.gz
 OLD_FILES+=usr/share/man/man1/clang++.1.gz
 OLD_FILES+=usr/share/man/man1/clang-cpp.1.gz
 OLD_FILES+=usr/share/man/man1/tblgen.1.gz
 .endif
 
 .if ${MK_CLANG_EXTRAS} == no
 OLD_FILES+=usr/bin/bugpoint
 OLD_FILES+=usr/bin/llc
 OLD_FILES+=usr/bin/lli
 OLD_FILES+=usr/bin/llvm-ar
 OLD_FILES+=usr/bin/llvm-as
 OLD_FILES+=usr/bin/llvm-bcanalyzer
 OLD_FILES+=usr/bin/llvm-diff
 OLD_FILES+=usr/bin/llvm-dis
 OLD_FILES+=usr/bin/llvm-extract
 OLD_FILES+=usr/bin/llvm-ld
 OLD_FILES+=usr/bin/llvm-link
 OLD_FILES+=usr/bin/llvm-mc
 OLD_FILES+=usr/bin/llvm-nm
 OLD_FILES+=usr/bin/llvm-objdump
 OLD_FILES+=usr/bin/llvm-rtdyld
 OLD_FILES+=usr/bin/llvm-stub
 OLD_FILES+=usr/bin/macho-dump
 OLD_FILES+=usr/bin/opt
 OLD_FILES+=usr/share/man/man1/bugpoint.1.gz
 OLD_FILES+=usr/share/man/man1/llc.1.gz
 OLD_FILES+=usr/share/man/man1/lli.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-ar.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-as.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-bcanalyzer.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-diff.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-dis.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-extract.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-ld.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-link.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-nm.1.gz
 OLD_FILES+=usr/share/man/man1/opt.1.gz
 .endif
 
 .if ${MK_CPP} == no
 OLD_FILES+=usr/bin/cpp
 OLD_FILES+=usr/share/man/man1/cpp.1.gz
 .endif
 
 #.if ${MK_CRYPT} == no
 # to be filled in
 #.endif
 
 .if ${MK_CTM} == no
 OLD_FILES+=usr/sbin/ctm
 OLD_FILES+=usr/sbin/ctm_dequeue
 OLD_FILES+=usr/sbin/ctm_rmail
 OLD_FILES+=usr/sbin/ctm_smail
 OLD_FILES+=usr/share/man/man1/ctm.1.gz
 OLD_FILES+=usr/share/man/man1/ctm_dequeue.1.gz
 OLD_FILES+=usr/share/man/man1/ctm_rmail.1.gz
 OLD_FILES+=usr/share/man/man1/ctm_smail.1.gz
 OLD_FILES+=usr/share/man/man5/ctm.5.gz
 .endif
 
 # devd(8) not listed here on purpose
 .if ${MK_CXX} == no
 OLD_FILES+=usr/bin/CC
 OLD_FILES+=usr/bin/c++
 OLD_FILES+=usr/bin/c++filt
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/libexec/cc1plus
 .if ${MK_GCC} == no
 OLD_FILES+=usr/bin/gperf
 OLD_FILES+=usr/share/info/gperf.info.gz
 OLD_FILES+=usr/share/man/man1/gperf.1.gz
 .endif
 .endif
 
 .if ${MK_FMTREE} == no
 OLD_FILES+=usr/sbin/fmtree
 OLD_FILES+=usr/share/man/man8/fmtree.8.gz
 .endif
 
 .if ${MK_GNUCXX} == no
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/include/c++/4.2/algorithm
 OLD_FILES+=usr/include/c++/4.2/backward/algo.h
 OLD_FILES+=usr/include/c++/4.2/backward/algobase.h
 OLD_FILES+=usr/include/c++/4.2/backward/alloc.h
 OLD_FILES+=usr/include/c++/4.2/backward/backward_warning.h
 OLD_FILES+=usr/include/c++/4.2/backward/bvector.h
 OLD_FILES+=usr/include/c++/4.2/backward/complex.h
 OLD_FILES+=usr/include/c++/4.2/backward/defalloc.h
 OLD_FILES+=usr/include/c++/4.2/backward/deque.h
 OLD_FILES+=usr/include/c++/4.2/backward/fstream.h
 OLD_FILES+=usr/include/c++/4.2/backward/function.h
 OLD_FILES+=usr/include/c++/4.2/backward/hash_map.h
 OLD_FILES+=usr/include/c++/4.2/backward/hash_set.h
 OLD_FILES+=usr/include/c++/4.2/backward/hashtable.h
 OLD_FILES+=usr/include/c++/4.2/backward/heap.h
 OLD_FILES+=usr/include/c++/4.2/backward/iomanip.h
 OLD_FILES+=usr/include/c++/4.2/backward/iostream.h
 OLD_FILES+=usr/include/c++/4.2/backward/istream.h
 OLD_FILES+=usr/include/c++/4.2/backward/iterator.h
 OLD_FILES+=usr/include/c++/4.2/backward/list.h
 OLD_FILES+=usr/include/c++/4.2/backward/map.h
 OLD_FILES+=usr/include/c++/4.2/backward/multimap.h
 OLD_FILES+=usr/include/c++/4.2/backward/multiset.h
 OLD_FILES+=usr/include/c++/4.2/backward/new.h
 OLD_FILES+=usr/include/c++/4.2/backward/ostream.h
 OLD_FILES+=usr/include/c++/4.2/backward/pair.h
 OLD_FILES+=usr/include/c++/4.2/backward/queue.h
 OLD_FILES+=usr/include/c++/4.2/backward/rope.h
 OLD_FILES+=usr/include/c++/4.2/backward/set.h
 OLD_FILES+=usr/include/c++/4.2/backward/slist.h
 OLD_FILES+=usr/include/c++/4.2/backward/stack.h
 OLD_FILES+=usr/include/c++/4.2/backward/stream.h
 OLD_FILES+=usr/include/c++/4.2/backward/streambuf.h
 OLD_FILES+=usr/include/c++/4.2/backward/strstream
 OLD_FILES+=usr/include/c++/4.2/backward/tempbuf.h
 OLD_FILES+=usr/include/c++/4.2/backward/tree.h
 OLD_FILES+=usr/include/c++/4.2/backward/vector.h
 OLD_FILES+=usr/include/c++/4.2/bits/allocator.h
 OLD_FILES+=usr/include/c++/4.2/bits/atomic_word.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_file.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_ios.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_ios.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/basic_string.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_string.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/boost_concept_check.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++allocator.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++config.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++io.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++locale.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++locale_internal.h
 OLD_FILES+=usr/include/c++/4.2/bits/char_traits.h
 OLD_FILES+=usr/include/c++/4.2/bits/cmath.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/codecvt.h
 OLD_FILES+=usr/include/c++/4.2/bits/compatibility.h
 OLD_FILES+=usr/include/c++/4.2/bits/concept_check.h
 OLD_FILES+=usr/include/c++/4.2/bits/cpp_type_traits.h
 OLD_FILES+=usr/include/c++/4.2/bits/cpu_defines.h
 OLD_FILES+=usr/include/c++/4.2/bits/ctype_base.h
 OLD_FILES+=usr/include/c++/4.2/bits/ctype_inline.h
 OLD_FILES+=usr/include/c++/4.2/bits/ctype_noninline.h
 OLD_FILES+=usr/include/c++/4.2/bits/cxxabi_tweaks.h
 OLD_FILES+=usr/include/c++/4.2/bits/deque.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/fstream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/functexcept.h
 OLD_FILES+=usr/include/c++/4.2/bits/gslice.h
 OLD_FILES+=usr/include/c++/4.2/bits/gslice_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-default.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-posix.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-single.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-tpf.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr.h
 OLD_FILES+=usr/include/c++/4.2/bits/indirect_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/ios_base.h
 OLD_FILES+=usr/include/c++/4.2/bits/istream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/list.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/locale_classes.h
 OLD_FILES+=usr/include/c++/4.2/bits/locale_facets.h
 OLD_FILES+=usr/include/c++/4.2/bits/locale_facets.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/localefwd.h
 OLD_FILES+=usr/include/c++/4.2/bits/mask_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/messages_members.h
 OLD_FILES+=usr/include/c++/4.2/bits/os_defines.h
 OLD_FILES+=usr/include/c++/4.2/bits/ostream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/ostream_insert.h
 OLD_FILES+=usr/include/c++/4.2/bits/postypes.h
 OLD_FILES+=usr/include/c++/4.2/bits/slice_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/sstream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/stl_algo.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_algobase.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_bvector.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_construct.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_deque.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_function.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_heap.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator_base_funcs.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator_base_types.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_list.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_map.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_multimap.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_multiset.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_numeric.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_pair.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_queue.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_relops.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_set.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_stack.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_tempbuf.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_tree.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_uninitialized.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_vector.h
 OLD_FILES+=usr/include/c++/4.2/bits/stream_iterator.h
 OLD_FILES+=usr/include/c++/4.2/bits/streambuf.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/streambuf_iterator.h
 OLD_FILES+=usr/include/c++/4.2/bits/stringfwd.h
 OLD_FILES+=usr/include/c++/4.2/bits/time_members.h
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_after.h
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_array.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_before.h
 OLD_FILES+=usr/include/c++/4.2/bits/vector.tcc
 OLD_FILES+=usr/include/c++/4.2/bitset
 OLD_FILES+=usr/include/c++/4.2/cassert
 OLD_FILES+=usr/include/c++/4.2/cctype
 OLD_FILES+=usr/include/c++/4.2/cerrno
 OLD_FILES+=usr/include/c++/4.2/cfloat
 OLD_FILES+=usr/include/c++/4.2/ciso646
 OLD_FILES+=usr/include/c++/4.2/climits
 OLD_FILES+=usr/include/c++/4.2/clocale
 OLD_FILES+=usr/include/c++/4.2/cmath
 OLD_FILES+=usr/include/c++/4.2/complex
 OLD_FILES+=usr/include/c++/4.2/csetjmp
 OLD_FILES+=usr/include/c++/4.2/csignal
 OLD_FILES+=usr/include/c++/4.2/cstdarg
 OLD_FILES+=usr/include/c++/4.2/cstddef
 OLD_FILES+=usr/include/c++/4.2/cstdio
 OLD_FILES+=usr/include/c++/4.2/cstdlib
 OLD_FILES+=usr/include/c++/4.2/cstring
 OLD_FILES+=usr/include/c++/4.2/ctime
 OLD_FILES+=usr/include/c++/4.2/cwchar
 OLD_FILES+=usr/include/c++/4.2/cwctype
 OLD_FILES+=usr/include/c++/4.2/cxxabi.h
 OLD_FILES+=usr/include/c++/4.2/debug/bitset
 OLD_FILES+=usr/include/c++/4.2/debug/debug.h
 OLD_FILES+=usr/include/c++/4.2/debug/deque
 OLD_FILES+=usr/include/c++/4.2/debug/formatter.h
 OLD_FILES+=usr/include/c++/4.2/debug/functions.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_map
 OLD_FILES+=usr/include/c++/4.2/debug/hash_map.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_multimap.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_multiset.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_set
 OLD_FILES+=usr/include/c++/4.2/debug/hash_set.h
 OLD_FILES+=usr/include/c++/4.2/debug/list
 OLD_FILES+=usr/include/c++/4.2/debug/macros.h
 OLD_FILES+=usr/include/c++/4.2/debug/map
 OLD_FILES+=usr/include/c++/4.2/debug/map.h
 OLD_FILES+=usr/include/c++/4.2/debug/multimap.h
 OLD_FILES+=usr/include/c++/4.2/debug/multiset.h
 OLD_FILES+=usr/include/c++/4.2/debug/safe_base.h
 OLD_FILES+=usr/include/c++/4.2/debug/safe_iterator.h
 OLD_FILES+=usr/include/c++/4.2/debug/safe_iterator.tcc
 OLD_FILES+=usr/include/c++/4.2/debug/safe_sequence.h
 OLD_FILES+=usr/include/c++/4.2/debug/set
 OLD_FILES+=usr/include/c++/4.2/debug/set.h
 OLD_FILES+=usr/include/c++/4.2/debug/string
 OLD_FILES+=usr/include/c++/4.2/debug/vector
 OLD_FILES+=usr/include/c++/4.2/deque
 OLD_FILES+=usr/include/c++/4.2/exception
 OLD_FILES+=usr/include/c++/4.2/exception_defines.h
 OLD_FILES+=usr/include/c++/4.2/ext/algorithm
 OLD_FILES+=usr/include/c++/4.2/ext/array_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/atomicity.h
 OLD_FILES+=usr/include/c++/4.2/ext/bitmap_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/codecvt_specializations.h
 OLD_FILES+=usr/include/c++/4.2/ext/concurrence.h
 OLD_FILES+=usr/include/c++/4.2/ext/debug_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/functional
 OLD_FILES+=usr/include/c++/4.2/ext/hash_fun.h
 OLD_FILES+=usr/include/c++/4.2/ext/hash_map
 OLD_FILES+=usr/include/c++/4.2/ext/hash_set
 OLD_FILES+=usr/include/c++/4.2/ext/hashtable.h
 OLD_FILES+=usr/include/c++/4.2/ext/iterator
 OLD_FILES+=usr/include/c++/4.2/ext/malloc_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/memory
 OLD_FILES+=usr/include/c++/4.2/ext/mt_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/new_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/numeric
 OLD_FILES+=usr/include/c++/4.2/ext/numeric_traits.h
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/assoc_container.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/basic_tree_policy_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/null_node_metadata.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_types.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/cond_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/cond_key_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/standard_policies.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cond_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/container_base_dispatch.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/counter_lu_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/mtf_lu_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/sample_update_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/map_debug_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/cond_dtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/child_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/cond_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/head.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/internal_node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/leaf.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_metadata_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/point_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/split_join_branch_bag.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/synth_e_access_traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/standard_policies.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/null_node_update_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_trace_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/null_node_update_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/sample_trie_e_access_traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/string_trie_e_access_traits_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/type_utils.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/types_traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/const_point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/exception.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/hash_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/list_update_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/priority_queue.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/tag_and_trait.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/tree_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/trie_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pod_char_traits.h
 OLD_FILES+=usr/include/c++/4.2/ext/pool_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/rb_tree
 OLD_FILES+=usr/include/c++/4.2/ext/rc_string_base.h
 OLD_FILES+=usr/include/c++/4.2/ext/rope
 OLD_FILES+=usr/include/c++/4.2/ext/ropeimpl.h
 OLD_FILES+=usr/include/c++/4.2/ext/slist
 OLD_FILES+=usr/include/c++/4.2/ext/sso_string_base.h
 OLD_FILES+=usr/include/c++/4.2/ext/stdio_filebuf.h
 OLD_FILES+=usr/include/c++/4.2/ext/stdio_sync_filebuf.h
 OLD_FILES+=usr/include/c++/4.2/ext/throw_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/type_traits.h
 OLD_FILES+=usr/include/c++/4.2/ext/typelist.h
 OLD_FILES+=usr/include/c++/4.2/ext/vstring.h
 OLD_FILES+=usr/include/c++/4.2/ext/vstring.tcc
 OLD_FILES+=usr/include/c++/4.2/ext/vstring_fwd.h
 OLD_FILES+=usr/include/c++/4.2/ext/vstring_util.h
 OLD_FILES+=usr/include/c++/4.2/fstream
 OLD_FILES+=usr/include/c++/4.2/functional
 OLD_FILES+=usr/include/c++/4.2/iomanip
 OLD_FILES+=usr/include/c++/4.2/ios
 OLD_FILES+=usr/include/c++/4.2/iosfwd
 OLD_FILES+=usr/include/c++/4.2/iostream
 OLD_FILES+=usr/include/c++/4.2/istream
 OLD_FILES+=usr/include/c++/4.2/iterator
 OLD_FILES+=usr/include/c++/4.2/limits
 OLD_FILES+=usr/include/c++/4.2/list
 OLD_FILES+=usr/include/c++/4.2/locale
 OLD_FILES+=usr/include/c++/4.2/map
 OLD_FILES+=usr/include/c++/4.2/memory
 OLD_FILES+=usr/include/c++/4.2/new
 OLD_FILES+=usr/include/c++/4.2/numeric
 OLD_FILES+=usr/include/c++/4.2/ostream
 OLD_FILES+=usr/include/c++/4.2/queue
 OLD_FILES+=usr/include/c++/4.2/set
 OLD_FILES+=usr/include/c++/4.2/sstream
 OLD_FILES+=usr/include/c++/4.2/stack
 OLD_FILES+=usr/include/c++/4.2/stdexcept
 OLD_FILES+=usr/include/c++/4.2/streambuf
 OLD_FILES+=usr/include/c++/4.2/string
 OLD_FILES+=usr/include/c++/4.2/tr1/array
 OLD_FILES+=usr/include/c++/4.2/tr1/bind_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/bind_repeat.h
 OLD_FILES+=usr/include/c++/4.2/tr1/boost_shared_ptr.h
 OLD_FILES+=usr/include/c++/4.2/tr1/cctype
 OLD_FILES+=usr/include/c++/4.2/tr1/cfenv
 OLD_FILES+=usr/include/c++/4.2/tr1/cfloat
 OLD_FILES+=usr/include/c++/4.2/tr1/cinttypes
 OLD_FILES+=usr/include/c++/4.2/tr1/climits
 OLD_FILES+=usr/include/c++/4.2/tr1/cmath
 OLD_FILES+=usr/include/c++/4.2/tr1/common.h
 OLD_FILES+=usr/include/c++/4.2/tr1/complex
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdarg
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdbool
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdint
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdio
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdlib
 OLD_FILES+=usr/include/c++/4.2/tr1/ctgmath
 OLD_FILES+=usr/include/c++/4.2/tr1/ctime
 OLD_FILES+=usr/include/c++/4.2/tr1/ctype.h
 OLD_FILES+=usr/include/c++/4.2/tr1/cwchar
 OLD_FILES+=usr/include/c++/4.2/tr1/cwctype
 OLD_FILES+=usr/include/c++/4.2/tr1/fenv.h
 OLD_FILES+=usr/include/c++/4.2/tr1/float.h
 OLD_FILES+=usr/include/c++/4.2/tr1/functional
 OLD_FILES+=usr/include/c++/4.2/tr1/functional_hash.h
 OLD_FILES+=usr/include/c++/4.2/tr1/functional_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/hashtable
 OLD_FILES+=usr/include/c++/4.2/tr1/hashtable_policy.h
 OLD_FILES+=usr/include/c++/4.2/tr1/inttypes.h
 OLD_FILES+=usr/include/c++/4.2/tr1/limits.h
 OLD_FILES+=usr/include/c++/4.2/tr1/math.h
 OLD_FILES+=usr/include/c++/4.2/tr1/memory
 OLD_FILES+=usr/include/c++/4.2/tr1/mu_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/random
 OLD_FILES+=usr/include/c++/4.2/tr1/random.tcc
 OLD_FILES+=usr/include/c++/4.2/tr1/ref_fwd.h
 OLD_FILES+=usr/include/c++/4.2/tr1/ref_wrap_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/repeat.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdarg.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdbool.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdint.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdio.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdlib.h
 OLD_FILES+=usr/include/c++/4.2/tr1/tgmath.h
 OLD_FILES+=usr/include/c++/4.2/tr1/tuple
 OLD_FILES+=usr/include/c++/4.2/tr1/tuple_defs.h
 OLD_FILES+=usr/include/c++/4.2/tr1/tuple_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/type_traits
 OLD_FILES+=usr/include/c++/4.2/tr1/type_traits_fwd.h
 OLD_FILES+=usr/include/c++/4.2/tr1/unordered_map
 OLD_FILES+=usr/include/c++/4.2/tr1/unordered_set
 OLD_FILES+=usr/include/c++/4.2/tr1/utility
 OLD_FILES+=usr/include/c++/4.2/tr1/wchar.h
 OLD_FILES+=usr/include/c++/4.2/tr1/wctype.h
 OLD_FILES+=usr/include/c++/4.2/typeinfo
 OLD_FILES+=usr/include/c++/4.2/utility
 OLD_FILES+=usr/include/c++/4.2/valarray
 OLD_FILES+=usr/include/c++/4.2/vector
 OLD_FILES+=usr/lib/libstdc++.a
 OLD_FILES+=usr/lib/libstdc++.so
 OLD_LIBS+=usr/lib/libstdc++.so.6
 OLD_FILES+=usr/lib/libstdc++_p.a
 OLD_FILES+=usr/lib/libsupc++.a
 OLD_FILES+=usr/lib/libsupc++.so
 OLD_LIBS+=usr/lib/libsupc++.so.1
 OLD_FILES+=usr/lib/libsupc++_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libstdc++.a
 OLD_FILES+=usr/lib32/libstdc++.so
 OLD_LIBS+=usr/lib32/libstdc++.so.6
 OLD_FILES+=usr/lib32/libstdc++_p.a
 OLD_FILES+=usr/lib32/libsupc++.a
 OLD_FILES+=usr/lib32/libsupc++.so
 OLD_LIBS+=usr/lib32/libsupc++.so.1
 OLD_FILES+=usr/lib32/libsupc++_p.a
 .endif
 OLD_FILES+=usr/libexec/cc1plus
 .endif
 
 .if ${MK_DICT} == no
 OLD_FILES+=usr/share/dict/README
 OLD_FILES+=usr/share/dict/eign
 OLD_FILES+=usr/share/dict/freebsd
 OLD_FILES+=usr/share/dict/propernames
 OLD_FILES+=usr/share/dict/web2
 OLD_FILES+=usr/share/dict/web2a
 OLD_FILES+=usr/share/dict/words
 OLD_DIRS+=usr/share/dict
 .endif
 
 .if ${MK_ELFTOOLCHAIN_TOOLS} == no
 OLD_FILES+=usr/bin/elfcopy
 OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
 .endif
 
 #.if ${MK_EXAMPLES} == no
 # to be filled in
 #.endif
 
 .if ${MK_FLOPPY} == no
 OLD_FILES+=usr/sbin/fdcontrol
 OLD_FILES+=usr/sbin/fdformat
 OLD_FILES+=usr/sbin/fdread
 OLD_FILES+=usr/sbin/fdwrite
 OLD_FILES+=usr/share/man/man1/fdformat.1.gz
 OLD_FILES+=usr/share/man/man1/fdread.1.gz
 OLD_FILES+=usr/share/man/man1/fdwrite.1.gz
 OLD_FILES+=usr/share/man/man8/fdcontrol.8.gz
 .endif
 
 .if ${MK_FREEBSD_UPDATE} == no
 OLD_FILES+=etc/freebsd-update.conf
 OLD_FILES+=usr/sbin/freebsd-update
 OLD_FILES+=usr/share/examples/etc/freebsd-update.conf
 OLD_FILES+=usr/share/man/man5/freebsd-update.conf.5.gz
 OLD_FILES+=usr/share/man/man8/freebsd-update.8.gz
 .endif
 
 .if ${MK_GAMES} == no
 OLD_FILES+=usr/games/bcd
 OLD_FILES+=usr/games/caesar
 OLD_FILES+=usr/games/factor
 OLD_FILES+=usr/games/fortune
 OLD_FILES+=usr/games/grdc
 OLD_FILES+=usr/games/morse
 OLD_FILES+=usr/games/number
 OLD_FILES+=usr/games/pom
 OLD_FILES+=usr/games/ppt
 OLD_FILES+=usr/games/primes
 OLD_FILES+=usr/games/random
 OLD_FILES+=usr/games/rot13
 OLD_FILES+=usr/games/strfile
 OLD_FILES+=usr/games/unstr
 OLD_DIRS+=usr/games
 OLD_FILES+=usr/share/games/fortune/fortunes
 OLD_FILES+=usr/share/games/fortune/fortunes.dat
 OLD_FILES+=usr/share/games/fortune/freebsd-tips
 OLD_FILES+=usr/share/games/fortune/freebsd-tips.dat
 OLD_FILES+=usr/share/games/fortune/gerrold.limerick
 OLD_FILES+=usr/share/games/fortune/gerrold.limerick.dat
 OLD_FILES+=usr/share/games/fortune/limerick
 OLD_FILES+=usr/share/games/fortune/limerick.dat
 OLD_FILES+=usr/share/games/fortune/murphy
 OLD_FILES+=usr/share/games/fortune/murphy-o
 OLD_FILES+=usr/share/games/fortune/murphy-o.dat
 OLD_FILES+=usr/share/games/fortune/murphy.dat
 OLD_FILES+=usr/share/games/fortune/startrek
 OLD_FILES+=usr/share/games/fortune/startrek.dat
 OLD_FILES+=usr/share/games/fortune/zippy
 OLD_FILES+=usr/share/games/fortune/zippy.dat
 OLD_DIRS+=usr/share/games/fortune
 OLD_DIRS+=usr/share/games
 OLD_FILES+=usr/share/man/man6/bcd.6.gz
 OLD_FILES+=usr/share/man/man6/caesar.6.gz
 OLD_FILES+=usr/share/man/man6/factor.6.gz
 OLD_FILES+=usr/share/man/man6/fortune.6.gz
 OLD_FILES+=usr/share/man/man6/grdc.6.gz
 OLD_FILES+=usr/share/man/man6/morse.6.gz
 OLD_FILES+=usr/share/man/man6/number.6.gz
 OLD_FILES+=usr/share/man/man6/pom.6.gz
 OLD_FILES+=usr/share/man/man6/ppt.6.gz
 OLD_FILES+=usr/share/man/man6/primes.6.gz
 OLD_FILES+=usr/share/man/man6/random.6.gz
 OLD_FILES+=usr/share/man/man6/rot13.6.gz
 OLD_FILES+=usr/share/man/man8/strfile.8.gz
 OLD_FILES+=usr/share/man/man8/unstr.8.gz
 .endif
 
 .if ${MK_GCC} == no
 OLD_FILES+=usr/bin/c++filt
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/bin/gcc
 OLD_FILES+=usr/bin/gcov
 OLD_FILES+=usr/bin/gcpp
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/gcc/4.2/__wmmintrin_aes.h
 OLD_FILES+=usr/include/gcc/4.2/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/gcc/4.2/ammintrin.h
 OLD_FILES+=usr/include/gcc/4.2/emmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/mm3dnow.h
 OLD_FILES+=usr/include/gcc/4.2/mm_malloc.h
 OLD_FILES+=usr/include/gcc/4.2/mmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/pmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/tmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/wmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/xmmintrin.h
 .elif ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/gcc/4.2/mmintrin.h
 .elif ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/include/gcc/4.2/altivec.h
 OLD_FILES+=usr/include/gcc/4.2/ppc-asm.h
 OLD_FILES+=usr/include/gcc/4.2/spe.h
 .endif
 OLD_FILES+=usr/libexec/cc1
 OLD_FILES+=usr/libexec/cc1plus
 OLD_FILES+=usr/share/info/cpp.info.gz
 OLD_FILES+=usr/share/info/cppinternals.info.gz
 OLD_FILES+=usr/share/info/gcc.info.gz
 OLD_FILES+=usr/share/info/gccint.info.gz
 OLD_FILES+=usr/share/man/man1/g++.1.gz
 OLD_FILES+=usr/share/man/man1/gcc.1.gz
 OLD_FILES+=usr/share/man/man1/gcov.1.gz
 OLD_FILES+=usr/share/man/man1/gcpp.1.gz
 .endif
 
 .if ${MK_GCOV} == no
 OLD_FILES+=usr/bin/gcov
 OLD_FILES+=usr/share/man/man1/gcov.1.gz
 .endif
 
 .if ${MK_GDB} == no
 OLD_FILES+=usr/bin/gdb
 OLD_FILES+=usr/bin/gdbserver
 OLD_FILES+=usr/bin/gdbtui
 OLD_FILES+=usr/bin/kgdb
 OLD_FILES+=usr/share/info/gdb.info.gz
 OLD_FILES+=usr/share/info/gdbint.info.gz
 OLD_FILES+=usr/share/info/stabs.info.gz
 OLD_FILES+=usr/share/man/man1/gdb.1.gz
 OLD_FILES+=usr/share/man/man1/gdbserver.1.gz
 OLD_FILES+=usr/share/man/man1/kgdb.1.gz
 .endif
 
 .if ${MK_GPIO} == no
 OLD_FILES+=usr/sbin/gpioctl
 OLD_FILES+=usr/share/man/man8/gpioctl.8.gz
 .endif
 
 # Also includes vgrind(1)
 .if ${MK_GROFF} == no
 OLD_FILES+=usr/bin/addftinfo
 OLD_FILES+=usr/bin/afmtodit
 OLD_FILES+=usr/bin/eqn
 OLD_FILES+=usr/bin/grn
 OLD_FILES+=usr/bin/grodvi
 OLD_FILES+=usr/bin/groff
 OLD_FILES+=usr/bin/grog
 OLD_FILES+=usr/bin/grolbp
 OLD_FILES+=usr/bin/grolj4
 OLD_FILES+=usr/bin/grops
 OLD_FILES+=usr/bin/grotty
 OLD_FILES+=usr/bin/hpftodit
 OLD_FILES+=usr/bin/indxbib
 OLD_FILES+=usr/bin/lkbib
 OLD_FILES+=usr/bin/lookbib
 OLD_FILES+=usr/bin/mmroff
 OLD_FILES+=usr/bin/neqn
 OLD_FILES+=usr/bin/nroff
 OLD_FILES+=usr/bin/pfbtops
 OLD_FILES+=usr/bin/pic
 OLD_FILES+=usr/bin/post-grohtml
 OLD_FILES+=usr/bin/pre-grohtml
 OLD_FILES+=usr/bin/psroff
 OLD_FILES+=usr/bin/refer
 OLD_FILES+=usr/bin/soelim
 OLD_FILES+=usr/bin/tbl
 OLD_FILES+=usr/bin/tfmtodit
 OLD_FILES+=usr/bin/troff
 OLD_FILES+=usr/bin/vgrind
 OLD_FILES+=usr/libexec/vfontedpr
 OLD_FILES+=usr/share/groff_font/devX100-12/CB
 OLD_FILES+=usr/share/groff_font/devX100-12/CBI
 OLD_FILES+=usr/share/groff_font/devX100-12/CI
 OLD_FILES+=usr/share/groff_font/devX100-12/CR
 OLD_FILES+=usr/share/groff_font/devX100-12/DESC
 OLD_FILES+=usr/share/groff_font/devX100-12/HB
 OLD_FILES+=usr/share/groff_font/devX100-12/HBI
 OLD_FILES+=usr/share/groff_font/devX100-12/HI
 OLD_FILES+=usr/share/groff_font/devX100-12/HR
 OLD_FILES+=usr/share/groff_font/devX100-12/NB
 OLD_FILES+=usr/share/groff_font/devX100-12/NBI
 OLD_FILES+=usr/share/groff_font/devX100-12/NI
 OLD_FILES+=usr/share/groff_font/devX100-12/NR
 OLD_FILES+=usr/share/groff_font/devX100-12/S
 OLD_FILES+=usr/share/groff_font/devX100-12/TB
 OLD_FILES+=usr/share/groff_font/devX100-12/TBI
 OLD_FILES+=usr/share/groff_font/devX100-12/TI
 OLD_FILES+=usr/share/groff_font/devX100-12/TR
 OLD_DIRS+=usr/share/groff_font/devX100-12
 OLD_FILES+=usr/share/groff_font/devX100/CB
 OLD_FILES+=usr/share/groff_font/devX100/CBI
 OLD_FILES+=usr/share/groff_font/devX100/CI
 OLD_FILES+=usr/share/groff_font/devX100/CR
 OLD_FILES+=usr/share/groff_font/devX100/DESC
 OLD_FILES+=usr/share/groff_font/devX100/HB
 OLD_FILES+=usr/share/groff_font/devX100/HBI
 OLD_FILES+=usr/share/groff_font/devX100/HI
 OLD_FILES+=usr/share/groff_font/devX100/HR
 OLD_FILES+=usr/share/groff_font/devX100/NB
 OLD_FILES+=usr/share/groff_font/devX100/NBI
 OLD_FILES+=usr/share/groff_font/devX100/NI
 OLD_FILES+=usr/share/groff_font/devX100/NR
 OLD_FILES+=usr/share/groff_font/devX100/S
 OLD_FILES+=usr/share/groff_font/devX100/TB
 OLD_FILES+=usr/share/groff_font/devX100/TBI
 OLD_FILES+=usr/share/groff_font/devX100/TI
 OLD_FILES+=usr/share/groff_font/devX100/TR
 OLD_DIRS+=usr/share/groff_font/devX100
 OLD_FILES+=usr/share/groff_font/devX75-12/CB
 OLD_FILES+=usr/share/groff_font/devX75-12/CBI
 OLD_FILES+=usr/share/groff_font/devX75-12/CI
 OLD_FILES+=usr/share/groff_font/devX75-12/CR
 OLD_FILES+=usr/share/groff_font/devX75-12/DESC
 OLD_FILES+=usr/share/groff_font/devX75-12/HB
 OLD_FILES+=usr/share/groff_font/devX75-12/HBI
 OLD_FILES+=usr/share/groff_font/devX75-12/HI
 OLD_FILES+=usr/share/groff_font/devX75-12/HR
 OLD_FILES+=usr/share/groff_font/devX75-12/NB
 OLD_FILES+=usr/share/groff_font/devX75-12/NBI
 OLD_FILES+=usr/share/groff_font/devX75-12/NI
 OLD_FILES+=usr/share/groff_font/devX75-12/NR
 OLD_FILES+=usr/share/groff_font/devX75-12/S
 OLD_FILES+=usr/share/groff_font/devX75-12/TB
 OLD_FILES+=usr/share/groff_font/devX75-12/TBI
 OLD_FILES+=usr/share/groff_font/devX75-12/TI
 OLD_FILES+=usr/share/groff_font/devX75-12/TR
 OLD_DIRS+=usr/share/groff_font/devX75-12
 OLD_FILES+=usr/share/groff_font/devX75/CB
 OLD_FILES+=usr/share/groff_font/devX75/CBI
 OLD_FILES+=usr/share/groff_font/devX75/CI
 OLD_FILES+=usr/share/groff_font/devX75/CR
 OLD_FILES+=usr/share/groff_font/devX75/DESC
 OLD_FILES+=usr/share/groff_font/devX75/HB
 OLD_FILES+=usr/share/groff_font/devX75/HBI
 OLD_FILES+=usr/share/groff_font/devX75/HI
 OLD_FILES+=usr/share/groff_font/devX75/HR
 OLD_FILES+=usr/share/groff_font/devX75/NB
 OLD_FILES+=usr/share/groff_font/devX75/NBI
 OLD_FILES+=usr/share/groff_font/devX75/NI
 OLD_FILES+=usr/share/groff_font/devX75/NR
 OLD_FILES+=usr/share/groff_font/devX75/S
 OLD_FILES+=usr/share/groff_font/devX75/TB
 OLD_FILES+=usr/share/groff_font/devX75/TBI
 OLD_FILES+=usr/share/groff_font/devX75/TI
 OLD_FILES+=usr/share/groff_font/devX75/TR
 OLD_DIRS+=usr/share/groff_font/devX75
 OLD_FILES+=usr/share/groff_font/devascii/B
 OLD_FILES+=usr/share/groff_font/devascii/BI
 OLD_FILES+=usr/share/groff_font/devascii/CW
 OLD_FILES+=usr/share/groff_font/devascii/DESC
 OLD_FILES+=usr/share/groff_font/devascii/I
 OLD_FILES+=usr/share/groff_font/devascii/L
 OLD_FILES+=usr/share/groff_font/devascii/R
 OLD_FILES+=usr/share/groff_font/devascii/S
 OLD_DIRS+=usr/share/groff_font/devascii
 OLD_FILES+=usr/share/groff_font/devcp1047/B
 OLD_FILES+=usr/share/groff_font/devcp1047/BI
 OLD_FILES+=usr/share/groff_font/devcp1047/CW
 OLD_FILES+=usr/share/groff_font/devcp1047/DESC
 OLD_FILES+=usr/share/groff_font/devcp1047/I
 OLD_FILES+=usr/share/groff_font/devcp1047/L
 OLD_FILES+=usr/share/groff_font/devcp1047/R
 OLD_FILES+=usr/share/groff_font/devcp1047/S
 OLD_DIRS+=usr/share/groff_font/devcp1047
 OLD_FILES+=usr/share/groff_font/devdvi/CW
 OLD_FILES+=usr/share/groff_font/devdvi/CWEC
 OLD_FILES+=usr/share/groff_font/devdvi/CWI
 OLD_FILES+=usr/share/groff_font/devdvi/CWIEC
 OLD_FILES+=usr/share/groff_font/devdvi/CWITC
 OLD_FILES+=usr/share/groff_font/devdvi/CWTC
 OLD_FILES+=usr/share/groff_font/devdvi/CompileFonts
 OLD_FILES+=usr/share/groff_font/devdvi/DESC
 OLD_FILES+=usr/share/groff_font/devdvi/EX
 OLD_FILES+=usr/share/groff_font/devdvi/HB
 OLD_FILES+=usr/share/groff_font/devdvi/HBEC
 OLD_FILES+=usr/share/groff_font/devdvi/HBI
 OLD_FILES+=usr/share/groff_font/devdvi/HBIEC
 OLD_FILES+=usr/share/groff_font/devdvi/HBITC
 OLD_FILES+=usr/share/groff_font/devdvi/HBTC
 OLD_FILES+=usr/share/groff_font/devdvi/HI
 OLD_FILES+=usr/share/groff_font/devdvi/HIEC
 OLD_FILES+=usr/share/groff_font/devdvi/HITC
 OLD_FILES+=usr/share/groff_font/devdvi/HR
 OLD_FILES+=usr/share/groff_font/devdvi/HREC
 OLD_FILES+=usr/share/groff_font/devdvi/HRTC
 OLD_FILES+=usr/share/groff_font/devdvi/MI
 OLD_FILES+=usr/share/groff_font/devdvi/Makefile
 OLD_FILES+=usr/share/groff_font/devdvi/S
 OLD_FILES+=usr/share/groff_font/devdvi/SA
 OLD_FILES+=usr/share/groff_font/devdvi/SB
 OLD_FILES+=usr/share/groff_font/devdvi/SC
 OLD_FILES+=usr/share/groff_font/devdvi/TB
 OLD_FILES+=usr/share/groff_font/devdvi/TBEC
 OLD_FILES+=usr/share/groff_font/devdvi/TBI
 OLD_FILES+=usr/share/groff_font/devdvi/TBIEC
 OLD_FILES+=usr/share/groff_font/devdvi/TBITC
 OLD_FILES+=usr/share/groff_font/devdvi/TBTC
 OLD_FILES+=usr/share/groff_font/devdvi/TI
 OLD_FILES+=usr/share/groff_font/devdvi/TIEC
 OLD_FILES+=usr/share/groff_font/devdvi/TITC
 OLD_FILES+=usr/share/groff_font/devdvi/TR
 OLD_FILES+=usr/share/groff_font/devdvi/TREC
 OLD_FILES+=usr/share/groff_font/devdvi/TRTC
 OLD_FILES+=usr/share/groff_font/devdvi/ec.map
 OLD_FILES+=usr/share/groff_font/devdvi/msam.map
 OLD_FILES+=usr/share/groff_font/devdvi/msbm.map
 OLD_FILES+=usr/share/groff_font/devdvi/tc.map
 OLD_FILES+=usr/share/groff_font/devdvi/texb.map
 OLD_FILES+=usr/share/groff_font/devdvi/texex.map
 OLD_FILES+=usr/share/groff_font/devdvi/texi.map
 OLD_FILES+=usr/share/groff_font/devdvi/texmi.map
 OLD_FILES+=usr/share/groff_font/devdvi/texr.map
 OLD_FILES+=usr/share/groff_font/devdvi/texsy.map
 OLD_FILES+=usr/share/groff_font/devdvi/textex.map
 OLD_FILES+=usr/share/groff_font/devdvi/textt.map
 OLD_DIRS+=usr/share/groff_font/devdvi
 OLD_FILES+=usr/share/groff_font/devhtml/B
 OLD_FILES+=usr/share/groff_font/devhtml/BI
 OLD_FILES+=usr/share/groff_font/devhtml/CB
 OLD_FILES+=usr/share/groff_font/devhtml/CBI
 OLD_FILES+=usr/share/groff_font/devhtml/CI
 OLD_FILES+=usr/share/groff_font/devhtml/CR
 OLD_FILES+=usr/share/groff_font/devhtml/DESC
 OLD_FILES+=usr/share/groff_font/devhtml/I
 OLD_FILES+=usr/share/groff_font/devhtml/R
 OLD_FILES+=usr/share/groff_font/devhtml/S
 OLD_DIRS+=usr/share/groff_font/devhtml
 OLD_FILES+=usr/share/groff_font/devkoi8-r/B
 OLD_FILES+=usr/share/groff_font/devkoi8-r/BI
 OLD_FILES+=usr/share/groff_font/devkoi8-r/CW
 OLD_FILES+=usr/share/groff_font/devkoi8-r/DESC
 OLD_FILES+=usr/share/groff_font/devkoi8-r/I
 OLD_FILES+=usr/share/groff_font/devkoi8-r/L
 OLD_FILES+=usr/share/groff_font/devkoi8-r/R
 OLD_FILES+=usr/share/groff_font/devkoi8-r/S
 OLD_DIRS+=usr/share/groff_font/devkoi8-r
 OLD_FILES+=usr/share/groff_font/devlatin1/B
 OLD_FILES+=usr/share/groff_font/devlatin1/BI
 OLD_FILES+=usr/share/groff_font/devlatin1/CW
 OLD_FILES+=usr/share/groff_font/devlatin1/DESC
 OLD_FILES+=usr/share/groff_font/devlatin1/I
 OLD_FILES+=usr/share/groff_font/devlatin1/L
 OLD_FILES+=usr/share/groff_font/devlatin1/R
 OLD_FILES+=usr/share/groff_font/devlatin1/S
 OLD_DIRS+=usr/share/groff_font/devlatin1
 OLD_FILES+=usr/share/groff_font/devlbp/CB
 OLD_FILES+=usr/share/groff_font/devlbp/CI
 OLD_FILES+=usr/share/groff_font/devlbp/CR
 OLD_FILES+=usr/share/groff_font/devlbp/DESC
 OLD_FILES+=usr/share/groff_font/devlbp/EB
 OLD_FILES+=usr/share/groff_font/devlbp/EI
 OLD_FILES+=usr/share/groff_font/devlbp/ER
 OLD_FILES+=usr/share/groff_font/devlbp/HB
 OLD_FILES+=usr/share/groff_font/devlbp/HBI
 OLD_FILES+=usr/share/groff_font/devlbp/HI
 OLD_FILES+=usr/share/groff_font/devlbp/HNB
 OLD_FILES+=usr/share/groff_font/devlbp/HNBI
 OLD_FILES+=usr/share/groff_font/devlbp/HNI
 OLD_FILES+=usr/share/groff_font/devlbp/HNR
 OLD_FILES+=usr/share/groff_font/devlbp/HR
 OLD_FILES+=usr/share/groff_font/devlbp/TB
 OLD_FILES+=usr/share/groff_font/devlbp/TBI
 OLD_FILES+=usr/share/groff_font/devlbp/TI
 OLD_FILES+=usr/share/groff_font/devlbp/TR
 OLD_DIRS+=usr/share/groff_font/devlbp
 OLD_FILES+=usr/share/groff_font/devlj4/AB
 OLD_FILES+=usr/share/groff_font/devlj4/ABI
 OLD_FILES+=usr/share/groff_font/devlj4/AI
 OLD_FILES+=usr/share/groff_font/devlj4/ALBB
 OLD_FILES+=usr/share/groff_font/devlj4/ALBR
 OLD_FILES+=usr/share/groff_font/devlj4/AOB
 OLD_FILES+=usr/share/groff_font/devlj4/AOI
 OLD_FILES+=usr/share/groff_font/devlj4/AOR
 OLD_FILES+=usr/share/groff_font/devlj4/AR
 OLD_FILES+=usr/share/groff_font/devlj4/CB
 OLD_FILES+=usr/share/groff_font/devlj4/CBI
 OLD_FILES+=usr/share/groff_font/devlj4/CI
 OLD_FILES+=usr/share/groff_font/devlj4/CLARENDON
 OLD_FILES+=usr/share/groff_font/devlj4/CORONET
 OLD_FILES+=usr/share/groff_font/devlj4/CR
 OLD_FILES+=usr/share/groff_font/devlj4/DESC
 OLD_FILES+=usr/share/groff_font/devlj4/GB
 OLD_FILES+=usr/share/groff_font/devlj4/GBI
 OLD_FILES+=usr/share/groff_font/devlj4/GI
 OLD_FILES+=usr/share/groff_font/devlj4/GR
 OLD_FILES+=usr/share/groff_font/devlj4/LGB
 OLD_FILES+=usr/share/groff_font/devlj4/LGI
 OLD_FILES+=usr/share/groff_font/devlj4/LGR
 OLD_FILES+=usr/share/groff_font/devlj4/MARIGOLD
 OLD_FILES+=usr/share/groff_font/devlj4/OB
 OLD_FILES+=usr/share/groff_font/devlj4/OBI
 OLD_FILES+=usr/share/groff_font/devlj4/OI
 OLD_FILES+=usr/share/groff_font/devlj4/OR
 OLD_FILES+=usr/share/groff_font/devlj4/S
 OLD_FILES+=usr/share/groff_font/devlj4/SYMBOL
 OLD_FILES+=usr/share/groff_font/devlj4/TB
 OLD_FILES+=usr/share/groff_font/devlj4/TBI
 OLD_FILES+=usr/share/groff_font/devlj4/TI
 OLD_FILES+=usr/share/groff_font/devlj4/TNRB
 OLD_FILES+=usr/share/groff_font/devlj4/TNRBI
 OLD_FILES+=usr/share/groff_font/devlj4/TNRI
 OLD_FILES+=usr/share/groff_font/devlj4/TNRR
 OLD_FILES+=usr/share/groff_font/devlj4/TR
 OLD_FILES+=usr/share/groff_font/devlj4/UB
 OLD_FILES+=usr/share/groff_font/devlj4/UBI
 OLD_FILES+=usr/share/groff_font/devlj4/UCB
 OLD_FILES+=usr/share/groff_font/devlj4/UCBI
 OLD_FILES+=usr/share/groff_font/devlj4/UCI
 OLD_FILES+=usr/share/groff_font/devlj4/UCR
 OLD_FILES+=usr/share/groff_font/devlj4/UI
 OLD_FILES+=usr/share/groff_font/devlj4/UR
 OLD_FILES+=usr/share/groff_font/devlj4/WINGDINGS
 OLD_DIRS+=usr/share/groff_font/devlj4
 OLD_FILES+=usr/share/groff_font/devps/AB
 OLD_FILES+=usr/share/groff_font/devps/ABI
 OLD_FILES+=usr/share/groff_font/devps/AI
 OLD_FILES+=usr/share/groff_font/devps/AR
 OLD_FILES+=usr/share/groff_font/devps/BMB
 OLD_FILES+=usr/share/groff_font/devps/BMBI
 OLD_FILES+=usr/share/groff_font/devps/BMI
 OLD_FILES+=usr/share/groff_font/devps/BMR
 OLD_FILES+=usr/share/groff_font/devps/CB
 OLD_FILES+=usr/share/groff_font/devps/CBI
 OLD_FILES+=usr/share/groff_font/devps/CI
 OLD_FILES+=usr/share/groff_font/devps/CR
 OLD_FILES+=usr/share/groff_font/devps/DESC
 OLD_FILES+=usr/share/groff_font/devps/EURO
 OLD_FILES+=usr/share/groff_font/devps/HB
 OLD_FILES+=usr/share/groff_font/devps/HBI
 OLD_FILES+=usr/share/groff_font/devps/HI
 OLD_FILES+=usr/share/groff_font/devps/HNB
 OLD_FILES+=usr/share/groff_font/devps/HNBI
 OLD_FILES+=usr/share/groff_font/devps/HNI
 OLD_FILES+=usr/share/groff_font/devps/HNR
 OLD_FILES+=usr/share/groff_font/devps/HR
 OLD_FILES+=usr/share/groff_font/devps/Makefile
 OLD_FILES+=usr/share/groff_font/devps/NB
 OLD_FILES+=usr/share/groff_font/devps/NBI
 OLD_FILES+=usr/share/groff_font/devps/NI
 OLD_FILES+=usr/share/groff_font/devps/NR
 OLD_FILES+=usr/share/groff_font/devps/PB
 OLD_FILES+=usr/share/groff_font/devps/PBI
 OLD_FILES+=usr/share/groff_font/devps/PI
 OLD_FILES+=usr/share/groff_font/devps/PR
 OLD_FILES+=usr/share/groff_font/devps/S
 OLD_FILES+=usr/share/groff_font/devps/SS
 OLD_FILES+=usr/share/groff_font/devps/TB
 OLD_FILES+=usr/share/groff_font/devps/TBI
 OLD_FILES+=usr/share/groff_font/devps/TI
 OLD_FILES+=usr/share/groff_font/devps/TR
 OLD_FILES+=usr/share/groff_font/devps/ZCMI
 OLD_FILES+=usr/share/groff_font/devps/ZD
 OLD_FILES+=usr/share/groff_font/devps/ZDR
 OLD_FILES+=usr/share/groff_font/devps/afmname
 OLD_FILES+=usr/share/groff_font/devps/dingbats.map
 OLD_FILES+=usr/share/groff_font/devps/dingbats.rmap
 OLD_FILES+=usr/share/groff_font/devps/download
 OLD_FILES+=usr/share/groff_font/devps/freeeuro.pfa
 OLD_FILES+=usr/share/groff_font/devps/lgreekmap
 OLD_FILES+=usr/share/groff_font/devps/prologue
 OLD_FILES+=usr/share/groff_font/devps/symbol.sed
 OLD_FILES+=usr/share/groff_font/devps/symbolchars
 OLD_FILES+=usr/share/groff_font/devps/symbolsl.afm
 OLD_FILES+=usr/share/groff_font/devps/symbolsl.pfa
 OLD_FILES+=usr/share/groff_font/devps/text.enc
 OLD_FILES+=usr/share/groff_font/devps/textmap
 OLD_FILES+=usr/share/groff_font/devps/zapfdr.pfa
 OLD_DIRS+=usr/share/groff_font/devps
 OLD_FILES+=usr/share/groff_font/devutf8/B
 OLD_FILES+=usr/share/groff_font/devutf8/BI
 OLD_FILES+=usr/share/groff_font/devutf8/CW
 OLD_FILES+=usr/share/groff_font/devutf8/DESC
 OLD_FILES+=usr/share/groff_font/devutf8/I
 OLD_FILES+=usr/share/groff_font/devutf8/L
 OLD_FILES+=usr/share/groff_font/devutf8/R
 OLD_FILES+=usr/share/groff_font/devutf8/S
 OLD_DIRS+=usr/share/groff_font/devutf8
 OLD_DIRS+=usr/share/groff_font
 OLD_FILES+=usr/share/info/groff.info.gz
 OLD_FILES+=usr/share/man/man1/addftinfo.1.gz
 OLD_FILES+=usr/share/man/man1/afmtodit.1.gz
 OLD_FILES+=usr/share/man/man1/eqn.1.gz
 OLD_FILES+=usr/share/man/man1/grn.1.gz
 OLD_FILES+=usr/share/man/man1/grodvi.1.gz
 OLD_FILES+=usr/share/man/man1/groff.1.gz
 OLD_FILES+=usr/share/man/man1/grog.1.gz
 OLD_FILES+=usr/share/man/man1/grolbp.1.gz
 OLD_FILES+=usr/share/man/man1/grolj4.1.gz
 OLD_FILES+=usr/share/man/man1/grops.1.gz
 OLD_FILES+=usr/share/man/man1/grotty.1.gz
 OLD_FILES+=usr/share/man/man1/hpftodit.1.gz
 OLD_FILES+=usr/share/man/man1/indxbib.1.gz
 OLD_FILES+=usr/share/man/man1/lkbib.1.gz
 OLD_FILES+=usr/share/man/man1/lookbib.1.gz
 OLD_FILES+=usr/share/man/man1/mmroff.1.gz
 OLD_FILES+=usr/share/man/man1/neqn.1.gz
 OLD_FILES+=usr/share/man/man1/nroff.1.gz
 OLD_FILES+=usr/share/man/man1/pfbtops.1.gz
 OLD_FILES+=usr/share/man/man1/pic.1.gz
 OLD_FILES+=usr/share/man/man1/psroff.1.gz
 OLD_FILES+=usr/share/man/man1/refer.1.gz
 OLD_FILES+=usr/share/man/man1/soelim.1.gz
 OLD_FILES+=usr/share/man/man1/tbl.1.gz
 OLD_FILES+=usr/share/man/man1/tfmtodit.1.gz
 OLD_FILES+=usr/share/man/man1/troff.1.gz
 OLD_FILES+=usr/share/man/man1/vgrind.1.gz
 OLD_FILES+=usr/share/man/man5/groff_font.5.gz
 OLD_FILES+=usr/share/man/man5/groff_out.5.gz
 OLD_FILES+=usr/share/man/man5/groff_tmac.5.gz
 OLD_FILES+=usr/share/man/man5/lj4_font.5.gz
 OLD_FILES+=usr/share/man/man5/tmac.5.gz
 OLD_FILES+=usr/share/man/man5/vgrindefs.5.gz
 OLD_FILES+=usr/share/man/man7/ditroff.7.gz
 OLD_FILES+=usr/share/man/man7/groff.7.gz
 OLD_FILES+=usr/share/man/man7/groff_char.7.gz
 OLD_FILES+=usr/share/man/man7/groff_diff.7.gz
 OLD_FILES+=usr/share/man/man7/groff_man.7.gz
 OLD_FILES+=usr/share/man/man7/groff_mdoc.7.gz
 OLD_FILES+=usr/share/man/man7/groff_me.7.gz
 OLD_FILES+=usr/share/man/man7/groff_mm.7.gz
 OLD_FILES+=usr/share/man/man7/groff_mmse.7.gz
 OLD_FILES+=usr/share/man/man7/groff_ms.7.gz
 OLD_FILES+=usr/share/man/man7/groff_trace.7.gz
 OLD_FILES+=usr/share/man/man7/groff_www.7.gz
 OLD_FILES+=usr/share/man/man7/mdoc.samples.7.gz
 OLD_FILES+=usr/share/man/man7/me.7.gz
 OLD_FILES+=usr/share/man/man7/mm.7.gz
 OLD_FILES+=usr/share/man/man7/mmse.7.gz
 OLD_FILES+=usr/share/man/man7/ms.7.gz
 OLD_FILES+=usr/share/man/man7/orig_me.7.gz
 OLD_FILES+=usr/share/man/man7/roff.7.gz
 OLD_FILES+=usr/share/me/acm.me
 OLD_FILES+=usr/share/me/chars.me
 OLD_FILES+=usr/share/me/deltext.me
 OLD_FILES+=usr/share/me/eqn.me
 OLD_FILES+=usr/share/me/float.me
 OLD_FILES+=usr/share/me/footnote.me
 OLD_FILES+=usr/share/me/index.me
 OLD_FILES+=usr/share/me/letterhead.me
 OLD_FILES+=usr/share/me/local.me
 OLD_FILES+=usr/share/me/null.me
 OLD_FILES+=usr/share/me/refer.me
 OLD_FILES+=usr/share/me/revisions
 OLD_FILES+=usr/share/me/sh.me
 OLD_FILES+=usr/share/me/tbl.me
 OLD_FILES+=usr/share/me/thesis.me
 OLD_DIRS+=usr/share/me
 OLD_FILES+=usr/share/misc/vgrindefs
 OLD_FILES+=usr/share/misc/vgrindefs.db
 OLD_FILES+=usr/share/tmac/X.tmac
 OLD_FILES+=usr/share/tmac/Xps.tmac
 OLD_FILES+=usr/share/tmac/a4.tmac
 OLD_FILES+=usr/share/tmac/an-old.tmac
 OLD_FILES+=usr/share/tmac/an.tmac
 OLD_FILES+=usr/share/tmac/andoc.tmac
 OLD_FILES+=usr/share/tmac/composite.tmac
 OLD_FILES+=usr/share/tmac/cp1047.tmac
 OLD_FILES+=usr/share/tmac/devtag.tmac
 OLD_FILES+=usr/share/tmac/doc.tmac
 OLD_FILES+=usr/share/tmac/dvi.tmac
 OLD_FILES+=usr/share/tmac/e.tmac
 OLD_FILES+=usr/share/tmac/ec.tmac
 OLD_FILES+=usr/share/tmac/eqnrc
 OLD_FILES+=usr/share/tmac/europs.tmac
 OLD_FILES+=usr/share/tmac/html-end.tmac
 OLD_FILES+=usr/share/tmac/html.tmac
 OLD_FILES+=usr/share/tmac/hyphen.ru
 OLD_FILES+=usr/share/tmac/hyphen.us
 OLD_FILES+=usr/share/tmac/hyphenex.us
 OLD_FILES+=usr/share/tmac/koi8-r.tmac
 OLD_FILES+=usr/share/tmac/latin1.tmac
 OLD_FILES+=usr/share/tmac/latin2.tmac
 OLD_FILES+=usr/share/tmac/latin9.tmac
 OLD_FILES+=usr/share/tmac/lbp.tmac
 OLD_FILES+=usr/share/tmac/lj4.tmac
 OLD_FILES+=usr/share/tmac/m.tmac
 OLD_FILES+=usr/share/tmac/man.local
 OLD_FILES+=usr/share/tmac/man.tmac
 OLD_FILES+=usr/share/tmac/mandoc.tmac
 OLD_FILES+=usr/share/tmac/mdoc.local
 OLD_FILES+=usr/share/tmac/mdoc.tmac
 OLD_FILES+=usr/share/tmac/mdoc/doc-common
 OLD_FILES+=usr/share/tmac/mdoc/doc-ditroff
 OLD_FILES+=usr/share/tmac/mdoc/doc-nroff
 OLD_FILES+=usr/share/tmac/mdoc/doc-syms
 OLD_FILES+=usr/share/tmac/mdoc/fr.ISO8859-1
 OLD_FILES+=usr/share/tmac/mdoc/ru.KOI8-R
 OLD_DIRS+=usr/share/tmac/mdoc
 OLD_FILES+=usr/share/tmac/me.tmac
 OLD_FILES+=usr/share/tmac/mm/0.MT
 OLD_FILES+=usr/share/tmac/mm/4.MT
 OLD_FILES+=usr/share/tmac/mm/5.MT
 OLD_FILES+=usr/share/tmac/mm/locale
 OLD_FILES+=usr/share/tmac/mm/mm.tmac
 OLD_FILES+=usr/share/tmac/mm/mmse.tmac
 OLD_FILES+=usr/share/tmac/mm/ms.cov
 OLD_FILES+=usr/share/tmac/mm/se_locale
 OLD_FILES+=usr/share/tmac/mm/se_ms.cov
 OLD_DIRS+=usr/share/tmac/mm
 OLD_FILES+=usr/share/tmac/ms.tmac
 OLD_FILES+=usr/share/tmac/mse.tmac
 OLD_FILES+=usr/share/tmac/papersize.tmac
 OLD_FILES+=usr/share/tmac/pic.tmac
 OLD_FILES+=usr/share/tmac/ps.tmac
 OLD_FILES+=usr/share/tmac/psatk.tmac
 OLD_FILES+=usr/share/tmac/psold.tmac
 OLD_FILES+=usr/share/tmac/pspic.tmac
 OLD_FILES+=usr/share/tmac/s.tmac
 OLD_FILES+=usr/share/tmac/safer.tmac
 OLD_FILES+=usr/share/tmac/tmac.orig_me
 OLD_FILES+=usr/share/tmac/tmac.vgrind
 OLD_FILES+=usr/share/tmac/trace.tmac
 OLD_FILES+=usr/share/tmac/troffrc
 OLD_FILES+=usr/share/tmac/troffrc-end
 OLD_FILES+=usr/share/tmac/tty-char.tmac
 OLD_FILES+=usr/share/tmac/tty.tmac
 OLD_FILES+=usr/share/tmac/unicode.tmac
 OLD_FILES+=usr/share/tmac/www.tmac
 OLD_DIRS+=usr/share/tmac
 .endif
 
 .if ${MK_GSSAPI} == no
 OLD_FILES+=usr/include/gssapi/gssapi.h
 OLD_DIRS+=usr/include/gssapi
 OLD_FILES+=usr/include/gssapi.h
 OLD_FILES+=usr/lib/libgssapi.a
 OLD_FILES+=usr/lib/libgssapi.so
 OLD_LIBS+=usr/lib/libgssapi.so.10
 OLD_FILES+=usr/lib/libgssapi_p.a
 OLD_FILES+=usr/lib/librpcsec_gss.a
 OLD_FILES+=usr/lib/librpcsec_gss.so
 OLD_LIBS+=usr/lib/librpcsec_gss.so.1
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libgssapi.a
 OLD_FILES+=usr/lib32/libgssapi.so
 OLD_LIBS+=usr/lib32/libgssapi.so.10
 OLD_FILES+=usr/lib32/libgssapi_p.a
 OLD_FILES+=usr/lib32/librpcsec_gss.a
 OLD_FILES+=usr/lib32/librpcsec_gss.so
 OLD_LIBS+=usr/lib32/librpcsec_gss.so.1
 .endif
 OLD_FILES+=usr/sbin/gssd
 OLD_FILES+=usr/share/man/man3/gss_accept_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_acquire_cred.3.gz
 OLD_FILES+=usr/share/man/man3/gss_add_cred.3.gz
 OLD_FILES+=usr/share/man/man3/gss_add_oid_set_member.3.gz
 OLD_FILES+=usr/share/man/man3/gss_canonicalize_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_compare_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_context_time.3.gz
 OLD_FILES+=usr/share/man/man3/gss_create_empty_oid_set.3.gz
 OLD_FILES+=usr/share/man/man3/gss_delete_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_display_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_display_status.3.gz
 OLD_FILES+=usr/share/man/man3/gss_duplicate_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_export_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_export_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_get_mic.3.gz
 OLD_FILES+=usr/share/man/man3/gss_import_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_import_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_indicate_mechs.3.gz
 OLD_FILES+=usr/share/man/man3/gss_init_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_cred.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_cred_by_mech.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_mechs_for_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_names_for_mech.3.gz
 OLD_FILES+=usr/share/man/man3/gss_process_context_token.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_buffer.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_cred.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_oid_set.3.gz
 OLD_FILES+=usr/share/man/man3/gss_seal.3.gz
 OLD_FILES+=usr/share/man/man3/gss_sign.3.gz
 OLD_FILES+=usr/share/man/man3/gss_test_oid_set_member.3.gz
 OLD_FILES+=usr/share/man/man3/gss_unseal.3.gz
 OLD_FILES+=usr/share/man/man3/gss_unwrap.3.gz
 OLD_FILES+=usr/share/man/man3/gss_verify.3.gz
 OLD_FILES+=usr/share/man/man3/gss_verify_mic.3.gz
 OLD_FILES+=usr/share/man/man3/gss_wrap.3.gz
 OLD_FILES+=usr/share/man/man3/gss_wrap_size_limit.3.gz
 OLD_FILES+=usr/share/man/man3/gssapi.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_error.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_mech_info.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_mechanisms.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_principal_name.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_versions.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_getcred.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_is_installed.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_max_data_length.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_mech_to_oid.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_oid_to_mech.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_qop_to_num.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_seccreate.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_set_callback.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_set_defaults.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_set_svc_name.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_svc_max_data_length.3.gz
 OLD_FILES+=usr/share/man/man3/rpcsec_gss.3.gz
 OLD_FILES+=usr/share/man/man5/mech.5.gz
 OLD_FILES+=usr/share/man/man5/qop.5.gz
 OLD_FILES+=usr/share/man/man8/gssd.8.gz
 .endif
 
 .if ${MK_HESIOD} == no
 OLD_FILES+=usr/bin/hesinfo
 OLD_FILES+=usr/include/hesiod.h
 OLD_FILES+=usr/share/man/man1/hesinfo.1.gz
 OLD_FILES+=usr/share/man/man3/hesiod.3.gz
 OLD_FILES+=usr/share/man/man5/hesiod.conf.5.gz
 .endif
 
 #.if ${MK_HTML} == no
 # to be filled in
 #.endif
 
 .if ${MK_ICONV} == no
 OLD_FILES+=usr/bin/iconv
 OLD_FILES+=usr/bin/mkcsmapper
 OLD_FILES+=usr/bin/mkesdb
 OLD_FILES+=usr/include/_libiconv_compat.h
 OLD_FILES+=usr/include/iconv.h
 OLD_FILES+=usr/share/man/man1/iconv.1.gz
 OLD_FILES+=usr/share/man/man1/mkcsmapper.1.gz
 OLD_FILES+=usr/share/man/man1/mkesdb.1.gz
 OLD_FILES+=usr/share/man/man3/__iconv.3.gz
 OLD_FILES+=usr/share/man/man3/__iconv_free_list.3.gz	
 OLD_FILES+=usr/share/man/man3/__iconv_get_list.3.gz
 OLD_FILES+=usr/share/man/man3/iconv.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_canonicalize.3.gz	
 OLD_FILES+=usr/share/man/man3/iconv_close.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_open.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_open_into.3.gz
 OLD_FILES+=usr/share/man/man3/iconvctl.3.gz
 OLD_FILES+=usr/share/man/man3/iconvlist.3.gz	
 .endif
 
 .if ${MK_INET6} == no
 OLD_FILES+=sbin/ping6
 OLD_FILES+=sbin/rtsol
 OLD_FILES+=usr/sbin/ip6addrctl
 OLD_FILES+=usr/sbin/mld6query
 OLD_FILES+=usr/sbin/ndp
 OLD_FILES+=usr/sbin/rip6query
 OLD_FILES+=usr/sbin/route6d
 OLD_FILES+=usr/sbin/rrenumd
 OLD_FILES+=usr/sbin/rtadvd
 OLD_FILES+=usr/sbin/rtsold
 OLD_FILES+=usr/sbin/traceroute6
 OLD_FILES+=usr/share/man/man5/rrenumd.conf.5.gz
 OLD_FILES+=usr/share/man/man5/rtadvd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/ip6addrctl.8.gz
 OLD_FILES+=usr/share/man/man8/mld6query.8.gz
 OLD_FILES+=usr/share/man/man8/ndp.8.gz
 OLD_FILES+=usr/share/man/man8/ping6.8.gz
 OLD_FILES+=usr/share/man/man8/rip6query.8.gz
 OLD_FILES+=usr/share/man/man8/route6d.8.gz
 OLD_FILES+=usr/share/man/man8/rrenumd.8.gz
 OLD_FILES+=usr/share/man/man8/rtadvd.8.gz
 OLD_FILES+=usr/share/man/man8/rtsol.8.gz
 OLD_FILES+=usr/share/man/man8/rtsold.8.gz
 OLD_FILES+=usr/share/man/man8/traceroute6.8.gz
 .endif
 
 .if ${MK_INET6_SUPPORT} == no
 OLD_FILES+=rescue/ping6
 .endif
 
-.if ${MK_INFO} == no
-OLD_FILES+=usr/bin/info
-OLD_FILES+=usr/bin/infokey
-OLD_FILES+=usr/bin/install-info
-OLD_FILES+=usr/bin/makeinfo
-OLD_FILES+=usr/bin/texindex
-OLD_FILES+=usr/share/info/am-utils.info.gz
-OLD_FILES+=usr/share/info/as-utils.info.gz
-OLD_FILES+=usr/share/info/binutils.info.gz
-OLD_FILES+=usr/share/info/com_err.info.gz
-OLD_FILES+=usr/share/info/diff.info.gz
-OLD_FILES+=usr/share/info/gdb.info.gz
-OLD_FILES+=usr/share/info/gdbint.info.gz
-OLD_FILES+=usr/share/info/gperf.info.gz
-OLD_FILES+=usr/share/info/grep.info.gz
-OLD_FILES+=usr/share/info/groff.info.gz
-OLD_FILES+=usr/share/info/heimdal.info.gz
-OLD_FILES+=usr/share/info/history.info.gz
-OLD_FILES+=usr/share/info/info-stnd.info.gz
-OLD_FILES+=usr/share/info/info.info.gz
-OLD_FILES+=usr/share/info/ld.info.gz
-OLD_FILES+=usr/share/info/regex.info.gz
-OLD_FILES+=usr/share/info/rluserman.info.gz
-OLD_FILES+=usr/share/info/stabs.info.gz
-OLD_FILES+=usr/share/info/texinfo.info.gz
-OLD_FILES+=usr/share/man/man1/info.1.gz
-OLD_FILES+=usr/share/man/man1/infokey.1.gz
-OLD_FILES+=usr/share/man/man1/install-info.1.gz
-OLD_FILES+=usr/share/man/man1/makeinfo.1.gz
-OLD_FILES+=usr/share/man/man1/texindex.1.gz
-OLD_FILES+=usr/share/man/man5/info.5.gz
-OLD_FILES+=usr/share/man/man5/texinfo.5.gz
-.endif
-
 .if ${MK_IPFILTER} == no
 OLD_FILES+=etc/periodic/security/510.ipfdenied
 OLD_FILES+=etc/periodic/security/610.ipf6denied
 OLD_FILES+=rescue/ipf
 OLD_FILES+=sbin/ipf
 OLD_FILES+=sbin/ipfs
 OLD_FILES+=sbin/ipfstat
 OLD_FILES+=sbin/ipftest
 OLD_FILES+=sbin/ipmon
 OLD_FILES+=sbin/ipnat
 OLD_FILES+=sbin/ippool
 OLD_FILES+=sbin/ipresend
 OLD_FILES+=usr/include/netinet/ip_auth.h
 OLD_FILES+=usr/include/netinet/ip_compat.h
 OLD_FILES+=usr/include/netinet/ip_fil.h
 OLD_FILES+=usr/include/netinet/ip_frag.h
 OLD_FILES+=usr/include/netinet/ip_htable.h
 OLD_FILES+=usr/include/netinet/ip_lookup.h
 OLD_FILES+=usr/include/netinet/ip_nat.h
 OLD_FILES+=usr/include/netinet/ip_pool.h
 OLD_FILES+=usr/include/netinet/ip_proxy.h
 OLD_FILES+=usr/include/netinet/ip_rules.h
 OLD_FILES+=usr/include/netinet/ip_scan.h
 OLD_FILES+=usr/include/netinet/ip_state.h
 OLD_FILES+=usr/include/netinet/ip_sync.h
 OLD_FILES+=usr/include/netinet/ipl.h
 OLD_FILES+=usr/share/examples/ipfilter/README
 OLD_FILES+=usr/share/examples/ipfilter/BASIC.NAT
 OLD_FILES+=usr/share/examples/ipfilter/BASIC_1.FW
 OLD_FILES+=usr/share/examples/ipfilter/BASIC_2.FW
 OLD_FILES+=usr/share/examples/ipfilter/example.1
 OLD_FILES+=usr/share/examples/ipfilter/example.2
 OLD_FILES+=usr/share/examples/ipfilter/example.3
 OLD_FILES+=usr/share/examples/ipfilter/example.4
 OLD_FILES+=usr/share/examples/ipfilter/example.5
 OLD_FILES+=usr/share/examples/ipfilter/example.6
 OLD_FILES+=usr/share/examples/ipfilter/example.7
 OLD_FILES+=usr/share/examples/ipfilter/example.8
 OLD_FILES+=usr/share/examples/ipfilter/example.9
 OLD_FILES+=usr/share/examples/ipfilter/example.10
 OLD_FILES+=usr/share/examples/ipfilter/example.11
 OLD_FILES+=usr/share/examples/ipfilter/example.12
 OLD_FILES+=usr/share/examples/ipfilter/example.13
 OLD_FILES+=usr/share/examples/ipfilter/example.sr
 OLD_FILES+=usr/share/examples/ipfilter/firewall
 OLD_FILES+=usr/share/examples/ipfilter/ftp-proxy
 OLD_FILES+=usr/share/examples/ipfilter/ftppxy
 OLD_FILES+=usr/share/examples/ipfilter/nat-setup
 OLD_FILES+=usr/share/examples/ipfilter/nat.eg
 OLD_FILES+=usr/share/examples/ipfilter/server
 OLD_FILES+=usr/share/examples/ipfilter/tcpstate
 OLD_FILES+=usr/share/examples/ipfilter/example.14
 OLD_FILES+=usr/share/examples/ipfilter/firewall.1
 OLD_FILES+=usr/share/examples/ipfilter/firewall.2
 OLD_FILES+=usr/share/examples/ipfilter/ipf.conf.permissive
 OLD_FILES+=usr/share/examples/ipfilter/ipf.conf.restrictive
 OLD_FILES+=usr/share/examples/ipfilter/ipf.conf.sample
 OLD_FILES+=usr/share/examples/ipfilter/ipnat.conf.sample
 OLD_FILES+=usr/share/examples/ipfilter/ipf-howto.txt
 OLD_FILES+=usr/share/examples/ipfilter/examples.txt
 OLD_FILES+=usr/share/examples/ipfilter/rules.txt
 OLD_FILES+=usr/share/examples/ipfilter/mkfilters
 OLD_DIRS+=usr/share/examples/ipfilter
 OLD_FILES+=usr/share/man/man1/ipftest.1.gz
 OLD_FILES+=usr/share/man/man1/ipresend.1.gz
 OLD_FILES+=usr/share/man/man4/ipf.4.gz
 OLD_FILES+=usr/share/man/man4/ipl.4.gz
 OLD_FILES+=usr/share/man/man4/ipfilter.4.gz
 OLD_FILES+=usr/share/man/man4/ipnat.4.gz
 OLD_FILES+=usr/share/man/man5/ipf.5.gz
 OLD_FILES+=usr/share/man/man5/ipf.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ipf6.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ipnat.5.gz
 OLD_FILES+=usr/share/man/man5/ipnat.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ippool.5.gz
 OLD_FILES+=usr/share/man/man8/ipf.8.gz
 OLD_FILES+=usr/share/man/man8/ipfs.8.gz
 OLD_FILES+=usr/share/man/man8/ipfstat.8.gz
 OLD_FILES+=usr/share/man/man8/ipmon.8.gz
 OLD_FILES+=usr/share/man/man8/ipnat.8.gz
 OLD_FILES+=usr/share/man/man8/ippool.8.gz
 .endif
 
 .if ${MK_IPFW} == no
 OLD_FILES+=etc/periodic/security/500.ipfwdenied
 OLD_FILES+=etc/periodic/security/550.ipfwlimit
 OLD_FILES+=sbin/ipfw
 OLD_FILES+=sbin/natd
 OLD_FILES+=usr/sbin/ipfwpcap
 OLD_FILES+=usr/share/man/man8/ipfw.8.gz
 OLD_FILES+=usr/share/man/man8/ipfwpcap.8.gz
 OLD_FILES+=usr/share/man/man8/natd.8.gz
 .endif
 
 .if ${MK_JAIL} == no
 OLD_FILES+=usr/sbin/jail
 OLD_FILES+=usr/sbin/jexec
 OLD_FILES+=usr/sbin/jls
 OLD_FILES+=usr/share/man/man8/jail.8.gz
 OLD_FILES+=usr/share/man/man8/jexec.8.gz
 OLD_FILES+=usr/share/man/man8/jls.8.gz
 .endif
 
 .if ${MK_KERBEROS} == no
 OLD_FILES+=usr/bin/compile_et
 OLD_FILES+=usr/bin/hxtool
 OLD_FILES+=usr/bin/kadmin
 OLD_FILES+=usr/bin/kdestroy
 OLD_FILES+=usr/bin/kf
 OLD_FILES+=usr/bin/kgetcred
 OLD_FILES+=usr/bin/kinit
 OLD_FILES+=usr/bin/klist
 OLD_FILES+=usr/bin/kpasswd
 OLD_FILES+=usr/bin/krb5-config
 OLD_FILES+=usr/bin/ksu
 OLD_FILES+=usr/bin/kswitch
 OLD_FILES+=usr/bin/string2key
 OLD_FILES+=usr/bin/verify_krb5_conf
 OLD_FILES+=usr/include/asn1-common.h
 OLD_FILES+=usr/include/asn1_err.h
 OLD_FILES+=usr/include/base64.h
 OLD_FILES+=usr/include/cms_asn1.h
 OLD_FILES+=usr/include/crmf_asn1.h
 OLD_FILES+=usr/include/der-private.h
 OLD_FILES+=usr/include/der-protos.h
 OLD_FILES+=usr/include/der.h
 OLD_FILES+=usr/include/digest_asn1.h
 OLD_FILES+=usr/include/getarg.h
 OLD_FILES+=usr/include/gssapi/gssapi_krb5.h
 OLD_FILES+=usr/include/hdb-protos.h
 OLD_FILES+=usr/include/hdb.h
 OLD_FILES+=usr/include/hdb_asn1.h
 OLD_FILES+=usr/include/hdb_err.h
 OLD_FILES+=usr/include/heim_asn1.h
 OLD_FILES+=usr/include/heim_err.h
 OLD_FILES+=usr/include/heim_threads.h
 OLD_FILES+=usr/include/heimbase.h
 OLD_FILES+=usr/include/heimntlm-protos.h
 OLD_FILES+=usr/include/heimntlm.h
 OLD_FILES+=usr/include/hex.h
 OLD_FILES+=usr/include/hx509-private.h
 OLD_FILES+=usr/include/hx509-protos.h
 OLD_FILES+=usr/include/hx509.h
 OLD_FILES+=usr/include/hx509_err.h
 OLD_FILES+=usr/include/k524_err.h
 OLD_FILES+=usr/include/kadm5/admin.h
 OLD_FILES+=usr/include/kadm5/kadm5-private.h
 OLD_FILES+=usr/include/kadm5/kadm5-protos.h
 OLD_FILES+=usr/include/kadm5/kadm5-pwcheck.h
 OLD_FILES+=usr/include/kadm5/kadm5_err.h
 OLD_FILES+=usr/include/kadm5/private.h
 OLD_DIRS+=usr/include/kadm5
 OLD_FILES+=usr/include/kafs.h
 OLD_FILES+=usr/include/kdc-protos.h
 OLD_FILES+=usr/include/kdc.h
 OLD_FILES+=usr/include/krb5-private.h
 OLD_FILES+=usr/include/krb5-protos.h
 OLD_FILES+=usr/include/krb5-types.h
 OLD_FILES+=usr/include/krb5.h
 OLD_FILES+=usr/include/krb5/ccache_plugin.h
 OLD_FILES+=usr/include/krb5/locate_plugin.h
 OLD_FILES+=usr/include/krb5/send_to_kdc_plugin.h
 OLD_FILES+=usr/include/krb5/windc_plugin.h
 OLD_DIRS+=usr/include/krb5
 OLD_FILES+=usr/include/krb5_asn1.h
 OLD_FILES+=usr/include/krb5_ccapi.h
 OLD_FILES+=usr/include/krb5_err.h
 OLD_FILES+=usr/include/kx509_asn1.h
 OLD_FILES+=usr/include/ntlm_err.h
 OLD_FILES+=usr/include/ocsp_asn1.h
 OLD_FILES+=usr/include/parse_bytes.h
 OLD_FILES+=usr/include/parse_time.h
 OLD_FILES+=usr/include/parse_units.h
 OLD_FILES+=usr/include/pkcs10_asn1.h
 OLD_FILES+=usr/include/pkcs12_asn1.h
 OLD_FILES+=usr/include/pkcs8_asn1.h
 OLD_FILES+=usr/include/pkcs9_asn1.h
 OLD_FILES+=usr/include/pkinit_asn1.h
 OLD_FILES+=usr/include/resolve.h
 OLD_FILES+=usr/include/rfc2459_asn1.h
 OLD_FILES+=usr/include/roken-common.h
 OLD_FILES+=usr/include/rtbl.h
 OLD_FILES+=usr/include/wind.h
 OLD_FILES+=usr/include/wind_err.h
 OLD_FILES+=usr/include/xdbm.h
 OLD_FILES+=usr/lib/libasn1.a
 OLD_FILES+=usr/lib/libasn1.so
 OLD_LIBS+=usr/lib/libasn1.so.11
 OLD_FILES+=usr/lib/libasn1_p.a
 OLD_FILES+=usr/lib/libcom_err.a
 OLD_FILES+=usr/lib/libcom_err.so
 OLD_LIBS+=usr/lib/libcom_err.so.5
 OLD_FILES+=usr/lib/libcom_err_p.a
 OLD_FILES+=usr/lib/libgssapi_krb5.a
 OLD_FILES+=usr/lib/libgssapi_krb5.so
 OLD_LIBS+=usr/lib/libgssapi_krb5.so.10
 OLD_FILES+=usr/lib/libgssapi_krb5_p.a
 OLD_FILES+=usr/lib/libgssapi_ntlm.a
 OLD_FILES+=usr/lib/libgssapi_ntlm.so
 OLD_LIBS+=usr/lib/libgssapi_ntlm.so.10
 OLD_FILES+=usr/lib/libgssapi_ntlm_p.a
 OLD_FILES+=usr/lib/libgssapi_spnego.a
 OLD_FILES+=usr/lib/libgssapi_spnego.so
 OLD_LIBS+=usr/lib/libgssapi_spnego.so.10
 OLD_FILES+=usr/lib/libgssapi_spnego_p.a
 OLD_FILES+=usr/lib/libhdb.a
 OLD_FILES+=usr/lib/libhdb.so
 OLD_LIBS+=usr/lib/libhdb.so.11
 OLD_FILES+=usr/lib/libhdb_p.a
 OLD_FILES+=usr/lib/libheimbase.a
 OLD_FILES+=usr/lib/libheimbase.so
 OLD_LIBS+=usr/lib/libheimbase.so.11
 OLD_FILES+=usr/lib/libheimbase_p.a
 OLD_FILES+=usr/lib/libheimntlm.a
 OLD_FILES+=usr/lib/libheimntlm.so
 OLD_LIBS+=usr/lib/libheimntlm.so.11
 OLD_FILES+=usr/lib/libheimntlm_p.a
 OLD_FILES+=usr/lib/libheimsqlite.a
 OLD_FILES+=usr/lib/libheimsqlite.so
 OLD_LIBS+=usr/lib/libheimsqlite.so.11
 OLD_FILES+=usr/lib/libheimsqlite_p.a
 OLD_FILES+=usr/lib/libhx509.a
 OLD_FILES+=usr/lib/libhx509.so
 OLD_LIBS+=usr/lib/libhx509.so.11
 OLD_FILES+=usr/lib/libhx509_p.a
 OLD_FILES+=usr/lib/libkadm5clnt.a
 OLD_FILES+=usr/lib/libkadm5clnt.so
 OLD_LIBS+=usr/lib/libkadm5clnt.so.11
 OLD_FILES+=usr/lib/libkadm5clnt_p.a
 OLD_FILES+=usr/lib/libkadm5srv.a
 OLD_FILES+=usr/lib/libkadm5srv.so
 OLD_LIBS+=usr/lib/libkadm5srv.so.11
 OLD_FILES+=usr/lib/libkadm5srv_p.a
 OLD_FILES+=usr/lib/libkafs5.a
 OLD_FILES+=usr/lib/libkafs5.so
 OLD_LIBS+=usr/lib/libkafs5.so.11
 OLD_FILES+=usr/lib/libkafs5_p.a
 OLD_FILES+=usr/lib/libkdc.a
 OLD_FILES+=usr/lib/libkdc.so
 OLD_LIBS+=usr/lib/libkdc.so.11
 OLD_FILES+=usr/lib/libkdc_p.a
 OLD_FILES+=usr/lib/libkrb5.a
 OLD_FILES+=usr/lib/libkrb5.so
 OLD_LIBS+=usr/lib/libkrb5.so.11
 OLD_FILES+=usr/lib/libkrb5_p.a
 OLD_FILES+=usr/lib/libroken.a
 OLD_FILES+=usr/lib/libroken.so
 OLD_LIBS+=usr/lib/libroken.so.11
 OLD_FILES+=usr/lib/libroken_p.a
 OLD_FILES+=usr/lib/libwind.a
 OLD_FILES+=usr/lib/libwind.so
 OLD_LIBS+=usr/lib/libwind.so.11
 OLD_FILES+=usr/lib/libwind_p.a
 OLD_FILES+=usr/lib/pam_krb5.so
 OLD_LIBS+=usr/lib/pam_krb5.so.5
 OLD_FILES+=usr/lib/pam_ksu.so
 OLD_LIBS+=usr/lib/pam_ksu.so.5
 OLD_FILES+=usr/lib/private/libheimipcc.a
 OLD_FILES+=usr/lib/private/libheimipcc.so
 OLD_LIBS+=usr/lib/private/libheimipcc.so.11
 OLD_FILES+=usr/lib/private/libheimipcc_p.a
 OLD_FILES+=usr/lib/private/libheimipcs.a
 OLD_FILES+=usr/lib/private/libheimipcs.so
 OLD_LIBS+=usr/lib/private/libheimipcs.so.11
 OLD_FILES+=usr/lib/private/libheimipcs_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libasn1.a
 OLD_FILES+=usr/lib32/libasn1.so
 OLD_LIBS+=usr/lib32/libasn1.so.11
 OLD_FILES+=usr/lib32/libasn1_p.a
 OLD_FILES+=usr/lib32/libgssapi_krb5.a
 OLD_FILES+=usr/lib32/libgssapi_krb5.so
 OLD_LIBS+=usr/lib32/libgssapi_krb5.so.10
 OLD_FILES+=usr/lib32/libgssapi_krb5_p.a
 OLD_FILES+=usr/lib32/libgssapi_ntlm.a
 OLD_FILES+=usr/lib32/libgssapi_ntlm.so
 OLD_LIBS+=usr/lib32/libgssapi_ntlm.so.10
 OLD_FILES+=usr/lib32/libgssapi_ntlm_p.a
 OLD_FILES+=usr/lib32/libgssapi_spnego.a
 OLD_FILES+=usr/lib32/libgssapi_spnego.so
 OLD_LIBS+=usr/lib32/libgssapi_spnego.so.10
 OLD_FILES+=usr/lib32/libgssapi_spnego_p.a
 OLD_FILES+=usr/lib32/libhdb.a
 OLD_FILES+=usr/lib32/libhdb.so
 OLD_LIBS+=usr/lib32/libhdb.so.11
 OLD_FILES+=usr/lib32/libhdb_p.a
 OLD_FILES+=usr/lib32/libheimbase.a
 OLD_FILES+=usr/lib32/libheimbase.so
 OLD_LIBS+=usr/lib32/libheimbase.so.11
 OLD_FILES+=usr/lib32/libheimbase_p.a
 OLD_FILES+=usr/lib32/libheimntlm.a
 OLD_FILES+=usr/lib32/libheimntlm.so
 OLD_LIBS+=usr/lib32/libheimntlm.so.11
 OLD_FILES+=usr/lib32/libheimntlm_p.a
 OLD_FILES+=usr/lib32/libheimsqlite.a
 OLD_FILES+=usr/lib32/libheimsqlite.so
 OLD_LIBS+=usr/lib32/libheimsqlite.so.11
 OLD_FILES+=usr/lib32/libheimsqlite_p.a
 OLD_FILES+=usr/lib32/libhx509.a
 OLD_FILES+=usr/lib32/libhx509.so
 OLD_LIBS+=usr/lib32/libhx509.so.11
 OLD_FILES+=usr/lib32/libhx509_p.a
 OLD_FILES+=usr/lib32/libkadm5clnt.a
 OLD_FILES+=usr/lib32/libkadm5clnt.so
 OLD_LIBS+=usr/lib32/libkadm5clnt.so.11
 OLD_FILES+=usr/lib32/libkadm5clnt_p.a
 OLD_FILES+=usr/lib32/libkadm5srv.a
 OLD_FILES+=usr/lib32/libkadm5srv.so
 OLD_LIBS+=usr/lib32/libkadm5srv.so.11
 OLD_FILES+=usr/lib32/libkadm5srv_p.a
 OLD_FILES+=usr/lib32/libkafs5.a
 OLD_FILES+=usr/lib32/libkafs5.so
 OLD_LIBS+=usr/lib32/libkafs5.so.11
 OLD_FILES+=usr/lib32/libkafs5_p.a
 OLD_FILES+=usr/lib32/libkdc.a
 OLD_FILES+=usr/lib32/libkdc.so
 OLD_LIBS+=usr/lib32/libkdc.so.11
 OLD_FILES+=usr/lib32/libkdc_p.a
 OLD_FILES+=usr/lib32/libkrb5.a
 OLD_FILES+=usr/lib32/libkrb5.so
 OLD_LIBS+=usr/lib32/libkrb5.so.11
 OLD_FILES+=usr/lib32/libkrb5_p.a
 OLD_FILES+=usr/lib32/libroken.a
 OLD_FILES+=usr/lib32/libroken.so
 OLD_LIBS+=usr/lib32/libroken.so.11
 OLD_FILES+=usr/lib32/libroken_p.a
 OLD_FILES+=usr/lib32/libwind.a
 OLD_FILES+=usr/lib32/libwind.so
 OLD_LIBS+=usr/lib32/libwind.so.11
 OLD_FILES+=usr/lib32/libwind_p.a
 OLD_FILES+=usr/lib32/pam_krb5.so
 OLD_LIBS+=usr/lib32/pam_krb5.so.5
 OLD_FILES+=usr/lib32/pam_ksu.so
 OLD_LIBS+=usr/lib32/pam_ksu.so.5
 OLD_FILES+=usr/lib32/private/libheimipcc.a
 OLD_FILES+=usr/lib32/private/libheimipcc.so
 OLD_LIBS+=usr/lib32/private/libheimipcc.so.11
 OLD_FILES+=usr/lib32/private/libheimipcc_p.a
 OLD_FILES+=usr/lib32/private/libheimipcs.a
 OLD_FILES+=usr/lib32/private/libheimipcs.so
 OLD_LIBS+=usr/lib32/private/libheimipcs.so.11
 OLD_FILES+=usr/lib32/private/libheimipcs_p.a
 .endif
 OLD_FILES+=usr/libexec/digest-service
 OLD_FILES+=usr/libexec/hprop
 OLD_FILES+=usr/libexec/hpropd
 OLD_FILES+=usr/libexec/ipropd-master
 OLD_FILES+=usr/libexec/ipropd-slave
 OLD_FILES+=usr/libexec/kadmind
 OLD_FILES+=usr/libexec/kcm
 OLD_FILES+=usr/libexec/kdc
 OLD_FILES+=usr/libexec/kdigest
 OLD_FILES+=usr/libexec/kfd
 OLD_FILES+=usr/libexec/kimpersonate
 OLD_FILES+=usr/libexec/kpasswdd
 OLD_FILES+=usr/sbin/kstash
 OLD_FILES+=usr/sbin/ktutil
 OLD_FILES+=usr/sbin/iprop-log
 OLD_FILES+=usr/share/info/heimdal.info.gz
 OLD_FILES+=usr/share/man/man1/kdestroy.1.gz
 OLD_FILES+=usr/share/man/man1/kf.1.gz
 OLD_FILES+=usr/share/man/man1/kinit.1.gz
 OLD_FILES+=usr/share/man/man1/klist.1.gz
 OLD_FILES+=usr/share/man/man1/kpasswd.1.gz
 OLD_FILES+=usr/share/man/man1/krb5-config.1.gz
 OLD_FILES+=usr/share/man/man1/kswitch.1.gz
 OLD_FILES+=usr/share/man/man3/HDB.3.gz
 OLD_FILES+=usr/share/man/man3/hdb__del.3.gz
 OLD_FILES+=usr/share/man/man3/hdb__get.3.gz
 OLD_FILES+=usr/share/man/man3/hdb__put.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_auth_status.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_check_constrained_delegation.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_check_pkinit_ms_upn_match.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_check_s4u2self.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_close.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_entry_ex.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_fetch_kvno.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_firstkey.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_free.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_get_realms.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_lock.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_name.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_nextkey.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_open.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_password.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_remove.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_rename.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_store.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_unlock.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_build_ntlm1_master.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_build_ntlm2_master.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_calculate_lm2.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_calculate_ntlm1.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_calculate_ntlm2.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_decode_targetinfo.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_encode_targetinfo.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_encode_type1.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_encode_type2.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_encode_type3.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_buf.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_targetinfo.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_type1.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_type2.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_type3.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_keyex_unwrap.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_nt_key.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_ntlmv2_key.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_verify_ntlm2.3.gz
 OLD_FILES+=usr/share/man/man3/hx509.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_bitstring_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_sign.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_sign_self.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_crl_dp_uri.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_eku.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_jid.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_ms_upn.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_otherName.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_pkinit.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_rfc822name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_ca.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_domaincontroller.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_notAfter.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_notAfter_lifetime.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_notBefore.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_proxy.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_serialnumber.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_spki.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_subject.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_template.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_unique.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_subject_expand.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_template_units.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_binary.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_check_eku.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_cmp.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_find_subjectAltName_otherName.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_SPKI.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_SPKI_AlgorithmIdentifier.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_attribute.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_base_subject.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_issuer.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_issuer_unique_id.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_notAfter.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_notBefore.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_serialnumber.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_subject.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_subject_unique_id.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_init_data.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_keyusage_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_ref.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_set_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_add.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_append.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_end_seq.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_filter.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_find.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_info.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_iter_f.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_merge.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_next_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_start_seq.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_store.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ci_print_names.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_clear_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_create_signed_1.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_envelope_1.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_unenvelope.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_unwrap_ContentInfo.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_verify_signed.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_wrap_ContentInfo.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_context_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_context_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_context_set_missing_revoke.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_add_revoked_certs.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_lifetime.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_sign.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crypto.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_add.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_add_binding.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_find.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_find_binding.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_lfind.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_err.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_error.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_free_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_free_octet_string_list.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_general_name_unparse.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_get_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_get_one_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_keyset.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_lock.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_misc.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_binary.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_cmp.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_copy.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_expand.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_is_null_p.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_to_Name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_to_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ocsp_request.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ocsp_verify.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_oid_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_oid_sprint.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_parse_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_add_cms_alg.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_set_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_set_cms_algs.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_print_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_print_stdout.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_cmp_func.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_eku.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_issuer_serial.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_option.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_statistic_file.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_unparse_stats.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_add_crl.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_add_ocsp.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_ocsp_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_verify.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_set_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_set_error_stringv.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_unparse_der_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_ctx_add_flags.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_ctx_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_ctx_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_ctx_set_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_attach_anchors.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_attach_revoke.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_ctx_f_allow_default_trustanchors.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_destroy_ctx.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_init_ctx.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_path.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_set_max_depth.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_set_proxy_certificate.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_set_strict_rfc3280_verification.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_set_time.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_signature.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_xfree.3.gz
 OLD_FILES+=usr/share/man/man3/k_afs_cell_of_file.3.gz
 OLD_FILES+=usr/share/man/man3/k_hasafs.3.gz
 OLD_FILES+=usr/share/man/man3/k_pioctl.3.gz
 OLD_FILES+=usr/share/man/man3/k_setpag.3.gz
 OLD_FILES+=usr/share/man/man3/k_unlog.3.gz
 OLD_FILES+=usr/share/man/man3/kadm5_pwcheck.3.gz
 OLD_FILES+=usr/share/man/man3/kafs.3.gz
 OLD_FILES+=usr/share/man/man3/kafs5.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_set_verbose.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_settoken.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_settoken5.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_settoken_rxkad.3.gz
 OLD_FILES+=usr/share/man/man3/krb5.3.gz
 OLD_FILES+=usr/share/man/man3/krb524_convert_creds_kdc.3.gz
 OLD_FILES+=usr/share/man/man3/krb524_convert_creds_kdc_ccache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_425_conv_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_425_conv_principal_ext.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_524_conv_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_acc_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_acl_match_file.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_acl_match_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_add_et_list.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_add_extra_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_add_ignore_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_addlog_dest.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_addlog_func.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_addr2sockaddr.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address_order.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address_prefixlen_boundary.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address_search.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_afslog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_afslog_uid.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_allow_weak_crypto.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_aname_to_localname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_anyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_appdefault.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_appdefault_boolean.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_appdefault_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_appdefault_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_append_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_genaddrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getaddrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getflags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getlocalsubkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getrcache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getremotesubkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getuserkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_initivector.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setaddrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setaddrs_from_fd.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setflags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setivector.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setlocalsubkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setrcache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setremotesubkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setuserkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_context.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getauthenticator.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getcksumtype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getkeytype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getlocalseqnumber.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getremoteseqnumber.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_setcksumtype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_setkeytype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_setlocalseqnumber.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_setremoteseqnumber.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_build_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_build_principal_ext.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_build_principal_va.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_build_principal_va_ext.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_c_enctype_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_c_make_checksum.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_cache_end_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_cache_get_first.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_cache_match.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_cache_next.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_clear_mcred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_close.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_copy_cache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_copy_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_copy_match_f.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_default_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_end_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_gen_new.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_config.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_full_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_kdc_offset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_lifetime.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_prefix_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_version.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_initialize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_last_change_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_move.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_new_unique.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_next_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_register.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_remove_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_resolve.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_retrieve_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_config.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_default_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_kdc_offset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_start_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_store_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_support_switch.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_switch.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ccache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ccache_intro.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cccol_cursor_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cccol_cursor_new.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cccol_cursor_next.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cccol_last_change_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_change_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_check_transited.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_checksum_is_collision_proof.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_checksum_is_keyed.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_checksumsize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cksumtype_to_enctype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_clear_error_message.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_clear_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_closelog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_compare_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_file_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_free_strings.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_bool.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_bool_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_list.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_string_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_strings.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_time_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_parse_file_multi.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_parse_string_multi.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_bool.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_bool_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_list.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_string_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_strings.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_time_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_context.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_creds_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_host_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_keyblock_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_ticket.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_create_checksum.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_create_checksum_iov.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_credential.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_creds_get_ticket_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_fx_cf2.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_getblocksize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_getconfoundersize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_getenctype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_getpadsize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_iov.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_cmp.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_copy.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_ct_cmp.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_realloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_zero.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_decrypt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_decrypt_EncryptedData.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_decrypt_iov_ivec.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_deprecated.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_digest.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_digest_probe.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_eai_to_heim_errno.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_encrypt_EncryptedData.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_encrypt_iov_ivec.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_enctype_disable.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_enctype_enable.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_enctype_valid.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_enctypes_compatible_keys.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_error.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_expand_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_expand_hostname_realms.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_fcc_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_fileformats.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_find_padata.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_config_files.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_context.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_cred_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_creds_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_data_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_host_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_keyblock_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_krbhst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_ticket.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_unparsed_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_fwd_tgt_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_generate_random_block.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_generate_subkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_generate_subkey_extended.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_all_client_addrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_all_server_addrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_cred_from_kdc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_cred_from_kdc_opt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_credentials.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_config_files.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_in_tkt_etypes.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_realms.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_dns_canonicalize_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_extra_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_fcache_version.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_forwarded_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_host_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_ignore_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_in_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_in_tkt_with_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_in_tkt_with_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_in_tkt_with_skey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_opt_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_opt_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_opt_get_error.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_opt_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_kdc_sec_offset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_krb524hst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_krb_admin_hst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_krb_changepw_hst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_krbhst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_max_time_skew.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_use_admin_kdc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_validated_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_getportbyname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_h_addr2addr.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_h_addr2sockaddr.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_h_errno_to_heim_errno.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_context.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_get_error.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_intro.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_set_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_set_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_set_service.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_step.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_ets.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_initlog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_introduction.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_is_config_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_is_thread_safe.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kerberos_enctypes.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keyblock_get_enctype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keyblock_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keyblock_zero.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytab_intro.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytab_key_proc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytype_to_enctypes.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytype_to_enctypes_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytype_to_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_format_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_get_addrinfo.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_next.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_next_as_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_reset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_add_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_close.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_copy_entry_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_default_modify_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_default_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_end_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_free_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_get_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_get_full_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_get_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_get_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_have_content.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_next_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_read_service_key.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_register.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_remove_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_resolve.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_start_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kuserok.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_log.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_log_msg.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_make_addrport.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_make_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_max_sockaddr_size.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_mcc_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_mk_req.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_mk_safe.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_openlog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_pac.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_pac_get_buffer.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_pac_verify.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_name_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_nametype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_password_key_proc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_plugin_register.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_prepend_config_files_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_princ_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_princ_set_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_compare_any_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_get_comp_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_get_num_comp.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_get_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_get_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_intro.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_is_krbtgt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_match.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_set_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_set_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_print_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_random_to_key.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rcache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_error.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_ctx.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_in_ctx_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_in_set_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_in_set_pac_check.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_out_ctx_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_out_get_server.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_safe.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_realm_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_addrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_authdata.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_creds_tag.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_int16.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_int32.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_int8.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_stringz.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_times.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_uint16.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_uint32.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_uint8.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_config_files.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_default_in_tkt_etypes.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_default_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_dns_canonicalize_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_error_message.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_extra_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_fcache_version.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_home_dir_access.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_ignore_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_kdc_sec_offset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_max_time_skew.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_real_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_use_admin_kdc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sname_to_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sock_to_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sockaddr2address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sockaddr2port.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sockaddr_uninteresting.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_clear_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_emem.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_from_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_from_fd.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_from_mem.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_from_readonly_mem.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_get_byteorder.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_get_eof_code.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_is_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_read.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_seek.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_set_byteorder.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_set_eof_code.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_set_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_set_max_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_to_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_truncate.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_write.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_addrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_authdata.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_creds_tag.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_int16.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_int32.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_int8.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_stringz.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_times.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_uint16.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_uint32.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_uint8.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_string_to_key.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_string_to_keytype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_support.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_authorization_data_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_client.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_endtime.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_server.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_timeofday.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_fixed.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_fixed_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_fixed_short.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_short.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_us_timeofday.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_v4compat.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_checksum.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_checksum_iov.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_init_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_set_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_set_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_set_secure.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_set_service.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_user.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_user_lrealm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_user_opt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_vlog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_vlog_msg.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_vset_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_vwarn.3.gz
 OLD_FILES+=usr/share/man/man3/krb_afslog.3.gz
 OLD_FILES+=usr/share/man/man3/krb_afslog_uid.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_buf.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_core.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_type1.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_type2.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_type3.3.gz
 OLD_FILES+=usr/share/man/man5/krb5.conf.5.gz
 OLD_FILES+=usr/share/man/man8/hprop.8.gz
 OLD_FILES+=usr/share/man/man8/hpropd.8.gz
 OLD_FILES+=usr/share/man/man8/iprop-log.8.gz
 OLD_FILES+=usr/share/man/man8/iprop.8.gz
 OLD_FILES+=usr/share/man/man8/kadmin.8.gz
 OLD_FILES+=usr/share/man/man8/kadmind.8.gz
 OLD_FILES+=usr/share/man/man8/kcm.8.gz
 OLD_FILES+=usr/share/man/man8/kdc.8.gz
 OLD_FILES+=usr/share/man/man8/kdigest.8.gz
 OLD_FILES+=usr/share/man/man8/kerberos.8.gz
 OLD_FILES+=usr/share/man/man8/kimpersonate.8.gz
 OLD_FILES+=usr/share/man/man8/kpasswdd.8.gz
 OLD_FILES+=usr/share/man/man8/kstash.8.gz
 OLD_FILES+=usr/share/man/man8/ktutil.8.gz
 OLD_FILES+=usr/share/man/man8/pam_krb5.8.gz
 OLD_FILES+=usr/share/man/man8/pam_ksu.8.gz
 OLD_FILES+=usr/share/man/man8/string2key.8.gz
 OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz
 .endif
 
 .if ${MK_LDNS} == no
 OLD_FILES+=usr/lib/private/libldns.a
 OLD_FILES+=usr/lib/private/libldns.so
 OLD_LIBS+=usr/lib/private/libldns.so.5
 OLD_FILES+=usr/lib/private/libldns_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/private/libldns.a
 OLD_FILES+=usr/lib32/private/libldns.so
 OLD_LIBS+=usr/lib32/private/libldns.so.5
 OLD_FILES+=usr/lib32/private/libldns_p.a
 .endif
 .endif
 
 .if ${MK_LDNS_UTILS} == no
 OLD_FILES+=usr/bin/drill
 OLD_FILES+=usr/share/man/man1/drill.1.gz
 OLD_FILES+=usr/bin/host
 OLD_FILES+=usr/share/man/man1/host.1.gz
 .endif
 
 #.if ${MK_LIB32} == no
 # to be filled in
 #.endif
 
 .if ${MK_LIBCPLUSPLUS} == no
 OLD_LIBS+=lib/libcxxrt.so.1
 OLD_FILES+=usr/lib/libc++.a
 OLD_FILES+=usr/lib/libc++_p.a
 OLD_FILES+=usr/lib/libc++.so
 OLD_LIBS+=usr/lib/libc++.so.1
 OLD_FILES+=usr/lib/libcxxrt.a
 OLD_FILES+=usr/lib/libcxxrt.so
 OLD_FILES+=usr/lib/libcxxrt_p.a
 OLD_FILES+=usr/include/c++/v1/__bit_reference
 OLD_FILES+=usr/include/c++/v1/__config
 OLD_FILES+=usr/include/c++/v1/__debug
 OLD_FILES+=usr/include/c++/v1/__functional_03
 OLD_FILES+=usr/include/c++/v1/__functional_base
 OLD_FILES+=usr/include/c++/v1/__functional_base_03
 OLD_FILES+=usr/include/c++/v1/__hash_table
 OLD_FILES+=usr/include/c++/v1/__locale
 OLD_FILES+=usr/include/c++/v1/__mutex_base
 OLD_FILES+=usr/include/c++/v1/__split_buffer
 OLD_FILES+=usr/include/c++/v1/__sso_allocator
 OLD_FILES+=usr/include/c++/v1/__std_stream
 OLD_FILES+=usr/include/c++/v1/__tree
 OLD_FILES+=usr/include/c++/v1/__tuple
 OLD_FILES+=usr/include/c++/v1/__tuple_03
 OLD_FILES+=usr/include/c++/v1/__undef_min_max
 OLD_FILES+=usr/include/c++/v1/algorithm
 OLD_FILES+=usr/include/c++/v1/array
 OLD_FILES+=usr/include/c++/v1/atomic
 OLD_FILES+=usr/include/c++/v1/bitset
 OLD_FILES+=usr/include/c++/v1/cassert
 OLD_FILES+=usr/include/c++/v1/ccomplex
 OLD_FILES+=usr/include/c++/v1/cctype
 OLD_FILES+=usr/include/c++/v1/cerrno
 OLD_FILES+=usr/include/c++/v1/cfenv
 OLD_FILES+=usr/include/c++/v1/cfloat
 OLD_FILES+=usr/include/c++/v1/chrono
 OLD_FILES+=usr/include/c++/v1/cinttypes
 OLD_FILES+=usr/include/c++/v1/ciso646
 OLD_FILES+=usr/include/c++/v1/climits
 OLD_FILES+=usr/include/c++/v1/clocale
 OLD_FILES+=usr/include/c++/v1/cmath
 OLD_FILES+=usr/include/c++/v1/codecvt
 OLD_FILES+=usr/include/c++/v1/complex
 OLD_FILES+=usr/include/c++/v1/complex.h
 OLD_FILES+=usr/include/c++/v1/condition_variable
 OLD_FILES+=usr/include/c++/v1/csetjmp
 OLD_FILES+=usr/include/c++/v1/csignal
 OLD_FILES+=usr/include/c++/v1/cstdarg
 OLD_FILES+=usr/include/c++/v1/cstdbool
 OLD_FILES+=usr/include/c++/v1/cstddef
 OLD_FILES+=usr/include/c++/v1/cstdint
 OLD_FILES+=usr/include/c++/v1/cstdio
 OLD_FILES+=usr/include/c++/v1/cstdlib
 OLD_FILES+=usr/include/c++/v1/cstring
 OLD_FILES+=usr/include/c++/v1/ctgmath
 OLD_FILES+=usr/include/c++/v1/ctime
 OLD_FILES+=usr/include/c++/v1/cwchar
 OLD_FILES+=usr/include/c++/v1/cwctype
 OLD_FILES+=usr/include/c++/v1/cxxabi.h
 OLD_FILES+=usr/include/c++/v1/deque
 OLD_FILES+=usr/include/c++/v1/exception
 OLD_FILES+=usr/include/c++/v1/experimental/dynarray
 OLD_FILES+=usr/include/c++/v1/experimental/optional
 OLD_FILES+=usr/include/c++/v1/ext/__hash
 OLD_FILES+=usr/include/c++/v1/ext/hash_map
 OLD_FILES+=usr/include/c++/v1/ext/hash_set
 OLD_FILES+=usr/include/c++/v1/forward_list
 OLD_FILES+=usr/include/c++/v1/fstream
 OLD_FILES+=usr/include/c++/v1/functional
 OLD_FILES+=usr/include/c++/v1/future
 OLD_FILES+=usr/include/c++/v1/initializer_list
 OLD_FILES+=usr/include/c++/v1/iomanip
 OLD_FILES+=usr/include/c++/v1/ios
 OLD_FILES+=usr/include/c++/v1/iosfwd
 OLD_FILES+=usr/include/c++/v1/iostream
 OLD_FILES+=usr/include/c++/v1/istream
 OLD_FILES+=usr/include/c++/v1/iterator
 OLD_FILES+=usr/include/c++/v1/limits
 OLD_FILES+=usr/include/c++/v1/list
 OLD_FILES+=usr/include/c++/v1/locale
 OLD_FILES+=usr/include/c++/v1/map
 OLD_FILES+=usr/include/c++/v1/memory
 OLD_FILES+=usr/include/c++/v1/mutex
 OLD_FILES+=usr/include/c++/v1/new
 OLD_FILES+=usr/include/c++/v1/numeric
 OLD_FILES+=usr/include/c++/v1/ostream
 OLD_FILES+=usr/include/c++/v1/queue
 OLD_FILES+=usr/include/c++/v1/random
 OLD_FILES+=usr/include/c++/v1/ratio
 OLD_FILES+=usr/include/c++/v1/regex
 OLD_FILES+=usr/include/c++/v1/scoped_allocator
 OLD_FILES+=usr/include/c++/v1/set
 OLD_FILES+=usr/include/c++/v1/sstream
 OLD_FILES+=usr/include/c++/v1/stack
 OLD_FILES+=usr/include/c++/v1/stdexcept
 OLD_FILES+=usr/include/c++/v1/streambuf
 OLD_FILES+=usr/include/c++/v1/string
 OLD_FILES+=usr/include/c++/v1/strstream
 OLD_FILES+=usr/include/c++/v1/system_error
 OLD_FILES+=usr/include/c++/v1/tgmath.h
 OLD_FILES+=usr/include/c++/v1/thread
 OLD_FILES+=usr/include/c++/v1/tuple
 OLD_FILES+=usr/include/c++/v1/type_traits
 OLD_FILES+=usr/include/c++/v1/typeindex
 OLD_FILES+=usr/include/c++/v1/typeinfo
 OLD_FILES+=usr/include/c++/v1/unordered_map
 OLD_FILES+=usr/include/c++/v1/unordered_set
 OLD_FILES+=usr/include/c++/v1/unwind-arm.h
 OLD_FILES+=usr/include/c++/v1/unwind-itanium.h
 OLD_FILES+=usr/include/c++/v1/unwind.h
 OLD_FILES+=usr/include/c++/v1/utility
 OLD_FILES+=usr/include/c++/v1/valarray
 OLD_FILES+=usr/include/c++/v1/vector
 OLD_DIRS+=usr/include/c++/v1/experimental
 OLD_DIRS+=usr/include/c++/v1/ext
 OLD_DIRS+=usr/include/c++/v1
 .endif
 
 #.if ${MK_LIBTHR} == no
 # to be filled in
 #.endif
 
 #.if ${MK_LOCALES} == no
 # to be filled in
 #.endif
 
 .if ${MK_LOCATE} == no
 OLD_FILES+=etc/locate.rc
 OLD_FILES+=etc/periodic/weekly/310.locate
 OLD_FILES+=usr/bin/locate
 OLD_FILES+=usr/libexec/locate.bigram
 OLD_FILES+=usr/libexec/locate.code
 OLD_FILES+=usr/libexec/locate.concatdb
 OLD_FILES+=usr/libexec/locate.mklocatedb
 OLD_FILES+=usr/libexec/locate.updatedb
 OLD_FILES+=usr/share/man/man1/locate.1.gz
 OLD_FILES+=usr/share/man/man8/locate.updatedb.8.gz
 OLD_FILES+=usr/share/man/man8/updatedb.8.gz
 .endif
 
 .if ${MK_LPR} == no
 OLD_FILES+=etc/hosts.lpd
 OLD_FILES+=etc/printcap
 OLD_FILES+=usr/bin/lp
 OLD_FILES+=usr/bin/lpq
 OLD_FILES+=usr/bin/lpr
 OLD_FILES+=usr/bin/lprm
 OLD_FILES+=usr/libexec/lpr/ru/bjc-240.sh.sample
 OLD_FILES+=usr/libexec/lpr/ru/koi2alt
 OLD_FILES+=usr/libexec/lpr/ru/koi2855
 OLD_DIRS+=usr/libexec/lpr/ru
 OLD_FILES+=usr/libexec/lpr/lpf
 OLD_DIRS+=usr/libexec/lpr
 OLD_FILES+=usr/sbin/chkprintcap
 OLD_FILES+=usr/sbin/lpc
 OLD_FILES+=usr/sbin/lpd
 OLD_FILES+=usr/sbin/lptest
 OLD_FILES+=usr/sbin/pac
 OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/07.lpd
 OLD_FILES+=usr/share/examples/etc/hosts.lpd
 OLD_FILES+=usr/share/examples/etc/printcap
 OLD_FILES+=usr/share/man/man1/lp.1.gz
 OLD_FILES+=usr/share/man/man1/lpq.1.gz
 OLD_FILES+=usr/share/man/man1/lpr.1.gz
 OLD_FILES+=usr/share/man/man1/lprm.1.gz
 OLD_FILES+=usr/share/man/man1/lptest.1.gz
 OLD_FILES+=usr/share/man/man5/printcap.5.gz
 OLD_FILES+=usr/share/man/man8/chkprintcap.8.gz
 OLD_FILES+=usr/share/man/man8/lpc.8.gz
 OLD_FILES+=usr/share/man/man8/lpd.8.gz
 OLD_FILES+=usr/share/man/man8/pac.8.gz
 .endif
 
 .if ${MK_MAIL} == no
 OLD_FILES+=etc/periodic/daily/130.clean-msgs
 OLD_FILES+=usr/bin/Mail
 OLD_FILES+=usr/bin/biff
 OLD_FILES+=usr/bin/from
 OLD_FILES+=usr/bin/mail
 OLD_FILES+=usr/bin/mailx
 OLD_FILES+=usr/bin/msgs
 OLD_FILES+=usr/libexec/comsat
 OLD_FILES+=usr/share/examples/etc/mail.rc
 OLD_FILES+=usr/share/man/man1/Mail.1.gz
 OLD_FILES+=usr/share/man/man1/biff.1.gz
 OLD_FILES+=usr/share/man/man1/from.1.gz
 OLD_FILES+=usr/share/man/man1/mail.1.gz
 OLD_FILES+=usr/share/man/man1/mailx.1.gz
 OLD_FILES+=usr/share/man/man1/msgs.1.gz
 OLD_FILES+=usr/share/man/man8/comsat.8.gz
 OLD_FILES+=usr/share/misc/mail.help
 OLD_FILES+=usr/share/misc/mail.tildehelp
 .endif
 
 .if ${MK_MAILWRAPPER} == no
 OLD_FILES+=etc/mail/mailer.conf
 .if ${MK_SENDMAIL} == no
 OLD_FILES+=usr/sbin/mailwrapper
 .endif
 OLD_FILES+=usr/share/man/man8/mailwrapper.8.gz
 .endif
 
 #.if ${MK_MAN} == no
 # This should add a dependency to a special target which removes all man pages.
 # Listing all of them here is overkill.
 #.endif
 
 .if ${MK_NDIS} == no
 OLD_FILES+=usr/sbin/ndiscvt
 OLD_FILES+=usr/sbin/ndisgen
 OLD_FILES+=usr/share/man/man8/ndiscvt.8.gz
 OLD_FILES+=usr/share/man/man8/ndisgen.8.gz
 OLD_FILES+=usr/share/misc/windrv_stub.c
 .endif
 
 .if ${MK_NETCAT} == no
 OLD_FILES+=usr/bin/nc
 OLD_FILES+=usr/share/man/man1/nc.1.gz
 .endif
 
 .if ${MK_NIS} == no
 OLD_FILES+=usr/bin/ypcat
 OLD_FILES+=usr/bin/ypchfn
 OLD_FILES+=usr/bin/ypchpass
 OLD_FILES+=usr/bin/ypchsh
 OLD_FILES+=usr/bin/ypmatch
 OLD_FILES+=usr/bin/yppasswd
 OLD_FILES+=usr/bin/ypwhich
 OLD_FILES+=usr/include/ypclnt.h
 OLD_FILES+=usr/lib/libypclnt.a
 OLD_FILES+=usr/lib/libypclnt.so
 OLD_LIBS+=usr/lib/libypclnt.so.4
 OLD_FILES+=usr/lib/libypclnt_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libypclnt.a
 OLD_FILES+=usr/lib32/libypclnt.so
 OLD_LIBS+=usr/lib32/libypclnt.so.4
 OLD_FILES+=usr/lib32/libypclnt_p.a
 .endif
 OLD_FILES+=usr/libexec/mknetid
 OLD_FILES+=usr/libexec/yppwupdate
 OLD_FILES+=usr/libexec/ypxfr
 OLD_FILES+=usr/sbin/rpc.yppasswdd
 OLD_FILES+=usr/sbin/rpc.ypupdated
 OLD_FILES+=usr/sbin/rpc.ypxfrd
 OLD_FILES+=usr/sbin/yp_mkdb
 OLD_FILES+=usr/sbin/ypbind
 OLD_FILES+=usr/sbin/ypinit
 OLD_FILES+=usr/sbin/yppoll
 OLD_FILES+=usr/sbin/yppush
 OLD_FILES+=usr/sbin/ypserv
 OLD_FILES+=usr/sbin/ypset
 OLD_FILES+=usr/share/man/man1/ypcat.1.gz
 OLD_FILES+=usr/share/man/man1/ypchfn.1.gz
 OLD_FILES+=usr/share/man/man1/ypchpass.1.gz
 OLD_FILES+=usr/share/man/man1/ypchsh.1.gz
 OLD_FILES+=usr/share/man/man1/ypmatch.1.gz
 OLD_FILES+=usr/share/man/man1/yppasswd.1.gz
 OLD_FILES+=usr/share/man/man1/ypwhich.1.gz
 OLD_FILES+=usr/share/man/man5/netid.5.gz
 OLD_FILES+=usr/share/man/man8/mknetid.8.gz
 OLD_FILES+=usr/share/man/man8/rpc.yppasswdd.8.gz
 OLD_FILES+=usr/share/man/man8/rpc.ypxfrd.8.gz
 OLD_FILES+=usr/share/man/man8/yp_mkdb.8.gz
 OLD_FILES+=usr/share/man/man8/ypbind.8.gz
 OLD_FILES+=usr/share/man/man8/ypinit.8.gz
 OLD_FILES+=usr/share/man/man8/yppoll.8.gz
 OLD_FILES+=usr/share/man/man8/yppush.8.gz
 OLD_FILES+=usr/share/man/man8/ypserv.8.gz
 OLD_FILES+=usr/share/man/man8/ypset.8.gz
 OLD_FILES+=usr/share/man/man8/ypxfr.8.gz
 OLD_FILES+=var/yp/Makefile
 OLD_FILES+=var/yp/Makefile.dist
 .endif
 
 .if ${MK_NLS} == no
 OLD_FILES+=usr/tests/bin/sh/builtins/locale1.0
 # to be filled in
 .endif
 
 .if ${MK_NTP} == no
 OLD_FILES+=etc/ntp.conf
 OLD_FILES+=etc/periodic/daily/480.status-ntpd
 OLD_FILES+=usr/bin/ntpq
 OLD_FILES+=usr/sbin/ntp-keygen
 OLD_FILES+=usr/sbin/ntpd
 OLD_FILES+=usr/sbin/ntpdate
 OLD_FILES+=usr/sbin/ntpdc
 OLD_FILES+=usr/sbin/ntptime
 OLD_FILES+=usr/sbin/sntp
 OLD_FILES+=usr/share/doc/ntp/accopt.html
 OLD_FILES+=usr/share/doc/ntp/assoc.html
 OLD_FILES+=usr/share/doc/ntp/audio.html
 OLD_FILES+=usr/share/doc/ntp/authopt.html
 OLD_FILES+=usr/share/doc/ntp/build.html
 OLD_FILES+=usr/share/doc/ntp/clockopt.html
 OLD_FILES+=usr/share/doc/ntp/config.html
 OLD_FILES+=usr/share/doc/ntp/confopt.html
 OLD_FILES+=usr/share/doc/ntp/copyright.html
 OLD_FILES+=usr/share/doc/ntp/debug.html
 OLD_FILES+=usr/share/doc/ntp/driver1.html
 OLD_FILES+=usr/share/doc/ntp/driver10.html
 OLD_FILES+=usr/share/doc/ntp/driver11.html
 OLD_FILES+=usr/share/doc/ntp/driver12.html
 OLD_FILES+=usr/share/doc/ntp/driver16.html
 OLD_FILES+=usr/share/doc/ntp/driver18.html
 OLD_FILES+=usr/share/doc/ntp/driver19.html
 OLD_FILES+=usr/share/doc/ntp/driver2.html
 OLD_FILES+=usr/share/doc/ntp/driver20.html
 OLD_FILES+=usr/share/doc/ntp/driver22.html
 OLD_FILES+=usr/share/doc/ntp/driver26.html
 OLD_FILES+=usr/share/doc/ntp/driver27.html
 OLD_FILES+=usr/share/doc/ntp/driver28.html
 OLD_FILES+=usr/share/doc/ntp/driver29.html
 OLD_FILES+=usr/share/doc/ntp/driver3.html
 OLD_FILES+=usr/share/doc/ntp/driver30.html
 OLD_FILES+=usr/share/doc/ntp/driver32.html
 OLD_FILES+=usr/share/doc/ntp/driver33.html
 OLD_FILES+=usr/share/doc/ntp/driver34.html
 OLD_FILES+=usr/share/doc/ntp/driver35.html
 OLD_FILES+=usr/share/doc/ntp/driver36.html
 OLD_FILES+=usr/share/doc/ntp/driver37.html
 OLD_FILES+=usr/share/doc/ntp/driver4.html
 OLD_FILES+=usr/share/doc/ntp/driver5.html
 OLD_FILES+=usr/share/doc/ntp/driver6.html
 OLD_FILES+=usr/share/doc/ntp/driver7.html
 OLD_FILES+=usr/share/doc/ntp/driver8.html
 OLD_FILES+=usr/share/doc/ntp/driver9.html
 OLD_FILES+=usr/share/doc/ntp/extern.html
 OLD_FILES+=usr/share/doc/ntp/hints.html
 OLD_FILES+=usr/share/doc/ntp/howto.html
 OLD_FILES+=usr/share/doc/ntp/index.html
 OLD_FILES+=usr/share/doc/ntp/kern.html
 OLD_FILES+=usr/share/doc/ntp/ldisc.html
 OLD_FILES+=usr/share/doc/ntp/measure.html
 OLD_FILES+=usr/share/doc/ntp/miscopt.html
 OLD_FILES+=usr/share/doc/ntp/monopt.html
 OLD_FILES+=usr/share/doc/ntp/mx4200data.html
 OLD_FILES+=usr/share/doc/ntp/notes.html
 OLD_FILES+=usr/share/doc/ntp/ntpd.html
 OLD_FILES+=usr/share/doc/ntp/ntpdate.html
 OLD_FILES+=usr/share/doc/ntp/ntpdc.html
 OLD_FILES+=usr/share/doc/ntp/ntpq.html
 OLD_FILES+=usr/share/doc/ntp/ntptime.html
 OLD_FILES+=usr/share/doc/ntp/ntptrace.html
 OLD_FILES+=usr/share/doc/ntp/parsedata.html
 OLD_FILES+=usr/share/doc/ntp/parsenew.html
 OLD_FILES+=usr/share/doc/ntp/patches.html
 OLD_FILES+=usr/share/doc/ntp/porting.html
 OLD_FILES+=usr/share/doc/ntp/pps.html
 OLD_FILES+=usr/share/doc/ntp/prefer.html
 OLD_FILES+=usr/share/doc/ntp/quick.html
 OLD_FILES+=usr/share/doc/ntp/rdebug.html
 OLD_FILES+=usr/share/doc/ntp/refclock.html
 OLD_FILES+=usr/share/doc/ntp/release.html
 OLD_FILES+=usr/share/doc/ntp/tickadj.html
 OLD_DIRS+=usr/share/doc/ntp
 OLD_FILES+=usr/share/examples/etc/ntp.conf
 OLD_FILES+=usr/share/man/man5/ntp.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ntp.keys.5.gz
 OLD_FILES+=usr/share/man/man8/ntp-keygen.8.gz
 OLD_FILES+=usr/share/man/man8/ntpd.8.gz
 OLD_FILES+=usr/share/man/man8/ntpdate.8.gz
 OLD_FILES+=usr/share/man/man8/ntpdc.8.gz
 OLD_FILES+=usr/share/man/man8/ntpq.8.gz
 OLD_FILES+=usr/share/man/man8/ntptime.8.gz
 .endif
 
 #.if ${MK_OBJC} == no
 # to be filled in
 #.endif
 
 .if ${MK_OPENSSH} == no
 OLD_FILES+=usr/bin/sftp
 OLD_FILES+=usr/bin/ssh
 OLD_FILES+=usr/bin/ssh-add
 OLD_FILES+=usr/bin/ssh-agent
 OLD_FILES+=usr/bin/ssh-copy-id
 OLD_FILES+=usr/bin/ssh-keygen
 OLD_FILES+=usr/bin/ssh-keyscan
 OLD_FILES+=usr/lib/private/libssh.a
 OLD_FILES+=usr/lib/private/libssh.so
 OLD_LIBS+=usr/lib/private/libssh.so.5
 OLD_FILES+=usr/lib/private/libssh_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/private/libssh.a
 OLD_FILES+=usr/lib32/private/libssh.so
 OLD_LIBS+=usr/lib32/private/libssh.so.5
 OLD_FILES+=usr/lib32/private/libssh_p.a
 .endif
 OLD_FILES+=usr/libexec/sftp-server
 OLD_FILES+=usr/libexec/ssh-keysign
 OLD_FILES+=usr/libexec/ssh-pkcs11-helper
 OLD_FILES+=usr/sbin/sshd
 .endif
 
 .if ${MK_OPENSSL} == no
 OLD_FILES+=etc/rc.d/keyserv
 .endif
 
 .if ${MK_PC_SYSINSTALL} == no
 # backend-partmanager
 OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/create-part.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/delete-part.sh
 # backend-query
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-emulation.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-laptop.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-nics.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-info.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-list.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-part.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/enable-net.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/get-packages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-components.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-config.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-mirrors.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-packages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-rsync-backups.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-tzones.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/query-langs.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/send-logs.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/setup-ssh-keys.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/set-mirror.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/sys-mem.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/test-live.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/test-netup.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/update-part-list.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-layouts.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-models.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-variants.sh
 # backend
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-bsdlabel.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-cleanup.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-disk.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-extractimage.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-ftp.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-installcomponents.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-installpackages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-localize.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-mountdisk.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-mountoptical.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-networking.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-newfs.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-parse.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-packages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-runcommands.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-unmount.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-upgrade.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-users.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/installimage.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/parseconfig.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/startautoinstall.sh
 # conf
 OLD_FILES+=usr/share/pc-sysinstall/conf/avail-langs
 OLD_FILES+=usr/share/pc-sysinstall/conf/exclude-from-upgrade
 OLD_FILES+=usr/share/pc-sysinstall/conf/license/bsd-en.txt
 OLD_FILES+=usr/share/pc-sysinstall/conf/license/intel-en.txt
 OLD_FILES+=usr/share/pc-sysinstall/conf/license/nvidia-en.txt
 OLD_FILES+=usr/share/pc-sysinstall/conf/pc-sysinstall.conf
 # doc
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-disk-list
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-disk-size
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-index
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-start-autoinstall
 # examples
 OLD_FILES+=usr/share/examples/pc-sysinstall/README
 OLD_FILES+=usr/share/examples/pc-sysinstall/pc-autoinstall.conf
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.fbsd-netinstall
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.geli
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.gmirror
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.netinstall
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.restore
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.rsync
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.upgrade
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.zfs
 # pc-sysinstall
 OLD_FILES+=usr/sbin/pc-sysinstall
 OLD_FILES+=usr/share/man/man8/pc-sysinstall.8.gz
 OLD_DIRS+=usr/share/pc-sysinstall/backend
 OLD_DIRS+=usr/share/pc-sysinstall/backend-partmanager
 OLD_DIRS+=usr/share/pc-sysinstall/backend-query
 OLD_DIRS+=usr/share/pc-sysinstall/conf/license
 OLD_DIRS+=usr/share/pc-sysinstall/conf
 OLD_DIRS+=usr/share/pc-sysinstall/doc
 OLD_DIRS+=usr/share/pc-sysinstall
 OLD_DIRS+=usr/share/examples/pc-sysinstall
 .endif
 
 .if ${MK_PF} == no
 OLD_FILES+=etc/periodic/security/520.pfdenied
 OLD_FILES+=etc/pf.os
 OLD_FILES+=etc/rc.d/ftp-proxy
 OLD_FILES+=sbin/pfctl
 OLD_FILES+=sbin/pflogd
 OLD_FILES+=usr/libexec/tftp-proxy
 OLD_FILES+=usr/sbin/ftp-proxy
 OLD_FILES+=usr/share/examples/etc/pf.os
 OLD_FILES+=usr/share/examples/pf/ackpri
 OLD_FILES+=usr/share/examples/pf/faq-example1
 OLD_FILES+=usr/share/examples/pf/faq-example2
 OLD_FILES+=usr/share/examples/pf/faq-example3
 OLD_FILES+=usr/share/examples/pf/pf.conf
 OLD_FILES+=usr/share/examples/pf/queue1
 OLD_FILES+=usr/share/examples/pf/queue2
 OLD_FILES+=usr/share/examples/pf/queue3
 OLD_FILES+=usr/share/examples/pf/queue4
 OLD_FILES+=usr/share/examples/pf/spamd
 OLD_DIRS+=usr/share/examples/pf
 OLD_FILES+=usr/share/man/man4/pf.4.gz
 OLD_FILES+=usr/share/man/man4/pflog.4.gz
 OLD_FILES+=usr/share/man/man4/pfsync.4.gz
 OLD_FILES+=usr/share/man/man5/pf.conf.5.gz
 OLD_FILES+=usr/share/man/man5/pf.os.5.gz
 OLD_FILES+=usr/share/man/man8/ftp-proxy.8.gz
 OLD_FILES+=usr/share/man/man8/pfctl.8.gz
 OLD_FILES+=usr/share/man/man8/pflogd.8.gz
 OLD_FILES+=usr/share/man/man8/tftp-proxy.8.gz
 .endif
 
 .if ${MK_PKGBOOTSTRAP} == no
 OLD_FILES+=usr/sbin/pkg
 OLD_FILES+=usr/share/man/man7/pkg.7.gz
 .endif
 
 .if ${MK_PORTSNAP} == no
 OLD_FILES+=etc/portsnap.conf
 OLD_FILES+=usr/libexec/make_index
 OLD_FILES+=usr/libexec/phttpget
 OLD_FILES+=usr/sbin/portsnap
 OLD_FILES+=usr/share/examples/etc/portsnap.conf
 OLD_FILES+=usr/share/man/man8/portsnap.8.gz
 .endif
 
 .if ${MK_PPP} == no
 OLD_FILES+=etc/ppp/ppp.conf
 OLD_DIRS+=etc/ppp
 OLD_FILES+=usr/sbin/ppp
 OLD_FILES+=usr/sbin/pppctl
 OLD_FILES+=usr/share/man/man8/ppp.8.gz
 OLD_FILES+=usr/share/man/man8/pppctl.8.gz
 .endif
 
 .if ${MK_PROFILE} == no
 OLD_FILES+=usr/lib/libalias_cuseeme_p.a
 OLD_FILES+=usr/lib/libalias_dummy_p.a
 OLD_FILES+=usr/lib/libalias_ftp_p.a
 OLD_FILES+=usr/lib/libalias_irc_p.a
 OLD_FILES+=usr/lib/libalias_nbt_p.a
 OLD_FILES+=usr/lib/libalias_p.a
 OLD_FILES+=usr/lib/libalias_pptp_p.a
 OLD_FILES+=usr/lib/libalias_skinny_p.a
 OLD_FILES+=usr/lib/libalias_smedia_p.a
 OLD_FILES+=usr/lib/libarchive_p.a
 OLD_FILES+=usr/lib/libasn1_p.a
 OLD_FILES+=usr/lib/libbegemot_p.a
 OLD_FILES+=usr/lib/libbluetooth_p.a
 OLD_FILES+=usr/lib/libbsdxml_p.a
 OLD_FILES+=usr/lib/libbsm_p.a
 OLD_FILES+=usr/lib/libbsnmp_p.a
 OLD_FILES+=usr/lib/libbz2_p.a
 OLD_FILES+=usr/lib/libc_p.a
 OLD_FILES+=usr/lib/libcalendar_p.a
 OLD_FILES+=usr/lib/libcam_p.a
 OLD_FILES+=usr/lib/libcom_err_p.a
 OLD_FILES+=usr/lib/libcompat_p.a
 OLD_FILES+=usr/lib/libcrypt_p.a
 OLD_FILES+=usr/lib/libcrypto_p.a
 OLD_FILES+=usr/lib/libcurses_p.a
 OLD_FILES+=usr/lib/libcursesw_p.a
 OLD_FILES+=usr/lib/libdevinfo_p.a
 OLD_FILES+=usr/lib/libdevstat_p.a
 OLD_FILES+=usr/lib/libdialog_p.a
 OLD_FILES+=usr/lib/libedit_p.a
 OLD_FILES+=usr/lib/libelf_p.a
 OLD_FILES+=usr/lib/libfetch_p.a
 OLD_FILES+=usr/lib/libfl_p.a
 OLD_FILES+=usr/lib/libform_p.a
 OLD_FILES+=usr/lib/libformw_p.a
 OLD_FILES+=usr/lib/libgcc_p.a
 OLD_FILES+=usr/lib/libgeom_p.a
 OLD_FILES+=usr/lib/libgnuregex_p.a
 OLD_FILES+=usr/lib/libgssapi_krb5_p.a
 OLD_FILES+=usr/lib/libgssapi_p.a
 OLD_FILES+=usr/lib/libhdb_p.a
 OLD_FILES+=usr/lib/libheimbase_p.a
 OLD_FILES+=usr/lib/libheimsqlite_p.a
 OLD_FILES+=usr/lib/libhistory_p.a
 OLD_FILES+=usr/lib/libipsec_p.a
 OLD_FILES+=usr/lib/libjail_p.a
 OLD_FILES+=usr/lib/libkadm5clnt_p.a
 OLD_FILES+=usr/lib/libkadm5srv_p.a
 OLD_FILES+=usr/lib/libkafs5_p.a
 OLD_FILES+=usr/lib/libkdc_p.a
 OLD_FILES+=usr/lib/libkiconv_p.a
 OLD_FILES+=usr/lib/libkrb5_p.a
 OLD_FILES+=usr/lib/libkvm_p.a
 OLD_FILES+=usr/lib/libl_p.a
 OLD_FILES+=usr/lib/libln_p.a
 OLD_FILES+=usr/lib/libm_p.a
 OLD_FILES+=usr/lib/libmagic_p.a
 OLD_FILES+=usr/lib/libmd_p.a
 OLD_FILES+=usr/lib/libmemstat_p.a
 OLD_FILES+=usr/lib/libmenu_p.a
 OLD_FILES+=usr/lib/libmenuw_p.a
 OLD_FILES+=usr/lib/libmilter_p.a
 OLD_FILES+=usr/lib/libmp_p.a
 OLD_FILES+=usr/lib/libncurses_p.a
 OLD_FILES+=usr/lib/libncursesw_p.a
 OLD_FILES+=usr/lib/libnetgraph_p.a
 OLD_FILES+=usr/lib/libngatm_p.a
 OLD_FILES+=usr/lib/libopie_p.a
 OLD_FILES+=usr/lib/libpanel_p.a
 OLD_FILES+=usr/lib/libpanelw_p.a
 OLD_FILES+=usr/lib/libpcap_p.a
 OLD_FILES+=usr/lib/libpmc_p.a
 OLD_FILES+=usr/lib/libpthread_p.a
 OLD_FILES+=usr/lib/libradius_p.a
 OLD_FILES+=usr/lib/libroken_p.a
 OLD_FILES+=usr/lib/librpcsvc_p.a
 OLD_FILES+=usr/lib/librt_p.a
 OLD_FILES+=usr/lib/libsbuf_p.a
 OLD_FILES+=usr/lib/libsdp_p.a
 OLD_FILES+=usr/lib/libsmb_p.a
 OLD_FILES+=usr/lib/libssl_p.a
 OLD_FILES+=usr/lib/libstdc++_p.a
 OLD_FILES+=usr/lib/libsupc++_p.a
 OLD_FILES+=usr/lib/libtacplus_p.a
 OLD_FILES+=usr/lib/libtermcap_p.a
 OLD_FILES+=usr/lib/libtermcapw_p.a
 OLD_FILES+=usr/lib/libtermlib_p.a
 OLD_FILES+=usr/lib/libtermlibw_p.a
 OLD_FILES+=usr/lib/libthr_p.a
 OLD_FILES+=usr/lib/libthread_db_p.a
 OLD_FILES+=usr/lib/libtinfo_p.a
 OLD_FILES+=usr/lib/libtinfow_p.a
 OLD_FILES+=usr/lib/libufs_p.a
 OLD_FILES+=usr/lib/libugidfw_p.a
 OLD_FILES+=usr/lib/libusbhid_p.a
 OLD_FILES+=usr/lib/libutil_p.a
 OLD_FILES+=usr/lib/libvgl_p.a
 OLD_FILES+=usr/lib/libwind_p.a
 OLD_FILES+=usr/lib/libwrap_p.a
 OLD_FILES+=usr/lib/liby_p.a
 OLD_FILES+=usr/lib/libypclnt_p.a
 OLD_FILES+=usr/lib/libz_p.a
 OLD_FILES+=usr/lib/private/libldns_p.a
 OLD_FILES+=usr/lib/private/libssh_p.a
 .endif
 
 .if ${MK_RCMDS} == no
 OLD_FILES+=bin/rcp
 OLD_FILES+=etc/rc.d/rwho
 OLD_FILES+=etc/periodic/daily/140.clean-rwho 
 OLD_FILES+=etc/periodic/daily/430.status-rwho
 OLD_FILES+=rescue/rcp
 OLD_FILES+=usr/bin/rlogin
 OLD_FILES+=usr/bin/rsh
 OLD_FILES+=usr/bin/ruptime
 OLD_FILES+=usr/bin/rwho
 OLD_FILES+=usr/libexec/rlogind
 OLD_FILES+=usr/libexec/rshd
 OLD_FILES+=usr/sbin/rwhod
 OLD_FILES+=usr/share/man/man1/rcp.1.gz
 OLD_FILES+=usr/share/man/man1/rlogin.1.gz
 OLD_FILES+=usr/share/man/man1/rsh.1.gz
 OLD_FILES+=usr/share/man/man1/ruptime.1.gz
 OLD_FILES+=usr/share/man/man1/rwho.1.gz
 OLD_FILES+=usr/share/man/man8/rlogind.8.gz
 OLD_FILES+=usr/share/man/man8/rshd.8.gz
 OLD_FILES+=usr/share/man/man8/rwhod.8.gz
 .endif
 
 .if ${MK_RCS} == no
 OLD_FILES+=usr/bin/ci
 OLD_FILES+=usr/bin/co
 OLD_FILES+=usr/bin/ident
 OLD_FILES+=usr/bin/merge
 OLD_FILES+=usr/bin/rcs
 OLD_FILES+=usr/bin/rcsclean
 OLD_FILES+=usr/bin/rcsdiff
 OLD_FILES+=usr/bin/rcsfreeze
 OLD_FILES+=usr/bin/rcsmerge
 OLD_FILES+=usr/bin/rlog
 OLD_FILES+=usr/sbin/etcupdate
 OLD_FILES+=usr/share/man/man1/ci.1.gz
 OLD_FILES+=usr/share/man/man1/co.1.gz
 OLD_FILES+=usr/share/man/man1/ident.1.gz
 OLD_FILES+=usr/share/man/man1/merge.1.gz
 OLD_FILES+=usr/share/man/man1/rcs.1.gz
 OLD_FILES+=usr/share/man/man1/rcsclean.1.gz
 OLD_FILES+=usr/share/man/man1/rcsdiff.1.gz
 OLD_FILES+=usr/share/man/man1/rcsfreeze.1.gz
 OLD_FILES+=usr/share/man/man1/rcsintro.1.gz
 OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz
 OLD_FILES+=usr/share/man/man1/rlog.1.gz
 OLD_FILES+=usr/share/man/man5/rcsfile.5.gz
 OLD_FILES+=usr/share/man/man8/etcupdate.8.gz
 .endif
 
 #.if ${MK_RESCUE} == no
 # to be filled in or replaced with a special target
 #.endif
 
 .if ${MK_ROUTED} == no
 OLD_FILES+=sbin/routed
 OLD_FILES+=sbin/rtquery
 OLD_FILES+=usr/share/man/man8/routed.8.gz
 OLD_FILES+=usr/share/man/man8/rtquery.8.gz
 .endif
 
 .if ${MK_SENDMAIL} == no
 OLD_FILES+=etc/periodic/daily/150.clean-hoststat
 OLD_FILES+=etc/periodic/daily/440.status-mailq
 OLD_FILES+=etc/periodic/daily/460.status-mail-rejects
 OLD_FILES+=etc/periodic/daily/500.queuerun
 .if ${MK_MAILWRAPPER} == no
 OLD_FILES+=bin/rmail
 .endif
 OLD_FILES+=usr/bin/vacation
 OLD_FILES+=usr/include/libmilter/mfapi.h
 OLD_FILES+=usr/include/libmilter/mfdef.h
 OLD_DIRS+=usr/include/libmilter
 OLD_FILES+=usr/lib/libmilter.a
 OLD_FILES+=usr/lib/libmilter.so
 OLD_LIBS+=usr/lib/libmilter.so.5
 OLD_FILES+=usr/lib/libmilter_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libmilter.a
 OLD_FILES+=usr/lib32/libmilter.so
 OLD_LIBS+=usr/lib32/libmilter.so.5
 OLD_FILES+=usr/lib32/libmilter_p.a
 .endif
 OLD_FILES+=usr/libexec/mail.local
 OLD_FILES+=usr/libexec/sendmail/sendmail
 OLD_FILES+=usr/libexec/smrsh
 OLD_FILES+=usr/sbin/editmap
 OLD_FILES+=usr/sbin/mailstats
 OLD_FILES+=usr/sbin/makemap
 OLD_FILES+=usr/sbin/praliases
 OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/08.sendmailop
 OLD_FILES+=usr/share/man/man1/mailq.1.gz
 OLD_FILES+=usr/share/man/man1/newaliases.1.gz
 OLD_FILES+=usr/share/man/man1/vacation.1.gz
 OLD_FILES+=usr/share/man/man5/aliases.5.gz
 OLD_FILES+=usr/share/man/man8/editmap.8.gz
 OLD_FILES+=usr/share/man/man8/hoststat.8.gz
 OLD_FILES+=usr/share/man/man8/mail.local.8.gz
 OLD_FILES+=usr/share/man/man8/mailstats.8.gz
 OLD_FILES+=usr/share/man/man8/makemap.8.gz
 OLD_FILES+=usr/share/man/man8/praliases.8.gz
 OLD_FILES+=usr/share/man/man8/purgestat.8.gz
 OLD_FILES+=usr/share/man/man8/rmail.8.gz
 OLD_FILES+=usr/share/man/man8/sendmail.8.gz
 OLD_FILES+=usr/share/man/man8/smrsh.8.gz
 OLD_FILES+=usr/share/sendmail/cf/README
 OLD_FILES+=usr/share/sendmail/cf/cf/Makefile
 OLD_FILES+=usr/share/sendmail/cf/cf/README
 OLD_FILES+=usr/share/sendmail/cf/cf/chez.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/clientproto.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-hpux10.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-hpux9.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-osf1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-solaris2.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-sunos4.1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-ultrix4.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cyrusproto.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-bsd4.4.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-hpux10.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-hpux9.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-linux.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-mpeix.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-nextstep3.3.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-osf1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-solaris.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-sunos4.1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-ultrix4.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/huginn.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/knecht.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/mail.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/mail.eecs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/mailspool.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/python.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/s2k-osf1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/s2k-ultrix4.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/submit.cf
 OLD_FILES+=usr/share/sendmail/cf/cf/submit.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/tcpproto.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/ucbarpa.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/ucbvax.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/uucpproto.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/vangogh.cs.mc
 OLD_DIRS+=usr/share/sendmail/cf/cf
 OLD_FILES+=usr/share/sendmail/cf/domain/Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/CS.Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/EECS.Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/S2K.Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/berkeley-only.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/generic.m4
 OLD_DIRS+=usr/share/sendmail/cf/domain
 OLD_FILES+=usr/share/sendmail/cf/feature/accept_unqualified_senders.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/accept_unresolvable_domains.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/access_db.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/allmasquerade.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/always_add_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/authinfo.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/badmx.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/bestmx_is_local.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/bitdomain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/blacklist_recipients.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/block_bad_helo.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/compat_check.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/conncontrol.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/delay_checks.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/dnsbl.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/domaintable.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/enhdnsbl.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/generics_entire_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/genericstable.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/greet_pause.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/ldap_routing.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/limited_masquerade.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/local_lmtp.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/local_no_masquerade.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/local_procmail.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/lookupdotdomain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/loose_relay_check.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/mailertable.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/masquerade_entire_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/masquerade_envelope.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/msp.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/mtamark.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/no_default_msa.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/nocanonify.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/notsticky.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/nouucp.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/nullclient.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/preserve_local_plus_detail.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/preserve_luser_host.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/promiscuous_relay.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/queuegroup.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/ratecontrol.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/redirect.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/relay_based_on_MX.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/relay_entire_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/relay_hosts_only.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/relay_local_from.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/relay_mail_from.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/require_rdns.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/smrsh.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/stickyhost.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/use_client_ptr.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/use_ct_file.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/use_cw_file.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/uucpdomain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/virtuser_entire_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/virtusertable.m4
 OLD_DIRS+=usr/share/sendmail/cf/feature
 OLD_FILES+=usr/share/sendmail/cf/hack/cssubdomain.m4
 OLD_DIRS+=usr/share/sendmail/cf/hack
 OLD_FILES+=usr/share/sendmail/cf/m4/cf.m4
 OLD_FILES+=usr/share/sendmail/cf/m4/cfhead.m4
 OLD_FILES+=usr/share/sendmail/cf/m4/proto.m4
 OLD_FILES+=usr/share/sendmail/cf/m4/version.m4
 OLD_DIRS+=usr/share/sendmail/cf/m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/cyrus.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/cyrusv2.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/fax.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/local.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/mail11.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/phquery.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/pop.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/procmail.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/qpage.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/smtp.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/usenet.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/uucp.m4
 OLD_DIRS+=usr/share/sendmail/cf/mailer
 OLD_FILES+=usr/share/sendmail/cf/ostype/a-ux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/aix3.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/aix4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/aix5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/altos.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/amdahl-uts.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsd4.3.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsd4.4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsdi.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsdi1.0.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsdi2.0.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/darwin.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/dgux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/domainos.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/dragonfly.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/dynix3.2.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/freebsd4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/freebsd5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/freebsd6.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/gnu.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/hpux10.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/hpux11.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/hpux9.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/irix4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/irix5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/irix6.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/isc4.1.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/linux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/maxion.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/mklinux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/mpeix.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/nextstep.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/openbsd.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/osf1.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/powerux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/ptx2.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/qnx.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/riscos4.5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sco-uw-2.1.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sco3.2.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sinix.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris11.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris2.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris2.ml.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris2.pre5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris8.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sunos3.5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sunos4.1.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/svr4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/ultrix4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unicos.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unicosmk.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unicosmp.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unixware7.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unknown.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/uxpds.m4
 OLD_DIRS+=usr/share/sendmail/cf/ostype
 OLD_FILES+=usr/share/sendmail/cf/sendmail.schema
 OLD_FILES+=usr/share/sendmail/cf/sh/makeinfo.sh
 OLD_DIRS+=usr/share/sendmail/cf/sh
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.cogsci.m4
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.old.arpa.m4
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.ucbarpa.m4
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.ucbvax.m4
 OLD_DIRS+=usr/share/sendmail/cf/siteconfig
 OLD_DIRS+=usr/share/sendmail/cf
 OLD_DIRS+=usr/share/sendmail
 .endif
 
 .if ${MK_SHAREDOCS} == no
 OLD_FILES+=usr/share/doc/pjdfstest/README
 OLD_DIRS+=usr/share/doc/pjdfstest
 .endif
 
 #.if ${MK_SYSCONS} == no
 # to be filled in
 #.endif
 
 .if ${MK_TCSH} == no
 OLD_FILES+=bin/csh
 OLD_FILES+=bin/tcsh
 OLD_FILES+=rescue/csh
 OLD_FILES+=rescue/tcsh
 OLD_FILES+=usr/share/examples/tcsh/complete.tcsh
 OLD_FILES+=usr/share/examples/tcsh/csh-mode.el
 OLD_DIRS+=usr/share/examples/tcsh
 OLD_FILES+=usr/share/man/man1/csh.1.gz
 OLD_FILES+=usr/share/man/man1/tcsh.1.gz
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/de_AT.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/de_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/de_DE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/el_GR.ISO8859-7/tcsh.cat
 OLD_FILES+=usr/share/nls/el_GR.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/es_ES.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/et_EE.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/et_EE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fi_FI.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fi_FI.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fi_FI.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_BE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CA.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_FR.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/it_CH.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/it_CH.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/it_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/it_IT.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/it_IT.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/it_IT.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/ja_JP.SJIS/tcsh.cat
 OLD_FILES+=usr/share/nls/ja_JP.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/ja_JP.eucJP/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.CP1251/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.CP866/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.ISO8859-5/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/uk_UA.ISO8859-5/tcsh.cat
 OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/tcsh.cat
 OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat
 .endif
 
 .if ${MK_TELNET} == no
 OLD_FILES+=usr/bin/telnet
 OLD_FILES+=usr/libexec/telnetd
 OLD_FILES+=usr/share/man/man1/telnet.1.gz
 OLD_FILES+=usr/share/man/man8/telnetd.8.gz
 .endif
 
 .if ${MK_TESTS} == yes
 OLD_FILES+=usr/bin/atf-sh
 OLD_FILES+=usr/include/atf-c++/config.hpp
 OLD_FILES+=usr/include/atf-c/config.h
 OLD_LIBS+=usr/lib/libatf-c++.a
 OLD_LIBS+=usr/lib/libatf-c++.so
 OLD_LIBS+=usr/lib/libatf-c++.so.1
 OLD_LIBS+=usr/lib/libatf-c++.so.2
 OLD_LIBS+=usr/lib/libatf-c++_p.a
 OLD_LIBS+=usr/lib/libatf-c.a
 OLD_LIBS+=usr/lib/libatf-c.so
 OLD_LIBS+=usr/lib/libatf-c.so.1
 OLD_LIBS+=usr/lib/libatf-c_p.a
 OLD_LIBS+=usr/lib/private/libatf-c.so.0
 OLD_LIBS+=usr/lib/private/libatf-c++.so.1
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_LIBS+=usr/lib32/libatf-c++.a
 OLD_LIBS+=usr/lib32/libatf-c++.so
 OLD_LIBS+=usr/lib32/libatf-c++.so.1
 OLD_LIBS+=usr/lib32/libatf-c++.so.2
 OLD_LIBS+=usr/lib32/libatf-c++_p.a
 OLD_LIBS+=usr/lib32/libatf-c.a
 OLD_LIBS+=usr/lib32/libatf-c.so
 OLD_LIBS+=usr/lib32/libatf-c.so.1
 OLD_LIBS+=usr/lib32/libatf-c_p.a
 OLD_LIBS+=usr/lib32/private/libatf-c.so.0
 OLD_LIBS+=usr/lib32/private/libatf-c++.so.1
 .endif
 OLD_FILES+=usr/libdata/pkgconfig/atf-c++.pc
 OLD_FILES+=usr/libdata/pkgconfig/atf-c.pc
 OLD_FILES+=usr/libdata/pkgconfig/atf-sh.pc
 OLD_FILES+=usr/share/aclocal/atf-c++.m4
 OLD_FILES+=usr/share/aclocal/atf-c.m4
 OLD_FILES+=usr/share/aclocal/atf-common.m4
 OLD_FILES+=usr/share/aclocal/atf-sh.m4
 OLD_DIRS+=usr/share/aclocal
 OLD_FILES+=usr/tests/bin/chown/units_basics
 OLD_FILES+=usr/tests/bin/date/legacy_test
 OLD_FILES+=usr/tests/bin/sh/legacy_test
 OLD_FILES+=usr/tests/usr.bin/atf/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/atf_check_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/config_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/integration_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/misc_helpers
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/normalize_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/tc_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/tp_test
 OLD_DIRS+=usr/tests/usr.bin/atf/atf-sh
 OLD_DIRS+=usr/tests/usr.bin/atf
 OLD_FILES+=usr/tests/lib/atf/libatf-c/test_helpers_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/fork_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/application_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/config_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/expand_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/parser_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/sanity_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/ui_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/env_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/exceptions_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/expand_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/fs_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/parser_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/process_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/sanity_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/pkg_config_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/text_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/ui_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/config_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/dynstr_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/env_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/fs_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/list_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/map_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/pkg_config_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/process_helpers
 OLD_FILES+=usr/tests/lib/atf/libatf-c/process_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/sanity_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/text_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/user_test
 .if ${MK_MAKE} == yes
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/libtest.a
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/libtest.a
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/libtest.a
 OLD_FILES+=usr/tests/usr.bin/make/archives/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/sh
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/sh
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/sh
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/shell
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/shell
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/TEST2.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/TEST2.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/cleanup
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/cleanup
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/common.sh
 OLD_FILES+=usr/tests/usr.bin/make/test-new.mk
 OLD_DIRS+=usr/tests/usr.bin/make/variables/t0
 OLD_DIRS+=usr/tests/usr.bin/make/variables/opt_V
 OLD_DIRS+=usr/tests/usr.bin/make/variables/modifier_t
 OLD_DIRS+=usr/tests/usr.bin/make/variables/modifier_M
 OLD_DIRS+=usr/tests/usr.bin/make/variables
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/mk
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/2/1
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/2
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/mk
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/2/1
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/2
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/mk
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/2/1
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/2
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk
 OLD_DIRS+=usr/tests/usr.bin/make/syntax/semi
 OLD_DIRS+=usr/tests/usr.bin/make/syntax/funny-targets
 OLD_DIRS+=usr/tests/usr.bin/make/syntax/enl
 OLD_DIRS+=usr/tests/usr.bin/make/syntax/directive-t0
 OLD_DIRS+=usr/tests/usr.bin/make/syntax
 OLD_DIRS+=usr/tests/usr.bin/make/suffixes/src_wild2
 OLD_DIRS+=usr/tests/usr.bin/make/suffixes/src_wild1
 OLD_DIRS+=usr/tests/usr.bin/make/suffixes/basic
 OLD_DIRS+=usr/tests/usr.bin/make/suffixes
 OLD_DIRS+=usr/tests/usr.bin/make/shell/select
 OLD_DIRS+=usr/tests/usr.bin/make/shell/replace
 OLD_DIRS+=usr/tests/usr.bin/make/shell/path_select
 OLD_DIRS+=usr/tests/usr.bin/make/shell/path
 OLD_DIRS+=usr/tests/usr.bin/make/shell/meta
 OLD_DIRS+=usr/tests/usr.bin/make/shell/builtin
 OLD_DIRS+=usr/tests/usr.bin/make/shell
 OLD_DIRS+=usr/tests/usr.bin/make/execution/plus
 OLD_DIRS+=usr/tests/usr.bin/make/execution/joberr
 OLD_DIRS+=usr/tests/usr.bin/make/execution/empty
 OLD_DIRS+=usr/tests/usr.bin/make/execution/ellipsis
 OLD_DIRS+=usr/tests/usr.bin/make/execution
 OLD_DIRS+=usr/tests/usr.bin/make/basic/t3
 OLD_DIRS+=usr/tests/usr.bin/make/basic/t2
 OLD_DIRS+=usr/tests/usr.bin/make/basic/t1
 OLD_DIRS+=usr/tests/usr.bin/make/basic/t0
 OLD_DIRS+=usr/tests/usr.bin/make/basic
 OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_oldbsd
 OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod
 OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_44bsd
 OLD_DIRS+=usr/tests/usr.bin/make/archives
 OLD_DIRS+=usr/tests/usr.bin/make
 OLD_FILES+=usr/tests/usr.bin/yacc/legacy_test
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.00.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.01.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.02.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.03.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.04.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.05.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.06.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.07.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.08.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.09.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.10.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.11.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.12.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.13.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.14.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.sh
 OLD_FILES+=usr/tests/usr.bin/yacc/undefined.y
 .endif
 .else
 # ATF libraries.
 OLD_FILES+=usr/bin/atf-sh
 OLD_DIRS+=usr/include/atf-c
 OLD_FILES+=usr/include/atf-c/build.h
 OLD_FILES+=usr/include/atf-c/check.h
 OLD_FILES+=usr/include/atf-c/config.h
 OLD_FILES+=usr/include/atf-c/defs.h
 OLD_FILES+=usr/include/atf-c/error.h
 OLD_FILES+=usr/include/atf-c/error_fwd.h
 OLD_FILES+=usr/include/atf-c/macros.h
 OLD_FILES+=usr/include/atf-c/tc.h
 OLD_FILES+=usr/include/atf-c/tp.h
 OLD_FILES+=usr/include/atf-c/utils.h
 OLD_FILES+=usr/include/atf-c.h
 OLD_DIRS+=usr/include/atf-c++
 OLD_FILES+=usr/include/atf-c++/build.hpp
 OLD_FILES+=usr/include/atf-c++/check.hpp
 OLD_FILES+=usr/include/atf-c++/config.hpp
 OLD_FILES+=usr/include/atf-c++/macros.hpp
 OLD_FILES+=usr/include/atf-c++/tests.hpp
 OLD_FILES+=usr/include/atf-c++/utils.hpp
 OLD_FILES+=usr/include/atf-c++.hpp
 OLD_FILES+=usr/lib/libatf-c_p.a
 OLD_FILES+=usr/lib/libatf-c.so.1
 OLD_FILES+=usr/lib/libatf-c.so
 OLD_FILES+=usr/lib/libatf-c++.a
 OLD_FILES+=usr/lib/libatf-c++_p.a
 OLD_FILES+=usr/lib/libatf-c++.so.1
 OLD_FILES+=usr/lib/libatf-c++.so
 OLD_FILES+=usr/lib/libatf-c.a
 OLD_FILES+=usr/libexec/atf-check
 OLD_DIRS+=usr/share/atf
 OLD_FILES+=usr/share/atf/libatf-sh.subr
 OLD_DIRS+=usr/share/doc/atf
 OLD_FILES+=usr/share/doc/atf/AUTHORS
 OLD_FILES+=usr/share/doc/atf/COPYING
 OLD_FILES+=usr/share/doc/atf/NEWS
 OLD_FILES+=usr/share/doc/atf/README
 OLD_FILES+=usr/share/man/man1/atf-check.1.gz
 OLD_FILES+=usr/share/man/man1/atf-sh.1.gz
 OLD_FILES+=usr/share/man/man1/atf-test-program.1.gz
 OLD_FILES+=usr/share/man/man3/atf-c-api.3.gz
 OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz
 OLD_FILES+=usr/share/man/man3/atf-sh-api.3.gz
 OLD_FILES+=usr/share/man/man4/atf-test-case.4.gz
 OLD_FILES+=usr/share/mk/atf.test.mk
 
 # Test suite.
 . if exists(${DESTDIR}${TESTSBASE})
 TESTS_DIRS!=find ${DESTDIR}${TESTSBASE} -type d | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${TESTS_DIRS}
 TESTS_FILES!=find ${DESTDIR}${TESTSBASE} \! -type d | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_FILES+=${TESTS_FILES}
 . endif
 .endif	# Test suite.
 
 #.if ${MK_TOOLCHAIN} == no
 # to be filled in
 #.endif
 
 .if ${MK_UNBOUND} == no
 OLD_FILES+=etc/rc.d/local_unbound
 OLD_FILES+=usr/lib/private/libunbound.a
 OLD_FILES+=usr/lib/private/libunbound.so
 OLD_LIBS+=usr/lib/private/libunbound.so.5
 OLD_FILES+=usr/lib/private/libunbound_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/private/libunbound.a
 OLD_FILES+=usr/lib32/private/libunbound.so
 OLD_LIBS+=usr/lib32/private/libunbound.so.5
 OLD_FILES+=usr/lib32/private/libunbound_p.a
 .endif
 OLD_FILES+=usr/sbin/local-unbound-setup
 OLD_FILES+=usr/sbin/unbound
 OLD_FILES+=usr/sbin/unbound-anchor
 OLD_FILES+=usr/sbin/unbound-checkconf
 OLD_FILES+=usr/sbin/unbound-control
 OLD_FILES+=usr/sbin/unbound-control-setup
 .endif
 
 .if ${MK_USB} == no
 OLD_FILES+=etc/devd/uauth.conf
 OLD_FILES+=etc/devd/usb.conf
 .endif
 
 .if ${MK_UTMPX} == no
 OLD_FILES+=etc/periodic/monthly/200.accounting
 OLD_FILES+=usr/bin/last
 OLD_FILES+=usr/bin/users
 OLD_FILES+=usr/bin/who
 OLD_FILES+=usr/sbin/ac
 OLD_FILES+=usr/sbin/lastlogin
 OLD_FILES+=usr/sbin/utx
 OLD_FILES+=usr/share/man/man1/last.1.gz
 OLD_FILES+=usr/share/man/man1/users.1.gz
 OLD_FILES+=usr/share/man/man1/who.1.gz
 OLD_FILES+=usr/share/man/man8/ac.8.gz
 OLD_FILES+=usr/share/man/man8/lastlogin.8.gz
 OLD_FILES+=usr/share/man/man8/utx.8.gz
 .endif
 
 .if ${MK_WIRELESS} == no
 OLD_FILES+=etc/regdomain.xml
 OLD_FILES+=usr/sbin/ancontrol
 OLD_FILES+=usr/sbin/hostapd
 OLD_FILES+=usr/sbin/hostapd_cli
 OLD_FILES+=usr/sbin/ndis_events
 OLD_FILES+=usr/sbin/wlandebug
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/sbin/wlconfig
 .endif
 OLD_FILES+=usr/sbin/wpa_cli
 OLD_FILES+=usr/sbin/wpa_passphrase
 OLD_FILES+=usr/sbin/wpa_supplicant
 OLD_FILES+=usr/share/examples/etc/regdomain.xml
 OLD_FILES+=usr/share/examples/etc/wpa_supplicant.conf
 OLD_FILES+=usr/share/examples/hostapd/hostapd.conf
 OLD_FILES+=usr/share/examples/hostapd/hostapd.eap_user
 OLD_FILES+=usr/share/examples/hostapd/hostapd.wpa_psk
 OLD_DIRS+=usr/share/examples/hostapd
 OLD_FILES+=usr/share/man/man5/hostapd.conf.5.gz
 OLD_FILES+=usr/share/man/man5/wpa_supplicant.conf.5.gz
 OLD_FILES+=usr/share/man/man8/ancontrol.8.gz
 OLD_FILES+=usr/share/man/man8/hostapd.8.gz
 OLD_FILES+=usr/share/man/man8/hostapd_cli.8.gz
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man8/i386/wlconfig.8.gz
 .endif
 OLD_FILES+=usr/share/man/man8/ndis_events.8.gz
 OLD_FILES+=usr/share/man/man8/wlandebug.8.gz
 OLD_FILES+=usr/share/man/man8/wpa_cli.8.gz
 OLD_FILES+=usr/share/man/man8/wpa_passphrase.8.gz
 OLD_FILES+=usr/share/man/man8/wpa_supplicant.8.gz
 .endif
 
 .if ${MK_SVNLITE} == no || ${MK_SVN} == yes
 OLD_FILES+=usr/bin/svnlite
 OLD_FILES+=usr/bin/svnliteadmin
 OLD_FILES+=usr/bin/svnlitedumpfilter
 OLD_FILES+=usr/bin/svnlitelook
 OLD_FILES+=usr/bin/svnlitemucc
 OLD_FILES+=usr/bin/svnliterdump
 OLD_FILES+=usr/bin/svnliteserve
 OLD_FILES+=usr/bin/svnlitesync
 OLD_FILES+=usr/bin/svnliteversion
 OLD_FILES+=usr/share/man/man1/svnlite.1.gz
 .endif
 
 .if ${MK_SVN} == no
 OLD_FILES+=usr/bin/svn
 OLD_FILES+=usr/bin/svnadmin
 OLD_FILES+=usr/bin/svndumpfilter
 OLD_FILES+=usr/bin/svnlook
 OLD_FILES+=usr/bin/svnmucc
 OLD_FILES+=usr/bin/svnrdump
 OLD_FILES+=usr/bin/svnserve
 OLD_FILES+=usr/bin/svnsync
 OLD_FILES+=usr/bin/svnversion
 .endif
 
 .if ${MK_DMAGENT} == no
 OLD_FILES+=usr/libexec/dma
 OLD_FILES+=usr/libexec/dma-mbox-create
 OLD_FILES+=usr/share/man/man8/dma.8.gz
 OLD_FILES+=usr/share/examples/dma/mailer.conf
 .endif
 
 .if ${MK_HYPERV} == no
 OLD_FILES+=etc/devd/hyperv.conf
 OLD_FILES+=usr/libexec/hyperv/hv_set_ifconfig
 OLD_FILES+=usr/libexec/hyperv/hv_get_dns_info
 OLD_FILES+=usr/libexec/hyperv/hv_get_dhcp_info
 OLD_FILES+=usr/sbin/hv_kvp_daemon
 OLD_FILES+=usr/share/man/man8/hv_kvp_daemon.8.gz
 .endif
Index: head/tools/build/options/WITH_INFO
===================================================================
--- head/tools/build/options/WITH_INFO	(revision 276550)
+++ head/tools/build/options/WITH_INFO	(nonexistent)
@@ -1,4 +0,0 @@
-.\" $FreeBSD$
-Set to make or install
-.Xr info 5
-files.

Property changes on: head/tools/build/options/WITH_INFO
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/usr.sbin/amd/doc/Makefile
===================================================================
--- head/usr.sbin/amd/doc/Makefile	(revision 276550)
+++ head/usr.sbin/amd/doc/Makefile	(nonexistent)
@@ -1,14 +0,0 @@
-# 	This file is under a "BSD" copyright (c) by David O'Brien 1998.
-
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../../contrib/amd/doc
-
-INFO=	am-utils
-
-INFOSECTION=	"AMD Documentation"
-INFOENTRY= 	"* Am-utils: (am-utils).	The Amd automounter suite of utilities"
-
-MAKEINFOFLAGS+=	-I ${.CURDIR}/../../../contrib/amd/doc
-
-.include <bsd.info.mk>

Property changes on: head/usr.sbin/amd/doc/Makefile
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/usr.sbin/amd/Makefile
===================================================================
--- head/usr.sbin/amd/Makefile	(revision 276550)
+++ head/usr.sbin/amd/Makefile	(revision 276551)
@@ -1,11 +1,11 @@
 # ex:ts=8
 #
 # Makefile for amd
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
 # $FreeBSD$
 
-SUBDIR= include libamu amd amq doc fixmount fsinfo hlfsd mk-amd-map pawd \
+SUBDIR= include libamu amd amq fixmount fsinfo hlfsd mk-amd-map pawd \
 	scripts wire-test
 
 .include <bsd.subdir.mk>