summaryrefslogtreecommitdiff
path: root/macros/texinfo/texinfo/doc
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-09-25 03:00:48 +0000
committerNorbert Preining <norbert@preining.info>2019-09-25 03:00:48 +0000
commitd232e1107d60e7689e706bee9705f26745ae8b9e (patch)
treef9ac3303fdb36c2eca1872286615c0931d952476 /macros/texinfo/texinfo/doc
parent94c2e367c3690be2a3c715b4577c81200652ad81 (diff)
CTAN sync 201909250300
Diffstat (limited to 'macros/texinfo/texinfo/doc')
-rw-r--r--macros/texinfo/texinfo/doc/Makefile.am2
-rw-r--r--macros/texinfo/texinfo/doc/Makefile.in23
-rw-r--r--macros/texinfo/texinfo/doc/info-stnd.texi13
-rw-r--r--macros/texinfo/texinfo/doc/refcard/txirefcard.tex2
-rw-r--r--macros/texinfo/texinfo/doc/short-sample-ja.texi4
-rw-r--r--macros/texinfo/texinfo/doc/stamp-18
-rw-r--r--macros/texinfo/texinfo/doc/stamp-vti8
-rw-r--r--macros/texinfo/texinfo/doc/texinfo-tex-test.WIDOWs224
-rw-r--r--macros/texinfo/texinfo/doc/texinfo-tex-test.texi1602
-rw-r--r--macros/texinfo/texinfo/doc/texinfo.tex899
-rw-r--r--macros/texinfo/texinfo/doc/texinfo.texi635
-rw-r--r--macros/texinfo/texinfo/doc/tp_api/Makefile.in20
-rw-r--r--macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Common.texi8
-rw-r--r--macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Convert-Converter.texi4
-rw-r--r--macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Parser.texi11
-rw-r--r--macros/texinfo/texinfo/doc/txi-ja.tex22
-rw-r--r--macros/texinfo/texinfo/doc/version-stnd.texi8
-rw-r--r--macros/texinfo/texinfo/doc/version.texi8
18 files changed, 1771 insertions, 1730 deletions
diff --git a/macros/texinfo/texinfo/doc/Makefile.am b/macros/texinfo/texinfo/doc/Makefile.am
index e890e7bcbb..732833e299 100644
--- a/macros/texinfo/texinfo/doc/Makefile.am
+++ b/macros/texinfo/texinfo/doc/Makefile.am
@@ -19,6 +19,7 @@ MAKEINFO_ENVIRONMENT = TEXINFO_DEV_SOURCE=1 ; export TEXINFO_DEV_SOURCE ; \
top_srcdir="$(top_srcdir)" ; export top_srcdir ; \
top_builddir="$(top_builddir)" ; export top_builddir ;
MAKEINFO = $(MAKEINFO_ENVIRONMENT) $(PERL) $(top_builddir)/tp/texi2any
+TEXI2DVI = $(top_srcdir)/util/texi2dvi
# We'd also like to use something like this, but Automake calls
# "install-info" directly.
@@ -63,6 +64,7 @@ install-tex:
test -n "$(TEXMF)" || (echo "TEXMF must be set." >&2; exit 1)
$(mkinstalldirs) $(DESTDIR)$(texmf_texinfo) $(DESTDIR)$(texmf_dvips)
$(INSTALL_DATA) $(srcdir)/texinfo.tex $(DESTDIR)$(texmf_texinfo)/texinfo.tex
+ $(INSTALL_DATA) $(srcdir)/texinfo-ja.tex $(DESTDIR)$(texmf_texinfo)/texinfo-ja.tex
$(INSTALL_DATA) $(srcdir)/epsf.tex $(DESTDIR)$(texmf_dvips)/epsf.tex
for f in $(TXI_XLATE); do \
$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(texmf_texinfo)/$$f; done
diff --git a/macros/texinfo/texinfo/doc/Makefile.in b/macros/texinfo/texinfo/doc/Makefile.in
index e944850a2f..ddf2d5c16f 100644
--- a/macros/texinfo/texinfo/doc/Makefile.in
+++ b/macros/texinfo/texinfo/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -263,7 +263,6 @@ PDFS = texinfo.pdf info-stnd.pdf
PSS = texinfo.ps info-stnd.ps
HTMLS = texinfo.html info-stnd.html
TEXINFOS = texinfo.texi info-stnd.texi
-TEXI2DVI = texi2dvi
TEXI2PDF = $(TEXI2DVI) --pdf --batch
MAKEINFOHTML = $(MAKEINFO) --html
AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
@@ -421,6 +420,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -576,6 +576,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -643,11 +644,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -713,6 +716,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -733,6 +737,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -767,6 +772,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -781,6 +787,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -859,8 +866,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -876,14 +881,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = $(MAKEINFO_ENVIRONMENT) $(PERL) $(top_builddir)/tp/texi2any
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -973,6 +977,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -1006,6 +1011,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -1018,6 +1024,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -1036,6 +1043,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -1139,6 +1147,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -1154,6 +1163,7 @@ MAKEINFO_ENVIRONMENT = TEXINFO_DEV_SOURCE=1 ; export TEXINFO_DEV_SOURCE ; \
top_srcdir="$(top_srcdir)" ; export top_srcdir ; \
top_builddir="$(top_builddir)" ; export top_builddir ;
+TEXI2DVI = $(top_srcdir)/util/texi2dvi
# We'd also like to use something like this, but Automake calls
# "install-info" directly.
@@ -1841,6 +1851,7 @@ install-tex:
test -n "$(TEXMF)" || (echo "TEXMF must be set." >&2; exit 1)
$(mkinstalldirs) $(DESTDIR)$(texmf_texinfo) $(DESTDIR)$(texmf_dvips)
$(INSTALL_DATA) $(srcdir)/texinfo.tex $(DESTDIR)$(texmf_texinfo)/texinfo.tex
+ $(INSTALL_DATA) $(srcdir)/texinfo-ja.tex $(DESTDIR)$(texmf_texinfo)/texinfo-ja.tex
$(INSTALL_DATA) $(srcdir)/epsf.tex $(DESTDIR)$(texmf_dvips)/epsf.tex
for f in $(TXI_XLATE); do \
$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(texmf_texinfo)/$$f; done
diff --git a/macros/texinfo/texinfo/doc/info-stnd.texi b/macros/texinfo/texinfo/doc/info-stnd.texi
index 86c92e867e..efeb36e807 100644
--- a/macros/texinfo/texinfo/doc/info-stnd.texi
+++ b/macros/texinfo/texinfo/doc/info-stnd.texi
@@ -24,14 +24,9 @@ Copyright @copyright{} 1992, 1993, 1996, 1997, 1998, 1999, 2001,
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 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 Texinfo manual.
-
-(a) The FSF's Back-Cover Text is: ``You have the freedom to
-copy and modify this GNU manual. Buying copies from the FSF
-supports it in developing GNU and promoting software freedom.''
+Invariant Sections, 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'' in the Texinfo manual.
@end quotation
This document is part of a collection distributed under the GNU Free
@@ -57,7 +52,6 @@ license to the document, as described in section 6 of the license.
@contents
-@ifnottex
@node Top
@top Stand-alone GNU Info
@@ -69,7 +63,6 @@ If you are new to the Info reader, then you can get started by typing
rest of this manual by typing @key{SPC} and @key{DEL} (or @key{Space}
and @key{Backspace}) to move forwards and backwards in it.
-@end ifnottex
@menu
* Stand-alone Info:: What is Info?
diff --git a/macros/texinfo/texinfo/doc/refcard/txirefcard.tex b/macros/texinfo/texinfo/doc/refcard/txirefcard.tex
index fa88c2b5e5..cde0a490d9 100644
--- a/macros/texinfo/texinfo/doc/refcard/txirefcard.tex
+++ b/macros/texinfo/texinfo/doc/refcard/txirefcard.tex
@@ -49,7 +49,7 @@
% Summary node in the Texinfo manual, originally written by Bob Chassell.
\def\versionyear{2019} % year manual was updated
-\def\versionTexinfo{6.6} % version of Texinfo this manual is for
+\def\versionTexinfo{6.7} % version of Texinfo this manual is for
\def\copyrightnotice{%
\vskip 1ex plus 1filll\begingroup\small
diff --git a/macros/texinfo/texinfo/doc/short-sample-ja.texi b/macros/texinfo/texinfo/doc/short-sample-ja.texi
index 560e40da8d..95c9693a3d 100644
--- a/macros/texinfo/texinfo/doc/short-sample-ja.texi
+++ b/macros/texinfo/texinfo/doc/short-sample-ja.texi
@@ -3,6 +3,8 @@
@documentencoding UTF-8
@documentlanguage ja
+@include version.texi
+
@settitle サンプル マニュアル 1.0 日本語版
@copying
@@ -21,14 +23,12 @@ Copyright @copyright{} 2016 Free Software Foundation, Inc.
@c 最初に目次を出力します。
@contents
-@ifnottex
@node Top
@top GNU サンプル
このマニュアルは GNU サンプル
(version @value{VERSION}, @value{UPDATED})
用です。
-@end ifnottex
@menu
* 第一章:: 第一章は
diff --git a/macros/texinfo/texinfo/doc/stamp-1 b/macros/texinfo/texinfo/doc/stamp-1
index bd8d35fb8b..f73a179aa9 100644
--- a/macros/texinfo/texinfo/doc/stamp-1
+++ b/macros/texinfo/texinfo/doc/stamp-1
@@ -1,4 +1,4 @@
-@set UPDATED 16 February 2019
-@set UPDATED-MONTH February 2019
-@set EDITION 6.6
-@set VERSION 6.6
+@set UPDATED 23 September 2019
+@set UPDATED-MONTH September 2019
+@set EDITION 6.7
+@set VERSION 6.7
diff --git a/macros/texinfo/texinfo/doc/stamp-vti b/macros/texinfo/texinfo/doc/stamp-vti
index bd8d35fb8b..f73a179aa9 100644
--- a/macros/texinfo/texinfo/doc/stamp-vti
+++ b/macros/texinfo/texinfo/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 16 February 2019
-@set UPDATED-MONTH February 2019
-@set EDITION 6.6
-@set VERSION 6.6
+@set UPDATED 23 September 2019
+@set UPDATED-MONTH September 2019
+@set EDITION 6.7
+@set VERSION 6.7
diff --git a/macros/texinfo/texinfo/doc/texinfo-tex-test.WIDOWs b/macros/texinfo/texinfo/doc/texinfo-tex-test.WIDOWs
index 834c9036d8..8a6134cdb8 100644
--- a/macros/texinfo/texinfo/doc/texinfo-tex-test.WIDOWs
+++ b/macros/texinfo/texinfo/doc/texinfo-tex-test.WIDOWs
@@ -1,112 +1,112 @@
-\initial {K}
-\entry {\code {kbd}}{63}
-\entry {\code {kbdinputstyle}}{63}
-\entry {\code {key}}{64}
-\entry {\code {kindex}}{97}
-\initial {L}
-\entry {\code {l}}{109}
-\entry {\code {L}}{109}
-\entry {\code {LaTeX}}{112}
-\entry {\code {lbracechar\lbracechar \rbracechar \r {(literal \samp {\lbracechar })}}}{103}
-\entry {\code {leq}}{114}
-\entry {\code {{\tt \backslashcurfont }linkcolor}}{59}
-\entry {\code {lisp}}{76}
-\entry {\code {listoffloats}}{91}
-\entry {\code {lowersections}}{47}
-\initial {M}
-\entry {\code {macro}}{149}
-\entry {\code {{\tt \backslashcurfont }mag \r {(raw \TeX {} magnification)}}}{173}
-\entry {\code {majorheading}}{44}
-\entry {\code {makeinfo-buffer}}{199}
-\entry {\code {makeinfo-kill-job}}{200}
-\entry {\code {makeinfo-recenter-output-buffer}}{200}
-\entry {\code {makeinfo-region}}{199}
-\entry {\code {math}}{111}
-\entry {\code {{\tt \backslashcurfont }mathopsup}}{111}
-\entry {\code {menu}}{38}
-\entry {\code {minus}}{114}
-\entry {\code {move_index_entries_after_items}}{195}
-\entry {\code {multitable}}{87}
-\initial {N}
-\entry {\code {need}}{122}
-\entry {\code {<newline>}}{105}
-\entry {\code {next-error}}{199}
-\entry {\code {node}}{32}
-\entry {\code {noindent}}{78}
-\entry {\code {novalidate}}{165}
-\initial {O}
-\entry {\code {o}}{109}
-\entry {\code {O}}{109}
-\entry {\code {occur}}{277}
-\entry {\code {occur-mode-goto-occurrence}}{259}
-\entry {\code {oddfooting}}{270}
-\entry {\code {oddfootingmarks}}{272}
-\entry {\code {oddheading}}{270}
-\entry {\code {oddheadingmarks}}{272}
-\entry {\code {oe}}{109}
-\entry {\code {OE}}{109}
-\entry {\code {ogonek}}{108}
-\entry {\code {option}}{67}
-\entry {\code {ordf}}{109}
-\entry {\code {ordm}}{109}
-\initial {P}
-\entry {\code {page}}{121}
-\entry {\code {page\r {, within \code {\@titlepage}}}}{20}
-\entry {\code {pagesizes}}{172}
-\entry {\code {paragraphindent}}{29}
-\entry {\code {parse}}{185}
-\entry {\code {part}}{46}
-\entry {\code {pdf}}{185}
-\entry {\code {phoo}}{155}
-\entry {\code {pindex}}{97}
-\entry {\code {plaintexinfo}}{185}
-\entry {\code {plaintext}}{185}
-\entry {\code {point}}{116}
-\entry {\code {pounds}}{113}
-\entry {\code {print}}{115}
-\entry {\code {printindex}}{99}
-\entry {\code {ps}}{185}
-\entry {\code {pxref}}{55}
-\initial {Q}
-\entry {\code {questiondown}}{109}
-\entry {\code {quotation}}{73}
-\entry {\code {quotedblbase}}{110}
-\entry {\code {quotedblleft}}{110}
-\entry {\code {quotedblright}}{110}
-\entry {\code {quoteleft}}{110}
-\entry {\code {quoteright}}{110}
-\entry {\code {quotesinglbase}}{110}
-\initial {R}
-\entry {\code {r \r {(roman font)}}}{71}
-\entry {\code {raggedright}}{78}
-\entry {\code {raisesections}}{47}
-\entry {\code {rawtext}}{185}
-\entry {\code {rbracechar\lbracechar \rbracechar \r {(literal \samp {\rbracechar })}}}{103}
-\entry {\code {ref}}{55}
-\entry {\code {refill}}{237}
-\entry {\code {regenerate_master_menu}}{195}
-\entry {\code {registeredsymbol}}{112}
-\entry {\code {result}}{115}
-\entry {\code {ringaccent}}{108}
-\entry {\code {rmacro}}{150}
-\initial {S}
-\entry {\code {samp}}{65}
-\entry {\code {sansserif \r {(sans serif font)}}}{71}
-\entry {\code {sc \r {(small caps font)}}}{70}
-\entry {\code {section}}{44}
-\entry {\code {set}}{143}
-\entry {\code {setchapternewpage}}{27}
-\entry {\code {\@setcontentsaftertitlepage}}{244}
-\entry {\code {setfilename}}{17}
-\entry {\code {\@setshortcontentsaftertitlepage}}{244}
-\entry {\code {settitle}}{18}
-\entry {\code {shortcaption}}{91}
-\entry {\code {shortcontents}}{24}
-\entry {\code {shorttitlepage}}{21}
-\entry {\code {simple_menu}}{195}
-\entry {\code {slanted \r {(slanted font)}}}{71}
-\entry {\code {smallbook}}{171}
-\entry {\code {smalldisplay}}{76}
-\entry {\code {smallexample}}{80}
-\entry {\code {smallformat}}{77, 80}
-\entry {\code {smallindentedblock}}{74}
+@initial {K}
+@entry {@code {kbd}}{63}
+@entry {@code {kbdinputstyle}}{63}
+@entry {@code {key}}{64}
+@entry {@code {kindex}}{97}
+@initial {L}
+@entry {@code {l}}{109}
+@entry {@code {L}}{109}
+@entry {@code {LaTeX}}{112}
+@entry {@code {lbracechar@lbracechar @rbracechar @r {(literal @samp {@lbracechar })}}}{103}
+@entry {@code {leq}}{114}
+@entry {@code {{@tt @backslashcurfont }linkcolor}}{59}
+@entry {@code {lisp}}{76}
+@entry {@code {listoffloats}}{91}
+@entry {@code {lowersections}}{47}
+@initial {M}
+@entry {@code {macro}}{149}
+@entry {@code {{@tt @backslashcurfont }mag @r {(raw @TeX {} magnification)}}}{173}
+@entry {@code {majorheading}}{44}
+@entry {@code {makeinfo-buffer}}{199}
+@entry {@code {makeinfo-kill-job}}{200}
+@entry {@code {makeinfo-recenter-output-buffer}}{200}
+@entry {@code {makeinfo-region}}{199}
+@entry {@code {math}}{111}
+@entry {@code {{@tt @backslashcurfont }mathopsup}}{111}
+@entry {@code {menu}}{38}
+@entry {@code {minus}}{114}
+@entry {@code {move_index_entries_after_items}}{195}
+@entry {@code {multitable}}{87}
+@initial {N}
+@entry {@code {need}}{122}
+@entry {@code {<newline>}}{105}
+@entry {@code {next-error}}{199}
+@entry {@code {node}}{32}
+@entry {@code {noindent}}{78}
+@entry {@code {novalidate}}{165}
+@initial {O}
+@entry {@code {o}}{109}
+@entry {@code {O}}{109}
+@entry {@code {occur}}{277}
+@entry {@code {occur-mode-goto-occurrence}}{259}
+@entry {@code {oddfooting}}{270}
+@entry {@code {oddfootingmarks}}{272}
+@entry {@code {oddheading}}{270}
+@entry {@code {oddheadingmarks}}{272}
+@entry {@code {oe}}{109}
+@entry {@code {OE}}{109}
+@entry {@code {ogonek}}{108}
+@entry {@code {option}}{67}
+@entry {@code {ordf}}{109}
+@entry {@code {ordm}}{109}
+@initial {P}
+@entry {@code {page}}{121}
+@entry {@code {page@r {, within @code {@@titlepage}}}}{20}
+@entry {@code {pagesizes}}{172}
+@entry {@code {paragraphindent}}{29}
+@entry {@code {parse}}{185}
+@entry {@code {part}}{46}
+@entry {@code {pdf}}{185}
+@entry {@code {phoo}}{155}
+@entry {@code {pindex}}{97}
+@entry {@code {plaintexinfo}}{185}
+@entry {@code {plaintext}}{185}
+@entry {@code {point}}{116}
+@entry {@code {pounds}}{113}
+@entry {@code {print}}{115}
+@entry {@code {printindex}}{99}
+@entry {@code {ps}}{185}
+@entry {@code {pxref}}{55}
+@initial {Q}
+@entry {@code {questiondown}}{109}
+@entry {@code {quotation}}{73}
+@entry {@code {quotedblbase}}{110}
+@entry {@code {quotedblleft}}{110}
+@entry {@code {quotedblright}}{110}
+@entry {@code {quoteleft}}{110}
+@entry {@code {quoteright}}{110}
+@entry {@code {quotesinglbase}}{110}
+@initial {R}
+@entry {@code {r @r {(roman font)}}}{71}
+@entry {@code {raggedright}}{78}
+@entry {@code {raisesections}}{47}
+@entry {@code {rawtext}}{185}
+@entry {@code {rbracechar@lbracechar @rbracechar @r {(literal @samp {@rbracechar })}}}{103}
+@entry {@code {ref}}{55}
+@entry {@code {refill}}{237}
+@entry {@code {regenerate_master_menu}}{195}
+@entry {@code {registeredsymbol}}{112}
+@entry {@code {result}}{115}
+@entry {@code {ringaccent}}{108}
+@entry {@code {rmacro}}{150}
+@initial {S}
+@entry {@code {samp}}{65}
+@entry {@code {sansserif @r {(sans serif font)}}}{71}
+@entry {@code {sc @r {(small caps font)}}}{70}
+@entry {@code {section}}{44}
+@entry {@code {set}}{143}
+@entry {@code {setchapternewpage}}{27}
+@entry {@code {@@setcontentsaftertitlepage}}{244}
+@entry {@code {setfilename}}{17}
+@entry {@code {@@setshortcontentsaftertitlepage}}{244}
+@entry {@code {settitle}}{18}
+@entry {@code {shortcaption}}{91}
+@entry {@code {shortcontents}}{24}
+@entry {@code {shorttitlepage}}{21}
+@entry {@code {simple_menu}}{195}
+@entry {@code {slanted @r {(slanted font)}}}{71}
+@entry {@code {smallbook}}{171}
+@entry {@code {smalldisplay}}{76}
+@entry {@code {smallexample}}{80}
+@entry {@code {smallformat}}{77, 80}
+@entry {@code {smallindentedblock}}{74}
diff --git a/macros/texinfo/texinfo/doc/texinfo-tex-test.texi b/macros/texinfo/texinfo/doc/texinfo-tex-test.texi
index ad1d3bb9dd..5d6b90364e 100644
--- a/macros/texinfo/texinfo/doc/texinfo-tex-test.texi
+++ b/macros/texinfo/texinfo/doc/texinfo-tex-test.texi
@@ -1,6 +1,6 @@
% texinfo-tex-test.texi -- test file for texinfo.tex
%
-% Copyright 2015, 2016 Free Software Foundation, Inc.
+% Copyright 2015-2019 Free Software Foundation, Inc.
%
% This file is free software: you can redistribute it and/or
% modify it under the terms of the GNU General Public License as
@@ -365,7 +365,7 @@ in next paragraph now.
@set fc Fran@,cois
@mactwo{@value{fc},}@*
-@mactwo{Fran@,cois,}@*
+@c doesn't work: @mactwo{Fran@,cois,}@*
Fran@,cois+.
@section Macro in argument to @@math
@@ -416,21 +416,6 @@ And multiple paragraphs.
Like an argument to @b{@@footnote}.
}
-(The double space in the @code{@@example} and the fact the text is not
-in bold is due to the way @code{\scantokens} inserts spaces after
-control sequences. This could be worked around like
-
-@verbatim
-@tex
-@gdef@coolb#1#{@b}%
-@end tex
-@end verbatim
-
-@noindent and using @samp{@@coolb} instead of @samp{@@b}. This skips
-the active space token before the opening brace. In theory this could
-be done automatically, but this would be a lot of work in
-@file{texinfo.tex} to do for all commands.)
-
@tex
\gdef \commenceindexnopage{%
@@ -440,7 +425,6 @@ be done automatically, but this would be a lot of work in
\tolerance = 9500
\plainfrenchspacing
\everypar = {}%
-\catcode`\\=0 \catcode`\@=12
}
\gdef \commenceindex{%
@@ -449,7 +433,6 @@ be done automatically, but this would be a lot of work in
}
\gdef \finishindex{%
-\catcode`\@=0 \catcode`\\=13
\enddoublecolumns
\endgroup
\hrule
@@ -462,19 +445,31 @@ In these examples, a horizontal rule is at the end of each run of double
column material in order to show if any material extends below the
box containing it.
+@section No page number in index
+
+No leaders unless there is also a page number
+
+@commenceindex
+@entry {whatever}{}
+@entry {more}{}
+@entry {whatever}{123}
+@entry {again}{}
+@finishindex
+
+
@section Long index entries
@commenceindex
-\entry {\code {-c}}{18, 20, 22, 27, 28, 38, 43, 51, 54, 65, 83, 91, 105,
+@entry {@code {-c}}{18, 20, 22, 27, 28, 38, 43, 51, 54, 65, 83, 91, 105,
124, 125, 127, 129, 135, 139, 143, 145, 148, 187}
-\entry {\code {-c}}{18, 20, 22, 27, 28, 38, 43, 51, 54, 65, 83, 91, 105,
+@entry {@code {-c}}{18, 20, 22, 27, 28, 38, 43, 51, 54, 65, 83, 91, 105,
124, 125, 127, 129, 135, 139, 143, 145, 148}
-\entry{Testing for Texinfo Commands: \code {\@ifcommanddefined}, \code
-{\@ifcommandnotdefined}}{148}
-\entry {\code {--dereference-command-line-symlink-to-dir}}{78}
-\entry {built-in shell commands, conflicts with}{119, 139, 144, 145,
+@entry{Testing for Texinfo Commands: @code {@@ifcommanddefined}, @code
+{@@ifcommandnotdefined}}{148}
+@entry {@code {--dereference-command-line-symlink-to-dir}}{78}
+@entry {built-in shell commands, conflicts with}{119, 139, 144, 145,
148, 163, 191, 196, 197}
-\finishindex
+@finishindex
@section End-column glue
@@ -484,125 +479,125 @@ inter-baseline spacing. This test only works if the `R' initial is at
the start of a page.
@commenceindex
-\initial {P}
-\entry {\code {PACKAGE}}{196}
-\entry {\code {PACKAGE_AND_VERSION}}{196}
-\entry {\code {PACKAGE_NAME}}{196}
-\entry {\code {PACKAGE_URL}}{196}
-\entry {\code {PACKAGE_VERSION}}{196}
-\entry {Page breaks, awkward}{124}
-\entry {Page breaks, forcing}{126}
-\entry {Page delimiter in Texinfo mode}{261}
-\entry {Page headings}{270}
-\entry {Page numbering}{270}
-\entry {Page sizes for books}{175}
-\entry {Page sizes, customized}{175}
-\entry {\code {page-delimiter}}{261}
-\entry {Pages, starting odd}{29}
-\entry {Paper size, A4}{175}
-\entry {Paragraph indentation control}{31}
-\entry {Paragraph, marking text within}{66}
-\entry {\code {paragraphindent}}{187}
-\entry {Parameters to macros}{154}
-\entry {Parentheses in node name}{37}
-\entry {Parsing errors}{202}
-\entry {Part of file formatting and printing}{266}
-\entry {Part pages}{50}
-\entry {Partial documents, formatting}{168}
-\entry {Parts of a cross reference}{54}
-\entry {Parts of a master menu}{28}
-\entry {Parts of a menu}{43}
-\entry {Patches, contributing}{4}
-\entry {PCL file, for printing}{170}
-\entry {\code {pdf image inclusions}}{97}
-\entry {PDF output}{176}
-\entry {PDF output of urls}{64}
-\entry {PDF output, overview}{5}
-\entry {\code {pdfetex}}{167}
-\entry {\code {pdftex}}{176}
-\entry {\code {pdftex\r {, and images}}}{97}
-\entry {\code {pdftxei2dvi}}{166}
-\entry {Period in node name}{37}
-\entry {Periods, inserting}{111}
-\entry {Perl format strings for translation}{199}
-\entry {Perl POD, converting to Texinfo}{200}
-\entry {Permissions text, including}{22}
-\entry {Permissions, printed}{25}
-\entry {\code {pg} (program) index}{102}
-\entry {Picas}{98}
-\entry {Pictures, inserting}{97}
-\entry {Pinard, Fran\,{c}ois}{7}
-\entry {Plain \TeX {}}{146}
-\entry {Plain text output with \option {--plaintext}}{183}
-\entry {Plain text output, overview}{4}
-\entry {\code {png image format}}{97}
-\entry {POD, converting to Texinfo}{200}
-\entry {\code {pod2texi}}{200}
-\entry {Point, indicating in a buffer}{121}
-\entry {Pointer creation with \code {makeinfo}}{40}
-\entry {Pointer validation with \code {makeinfo}}{185}
-\entry {Pointer validation, suppressing}{168}
-\entry {Pointer validation, suppressing from command line}{182}
-\entry {Points (dimension)}{98}
-\entry {PostScript output, overview}{4}
-\entry {Pounds symbol}{118}
-\entry {\code {PRE_ABOUT}}{192}
-\entry {\code {PRE_BODY_CLOSE}}{192}
-\entry {Preamble, in Info format}{283}
-\entry {Predefined names for indices}{105}
-\entry {Preface, etc., and Docbook}{48}
-\entry {\code {PREFIX}}{196}
-\entry {Preparing for \TeX {}}{173}
-\entry {Preserving HTML links to old nodes}{221}
-\entry {Prev node of Top node}{38}
-\entry {Preventing first paragraph indentation}{32}
-\entry {Preventing line and page breaks}{124}
-\entry {Print and format in Texinfo mode}{170}
-\entry {Print, format from Emacs shell}{170}
-\entry {Printed book and manual characteristics}{6}
-\entry {Printed output, indicating}{120}
-\entry {Printed output, through \command {texi2any}}{185}
-\entry {Printed permissions}{25}
-\entry {Printing a region or buffer}{266}
-\entry {Printing an index}{104}
-\entry {Printing cost, reducing}{75}
-\entry {Printing cropmarks}{176}
-\entry {Printing DVI files, on MS-DOS/MS-Windows}{170}
-\entry {Printing hardcopy}{166}
-\entry {Problems, catching}{275}
-\entry {\code {PROGRAM}}{196}
-\entry {Program names, indicating}{72}
-\entry {\code {PROGRAM_NAME_IN_FOOTER}}{192}
-\entry {Programming, glyhs for}{119}
-\entry {Pronunciation of Texinfo}{3}
-\entry {Prototype row, column widths defined by}{93}
-\entry {Ragged left, without filling}{83}
-\entry {Ragged right, with filling}{84}
-\entry {Ragged right, without filling}{83}
-\entry {Raising and lowering sections}{51}
-\entry {Raw formatter commands}{146}
-\entry {Raw HTML}{213}
-\entry {raw text output}{188}
-\initial {Q}
-\entry {Quotation characters (`'), in source}{114}
-\entry {Quotation marks, French}{115}
-\entry {Quotation marks, German}{115}
-\entry {Quotation marks, inserting}{114}
-\entry {Quotations}{78}
-\entry {Quotations in smaller fonts}{82}
-\entry {Quote characters, inserting}{110}
-\entry {Quoting, automatic for some macros}{156}
-\initial {R}
-\entry {RCS $Id}{253}
-\entry {Recommended names for keys}{69}
-\entry {Rectangle, black in hardcopy}{174}
-\entry {Recursive macro invocations}{155}
-\entry {Reducing font size}{75}
-\entry {Reference implementation}{178}
-\entry {Reference to @-commands}{223}
-\entry {References}{53}
-\entry {References using \code {@inforef}}{62}
-\finishindex
+@initial {P}
+@entry {@code {PACKAGE}}{196}
+@entry {@code {PACKAGE_AND_VERSION}}{196}
+@entry {@code {PACKAGE_NAME}}{196}
+@entry {@code {PACKAGE_URL}}{196}
+@entry {@code {PACKAGE_VERSION}}{196}
+@entry {Page breaks, awkward}{124}
+@entry {Page breaks, forcing}{126}
+@entry {Page delimiter in Texinfo mode}{261}
+@entry {Page headings}{270}
+@entry {Page numbering}{270}
+@entry {Page sizes for books}{175}
+@entry {Page sizes, customized}{175}
+@entry {@code {page-delimiter}}{261}
+@entry {Pages, starting odd}{29}
+@entry {Paper size, A4}{175}
+@entry {Paragraph indentation control}{31}
+@entry {Paragraph, marking text within}{66}
+@entry {@code {paragraphindent}}{187}
+@entry {Parameters to macros}{154}
+@entry {Parentheses in node name}{37}
+@entry {Parsing errors}{202}
+@entry {Part of file formatting and printing}{266}
+@entry {Part pages}{50}
+@entry {Partial documents, formatting}{168}
+@entry {Parts of a cross reference}{54}
+@entry {Parts of a master menu}{28}
+@entry {Parts of a menu}{43}
+@entry {Patches, contributing}{4}
+@entry {PCL file, for printing}{170}
+@entry {@code {pdf image inclusions}}{97}
+@entry {PDF output}{176}
+@entry {PDF output of urls}{64}
+@entry {PDF output, overview}{5}
+@entry {@code {pdfetex}}{167}
+@entry {@code {pdftex}}{176}
+@entry {@code {pdftex@r {, and images}}}{97}
+@entry {@code {pdftxei2dvi}}{166}
+@entry {Period in node name}{37}
+@entry {Periods, inserting}{111}
+@entry {Perl format strings for translation}{199}
+@entry {Perl POD, converting to Texinfo}{200}
+@entry {Permissions text, including}{22}
+@entry {Permissions, printed}{25}
+@entry {@code {pg} (program) index}{102}
+@entry {Picas}{98}
+@entry {Pictures, inserting}{97}
+@entry {Pinard, Fran@,{c}ois}{7}
+@entry {Plain @TeX {}}{146}
+@entry {Plain text output with @option {--plaintext}}{183}
+@entry {Plain text output, overview}{4}
+@entry {@code {png image format}}{97}
+@entry {POD, converting to Texinfo}{200}
+@entry {@code {pod2texi}}{200}
+@entry {Point, indicating in a buffer}{121}
+@entry {Pointer creation with @code {makeinfo}}{40}
+@entry {Pointer validation with @code {makeinfo}}{185}
+@entry {Pointer validation, suppressing}{168}
+@entry {Pointer validation, suppressing from command line}{182}
+@entry {Points (dimension)}{98}
+@entry {PostScript output, overview}{4}
+@entry {Pounds symbol}{118}
+@entry {@code {PRE_ABOUT}}{192}
+@entry {@code {PRE_BODY_CLOSE}}{192}
+@entry {Preamble, in Info format}{283}
+@entry {Predefined names for indices}{105}
+@entry {Preface, etc., and Docbook}{48}
+@entry {@code {PREFIX}}{196}
+@entry {Preparing for @TeX {}}{173}
+@entry {Preserving HTML links to old nodes}{221}
+@entry {Prev node of Top node}{38}
+@entry {Preventing first paragraph indentation}{32}
+@entry {Preventing line and page breaks}{124}
+@entry {Print and format in Texinfo mode}{170}
+@entry {Print, format from Emacs shell}{170}
+@entry {Printed book and manual characteristics}{6}
+@entry {Printed output, indicating}{120}
+@entry {Printed output, through @command {texi2any}}{185}
+@entry {Printed permissions}{25}
+@entry {Printing a region or buffer}{266}
+@entry {Printing an index}{104}
+@entry {Printing cost, reducing}{75}
+@entry {Printing cropmarks}{176}
+@entry {Printing DVI files, on MS-DOS/MS-Windows}{170}
+@entry {Printing hardcopy}{166}
+@entry {Problems, catching}{275}
+@entry {@code {PROGRAM}}{196}
+@entry {Program names, indicating}{72}
+@entry {@code {PROGRAM_NAME_IN_FOOTER}}{192}
+@entry {Programming, glyhs for}{119}
+@entry {Pronunciation of Texinfo}{3}
+@entry {Prototype row, column widths defined by}{93}
+@entry {Ragged left, without filling}{83}
+@entry {Ragged right, with filling}{84}
+@entry {Ragged right, without filling}{83}
+@entry {Raising and lowering sections}{51}
+@entry {Raw formatter commands}{146}
+@entry {Raw HTML}{213}
+@entry {raw text output}{188}
+@initial {Q}
+@entry {Quotation characters (`'), in source}{114}
+@entry {Quotation marks, French}{115}
+@entry {Quotation marks, German}{115}
+@entry {Quotation marks, inserting}{114}
+@entry {Quotations}{78}
+@entry {Quotations in smaller fonts}{82}
+@entry {Quote characters, inserting}{110}
+@entry {Quoting, automatic for some macros}{156}
+@initial {R}
+@entry {RCS $Id}{253}
+@entry {Recommended names for keys}{69}
+@entry {Rectangle, black in hardcopy}{174}
+@entry {Recursive macro invocations}{155}
+@entry {Reducing font size}{75}
+@entry {Reference implementation}{178}
+@entry {Reference to @@-commands}{223}
+@entry {References}{53}
+@entry {References using @code {@@inforef}}{62}
+@finishindex
@section Index page break not before initial
@@ -610,191 +605,191 @@ The next index is to show the bottoms of columns when the next page
doesn't start with an initial.
@commenceindex
-\initial {P}
-\entry {\code {PACKAGE}}{196}
-\entry {\code {PACKAGE_AND_VERSION}}{196}
-\entry {\code {PACKAGE_NAME}}{196}
-\entry {\code {PACKAGE_URL}}{196}
-\entry {\code {PACKAGE_VERSION}}{196}
-\entry {Page breaks, awkward}{124}
-\entry {Page breaks, forcing}{126}
-\entry {Page delimiter in Texinfo mode}{261}
-\entry {Page headings}{270}
-\entry {Page numbering}{270}
-\entry {Page sizes for books}{175}
-\entry {Page sizes, customized}{175}
-\entry {\code {page-delimiter}}{261}
-\entry {Pages, starting odd}{29}
-\entry {Paper size, A4}{175}
-\entry {Paragraph indentation control}{31}
-\entry {Paragraph, marking text within}{66}
-\entry {\code {paragraphindent}}{187}
-\entry {Parameters to macros}{154}
-\entry {Parentheses in node name}{37}
-\entry {Parsing errors}{202}
-\entry {Part of file formatting and printing}{266}
-\entry {Part pages}{50}
-\entry {Partial documents, formatting}{168}
-\entry {Parts of a cross reference}{54}
-\entry {Parts of a master menu}{28}
-\entry {Parts of a menu}{43}
-\entry {Patches, contributing}{4}
-\entry {PCL file, for printing}{170}
-\entry {\code {pdf image inclusions}}{97}
-\entry {PDF output}{176}
-\entry {PDF output of urls}{64}
-\entry {PDF output, overview}{5}
-\entry {\code {pdfetex}}{167}
-\entry {\code {pdftex}}{176}
-\entry {\code {pdftex\r {, and images}}}{97}
-\entry {\code {pdftxei2dvi}}{166}
-\entry {Period in node name}{37}
-\entry {Periods, inserting}{111}
-\entry {Perl format strings for translation}{199}
-\entry {Perl POD, converting to Texinfo}{200}
-\entry {Permissions text, including}{22}
-\entry {Permissions, printed}{25}
-\entry {\code {pg} (program) index}{102}
-\entry {Picas}{98}
-\entry {Pictures, inserting}{97}
-\entry {Pinard, Fran\,{c}ois}{7}
-\entry {Plain \TeX {}}{146}
-\entry {Plain text output with \option {--plaintext}}{183}
-\entry {Plain text output, overview}{4}
-\entry {\code {png image format}}{97}
-\entry {POD, converting to Texinfo}{200}
-\entry {\code {pod2texi}}{200}
-\entry {Point, indicating in a buffer}{121}
-\entry {Pointer creation with \code {makeinfo}}{40}
-\entry {Pointer validation with \code {makeinfo}}{185}
-\entry {Pointer validation, suppressing}{168}
-\entry {Pointer validation, suppressing from command line}{182}
-\entry {Points (dimension)}{98}
-\entry {PostScript output, overview}{4}
-\entry {Pounds symbol}{118}
-\entry {\code {PRE_ABOUT}}{192}
-\entry {\code {PRE_BODY_CLOSE}}{192}
-\entry {Preamble, in Info format}{283}
-\entry {Predefined names for indices}{105}
-\entry {Preface, etc., and Docbook}{48}
-\entry {\code {PREFIX}}{196}
-\entry {Preparing for \TeX {}}{173}
-\entry {Preserving HTML links to old nodes}{221}
-\entry {Prev node of Top node}{38}
-\entry {Preventing first paragraph indentation}{32}
-\entry {Preventing line and page breaks}{124}
-\entry {Print and format in Texinfo mode}{170}
-\entry {Print, format from Emacs shell}{170}
-\entry {Printed book and manual characteristics}{6}
-\entry {Printed output, indicating}{120}
-\entry {Printed output, through \command {texi2any}}{185}
-\entry {Printed permissions}{25}
-\entry {Printing a region or buffer}{266}
-\entry {Printing an index}{104}
-\entry {Printing cost, reducing}{75}
-\entry {Printing cropmarks}{176}
-\entry {Printing DVI files, on MS-DOS/MS-Windows}{170}
-\entry {Printing hardcopy}{166}
-\entry {Problems, catching}{275}
-\entry {\code {PROGRAM}}{196}
-\entry {Program names, indicating}{72}
-\entry {\code {PROGRAM_NAME_IN_FOOTER}}{192}
-\entry {Programming, glyhs for}{119}
-\entry {Pronunciation of Texinfo}{3}
-\entry {Prototype row, column widths defined by}{93}
-\initial {Q}
-\entry {Quotation characters (`'), in source}{114}
-\entry {Quotation marks, French}{115}
-\entry {Quotation marks, German}{115}
-\entry {Quotation marks, inserting}{114}
-\entry {Quotations}{78}
-\entry {Quotations in smaller fonts}{82}
-\entry {Quote characters, inserting}{110}
-\entry {Quoting, automatic for some macros}{156}
-\entry {Ragged left, without filling}{83}
-\entry {Ragged right, with filling}{84}
-\entry {Ragged right, without filling}{83}
-\entry {Raising and lowering sections}{51}
-\entry {Raw formatter commands}{146}
-\entry {Raw HTML}{213}
-\entry {raw text output}{188}
-\entry {RCS $Id}{253}
-\entry {Recommended names for keys}{69}
-\entry {Rectangle, black in hardcopy}{174}
-\entry {Recursive macro invocations}{155}
-\entry {Reducing font size}{75}
-\entry {Reference implementation}{178}
-\entry {Reference to @-commands}{223}
-\entry {References}{53}
-\entry {References using \code {@inforef}}{62}
-\entry {Raw formatter commands}{146}
-\entry {Raw HTML}{213}
-\entry {raw text output}{188}
-\entry {RCS $Id}{253}
-\entry {Recommended names for keys}{69}
-\entry {Rectangle, black in hardcopy}{174}
-\entry {Recursive macro invocations}{155}
-\entry {Reducing font size}{75}
-\entry {Reference implementation}{178}
-\entry {Reference to @-commands}{223}
-\entry {References}{53}
-\entry {References using \code {@inforef}}{62}
-\finishindex
+@initial {P}
+@entry {@code {PACKAGE}}{196}
+@entry {@code {PACKAGE_AND_VERSION}}{196}
+@entry {@code {PACKAGE_NAME}}{196}
+@entry {@code {PACKAGE_URL}}{196}
+@entry {@code {PACKAGE_VERSION}}{196}
+@entry {Page breaks, awkward}{124}
+@entry {Page breaks, forcing}{126}
+@entry {Page delimiter in Texinfo mode}{261}
+@entry {Page headings}{270}
+@entry {Page numbering}{270}
+@entry {Page sizes for books}{175}
+@entry {Page sizes, customized}{175}
+@entry {@code {page-delimiter}}{261}
+@entry {Pages, starting odd}{29}
+@entry {Paper size, A4}{175}
+@entry {Paragraph indentation control}{31}
+@entry {Paragraph, marking text within}{66}
+@entry {@code {paragraphindent}}{187}
+@entry {Parameters to macros}{154}
+@entry {Parentheses in node name}{37}
+@entry {Parsing errors}{202}
+@entry {Part of file formatting and printing}{266}
+@entry {Part pages}{50}
+@entry {Partial documents, formatting}{168}
+@entry {Parts of a cross reference}{54}
+@entry {Parts of a master menu}{28}
+@entry {Parts of a menu}{43}
+@entry {Patches, contributing}{4}
+@entry {PCL file, for printing}{170}
+@entry {@code {pdf image inclusions}}{97}
+@entry {PDF output}{176}
+@entry {PDF output of urls}{64}
+@entry {PDF output, overview}{5}
+@entry {@code {pdfetex}}{167}
+@entry {@code {pdftex}}{176}
+@entry {@code {pdftex@r {, and images}}}{97}
+@entry {@code {pdftxei2dvi}}{166}
+@entry {Period in node name}{37}
+@entry {Periods, inserting}{111}
+@entry {Perl format strings for translation}{199}
+@entry {Perl POD, converting to Texinfo}{200}
+@entry {Permissions text, including}{22}
+@entry {Permissions, printed}{25}
+@entry {@code {pg} (program) index}{102}
+@entry {Picas}{98}
+@entry {Pictures, inserting}{97}
+@entry {Pinard, Fran@,{c}ois}{7}
+@entry {Plain @TeX {}}{146}
+@entry {Plain text output with @option {--plaintext}}{183}
+@entry {Plain text output, overview}{4}
+@entry {@code {png image format}}{97}
+@entry {POD, converting to Texinfo}{200}
+@entry {@code {pod2texi}}{200}
+@entry {Point, indicating in a buffer}{121}
+@entry {Pointer creation with @code {makeinfo}}{40}
+@entry {Pointer validation with @code {makeinfo}}{185}
+@entry {Pointer validation, suppressing}{168}
+@entry {Pointer validation, suppressing from command line}{182}
+@entry {Points (dimension)}{98}
+@entry {PostScript output, overview}{4}
+@entry {Pounds symbol}{118}
+@entry {@code {PRE_ABOUT}}{192}
+@entry {@code {PRE_BODY_CLOSE}}{192}
+@entry {Preamble, in Info format}{283}
+@entry {Predefined names for indices}{105}
+@entry {Preface, etc., and Docbook}{48}
+@entry {@code {PREFIX}}{196}
+@entry {Preparing for @TeX {}}{173}
+@entry {Preserving HTML links to old nodes}{221}
+@entry {Prev node of Top node}{38}
+@entry {Preventing first paragraph indentation}{32}
+@entry {Preventing line and page breaks}{124}
+@entry {Print and format in Texinfo mode}{170}
+@entry {Print, format from Emacs shell}{170}
+@entry {Printed book and manual characteristics}{6}
+@entry {Printed output, indicating}{120}
+@entry {Printed output, through @command {texi2any}}{185}
+@entry {Printed permissions}{25}
+@entry {Printing a region or buffer}{266}
+@entry {Printing an index}{104}
+@entry {Printing cost, reducing}{75}
+@entry {Printing cropmarks}{176}
+@entry {Printing DVI files, on MS-DOS/MS-Windows}{170}
+@entry {Printing hardcopy}{166}
+@entry {Problems, catching}{275}
+@entry {@code {PROGRAM}}{196}
+@entry {Program names, indicating}{72}
+@entry {@code {PROGRAM_NAME_IN_FOOTER}}{192}
+@entry {Programming, glyhs for}{119}
+@entry {Pronunciation of Texinfo}{3}
+@entry {Prototype row, column widths defined by}{93}
+@initial {Q}
+@entry {Quotation characters (`'), in source}{114}
+@entry {Quotation marks, French}{115}
+@entry {Quotation marks, German}{115}
+@entry {Quotation marks, inserting}{114}
+@entry {Quotations}{78}
+@entry {Quotations in smaller fonts}{82}
+@entry {Quote characters, inserting}{110}
+@entry {Quoting, automatic for some macros}{156}
+@entry {Ragged left, without filling}{83}
+@entry {Ragged right, with filling}{84}
+@entry {Ragged right, without filling}{83}
+@entry {Raising and lowering sections}{51}
+@entry {Raw formatter commands}{146}
+@entry {Raw HTML}{213}
+@entry {raw text output}{188}
+@entry {RCS $Id}{253}
+@entry {Recommended names for keys}{69}
+@entry {Rectangle, black in hardcopy}{174}
+@entry {Recursive macro invocations}{155}
+@entry {Reducing font size}{75}
+@entry {Reference implementation}{178}
+@entry {Reference to @@-commands}{223}
+@entry {References}{53}
+@entry {References using @code {@@inforef}}{62}
+@entry {Raw formatter commands}{146}
+@entry {Raw HTML}{213}
+@entry {raw text output}{188}
+@entry {RCS $Id}{253}
+@entry {Recommended names for keys}{69}
+@entry {Rectangle, black in hardcopy}{174}
+@entry {Recursive macro invocations}{155}
+@entry {Reducing font size}{75}
+@entry {Reference implementation}{178}
+@entry {Reference to @@-commands}{223}
+@entry {References}{53}
+@entry {References using @code {@@inforef}}{62}
+@finishindex
@section Short indices
See following pages
@commenceindex
-\initial{A}
-\entry{aaaa}{1}
-\initial{B}
-\entry{bbbb}{2}
-\finishindex
+@initial{A}
+@entry{aaaa}{1}
+@initial{B}
+@entry{bbbb}{2}
+@finishindex
If the above is in two columns, check that the space below the initials
`A' and `B' is even.
@commenceindex
-\initial{A}
-\entry{aaaa}{1}
-\initial{B}
-\entry{bbbb}{2}
-\initial{C}
-\entry{cccc}{2}
-\finishindex
+@initial{A}
+@entry{aaaa}{1}
+@initial{B}
+@entry{bbbb}{2}
+@initial{C}
+@entry{cccc}{2}
+@finishindex
@commenceindex
-\initial{A}
-\entry{aaaa}{1}
-\initial{B}
-\entry{bbbb}{2}
-\initial{C}
-\entry{cccc}{2}
-\entry{cccc}{2}
-\finishindex
+@initial{A}
+@entry{aaaa}{1}
+@initial{B}
+@entry{bbbb}{2}
+@initial{C}
+@entry{cccc}{2}
+@entry{cccc}{2}
+@finishindex
@commenceindex
-\initial{A}
-\entry{aaaa}{1}
-\entry{bbbb}{2}
-\entry{bbbb}{2}
-\entry{bbbb}{2}
-\entry{bbbb}{2}
-\entry{bbbb}{2}
-\finishindex
+@initial{A}
+@entry{aaaa}{1}
+@entry{bbbb}{2}
+@entry{bbbb}{2}
+@entry{bbbb}{2}
+@entry{bbbb}{2}
+@entry{bbbb}{2}
+@finishindex
@commenceindex
-\initial{A}
-\entry{aaaa}{1}
-\entry{bbbb}{2}
-\entry{bbbb}{2}
-\entry{bbbb}{2}
-\entry{bbbb}{2}
-\entry{bbbb}{2}
-\entry{bbbb}{2}
-\entry{cccc}{17}
-\finishindex
+@initial{A}
+@entry{aaaa}{1}
+@entry{bbbb}{2}
+@entry{bbbb}{2}
+@entry{bbbb}{2}
+@entry{bbbb}{2}
+@entry{bbbb}{2}
+@entry{bbbb}{2}
+@entry{cccc}{17}
+@finishindex
@section Final page of index hard to balance
@@ -802,297 +797,297 @@ No empty page should appear in the middle of the index. All index
material should fit on the page within the margins.
@commenceindex
-\entry {outline, importing into}{39}
-\entry {outline, inserting into}{39}
-\entry {outline, label separator}{35}
-\entry {outline, label type}{35}
-\entry {outline, mailing}{37}
-\entry {outline, motion}{38}
-\entry {outline, overview}{40}
-\entry {outline, show levels}{40}
-\entry {outline, showing}{40}
-\entry {outline, top-level}{40}
-\entry {outline, view specs}{41}
-\entry {outline, viewing}{40}
-\entry {outliner}{32}
-\entry {outliner commands}{33}
-\entry {outliner keys}{90}
-\entry {overview}{40}
-\initial {P}
-\entry {paragraph, filling}{38}
-\entry {Paste Key}{8}
-\entry {paste region}{11}
-\entry {pasting a region}{70, 71, 76}
-\entry {patch output}{15}
-\entry {pathname}{15}
-\entry {permanent identifier}{32, 36}
-\entry {pipe character}{41}
-\entry {posting buttons}{23}
-\entry {posting news}{24}
-\entry {programming interface}{57}
-\entry {promotion}{36}
-\entry {proportional scrolling}{62, 74}
-\initial {R}
-\entry {rdb-mode}{77}
-\entry {README file}{65}
-\entry {reference}{16}
-\entry {refilling}{38}
-\entry {region selection}{11}
-\entry {region, active}{72}
-\entry {relative autonumber}{32}
-\entry {relative identifier}{35}
-\entry {remote file}{15}
-\entry {remote path}{15}
-\entry {remote pathnames}{68}
-\entry {remove lines}{27}
-\entry {removing Hyperbole menu}{25}
-\entry {Request For Comment}{15, 16}
-\entry {restoring windows}{50}
-\entry {RFC}{15, 16}
-\entry {Rmail}{23}
-\entry {rolo}{44}
-\entry {rolo address}{14}
-\entry {rolo commands}{45}
-\entry {rolo entry}{44}
-\entry {rolo file}{44}
-\entry {rolo keys}{47}
-\entry {rolo menu}{45}
-\entry {rolo searching}{46}
-\entry {rolo, buttons in}{44}
-\entry {rolo, datestamps}{48}
-\entry {rolo, editing}{48}
-\entry {rolo, extending a match}{47}
-\entry {rolo, finding matches}{47}
-\entry {rolo, highlighting matches}{47, 49}
-\entry {rolo, interactive searching}{47}
-\entry {rolo, locating a name}{47}
-\entry {rolo, moving through matches}{47}
-\entry {rolo, moving to entries}{48}
-\entry {rolo, outlining}{47}
-\entry {rolo, personal}{48}
-\entry {rolo, quitting}{48}
-\entry {root cell}{34, 36}
-\initial {S}
-\entry {save lines}{27}
-\entry {saving window configurations}{50}
-\entry {screen}{29}
-\entry {Screen}{62}
-\entry {scrolling}{62, 74}
-\entry {search}{26, 69}
-\entry {searching, rolo}{46}
-\entry {selection}{11}
-\entry {set}{70, 76}
-\entry {setting the view spec}{41}
-\entry {sexp selection}{11}
-\entry {SGML tag pair}{11}
-\entry {show subtree}{40}
-\entry {show tree}{40}
-\entry {showing}{40}
-\entry {side drag}{71}
-\entry {signatures, hiding}{14}
-\entry {site initialization}{66}
-\entry {Smart Key}{8, 62, 99}
-\entry {smart key assignments}{8}
-\entry {smart key commands}{8}
-\entry {Smart Key help}{11}
-\entry {Smart Key operation}{9}
-\entry {Smart Key, default context}{11, 89}
-\entry {Smart Keyboard Keys}{73}
-\entry {smart marking}{11}
-\entry {Smart Menu}{74}
-\entry {Smart Mouse Key}{70, 76}
-\entry {Smart Mouse Key drag}{22}
-\entry {Smart Mouse Key toggle}{8}
-\entry {Smart Mouse Keys}{70}
-\entry {smart selection}{11}
-\entry {source line}{15}
-\entry {splitting a cell}{39}
-\entry {stack frame}{15}
-\entry {star outline}{39}
-\entry {starting Hyperbole}{65}
-\entry {storage manager}{56}
-\entry {string}{70, 76}
-\entry {submenus}{27}
-\entry {submodes}{29}
-\entry {subtree, hide}{40}
-\entry {subtree, show}{40}
-\entry {swapping}{31}
-\entry {system encapsulation}{57}
-\initial {T}
-\entry {table of contents}{16, 19}
-\entry {tabs, inserting}{37}
-\entry {tag}{16}
-\entry {tags file}{16}
-\entry {TAGS file}{16}
-\entry {tar archive}{66}
-\entry {tar archive browsing}{87}
-\entry {terminal use}{4}
-\entry {Texinfo cross-reference}{14}
-\entry {Texinfo manual}{65}
-\entry {text file}{39}
-\entry {thing}{70, 76}
-\entry {things}{11}
-\entry {toc action type}{19}
-\entry {toc implicit button type}{16}
-\entry {toggling blank lines}{41}
-\entry {top-level cell}{34, 36}
-\entry {top-level view}{40}
-\entry {Tramp}{15, 68}
-\entry {transposing cells}{38}
-\entry {tree, copying}{37}
-\entry {tree, demoting}{36}
-\entry {tree, exporting}{37}
-\entry {tree, filling}{38}
-\entry {tree, hide subtree}{40}
-\entry {tree, killing}{36}
-\entry {tree, mailing}{37}
-\entry {tree, moving}{37}
-\entry {tree, promoting}{36}
-\entry {tree, show}{40}
-\entry {tree, show subtree}{40}
-\entry {type definition}{53}
-\entry {type redefinition}{19, 53}
-\initial {U}
-\entry {unburying}{30}
-\entry {uncompressing archives}{66}
-\entry {UNIX manual}{15}
-\entry {unpacking archives}{66}
-\entry {URL}{14, 19, 87}
-\entry {URLs, abbreviated}{68}
-\entry {URLs, using with find-file}{68}
-\entry {USENET}{23, 24}
-\initial {V}
-\entry {variables}{52}
-\entry {vector}{70, 76}
-\entry {version description}{98}
-\entry {vertical drag}{72}
-\entry {view}{40}
-\entry {view mode}{75}
-\entry {view spec}{41}
-\entry {view spec klink}{42}
-\entry {view spec, all lines and levels}{41}
-\entry {view spec, blank lines}{41}
-\entry {view spec, changing}{41}
-\entry {view spec, characters}{41}
-\entry {view spec, ellipses}{41}
-\entry {view spec, example}{41}
-\entry {view spec, label type}{41}
-\entry {view spec, lines per cell}{41}
-\entry {view spec, setting}{41}
-\entry {view spec, show levels}{41}
-\entry {VM}{23}
-\initial {W}
-\entry {W3}{87}
-\entry {wconfig commands}{50}
-\entry {web pages, displaying}{68}
-\entry {window configuration commands}{50}
-\entry {window configuration ring}{50}
-\entry {window configurations}{50}
-\entry {window control}{29}
-\entry {window system}{68}
-\entry {windows}{58}
-\entry {word wrap}{38}
-\entry {world-wide web}{87}
-\entry {World-wide Web}{14, 19}
-\entry {wrolo}{44}
-\entry {wrolo commands}{45}
-\entry {wrolo matches}{88}
-\entry {wrolo menu}{47}
-\entry {WWW}{14, 19}
-\initial {X}
-\entry {xdb}{15}
-\entry {XEmacs}{2, 25}
-\entry {XEmacs support}{69}
-\initial {Y}
-\entry {yank region}{11}
-\entry {yank, reformatting}{53}
-\entry {yanking}{70, 71, 76}
-\initial {Z}
-\entry {zcat}{66}
-\entry {zip file}{66}
-\entry {zooming}{31}
-\finishindex
+@entry {outline, importing into}{39}
+@entry {outline, inserting into}{39}
+@entry {outline, label separator}{35}
+@entry {outline, label type}{35}
+@entry {outline, mailing}{37}
+@entry {outline, motion}{38}
+@entry {outline, overview}{40}
+@entry {outline, show levels}{40}
+@entry {outline, showing}{40}
+@entry {outline, top-level}{40}
+@entry {outline, view specs}{41}
+@entry {outline, viewing}{40}
+@entry {outliner}{32}
+@entry {outliner commands}{33}
+@entry {outliner keys}{90}
+@entry {overview}{40}
+@initial {P}
+@entry {paragraph, filling}{38}
+@entry {Paste Key}{8}
+@entry {paste region}{11}
+@entry {pasting a region}{70, 71, 76}
+@entry {patch output}{15}
+@entry {pathname}{15}
+@entry {permanent identifier}{32, 36}
+@entry {pipe character}{41}
+@entry {posting buttons}{23}
+@entry {posting news}{24}
+@entry {programming interface}{57}
+@entry {promotion}{36}
+@entry {proportional scrolling}{62, 74}
+@initial {R}
+@entry {rdb-mode}{77}
+@entry {README file}{65}
+@entry {reference}{16}
+@entry {refilling}{38}
+@entry {region selection}{11}
+@entry {region, active}{72}
+@entry {relative autonumber}{32}
+@entry {relative identifier}{35}
+@entry {remote file}{15}
+@entry {remote path}{15}
+@entry {remote pathnames}{68}
+@entry {remove lines}{27}
+@entry {removing Hyperbole menu}{25}
+@entry {Request For Comment}{15, 16}
+@entry {restoring windows}{50}
+@entry {RFC}{15, 16}
+@entry {Rmail}{23}
+@entry {rolo}{44}
+@entry {rolo address}{14}
+@entry {rolo commands}{45}
+@entry {rolo entry}{44}
+@entry {rolo file}{44}
+@entry {rolo keys}{47}
+@entry {rolo menu}{45}
+@entry {rolo searching}{46}
+@entry {rolo, buttons in}{44}
+@entry {rolo, datestamps}{48}
+@entry {rolo, editing}{48}
+@entry {rolo, extending a match}{47}
+@entry {rolo, finding matches}{47}
+@entry {rolo, highlighting matches}{47, 49}
+@entry {rolo, interactive searching}{47}
+@entry {rolo, locating a name}{47}
+@entry {rolo, moving through matches}{47}
+@entry {rolo, moving to entries}{48}
+@entry {rolo, outlining}{47}
+@entry {rolo, personal}{48}
+@entry {rolo, quitting}{48}
+@entry {root cell}{34, 36}
+@initial {S}
+@entry {save lines}{27}
+@entry {saving window configurations}{50}
+@entry {screen}{29}
+@entry {Screen}{62}
+@entry {scrolling}{62, 74}
+@entry {search}{26, 69}
+@entry {searching, rolo}{46}
+@entry {selection}{11}
+@entry {set}{70, 76}
+@entry {setting the view spec}{41}
+@entry {sexp selection}{11}
+@entry {SGML tag pair}{11}
+@entry {show subtree}{40}
+@entry {show tree}{40}
+@entry {showing}{40}
+@entry {side drag}{71}
+@entry {signatures, hiding}{14}
+@entry {site initialization}{66}
+@entry {Smart Key}{8, 62, 99}
+@entry {smart key assignments}{8}
+@entry {smart key commands}{8}
+@entry {Smart Key help}{11}
+@entry {Smart Key operation}{9}
+@entry {Smart Key, default context}{11, 89}
+@entry {Smart Keyboard Keys}{73}
+@entry {smart marking}{11}
+@entry {Smart Menu}{74}
+@entry {Smart Mouse Key}{70, 76}
+@entry {Smart Mouse Key drag}{22}
+@entry {Smart Mouse Key toggle}{8}
+@entry {Smart Mouse Keys}{70}
+@entry {smart selection}{11}
+@entry {source line}{15}
+@entry {splitting a cell}{39}
+@entry {stack frame}{15}
+@entry {star outline}{39}
+@entry {starting Hyperbole}{65}
+@entry {storage manager}{56}
+@entry {string}{70, 76}
+@entry {submenus}{27}
+@entry {submodes}{29}
+@entry {subtree, hide}{40}
+@entry {subtree, show}{40}
+@entry {swapping}{31}
+@entry {system encapsulation}{57}
+@initial {T}
+@entry {table of contents}{16, 19}
+@entry {tabs, inserting}{37}
+@entry {tag}{16}
+@entry {tags file}{16}
+@entry {TAGS file}{16}
+@entry {tar archive}{66}
+@entry {tar archive browsing}{87}
+@entry {terminal use}{4}
+@entry {Texinfo cross-reference}{14}
+@entry {Texinfo manual}{65}
+@entry {text file}{39}
+@entry {thing}{70, 76}
+@entry {things}{11}
+@entry {toc action type}{19}
+@entry {toc implicit button type}{16}
+@entry {toggling blank lines}{41}
+@entry {top-level cell}{34, 36}
+@entry {top-level view}{40}
+@entry {Tramp}{15, 68}
+@entry {transposing cells}{38}
+@entry {tree, copying}{37}
+@entry {tree, demoting}{36}
+@entry {tree, exporting}{37}
+@entry {tree, filling}{38}
+@entry {tree, hide subtree}{40}
+@entry {tree, killing}{36}
+@entry {tree, mailing}{37}
+@entry {tree, moving}{37}
+@entry {tree, promoting}{36}
+@entry {tree, show}{40}
+@entry {tree, show subtree}{40}
+@entry {type definition}{53}
+@entry {type redefinition}{19, 53}
+@initial {U}
+@entry {unburying}{30}
+@entry {uncompressing archives}{66}
+@entry {UNIX manual}{15}
+@entry {unpacking archives}{66}
+@entry {URL}{14, 19, 87}
+@entry {URLs, abbreviated}{68}
+@entry {URLs, using with find-file}{68}
+@entry {USENET}{23, 24}
+@initial {V}
+@entry {variables}{52}
+@entry {vector}{70, 76}
+@entry {version description}{98}
+@entry {vertical drag}{72}
+@entry {view}{40}
+@entry {view mode}{75}
+@entry {view spec}{41}
+@entry {view spec klink}{42}
+@entry {view spec, all lines and levels}{41}
+@entry {view spec, blank lines}{41}
+@entry {view spec, changing}{41}
+@entry {view spec, characters}{41}
+@entry {view spec, ellipses}{41}
+@entry {view spec, example}{41}
+@entry {view spec, label type}{41}
+@entry {view spec, lines per cell}{41}
+@entry {view spec, setting}{41}
+@entry {view spec, show levels}{41}
+@entry {VM}{23}
+@initial {W}
+@entry {W3}{87}
+@entry {wconfig commands}{50}
+@entry {web pages, displaying}{68}
+@entry {window configuration commands}{50}
+@entry {window configuration ring}{50}
+@entry {window configurations}{50}
+@entry {window control}{29}
+@entry {window system}{68}
+@entry {windows}{58}
+@entry {word wrap}{38}
+@entry {world-wide web}{87}
+@entry {World-wide Web}{14, 19}
+@entry {wrolo}{44}
+@entry {wrolo commands}{45}
+@entry {wrolo matches}{88}
+@entry {wrolo menu}{47}
+@entry {WWW}{14, 19}
+@initial {X}
+@entry {xdb}{15}
+@entry {XEmacs}{2, 25}
+@entry {XEmacs support}{69}
+@initial {Y}
+@entry {yank region}{11}
+@entry {yank, reformatting}{53}
+@entry {yanking}{70, 71, 76}
+@initial {Z}
+@entry {zcat}{66}
+@entry {zip file}{66}
+@entry {zooming}{31}
+@finishindex
@section Final page initial at top of both columns
@commenceindex
-\initial {P}
-\entry {\code {phi}}{397}
-\entry {\code {pi}}{397}
-\entry {\code {pi-over-180}}{397}
-\entry {\code {pi-over-2}}{397}
-\entry {\code {pi-over-4}}{397}
-\entry {\code {polar-complexp}}{392}
-\entry {\code {poly-mix}}{408}
-\entry {\code {poly-mul}}{408}
-\entry {\code {poly-simplify}}{408}
-\entry {\code {polynomial-base}}{408}
-\entry {\code {polynomial-p}}{408}
-\entry {\code {posp}}{391}
-\entry {\code {pow}}{397}
-\entry {\code {pow-mod}}{398}
-\entry {\code {power-of-2}}{398}
-\entry {\code {prime-test}}{399}
-\entry {\code {primp}}{393}
-\initial {Q}
-\entry {\code {quarter-circle}}{397}
-\entry {\code {quarter-integer}}{399}
-\entry {\code {quotient}}{397}
-\initial {R}
-\entry {\code {random-digit}}{398}
-\entry {\code {random-digits}}{399}
-\entry {\code {random-float}}{399}
-\entry {\code {ratp}}{392}
-\entry {\code {read-expr}}{409}
-\entry {\code {read-exprs}}{410}
-\entry {\code {read-number}}{409}
-\entry {\code {realp}}{392}
-\entry {\code {rect-complexp}}{392}
-\entry {\code {reduce-cols}}{400}
-\entry {\code {reduce-vec}}{400}
-\entry {\code {reject-arg}}{394}
-\entry {\code {remove-units}}{409}
-\entry {\code {rewrite}}{405}
-\entry {\code {rewrite-heads}}{405}
-\entry {\code {row-matrix}}{400}
-\initial {S}
-\entry {\code {scalarp}}{392}
-\entry {\code {scale-int}}{396}
-\entry {\code {scale-rounding}}{396}
-\entry {\code {simplify}}{403}
-\entry {\code {simplify-extended}}{403}
-\entry {\code {simplify-units}}{403}
-\entry {\code {single-units-in-expr-p}}{409}
-\entry {\code {solve-eqn}}{407}
-\entry {\code {solve-for}}{406}
-\entry {\code {solve-system}}{407}
-\entry {\code {sort-intv}}{396}
-\entry {\code {sqr}}{397}
-\entry {\code {sqrt-e}}{397}
-\entry {\code {sqrt-two-pi}}{397}
-\entry {\code {square-matrixp}}{393}
-\entry {\code {swap-rows}}{401}
-\initial {T}
-\entry {\code {tderiv}}{406}
-\entry {\code {to-fraction}}{399}
-\entry {\code {to-hms}}{398}
-\entry {\code {to-radians}}{398}
-\entry {\code {to-radians-2}}{398}
-\entry {\code {to-simple-fraction}}{399}
-\entry {\code {to-standard-units}}{409}
-\entry {\code {transpose}}{401}
-\entry {\code {two-pi}}{397}
-\initial {U}
-\entry {\code {underflow}}{394}
-\entry {\code {units-in-expr-p}}{409}
-\initial {V}
-\entry {\code {vec-length}}{399}
-\entry {\code {vectorp}}{393}
-\initial {W}
-\entry {\code {with-extra-prec}}{395}
-\initial {Z}
-\entry {\code {zerop}}{391}
-\finishindex
+@initial {P}
+@entry {@code {phi}}{397}
+@entry {@code {pi}}{397}
+@entry {@code {pi-over-180}}{397}
+@entry {@code {pi-over-2}}{397}
+@entry {@code {pi-over-4}}{397}
+@entry {@code {polar-complexp}}{392}
+@entry {@code {poly-mix}}{408}
+@entry {@code {poly-mul}}{408}
+@entry {@code {poly-simplify}}{408}
+@entry {@code {polynomial-base}}{408}
+@entry {@code {polynomial-p}}{408}
+@entry {@code {posp}}{391}
+@entry {@code {pow}}{397}
+@entry {@code {pow-mod}}{398}
+@entry {@code {power-of-2}}{398}
+@entry {@code {prime-test}}{399}
+@entry {@code {primp}}{393}
+@initial {Q}
+@entry {@code {quarter-circle}}{397}
+@entry {@code {quarter-integer}}{399}
+@entry {@code {quotient}}{397}
+@initial {R}
+@entry {@code {random-digit}}{398}
+@entry {@code {random-digits}}{399}
+@entry {@code {random-float}}{399}
+@entry {@code {ratp}}{392}
+@entry {@code {read-expr}}{409}
+@entry {@code {read-exprs}}{410}
+@entry {@code {read-number}}{409}
+@entry {@code {realp}}{392}
+@entry {@code {rect-complexp}}{392}
+@entry {@code {reduce-cols}}{400}
+@entry {@code {reduce-vec}}{400}
+@entry {@code {reject-arg}}{394}
+@entry {@code {remove-units}}{409}
+@entry {@code {rewrite}}{405}
+@entry {@code {rewrite-heads}}{405}
+@entry {@code {row-matrix}}{400}
+@initial {S}
+@entry {@code {scalarp}}{392}
+@entry {@code {scale-int}}{396}
+@entry {@code {scale-rounding}}{396}
+@entry {@code {simplify}}{403}
+@entry {@code {simplify-extended}}{403}
+@entry {@code {simplify-units}}{403}
+@entry {@code {single-units-in-expr-p}}{409}
+@entry {@code {solve-eqn}}{407}
+@entry {@code {solve-for}}{406}
+@entry {@code {solve-system}}{407}
+@entry {@code {sort-intv}}{396}
+@entry {@code {sqr}}{397}
+@entry {@code {sqrt-e}}{397}
+@entry {@code {sqrt-two-pi}}{397}
+@entry {@code {square-matrixp}}{393}
+@entry {@code {swap-rows}}{401}
+@initial {T}
+@entry {@code {tderiv}}{406}
+@entry {@code {to-fraction}}{399}
+@entry {@code {to-hms}}{398}
+@entry {@code {to-radians}}{398}
+@entry {@code {to-radians-2}}{398}
+@entry {@code {to-simple-fraction}}{399}
+@entry {@code {to-standard-units}}{409}
+@entry {@code {transpose}}{401}
+@entry {@code {two-pi}}{397}
+@initial {U}
+@entry {@code {underflow}}{394}
+@entry {@code {units-in-expr-p}}{409}
+@initial {V}
+@entry {@code {vec-length}}{399}
+@entry {@code {vectorp}}{393}
+@initial {W}
+@entry {@code {with-extra-prec}}{395}
+@initial {Z}
+@entry {@code {zerop}}{391}
+@finishindex
@section Medium length index
@@ -1123,120 +1118,124 @@ More text before index.
@commenceindexnopage
-\entry {\code {ac_cv_alignof_\var {type-or-expr}}}{152}
-\entry {\code {ac_cv_c_const}}{157}
-\entry {\code {ac_cv_c_int16_t}}{178}
-\entry {\code {ac_cv_c_int32_t}}{179}
-\entry {\code {ac_cv_c_int64_t}}{179}
-\entry {\code {ac_cv_c_int8_t}}{178}
-\entry {\code {ac_cv_c_restrict}}{157}
-\entry {\code {ac_cv_c_uint16_t}}{180}
-\entry {\code {ac_cv_c_uint32_t}}{180}
-\entry {\code {ac_cv_c_uint64_t}}{180}
-\entry {\code {ac_cv_c_uint8_t}}{180}
-\entry {\code {ac_cv_f77_compiler_gnu}}{191}
-\entry {\code {ac_cv_f77_dummy_main}}{193}
-\entry {\code {ac_cv_f77_implicit_none}}{198}
-\entry {\code {ac_cv_f77_libs}}{193}
-\entry {\code {ac_cv_f77_main}}{194}
-\entry {\code {ac_cv_f77_mangling}}{194}
-\entry {\code {ac_cv_fc_check_bounds}}{198}
-\entry {\code {ac_cv_fc_compiler_gnu}}{192}
-\entry {\code {ac_cv_fc_dummy_main}}{193}
-\entry {\code {ac_cv_fc_fixedform}}{197}
-\entry {\code {ac_cv_fc_freeform}}{197}
-\entry {\code {ac_cv_fc_implicit_none}}{198}
-\entry {\code {ac_cv_fc_libs}}{193}
-\entry {\code {ac_cv_fc_line_length}}{197}
-\entry {\code {ac_cv_fc_main}}{194}
-\entry {\code {ac_cv_fc_mangling}}{194}
-\entry {\code {ac_cv_fc_module_ext}}{198}
-\entry {\code {ac_cv_fc_module_flag}}{198}
-\entry {\code {ac_cv_fc_module_output_flag}}{199}
-\entry {\code {ac_cv_fc_pp_define}}{196}
-\entry {\code {ac_cv_fc_pp_srcext_\var {ext}}}{196}
-\entry {\code {ac_cv_fc_srcext_\var {ext}}}{196}
-\entry {\code {ac_cv_file_\var {file}}}{91}
-\entry {\code {ac_cv_func_chown_works}}{160}
-\entry {\code {ac_cv_func_closedir_void}}{160}
-\entry {\code {ac_cv_func_fnmatch_gnu}}{161}
-\entry {\code {ac_cv_func_fnmatch_works}}{161, 166}
-\entry {\code {ac_cv_func_\var {function}}}{166}
-\entry {\code {ac_cv_func_getgroups_works}}{161}
-\entry {\code {ac_cv_func_getpgrp_void}}{162}
-\entry {\code {ac_cv_func_lstat_dereferences_slashed_symlink}}{163}
-\entry {\code {ac_cv_func_lstat_empty_string_bug}}{165}
-\entry {\code {ac_cv_func_malloc_0_nonnull}}{163}
-\entry {\code {ac_cv_func_mbrtowc}}{163}
-\entry {\code {ac_cv_func_memcmp_working}}{163}
-\entry {\code {ac_cv_func_mmap_fixed_mapped}}{164}
-\entry {\code {ac_cv_func_obstack}}{164}
-\entry {\code {ac_cv_func_pow}}{165}
-\entry {\code {ac_cv_func_realloc_0_nonnull}}{164}
-\entry {\code {ac_cv_func_setpgrp_void}}{164}
-\entry {\code {ac_cv_func_stat_empty_string_bug}}{165}
-\entry {\code {ac_cv_func_strcoll_works}}{165}
-\entry {\code {ac_cv_func_strerror_r_char_p}}{165}
-\entry {\code {ac_cv_func_strnlen_working}}{166}
-\entry {\code {ac_cv_func_strtod}}{165}
-\entry {\code {ac_cv_func_strtold}}{165}
-\entry {\code {ac_cv_func_utime_null}}{166}
-\entry {\code {ac_cv_func_working_mktime}}{164}
-\entry {\code {ac_cv_have_decl_\var {symbol}}}{175}
-\entry {\code {ac_cv_header_\var {header-file}}}{174}
-\entry {\code {ac_cv_header_stdbool_h}}{170, 172}
-\entry {\code {ac_cv_header_stdc}}{172}
-\entry {\code {ac_cv_header_sys_wait_h}}{172}
-\entry {\code {ac_cv_header_time}}{424}
-\entry {\code {ac_cv_lib_error_at_line}}{160}
-\entry {\code {ac_cv_lib_\var {library}_\var {function}}}{91}
-\entry {\code {ac_cv_member_\var {aggregate}_\var {member}}}{177}
-\entry {\code {ac_cv_member_struct_stat_st_blocks}}{177}
-\entry {\code {ac_cv_path_install}}{85}
-\entry {\code {ac_cv_path_mkdir}}{86}
-\entry {\code {ac_cv_path_SED}}{88}
-\entry {\code {ac_cv_path_\var {variable}}}{90}
-\entry {\code {ac_cv_prog_AWK}}{85}
-\entry {\code {ac_cv_prog_c_openmp}}{153}
-\entry {\code {ac_cv_prog_cc_\var {compiler}_c_o}}{156}
-\entry {\code {ac_cv_prog_cc_stdc}}{155}
-\entry {\code {ac_cv_prog_cxx_openmp}}{153}
-\entry {\code {ac_cv_prog_EGREP}}{85}
-\entry {\code {ac_cv_prog_f77_c_o}}{192}
-\entry {\code {ac_cv_prog_f77_g}}{191}
-\entry {\code {ac_cv_prog_f77_openmp}}{153}
-\entry {\code {ac_cv_prog_f77_v}}{193}
-\entry {\code {ac_cv_prog_fc_c_o}}{192}
-\entry {\code {ac_cv_prog_fc_g}}{192}
-\entry {\code {ac_cv_prog_fc_openmp}}{153}
-\entry {\code {ac_cv_prog_fc_v}}{193}
-\entry {\code {ac_cv_prog_FGREP}}{85}
-\entry {\code {ac_cv_prog_GREP}}{85}
-\entry {\code {ac_cv_prog_LEX}}{87}
-\entry {\code {ac_cv_prog_\var {variable}}}{88, 89}
-\entry {\code {ac_cv_prog_YACC}}{88}
-\entry {\code {ac_cv_search_\var {function}}}{92}
-\entry {\code {ac_cv_search_getmntent}}{162}
-\entry {\code {ac_cv_sizeof_\var {type-or-expr}}}{152}
-\entry {\code {ac_cv_sys_posix_termios}}{96}
-\entry {\code {ac_cv_type_getgroups}}{178}
-\entry {\code {ac_cv_type_long_double}}{179}
-\entry {\code {ac_cv_type_long_double_wider}}{179}
-\entry {\code {ac_cv_type_long_long_int}}{179}
-\entry {\code {ac_cv_type_mbstate_t}}{179}
-\entry {\code {ac_cv_type_mode_t}}{179}
-\entry {\code {ac_cv_type_off_t}}{179}
-\entry {\code {ac_cv_type_pid_t}}{179}
-\entry {\code {ac_cv_type_size_t}}{180}
-\entry {\code {ac_cv_type_ssize_t}}{180}
-\entry {\code {ac_cv_type_\var {type}}}{180}
-\entry {\code {ac_cv_type_uid_t}}{180}
-\entry {\code {ac_cv_type_unsigned_long_long_int}}{180}
-\finishindex
-
-
-
-
+@entry {@code {ac_cv_alignof_@var {type-or-expr}}}{152}
+@entry {@code {ac_cv_c_const}}{157}
+@entry {@code {ac_cv_c_int16_t}}{178}
+@entry {@code {ac_cv_c_int32_t}}{179}
+@entry {@code {ac_cv_c_int64_t}}{179}
+@entry {@code {ac_cv_c_int8_t}}{178}
+@entry {@code {ac_cv_c_restrict}}{157}
+@entry {@code {ac_cv_c_uint16_t}}{180}
+@entry {@code {ac_cv_c_uint32_t}}{180}
+@entry {@code {ac_cv_c_uint64_t}}{180}
+@entry {@code {ac_cv_c_uint8_t}}{180}
+@entry {@code {ac_cv_f77_compiler_gnu}}{191}
+@entry {@code {ac_cv_f77_dummy_main}}{193}
+@entry {@code {ac_cv_f77_implicit_none}}{198}
+@entry {@code {ac_cv_f77_libs}}{193}
+@entry {@code {ac_cv_f77_main}}{194}
+@entry {@code {ac_cv_f77_mangling}}{194}
+@entry {@code {ac_cv_fc_check_bounds}}{198}
+@entry {@code {ac_cv_fc_compiler_gnu}}{192}
+@entry {@code {ac_cv_fc_dummy_main}}{193}
+@entry {@code {ac_cv_fc_fixedform}}{197}
+@entry {@code {ac_cv_fc_freeform}}{197}
+@entry {@code {ac_cv_fc_implicit_none}}{198}
+@entry {@code {ac_cv_fc_libs}}{193}
+@entry {@code {ac_cv_fc_line_length}}{197}
+@entry {@code {ac_cv_fc_main}}{194}
+@entry {@code {ac_cv_fc_mangling}}{194}
+@entry {@code {ac_cv_fc_module_ext}}{198}
+@entry {@code {ac_cv_fc_module_flag}}{198}
+@entry {@code {ac_cv_fc_module_output_flag}}{199}
+@entry {@code {ac_cv_fc_pp_define}}{196}
+@entry {@code {ac_cv_fc_pp_srcext_@var {ext}}}{196}
+@entry {@code {ac_cv_fc_srcext_@var {ext}}}{196}
+@entry {@code {ac_cv_file_@var {file}}}{91}
+@entry {@code {ac_cv_func_chown_works}}{160}
+@entry {@code {ac_cv_func_closedir_void}}{160}
+@entry {@code {ac_cv_func_fnmatch_gnu}}{161}
+@entry {@code {ac_cv_func_fnmatch_works}}{161, 166}
+@entry {@code {ac_cv_func_@var {function}}}{166}
+@entry {@code {ac_cv_func_getgroups_works}}{161}
+@entry {@code {ac_cv_func_getpgrp_void}}{162}
+@entry {@code {ac_cv_func_lstat_dereferences_slashed_symlink}}{163}
+@entry {@code {ac_cv_func_lstat_empty_string_bug}}{165}
+@entry {@code {ac_cv_func_malloc_0_nonnull}}{163}
+@entry {@code {ac_cv_func_mbrtowc}}{163}
+@entry {@code {ac_cv_func_memcmp_working}}{163}
+@entry {@code {ac_cv_func_mmap_fixed_mapped}}{164}
+@entry {@code {ac_cv_func_obstack}}{164}
+@entry {@code {ac_cv_func_pow}}{165}
+@entry {@code {ac_cv_func_realloc_0_nonnull}}{164}
+@entry {@code {ac_cv_func_setpgrp_void}}{164}
+@entry {@code {ac_cv_func_stat_empty_string_bug}}{165}
+@entry {@code {ac_cv_func_strcoll_works}}{165}
+@entry {@code {ac_cv_func_strerror_r_char_p}}{165}
+@entry {@code {ac_cv_func_strnlen_working}}{166}
+@entry {@code {ac_cv_func_strtod}}{165}
+@entry {@code {ac_cv_func_strtold}}{165}
+@entry {@code {ac_cv_func_utime_null}}{166}
+@entry {@code {ac_cv_func_working_mktime}}{164}
+@entry {@code {ac_cv_have_decl_@var {symbol}}}{175}
+@entry {@code {ac_cv_header_@var {header-file}}}{174}
+@entry {@code {ac_cv_header_stdbool_h}}{170, 172}
+@entry {@code {ac_cv_header_stdc}}{172}
+@entry {@code {ac_cv_header_sys_wait_h}}{172}
+@entry {@code {ac_cv_header_time}}{424}
+@entry {@code {ac_cv_lib_error_at_line}}{160}
+@entry {@code {ac_cv_lib_@var {library}_@var {function}}}{91}
+@entry {@code {ac_cv_member_@var {aggregate}_@var {member}}}{177}
+@entry {@code {ac_cv_member_struct_stat_st_blocks}}{177}
+@entry {@code {ac_cv_path_install}}{85}
+@entry {@code {ac_cv_path_mkdir}}{86}
+@entry {@code {ac_cv_path_SED}}{88}
+@entry {@code {ac_cv_path_@var {variable}}}{90}
+@entry {@code {ac_cv_prog_AWK}}{85}
+@entry {@code {ac_cv_prog_c_openmp}}{153}
+@entry {@code {ac_cv_prog_cc_@var {compiler}_c_o}}{156}
+@entry {@code {ac_cv_prog_cc_stdc}}{155}
+@entry {@code {ac_cv_prog_cxx_openmp}}{153}
+@entry {@code {ac_cv_prog_EGREP}}{85}
+@entry {@code {ac_cv_prog_f77_c_o}}{192}
+@entry {@code {ac_cv_prog_f77_g}}{191}
+@entry {@code {ac_cv_prog_f77_openmp}}{153}
+@entry {@code {ac_cv_prog_f77_v}}{193}
+@entry {@code {ac_cv_prog_fc_c_o}}{192}
+@entry {@code {ac_cv_prog_fc_g}}{192}
+@entry {@code {ac_cv_prog_fc_openmp}}{153}
+@entry {@code {ac_cv_prog_fc_v}}{193}
+@entry {@code {ac_cv_prog_FGREP}}{85}
+@entry {@code {ac_cv_prog_GREP}}{85}
+@entry {@code {ac_cv_prog_LEX}}{87}
+@entry {@code {ac_cv_prog_@var {variable}}}{88, 89}
+@entry {@code {ac_cv_prog_YACC}}{88}
+@entry {@code {ac_cv_search_@var {function}}}{92}
+@entry {@code {ac_cv_search_getmntent}}{162}
+@entry {@code {ac_cv_sizeof_@var {type-or-expr}}}{152}
+@entry {@code {ac_cv_sys_posix_termios}}{96}
+@entry {@code {ac_cv_type_getgroups}}{178}
+@entry {@code {ac_cv_type_long_double}}{179}
+@entry {@code {ac_cv_type_long_double_wider}}{179}
+@entry {@code {ac_cv_type_long_long_int}}{179}
+@entry {@code {ac_cv_type_mbstate_t}}{179}
+@entry {@code {ac_cv_type_mode_t}}{179}
+@entry {@code {ac_cv_type_off_t}}{179}
+@entry {@code {ac_cv_type_pid_t}}{179}
+@entry {@code {ac_cv_type_size_t}}{180}
+@entry {@code {ac_cv_type_ssize_t}}{180}
+@entry {@code {ac_cv_type_@var {type}}}{180}
+@entry {@code {ac_cv_type_uid_t}}{180}
+@entry {@code {ac_cv_type_unsigned_long_long_int}}{180}
+@finishindex
+
+
+
+
+
+@ignore
+@c this is not currently implemented, as it added a lot of complexity
+@c for not much benefit.
@section Test of index widow elimination
@@ -1246,13 +1245,45 @@ First time shows without widow elimination. Second time shows it with
case.
@commenceindex
-\input texinfo-tex-test.WIDOWs
-\finishindex
+@input texinfo-tex-test.WIDOWs
+@finishindex
@page
@printindex WIDOW
+@end ignore
+
+@section Index subentries
+
+Check that entries are indented properly.
+
+Possible issues with subentries being separated from superentries by a
+page or column break. (There may not be much that can be done in some
+cases.)
+
+@commenceindex
+@entry{tea makers}{19}
+@entry{coffee makers}{}
+@secondary{gerbil-driven long line line line line line line line line
+line line line line line line}{9, 42}
+@secondary{gerbil-driven}{9, 42}
+@secondary{electric}{}
+@tertiary{orange}{5, 62}
+@tertiary{green}{727}
+@tertiary{pink}{5, 62, 45, 81, 45, 81, 123, 2314, 123, 2314, 123, 2314,
+123, 2314, 123, 2314}
+@entry{tea makers}{19}
+@entry{coffee makers}{}
+@secondary{gerbil-driven long line line line line line line line line
+line line line line line line}{9, 42}
+@secondary{gerbil-driven}{9, 42}
+@secondary{electric}{}
+@tertiary{orange}{5, 62}
+@tertiary{green}{727}
+@tertiary{pink}{5, 62, 45, 81, 45, 81, 123, 2314, 123, 2314, 123, 2314,
+123, 2314, 123, 2314}
+@finishindex
@section Non-alphanumeric Index Initials
@@ -1260,13 +1291,13 @@ case.
/ and \ should be mirror images.
@commenceindex
-\initial{\\}
-\initial{/}
-\initial{|}
-\initial{\{}
-\initial{\}}
-\initial{F}
-\finishindex
+@initial{\}
+@initial{/}
+@initial{|}
+@initial{@{}
+@initial{@}}
+@initial{F}
+@finishindex
@@ -1286,6 +1317,9 @@ In code @t{@{@}@@#\}
@chapter Test of auxiliary files
+
+@section Values
+
Need to test with @command{texi2dvi}.
Undefined value in anchor: @anchor{@value{ho} ho}
@@ -1311,6 +1345,19 @@ value in index entry, but only defined afterwards
@axindex @b{another}
+@set complex @code{foo@b{b@'ar}}
+test of texinfo commands in value in index entry
+@axindex @value{complex} index entry
+
+test of value change after index command
+@set changed original
+@axindex `@value{changed}' should be `original'
+@set changed new
+
+test of underscore in value
+@set underscore _
+@axindex `@value{underscore}' should be `_'
+
some more text.
test of macro in index entry:
@@ -1327,6 +1374,11 @@ ffff\arg\ggggg
@printindex ax
+
+@ignore
+@c This section doesn't work while we use \ as the escape character
+@c in the index files.
+
@section Test of macros with @samp{@@} in index
@defindex BB
@@ -1343,6 +1395,22 @@ ffff\arg\ggggg
@BBindex @MacTwo{DDDD @@}
@printindex BB
+@end ignore
+
+
+@section Test of certain characters in index
+
+@defindex CC
+@CCindex \, backslash
+@CCindex @{, open brace
+@CCindex @}, close brace
+@CCindex @@, at sign
+@CCindex @backslashchar{}, backslash 2
+@CCindex @lbracechar{}, open brace 2
+@CCindex @rbracechar{}, close brace 2
+@CCindex @atchar{}, at sign 2
+
+@printindex CC
@section Test of @code{@@synindex}
@@ -1370,6 +1438,34 @@ Should be two entries, not one below.
@printindex SK
+@page
+@section Test of characters in node names for PDF
+
+@ifx@pdfescapestring@thisisundefined
+
+This test requires newer @command{pdfetex}.
+
+@else
+
+@anchor{anchor}.
+
+@anchor{backslash \}.
+
+@anchor{closing bracket )}.
+
+@anchor{opening bracket (}.
+
+@xref{anchor}.
+
+@xref{backslash \}.
+
+@xref{closing bracket )}.
+
+@xref{opening bracket (}.
+
+@fi
+
+
@chapter @code{@@set} and @code{@@value}
@section Another test of @t{@@value}
@@ -1605,6 +1701,66 @@ aaaaa/bbbbb/aaaaa/bbbbb/}
par
+@chapter URL line breaking
+
+Some use of @code{@@url}.
+
+see the
+@url{https://www.gnu.org/software/libc/manual/html_node/Message-catalogs-with-gettext.html}
+
+foo foo foo foo foo foo foof see the @url{https://www.gnu.org/software/libc/manual/html_node/}
+
+
+
+@chapter Headings and footings
+
+test of @samp{@@everyheadingmarks top}
+@c due to the way that @chapter outputs a pair of marks, possibly one on
+@c the page before, following @page directly by @chapter can cause the
+@c wrong chapter in the heading line, because then both marks are output
+@c on the new page.
+
+@everyheading @thischapter
+@everyheadingmarks top
+@setchapternewpage off
+
+@chapter One
+
+one
+
+@page
+
+two
+
+@chapter Two
+
+@chapter Three
+
+@page
+
+ffffff
+
+@chapter Four
+
+@page
+
+test of @samp{@@everyheadingmarks bottom}
+
+@everyheading @thischapter
+@everyheadingmarks bottom
+
+@page
+
+@chapter One
+
+@chapter Two
+
+@chapter Three
+
+@page
+
+ffffff
+@chapter Four
@bye
diff --git a/macros/texinfo/texinfo/doc/texinfo.tex b/macros/texinfo/texinfo/doc/texinfo.tex
index 5fe81b4c28..af857cbbb0 100644
--- a/macros/texinfo/texinfo/doc/texinfo.tex
+++ b/macros/texinfo/texinfo/doc/texinfo.tex
@@ -3,8 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2019-02-16.14}
-
+\def\texinfoversion{2019-09-20.22}
%
% Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc.
%
@@ -258,8 +257,8 @@
% \domark is called twice inside \chapmacro, to add one
% mark before the section break, and one after.
-% In the second call \prevchapterdefs is the same as \lastchapterdefs,
-% and \prevsectiondefs is the same as \lastsectiondefs.
+% In the second call \prevchapterdefs is the same as \currentchapterdefs,
+% and \prevsectiondefs is the same as \currentsectiondefs.
% Then if the page is not broken at the mark, some of the previous
% section appears on the page, and we can get the name of this section
% from \firstmark for @everyheadingmarks top.
@@ -267,11 +266,11 @@
%
% See page 260 of The TeXbook.
\def\domark{%
- \toks0=\expandafter{\lastchapterdefs}%
- \toks2=\expandafter{\lastsectiondefs}%
+ \toks0=\expandafter{\currentchapterdefs}%
+ \toks2=\expandafter{\currentsectiondefs}%
\toks4=\expandafter{\prevchapterdefs}%
\toks6=\expandafter{\prevsectiondefs}%
- \toks8=\expandafter{\lastcolordefs}%
+ \toks8=\expandafter{\currentcolordefs}%
\mark{%
\the\toks0 \the\toks2 % 0: marks for @everyheadingmarks top
\noexpand\or \the\toks4 \the\toks6 % 1: for @everyheadingmarks bottom
@@ -288,19 +287,19 @@
% @setcolor (or @url, or @link, etc.) between @contents and the very
% first @chapter.
\def\gettopheadingmarks{%
- \ifcase0\topmark\fi
+ \ifcase0\the\savedtopmark\fi
\ifx\thischapter\empty \ifcase0\firstmark\fi \fi
}
\def\getbottomheadingmarks{\ifcase1\botmark\fi}
-\def\getcolormarks{\ifcase2\topmark\fi}
+\def\getcolormarks{\ifcase2\the\savedtopmark\fi}
% Avoid "undefined control sequence" errors.
-\def\lastchapterdefs{}
-\def\lastsectiondefs{}
-\def\lastsection{}
+\def\currentchapterdefs{}
+\def\currentsectiondefs{}
+\def\currentsection{}
\def\prevchapterdefs{}
\def\prevsectiondefs{}
-\def\lastcolordefs{}
+\def\currentcolordefs{}
% Margin to add to right of even pages, to left of odd pages.
\newdimen\bindingoffset
@@ -310,11 +309,35 @@
% Main output routine.
%
\chardef\PAGE = 255
-\output = {\onepageout{\pagecontents\PAGE}}
+\newtoks\defaultoutput
+\defaultoutput = {\savetopmark\onepageout{\pagecontents\PAGE}}
+\output=\expandafter{\the\defaultoutput}
\newbox\headlinebox
\newbox\footlinebox
+% When outputting the double column layout for indices, an output routine
+% is run several times, which hides the original value of \topmark. This
+% can lead to a page heading being output and duplicating the chapter heading
+% of the index. Hence, save the contents of \topmark at the beginning of
+% the output routine. The saved contents are valid until we actually
+% \shipout a page.
+%
+% (We used to run a short output routine to actually set \topmark and
+% \firstmark to the right values, but if this was called with an empty page
+% containing whatsits for writing index entries, the whatsits would be thrown
+% away and the index auxiliary file would remain empty.)
+%
+\newtoks\savedtopmark
+\newif\iftopmarksaved
+\topmarksavedtrue
+\def\savetopmark{%
+ \iftopmarksaved\else
+ \global\savedtopmark=\expandafter{\topmark}%
+ \global\topmarksavedtrue
+ \fi
+}
+
% \onepageout takes a vbox as an argument.
% \shipout a vbox for a single page, adding an optional header, footer
% and footnote. This also causes index entries for this page to be written
@@ -326,23 +349,17 @@
\ifodd\pageno \advance\hoffset by \bindingoffset
\else \advance\hoffset by -\bindingoffset\fi
%
- % Common context changes for both heading and footing.
- % Do this outside of the \shipout so @code etc. will be expanded in
- % the headline as they should be, not taken literally (outputting ''code).
- \def\commmonheadfootline{\let\hsize=\txipagewidth \texinfochars}
- %
% Retrieve the information for the headings from the marks in the page,
% and call Plain TeX's \makeheadline and \makefootline, which use the
% values in \headline and \footline.
%
% This is used to check if we are on the first page of a chapter.
- \ifcase1\topmark\fi
+ \ifcase1\the\savedtopmark\fi
\let\prevchaptername\thischaptername
\ifcase0\firstmark\fi
\let\curchaptername\thischaptername
%
\ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
- \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
%
\ifx\curchaptername\prevchaptername
\let\thischapterheading\thischapter
@@ -353,7 +370,14 @@
\def\thischapterheading{}%
\fi
%
+ % Common context changes for both heading and footing.
+ % Do this outside of the \shipout so @code etc. will be expanded in
+ % the headline as they should be, not taken literally (outputting ''code).
+ \def\commmonheadfootline{\let\hsize=\txipagewidth \texinfochars}
+ %
\global\setbox\headlinebox = \vbox{\commmonheadfootline \makeheadline}%
+ %
+ \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
\global\setbox\footlinebox = \vbox{\commmonheadfootline \makefootline}%
%
{%
@@ -362,14 +386,8 @@
% take effect in \write's, yet the group defined by the \vbox ends
% before the \shipout runs.
%
- \indexdummies % don't expand commands in the output.
- \normalturnoffactive % \ in index entries must not stay \, e.g., if
- % the page break happens to be in the middle of an example.
- % We don't want .vr (or whatever) entries like this:
- % \entry{{\indexbackslash }acronym}{32}{\code {\acronym}}
- % "\acronym" won't work when it's read back in;
- % it needs to be
- % {\code {{\backslashcurfont }acronym}
+ \atdummies % don't expand commands in the output.
+ \turnoffactive
\shipout\vbox{%
% Do this early so pdf references go to the beginning of the page.
\ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
@@ -384,8 +402,9 @@
\unvbox\footlinebox
\fi
%
- }% end of \shipout\vbox
- }% end of group with \indexdummies
+ }%
+ }%
+ \global\topmarksavedfalse
\advancepageno
\ifnum\outputpenalty>-20000 \else\dosupereject\fi
}
@@ -429,11 +448,10 @@
}%
}
-% First remove any @comment, then any @c comment. Also remove a @texinfoc
-% comment (see \scanmacro for details). Pass the result on to \argcheckspaces.
+% First remove any @comment, then any @c comment. Pass the result on to
+% \argcheckspaces.
\def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm}
-\def\argremovec#1\c#2\ArgTerm{\argremovetexinfoc #1\texinfoc\ArgTerm}
-\def\argremovetexinfoc#1\texinfoc#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
+\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
% Each occurrence of `\^^M' or `<space>\^^M' is replaced by a single space.
%
@@ -1034,7 +1052,7 @@ where each line of input produces a line of output.}
tex.sprint(
string.format(string.char(0x5c) .. string.char(0x25) .. '03o' ..
string.char(0x5c) .. string.char(0x25) .. '03o',
- (c / 256), (c % 256)))
+ math.floor(c / 256), math.floor(c % 256)))
else
c = c - 0x10000
local c_hi = c / 1024 + 0xd800
@@ -1044,8 +1062,8 @@ where each line of input produces a line of output.}
string.char(0x5c) .. string.char(0x25) .. '03o' ..
string.char(0x5c) .. string.char(0x25) .. '03o' ..
string.char(0x5c) .. string.char(0x25) .. '03o',
- (c_hi / 256), (c_hi % 256),
- (c_lo / 256), (c_lo % 256)))
+ math.floor(c_hi / 256), math.floor(c_hi % 256),
+ math.floor(c_lo / 256), math.floor(c_lo % 256)))
end
end
end
@@ -1058,15 +1076,19 @@ where each line of input produces a line of output.}
function PDFescstr(str)
for c in string.bytes(str) do
if c <= 0x20 or c >= 0x80 or c == 0x28 or c == 0x29 or c == 0x5c then
- tex.sprint(
+ tex.sprint(-2,
string.format(string.char(0x5c) .. string.char(0x25) .. '03o',
c))
else
- tex.sprint(string.char(c))
+ tex.sprint(-2, string.char(c))
end
end
end
}
+ % The -2 in the arguments here gives all the input to TeX catcode 12
+ % (other) or 10 (space), preventing undefined control sequence errors. See
+ % https://lists.gnu.org/archive/html/bug-texinfo/2019-08/msg00031.html
+ %
\endgroup
\def\pdfescapestring#1{\directlua{PDFescstr('\luaescapestring{#1}')}}
\ifnum\luatexversion>84
@@ -1105,6 +1127,16 @@ where each line of input produces a line of output.}
\fi
\fi
+\newif\ifpdforxetex
+\pdforxetexfalse
+\ifpdf
+ \pdforxetextrue
+\fi
+\ifx\XeTeXrevision\thisisundefined\else
+ \pdforxetextrue
+\fi
+
+
% PDF uses PostScript string constants for the names of xref targets,
% for display in the outlines, and in other places. Thus, we have to
% double any backslashes. Otherwise, a name like "\node" will be
@@ -1161,7 +1193,7 @@ output) for that.)}
% Set color, and create a mark which defines \thiscolor accordingly,
% so that \makeheadline knows which color to restore.
\def\setcolor#1{%
- \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
+ \xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}%
\domark
\pdfsetcolor{#1}%
}
@@ -1169,7 +1201,7 @@ output) for that.)}
\def\maincolor{\rgbBlack}
\pdfsetcolor{\maincolor}
\edef\thiscolor{\maincolor}
- \def\lastcolordefs{}
+ \def\currentcolordefs{}
%
\def\makefootline{%
\baselineskip24pt
@@ -1547,7 +1579,7 @@ output) for that.)}
% Set color, and create a mark which defines \thiscolor accordingly,
% so that \makeheadline knows which color to restore.
\def\setcolor#1{%
- \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
+ \xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}%
\domark
\pdfsetcolor{#1}%
}
@@ -1555,7 +1587,7 @@ output) for that.)}
\def\maincolor{\rgbBlack}
\pdfsetcolor{\maincolor}
\edef\thiscolor{\maincolor}
- \def\lastcolordefs{}
+ \def\currentcolordefs{}
%
\def\makefootline{%
\baselineskip24pt
@@ -2147,7 +2179,7 @@ end
% A few fonts for @defun names and args.
\setfont\defbf\bfshape{10}{\magstep1}{OT1}
\setfont\deftt\ttshape{10}{\magstep1}{OT1TT}
-\setfont\defsl\slshape{10}{\magstep1}{OT1TT}
+\setfont\defsl\slshape{10}{\magstep1}{OT1}
\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT}
\def\df{\let\ttfont=\deftt \let\bffont = \defbf
\let\ttslfont=\defttsl \let\slfont=\defsl \bf}
@@ -2295,7 +2327,7 @@ end
% A few fonts for @defun names and args.
\setfont\defbf\bfshape{10}{\magstephalf}{OT1}
\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT}
-\setfont\defsl\slshape{10}{\magstephalf}{OT1TT}
+\setfont\defsl\slshape{10}{\magstephalf}{OT1}
\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT}
\def\df{\let\ttfont=\deftt \let\bffont = \defbf
\let\slfont=\defsl \let\ttslfont=\defttsl \bf}
@@ -2818,7 +2850,7 @@ end
% @t, explicit typewriter.
\def\t#1{%
- {\tt \rawbackslash \plainfrenchspacing #1}%
+ {\tt \plainfrenchspacing #1}%
\null
}
@@ -2845,7 +2877,6 @@ end
% Turn off hyphenation.
\nohyphenation
%
- \rawbackslash
\plainfrenchspacing
#1%
}%
@@ -3032,41 +3063,33 @@ end
\global\def/{\normalslash}
}
-% we put a little stretch before and after the breakable chars, to help
-% line breaking of long url's. The unequal skips make look better in
-% cmtt at least, especially for dots.
-\def\urefprestretchamount{.13em}
-\def\urefpoststretchamount{.1em}
-\def\urefprestretch{\urefprebreak \hskip0pt plus\urefprestretchamount\relax}
-\def\urefpoststretch{\urefpostbreak \hskip0pt plus\urefprestretchamount\relax}
-%
-\def\urefcodeamp{\urefprestretch \&\urefpoststretch}
-\def\urefcodedot{\urefprestretch .\urefpoststretch}
-\def\urefcodehash{\urefprestretch \#\urefpoststretch}
-\def\urefcodequest{\urefprestretch ?\urefpoststretch}
+\def\urefcodeamp{\urefprebreak \&\urefpostbreak}
+\def\urefcodedot{\urefprebreak .\urefpostbreak}
+\def\urefcodehash{\urefprebreak \#\urefpostbreak}
+\def\urefcodequest{\urefprebreak ?\urefpostbreak}
\def\urefcodeslash{\futurelet\next\urefcodeslashfinish}
{
\catcode`\/=\active
\global\def\urefcodeslashfinish{%
- \urefprestretch \slashChar
+ \urefprebreak \slashChar
% Allow line break only after the final / in a sequence of
% slashes, to avoid line break between the slashes in http://.
- \ifx\next/\else \urefpoststretch \fi
+ \ifx\next/\else \urefpostbreak \fi
}
}
-% One more complication: by default we'll break after the special
-% characters, but some people like to break before the special chars, so
-% allow that. Also allow no breaking at all, for manual control.
+% By default we'll break after the special characters, but some people like to
+% break before the special chars, so allow that. Also allow no breaking at
+% all, for manual control.
%
\parseargdef\urefbreakstyle{%
\def\txiarg{#1}%
\ifx\txiarg\wordnone
\def\urefprebreak{\nobreak}\def\urefpostbreak{\nobreak}
\else\ifx\txiarg\wordbefore
- \def\urefprebreak{\allowbreak}\def\urefpostbreak{\nobreak}
+ \def\urefprebreak{\urefallowbreak}\def\urefpostbreak{\nobreak}
\else\ifx\txiarg\wordafter
- \def\urefprebreak{\nobreak}\def\urefpostbreak{\allowbreak}
+ \def\urefprebreak{\nobreak}\def\urefpostbreak{\urefallowbreak}
\else
\errhelp = \EMsimple
\errmessage{Unknown @urefbreakstyle setting `\txiarg'}%
@@ -3076,6 +3099,14 @@ end
\def\wordbefore{before}
\def\wordnone{none}
+% Allow a ragged right output to aid breaking long URL's. Putting stretch in
+% between characters of the URL doesn't look good.
+\def\urefallowbreak{%
+ \hskip 0pt plus 4 em\relax
+ \allowbreak
+ \hskip 0pt plus -4 em\relax
+}
+
\urefbreakstyle after
% @url synonym for @uref, since that's how everyone uses it.
@@ -3086,7 +3117,7 @@ end
% So now @email is just like @uref, unless we are pdf.
%
%\def\email#1{\angleleft{\tt #1}\angleright}
-\ifpdf
+\ifpdforxetex
\def\email#1{\doemail#1,,\finish}
\def\doemail#1,#2,#3\finish{\begingroup
\unsepspaces
@@ -3096,18 +3127,7 @@ end
\endlink
\endgroup}
\else
- \ifx\XeTeXrevision\thisisundefined
- \let\email=\uref
- \else
- \def\email#1{\doemail#1,,\finish}
- \def\doemail#1,#2,#3\finish{\begingroup
- \unsepspaces
- \pdfurl{mailto:#1}%
- \setbox0 = \hbox{\ignorespaces #2}%
- \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi
- \endlink
- \endgroup}
- \fi
+ \let\email=\uref
\fi
% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
@@ -4641,19 +4661,6 @@ end
}
}
-% We have this subroutine so that we can handle at least some @value's
-% properly in indexes (we call \makevalueexpandable in \indexdummies).
-% The command has to be fully expandable (if the variable is set), since
-% the result winds up in the index file. This means that if the
-% variable's value contains other Texinfo commands, it's almost certain
-% it will fail (although perhaps we could fix that with sufficient work
-% to do a one-level expansion on the result, instead of complete).
-%
-% Unfortunately, this has the consequence that when _ is in the *value*
-% of an @set, it does not print properly in the roman fonts (get the cmr
-% dot accent at position 126 instead). No fix comes to mind, and it's
-% been this way since 2003 or earlier, so just ignore it.
-%
\def\expandablevalue#1{%
\expandafter\ifx\csname SET#1\endcsname\relax
{[No value for ``#1'']}%
@@ -4672,7 +4679,7 @@ end
% NB flag names containing - or _ may not work here.
\def\dummyvalue#1{%
\expandafter\ifx\csname SET#1\endcsname\relax
- \noexpand\value{#1}%
+ \string\value{#1}%
\else
\csname SET#1\endcsname
\fi
@@ -4682,7 +4689,7 @@ end
% if possible, otherwise sort late.
\def\indexnofontsvalue#1{%
\expandafter\ifx\csname SET#1\endcsname\relax
- ZZZZZZZ
+ ZZZZZZZ%
\else
\csname SET#1\endcsname
\fi
@@ -4832,29 +4839,15 @@ end
\def\docodeindexxxx #1{\doind{\indexname}{\code{#1}}}
-% Used when writing an index entry out to an index file to prevent
-% expansion of Texinfo commands that can appear in an index entry.
-%
-\def\indexdummies{%
- \escapechar = `\\ % use backslash in output files.
- \definedummyletter\@%
- \definedummyletter\ %
- %
- % For texindex which always views { and } as separators.
- \def\{{\lbracechar{}}%
- \def\}{\rbracechar{}}%
- %
- % Do the redefinitions.
- \definedummies
-}
-
-% Used for the aux and toc files, where @ is the escape character.
+% Used for the aux, toc and index files to prevent expansion of Texinfo
+% commands.
%
\def\atdummies{%
\definedummyletter\@%
\definedummyletter\ %
\definedummyletter\{%
\definedummyletter\}%
+ \definedummyletter\&%
%
% Do the redefinitions.
\definedummies
@@ -4878,8 +4871,7 @@ end
\def\definedummyletter#1{\def#1{\string#1}}%
\let\definedummyaccent\definedummyletter
-% Called from \indexdummies and \atdummies, to effectively prevent
-% the expansion of commands.
+% Called from \atdummies to prevent the expansion of commands.
%
\def\definedummies{%
%
@@ -4926,8 +4918,10 @@ end
\definedummyword\TeX
%
% Assorted special characters.
+ \definedummyword\ampchar
\definedummyword\atchar
\definedummyword\arrow
+ \definedummyword\backslashchar
\definedummyword\bullet
\definedummyword\comma
\definedummyword\copyright
@@ -4964,6 +4958,8 @@ end
\definedummyword\sup
\definedummyword\textdegree
%
+ \definedummyword\subentry
+ %
% We want to disable all macros so that they are not expanded by \write.
\macrolist
\let\value\dummyvalue
@@ -5044,11 +5040,10 @@ end
\commondummyword\xref
}
-% This does nothing, but for a time it was recommended to use
-% \usebracesinindexestrue to be able to use braces in index entries.
-
\let\indexlbrace\relax
\let\indexrbrace\relax
+\let\indexatchar\relax
+\let\indexbackslash\relax
{\catcode`\@=0
\catcode`\\=13
@@ -5082,10 +5077,8 @@ end
}
\gdef\indexnonalnumreappear{%
- \useindexbackslash
\let-\normaldash
\let<\normalless
- \def\@{@}%
}
}
@@ -5196,36 +5189,16 @@ end
-\let\SETmarginindex=\relax % put index entries in margin (undocumented)?
-
-% Most index entries go through here, but \dosubind is the general case.
% #1 is the index name, #2 is the entry text.
-\def\doind#1#2{\dosubind{#1}{#2}{}}
-
-% There is also \dosubind {index}{topic}{subtopic}
-% which makes an entry in a two-level index such as the operation index.
-% TODO: Two-level index? Operation index?
-
-% Workhorse for all indexes.
-% #1 is name of index, #2 is stuff to put there, #3 is subentry --
-% empty if called from \doind, as we usually are (the main exception
-% is with most defuns, which call us directly).
-%
-\def\dosubind#1#2#3{%
+\def\doind#1#2{%
\iflinks
{%
- \requireopenindexfile{#1}%
- % Store the main index entry text (including the third arg).
- \toks0 = {#2}%
- % If third arg is present, precede it with a space.
- \def\thirdarg{#3}%
- \ifx\thirdarg\empty \else
- \toks0 = \expandafter{\the\toks0 \space #3}%
- \fi
%
+ \requireopenindexfile{#1}%
\edef\writeto{\csname#1indfile\endcsname}%
%
- \safewhatsit\dosubindwrite
+ \def\indextext{#2}%
+ \safewhatsit\doindwrite
}%
\fi
}
@@ -5247,21 +5220,7 @@ end
\fi}
\def\indexisfl{fl}
-% Output \ as {\indexbackslash}, because \ is an escape character in
-% the index files.
-\let\indexbackslash=\relax
-{\catcode`\@=0 \catcode`\\=\active
- @gdef@useindexbackslash{@def\{{@indexbackslash}}}
-}
-
-% Definition for writing index entry text.
-\def\sortas#1{\ignorespaces}%
-
-% Definition for writing index entry sort key. Should occur at the at
-% the beginning of the index entry, like
-% @cindex @sortas{september} \september
-% The \ignorespaces takes care of following space, but there's no way
-% to remove space before it.
+% Definition for writing index entry sort key.
{
\catcode`\-=13
\gdef\indexwritesortas{%
@@ -5272,51 +5231,150 @@ end
\xdef\indexsortkey{#1}\endgroup}
}
+\def\indexwriteseealso#1{
+ \gdef\pagenumbertext{\string\seealso{#1}}%
+}
+\def\indexwriteseeentry#1{
+ \gdef\pagenumbertext{\string\seeentry{#1}}%
+}
+
+% The default definitions
+\def\sortas#1{}%
+\def\seealso#1{\i{\putwordSeeAlso}\ #1}% for sorted index file only
+\def\putwordSeeAlso{See also}
+\def\seeentry#1{\i{\putwordSee}\ #1}% for sorted index file only
-% Write the entry in \toks0 to the index file.
+
+% Given index entry text like "aaa @subentry bbb @sortas{ZZZ}":
+% * Set \bracedtext to "{aaa}{bbb}"
+% * Set \fullindexsortkey to "aaa @subentry ZZZ"
+% * If @seealso occurs, set \pagenumbertext
%
-\def\dosubindwrite{%
- % Put the index entry in the margin if desired.
- \ifx\SETmarginindex\relax\else
- \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}%
+\def\splitindexentry#1{%
+ \gdef\fullindexsortkey{}%
+ \xdef\bracedtext{}%
+ \def\sep{}%
+ \def\seealso##1{}%
+ \def\seeentry##1{}%
+ \expandafter\doindexsegment#1\subentry\finish\subentry
+}
+
+% append the results from the next segment
+\def\doindexsegment#1\subentry{%
+ \def\segment{#1}%
+ \ifx\segment\isfinish
+ \else
+ %
+ % Fully expand the segment, throwing away any @sortas directives, and
+ % trim spaces.
+ \edef\trimmed{\segment}%
+ \edef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}%
+ %
+ \xdef\bracedtext{\bracedtext{\trimmed}}%
+ %
+ % Get the string to sort by. Process the segment with all
+ % font commands turned off.
+ \bgroup
+ \let\sortas\indexwritesortas
+ \let\seealso\indexwriteseealso
+ \let\seeentry\indexwriteseeentry
+ \indexnofonts
+ % The braces around the commands are recognized by texindex.
+ \def\lbracechar{{\string\indexlbrace}}%
+ \def\rbracechar{{\string\indexrbrace}}%
+ \let\{=\lbracechar
+ \let\}=\rbracechar
+ \def\@{{\string\indexatchar}}%
+ \def\atchar##1{\@}%
+ \def\backslashchar{{\string\indexbackslash}}%
+ \uccode`\~=`\\ \uppercase{\let~\backslashchar}%
+ %
+ \let\indexsortkey\empty
+ \global\let\pagenumbertext\empty
+ % Execute the segment and throw away the typeset output. This executes
+ % any @sortas or @seealso commands in this segment.
+ \setbox\dummybox = \hbox{\segment}%
+ \ifx\indexsortkey\empty{%
+ \indexnonalnumdisappear
+ \xdef\trimmed{\segment}%
+ \xdef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}%
+ \xdef\indexsortkey{\trimmed}%
+ \ifx\indexsortkey\empty\xdef\indexsortkey{ }\fi
+ }\fi
+ %
+ % Append to \fullindexsortkey.
+ \edef\tmp{\gdef\noexpand\fullindexsortkey{%
+ \fullindexsortkey\sep\indexsortkey}}%
+ \tmp
+ \egroup
+ \def\sep{\subentry}%
+ %
+ \expandafter\doindexsegment
\fi
+}
+\def\isfinish{\finish}%
+\newbox\dummybox % used above
+
+\let\subentry\relax
+
+% Use \ instead of @ in index files. To support old texi2dvi and texindex.
+% This works without changing the escape character used in the toc or aux
+% files because the index entries are fully expanded here, and \string uses
+% the current value of \escapechar.
+\def\escapeisbackslash{\escapechar=`\\}
+
+% Use \ in index files by default. texi2dvi didn't support @ as the escape
+% character (as it checked for "\entry" in the files, and not "@entry"). When
+% the new version of texi2dvi has had a chance to become more prevalent, then
+% the escape character can change back to @ again. This should be an easy
+% change to make now because both @ and \ are only used as escape characters in
+% index files, never standing for themselves.
+%
+\set txiindexescapeisbackslash
+
+% Write the entry in \indextext to the index file.
+%
+\def\doindwrite{%
+ \maybemarginindex
%
- % Remember, we are within a group.
- \indexdummies % Must do this here, since \bf, etc expand at this stage
- \useindexbackslash % \indexbackslash isn't defined now so it will be output
- % as is; and it will print as backslash.
- % The braces around \indexbrace are recognized by texindex.
- %
- % Get the string to sort by, by processing the index entry with all
- % font commands turned off.
- {\indexnofonts
- \def\lbracechar{{\indexlbrace}}%
- \def\rbracechar{{\indexrbrace}}%
- \let\{=\lbracechar
- \let\}=\rbracechar
- \indexnonalnumdisappear
- \xdef\indexsortkey{}%
- \let\sortas=\indexwritesortas
- \edef\temp{\the\toks0}%
- \setbox\dummybox = \hbox{\temp}% Make sure to execute any \sortas
- \ifx\indexsortkey\empty
- \xdef\indexsortkey{\temp}%
- \ifx\indexsortkey\empty\xdef\indexsortkey{ }\fi
- \fi
- }%
+ \atdummies
+ %
+ \expandafter\ifx\csname SETtxiindexescapeisbackslash\endcsname\relax\else
+ \escapeisbackslash
+ \fi
+ %
+ % For texindex which always views { and } as separators.
+ \def\{{\lbracechar{}}%
+ \def\}{\rbracechar{}}%
+ \uccode`\~=`\\ \uppercase{\def~{\backslashchar{}}}%
+ %
+ % Split the entry into primary entry and any subentries, and get the index
+ % sort key.
+ \splitindexentry\indextext
%
% Set up the complete index entry, with both the sort key and
% the original text, including any font commands. We write
% three arguments to \entry to the .?? file (four in the
% subentry case), texindex reduces to two when writing the .??s
% sorted result.
+ %
\edef\temp{%
\write\writeto{%
- \string\entry{\indexsortkey}{\noexpand\folio}{\the\toks0}}%
+ \string\entry{\fullindexsortkey}%
+ {\ifx\pagenumbertext\empty\noexpand\folio\else\pagenumbertext\fi}%
+ \bracedtext}%
}%
\temp
}
-\newbox\dummybox % used above
+
+% Put the index entry in the margin if desired (undocumented).
+\def\maybemarginindex{%
+ \ifx\SETmarginindex\relax\else
+ \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \relax\indextext}}%
+ \fi
+}
+\let\SETmarginindex=\relax
+
% Take care of unwanted page breaks/skips around a whatsit:
%
@@ -5404,9 +5462,14 @@ end
% \entry {topic}{pagelist}
% for a topic that is used without subtopics
% \primary {topic}
+% \entry {topic}{}
% for the beginning of a topic that is used with subtopics
% \secondary {subtopic}{pagelist}
% for each subtopic.
+% \secondary {subtopic}{}
+% for a subtopic with sub-subtopics
+% \tertiary {subtopic}{subsubtopic}{pagelist}
+% for each sub-subtopic.
% Define the user-accessible indexing commands
% @findex, @vindex, @kindex, @cindex.
@@ -5418,11 +5481,6 @@ end
\def\tindex {\tpindex}
\def\pindex {\pgindex}
-\def\cindexsub {\begingroup\obeylines\cindexsub}
-{\obeylines %
-\gdef\cindexsub "#1" #2^^M{\endgroup %
-\dosubind{cp}{#2}{#1}}}
-
% Define the macros used in formatting output of the sorted index material.
% @printindex causes a particular index (the ??s file) to get printed.
@@ -5436,14 +5494,10 @@ end
\plainfrenchspacing
\everypar = {}% don't want the \kern\-parindent from indentation suppression.
%
- % See if the index file exists and is nonempty.
- % Change catcode of @ here so that if the index file contains
- % \initial {@}
- % as its first line, TeX doesn't complain about mismatched braces
- % (because it thinks @} is a control sequence).
- \catcode`\@ = 12
% See comment in \requireopenindexfile.
\def\indexname{#1}\ifx\indexname\indexisfl\def\indexname{f1}\fi
+ %
+ % See if the index file exists and is nonempty.
\openin 1 \jobname.\indexname s
\ifeof 1
% \enddoublecolumns gets confused if there is no text in the index,
@@ -5453,8 +5507,6 @@ end
\putwordIndexNonexistent
\typeout{No file \jobname.\indexname s.}%
\else
- \catcode`\\ = 0
- %
% If the index file exists but is empty, then \openin leaves \ifeof
% false. We have to make TeX try to read something from the file, so
% it can discover if there is anything in it.
@@ -5462,47 +5514,51 @@ end
\ifeof 1
\putwordIndexIsEmpty
\else
- % Index files are almost Texinfo source, but we use \ as the escape
- % character. It would be better to use @, but that's too big a change
- % to make right now.
- \def\indexbackslash{\ttbackslash}%
- \let\indexlbrace\{ % Likewise, set these sequences for braces
- \let\indexrbrace\} % used in the sort key.
- \begindoublecolumns
- \let\dotheinsertentrybox\dotheinsertentryboxwithpenalty
- %
- % Read input from the index file line by line.
- \loopdo
- \ifeof1 \else
- \read 1 to \nextline
- \fi
- %
- \indexinputprocessing
- \thisline
- %
- \ifeof1\else
- \let\thisline\nextline
- \repeat
- %%
- \enddoublecolumns
+ \expandafter\printindexzz\thisline\relax\relax\finish%
\fi
\fi
\closein 1
\endgroup}
-\def\loopdo#1\repeat{\def\body{#1}\loopdoxxx}
-\def\loopdoxxx{\let\next=\relax\body\let\next=\loopdoxxx\fi\next}
-\def\indexinputprocessing{%
- \ifeof1
- \let\firsttoken\relax
+% If the index file starts with a backslash, forgo reading the index
+% file altogether. If somebody upgrades texinfo.tex they may still have
+% old index files using \ as the escape character. Reading this would
+% at best lead to typesetting garbage, at worst a TeX syntax error.
+\def\printindexzz#1#2\finish{%
+ \expandafter\ifx\csname SETtxiindexescapeisbackslash\endcsname\relax
+ \uccode`\~=`\\ \uppercase{\if\noexpand~}\noexpand#1
+ \expandafter\ifx\csname SETtxiskipindexfileswithbackslash\endcsname\relax
+\errmessage{%
+ERROR: A sorted index file in an obsolete format was skipped.
+To fix this problem, please upgrade your version of 'texi2dvi'
+or 'texi2pdf' to that at <https://ftp.gnu.org/gnu/texinfo>.
+If you are using an old version of 'texindex' (part of the Texinfo
+distribution), you may also need to upgrade to a newer version (at least 6.0).
+You may be able to typeset the index if you run
+'texindex \jobname.\indexname' yourself.
+You could also try setting the 'txiindexescapeisbackslash' flag by
+running a command like
+'texi2dvi -t "@set txiindexescapeisbackslash" \jobname.texi'. If you do
+this, Texinfo will try to use index files in the old format.
+If you continue to have problems, deleting the index files and starting again
+might help (with 'rm \jobname.?? \jobname.??s')%
+}%
+ \else
+ (Skipped sorted index file in obsolete format)
+ \fi
+ \else
+ \begindoublecolumns
+ \input \jobname.\indexname s
+ \enddoublecolumns
+ \fi
\else
- \edef\act{\gdef\noexpand\firsttoken{\getfirsttoken\nextline}}%
- \act
+ \begindoublecolumns
+ \catcode`\\=0\relax
+ \catcode`\@=12\relax
+ \input \jobname.\indexname s
+ \enddoublecolumns
\fi
}
-\def\getfirsttoken#1{\expandafter\getfirsttokenx#1\endfirsttoken}
-\long\def\getfirsttokenx#1#2\endfirsttoken{\noexpand#1}
-
% These macros are used by the sorted index file itself.
% Change them to control the appearance of the index.
@@ -5511,12 +5567,19 @@ end
\catcode`\|=13 \catcode`\<=13 \catcode`\>=13 \catcode`\+=13 \catcode`\"=13
\catcode`\$=3
\gdef\initialglyphs{%
+ % special control sequences used in the index sort key
+ \let\indexlbrace\{%
+ \let\indexrbrace\}%
+ \let\indexatchar\@%
+ \def\indexbackslash{\math{\backslash}}%
+ %
% Some changes for non-alphabetic characters. Using the glyphs from the
% math fonts looks more consistent than the typewriter font used elsewhere
% for these characters.
- \def\indexbackslash{\math{\backslash}}%
- \let\\=\indexbackslash
+ \uccode`\~=`\\ \uppercase{\def~{\math{\backslash}}}
%
+ % In case @\ is used for backslash
+ \uppercase{\let\\=~}
% Can't get bold backslash so don't use bold forward slash
\catcode`\/=13
\def/{{\secrmnotbold \normalslash}}%
@@ -5576,12 +5639,6 @@ end
\def\entry{%
\begingroup
%
- % For pdfTeX and XeTeX.
- % The redefinition of \domark stops marks being added in \pdflink to
- % preserve coloured links across page boundaries. Otherwise the marks
- % would get in the way of \lastbox in \insertentrybox.
- \let\domark\relax
- %
% Start a new paragraph if necessary, so our assignments below can't
% affect previous text.
\par
@@ -5614,35 +5671,31 @@ end
\gdef\finishentry#1{%
\egroup % end box A
\dimen@ = \wd\boxA % Length of text of entry
- \global\setbox\boxA=\hbox\bgroup\unhbox\boxA
- % #1 is the page number.
- %
- % Get the width of the page numbers, and only use
- % leaders if they are present.
- \global\setbox\boxB = \hbox{#1}%
- \ifdim\wd\boxB = 0pt
- \null\nobreak\hfill\ %
- \else
- %
- \null\nobreak\indexdotfill % Have leaders before the page number.
+ \global\setbox\boxA=\hbox\bgroup
+ \unhbox\boxA
+ % #1 is the page number.
%
- \ifpdf
- \pdfgettoks#1.%
- \hskip\skip\thinshrinkable\the\toksA
+ % Get the width of the page numbers, and only use
+ % leaders if they are present.
+ \global\setbox\boxB = \hbox{#1}%
+ \ifdim\wd\boxB = 0pt
+ \null\nobreak\hfill\ %
\else
- \ifx\XeTeXrevision\thisisundefined
- \hskip\skip\thinshrinkable #1%
- \else
+ %
+ \null\nobreak\indexdotfill % Have leaders before the page number.
+ %
+ \ifpdforxetex
\pdfgettoks#1.%
\hskip\skip\thinshrinkable\the\toksA
+ \else
+ \hskip\skip\thinshrinkable #1%
\fi
\fi
- \fi
\egroup % end \boxA
\ifdim\wd\boxB = 0pt
- \global\setbox\entrybox=\vbox{\unhbox\boxA}%
- \else
- \global\setbox\entrybox=\vbox\bgroup
+ \noindent\unhbox\boxA\par
+ \nobreak
+ \else\bgroup
% We want the text of the entries to be aligned to the left, and the
% page numbers to be aligned to the right.
%
@@ -5708,55 +5761,11 @@ end
\egroup % The \vbox
\fi
\endgroup
- \dotheinsertentrybox
}}
\newskip\thinshrinkable
\skip\thinshrinkable=.15em minus .15em
-\newbox\entrybox
-\def\insertentrybox{%
- \ourunvbox\entrybox
-}
-
-% default definition
-\let\dotheinsertentrybox\insertentrybox
-
-% Use \lastbox to take apart vbox box by box, and add each sub-box
-% to the current vertical list.
-\def\ourunvbox#1{%
-\bgroup % for local binding of \delayedbox
- % Remove the last box from box #1
- \global\setbox#1=\vbox{%
- \unvbox#1%
- \unskip % remove any glue
- \unpenalty
- \global\setbox\interbox=\lastbox
- }%
- \setbox\delayedbox=\box\interbox
- \ifdim\ht#1=0pt\else
- \ourunvbox#1 % Repeat on what's left of the box
- \nobreak
- \fi
- \box\delayedbox
-\egroup
-}
-\newbox\delayedbox
-\newbox\interbox
-
-% Used from \printindex. \firsttoken should be the first token
-% after the \entry. If it's not another \entry, we are at the last
-% line of a group of index entries, so insert a penalty to discourage
-% widowed index entries.
-\def\dotheinsertentryboxwithpenalty{%
- \ifx\firsttoken\isentry
- \else
- \penalty 9000
- \fi
- \insertentrybox
-}
-\def\isentry{\entry}%
-
% Like plain.tex's \dotfill, except uses up at least 1 em.
% The filll stretch here overpowers both the fil and fill stretch to push
% the page number to the right.
@@ -5766,24 +5775,15 @@ end
\def\primary #1{\line{#1\hfil}}
-\newskip\secondaryindent \secondaryindent=0.5cm
-\def\secondary#1#2{{%
- \parfillskip=0in
- \parskip=0in
- \hangindent=1in
- \hangafter=1
- \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill
- \ifpdf
- \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
- \else
- \ifx\XeTeXrevision\thisisundefined
- #2
- \else
- \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
- \fi
- \fi
- \par
-}}
+\def\secondary{\indententry{0.5cm}}
+\def\tertiary{\indententry{1cm}}
+
+\def\indententry#1#2#3{%
+ \bgroup
+ \leftskip=#1
+ \entry{#2}{#3}%
+ \egroup
+}
% Define two-column mode, which we use to typeset indexes.
% Adapted from the TeXbook, page 416, which is to say,
@@ -5793,60 +5793,21 @@ end
\newbox\partialpage
\newdimen\doublecolumnhsize
-% Use inside an output routine to save \topmark and \firstmark
-\def\savemarks{%
- \global\savedtopmark=\expandafter{\topmark }%
- \global\savedfirstmark=\expandafter{\firstmark }%
-}
-\newtoks\savedtopmark
-\newtoks\savedfirstmark
-
-% Set \topmark and \firstmark for next time \output runs.
-% Can't be run from withinside \output (because any material
-% added while an output routine is active, including
-% penalties, is saved for after it finishes). The page so far
-% should be empty, otherwise what's on it will be thrown away.
-\def\restoremarks{%
- \mark{\the\savedtopmark}%
- \bgroup\output = {%
- \setbox\dummybox=\box\PAGE
- }abc\eject\egroup
- % "abc" because output routine doesn't fire for a completely empty page.
- \mark{\the\savedfirstmark}%
-}
-
\def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
% If not much space left on page, start a new page.
\ifdim\pagetotal>0.8\vsize\vfill\eject\fi
%
% Grab any single-column material above us.
\output = {%
- %
- % Here is a possibility not foreseen in manmac: if we accumulate a
- % whole lot of material, we might end up calling this \output
- % routine twice in a row (see the doublecol-lose test, which is
- % essentially a couple of indexes with @setchapternewpage off). In
- % that case we just ship out what is in \partialpage with the normal
- % output routine. Generally, \partialpage will be empty when this
- % runs and this will be a no-op. See the indexspread.tex test case.
- \ifvoid\partialpage \else
- \onepageout{\pagecontents\partialpage}%
- \fi
+ \savetopmark
%
\global\setbox\partialpage = \vbox{%
% Unvbox the main output page.
\unvbox\PAGE
\kern-\topskip \kern\baselineskip
}%
- \savemarks
}%
\eject % run that output routine to set \partialpage
- \restoremarks
- %
- % We recover the two marks that the last output routine saved in order
- % to propagate the information in marks added around a chapter heading,
- % which could be otherwise be lost by the time the final page is output.
- %
%
% Use the double-column output routine for subsequent pages.
\output = {\doublecolumnout}%
@@ -5887,6 +5848,7 @@ end
%
\def\doublecolumnout{%
%
+ \savetopmark
\splittopskip=\topskip \splitmaxdepth=\maxdepth
\dimen@ = \vsize
\divide\dimen@ by 2
@@ -5910,7 +5872,7 @@ end
}
-% Finished with with double columns.
+% Finished with double columns.
\def\enddoublecolumns{%
% The following penalty ensures that the page builder is exercised
% _before_ we change the output routine. This is necessary in the
@@ -5942,7 +5904,7 @@ end
%
\output = {%
% Split the last of the double-column material.
- \savemarks
+ \savetopmark
\balancecolumns
}%
\eject % call the \output just set
@@ -5950,10 +5912,9 @@ end
% Having called \balancecolumns once, we do not
% want to call it again. Therefore, reset \output to its normal
% definition right away.
- \global\output = {\onepageout{\pagecontents\PAGE}}%
+ \global\output=\expandafter{\the\defaultoutput}
%
\endgroup % started in \begindoublecolumns
- \restoremarks
% Leave the double-column material on the current page, no automatic
% page break.
\box\balancedcolumns
@@ -6119,11 +6080,9 @@ end
% @raisesections: treat @section as chapter, @subsection as section, etc.
\def\raisesections{\global\advance\secbase by -1}
-\let\up=\raisesections % original BFox name
% @lowersections: treat @chapter as section, @section as subsection, etc.
\def\lowersections{\global\advance\secbase by 1}
-\let\down=\lowersections % original BFox name
% we only have subsub.
\chardef\maxseclevel = 3
@@ -6468,27 +6427,22 @@ end
\expandafter\ifx\thisenv\titlepage\else
\checkenv{}% chapters, etc., should not start inside an environment.
\fi
- % FIXME: \chapmacro is currently called from inside \titlepage when
- % \setcontentsaftertitlepage to print the "Table of Contents" heading, but
- % this should probably be done by \sectionheading with an option to print
- % in chapter size.
- %
% Insert the first mark before the heading break (see notes for \domark).
- \let\prevchapterdefs=\lastchapterdefs
- \let\prevsectiondefs=\lastsectiondefs
- \gdef\lastsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}%
+ \let\prevchapterdefs=\currentchapterdefs
+ \let\prevsectiondefs=\currentsectiondefs
+ \gdef\currentsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}%
\gdef\thissection{}}%
%
\def\temptype{#2}%
\ifx\temptype\Ynothingkeyword
- \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
+ \gdef\currentchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
\gdef\thischapter{\thischaptername}}%
\else\ifx\temptype\Yomitfromtockeyword
- \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
+ \gdef\currentchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
\gdef\thischapter{}}%
\else\ifx\temptype\Yappendixkeyword
\toks0={#1}%
- \xdef\lastchapterdefs{%
+ \xdef\currentchapterdefs{%
\gdef\noexpand\thischaptername{\the\toks0}%
\gdef\noexpand\thischapternum{\appendixletter}%
% \noexpand\putwordAppendix avoids expanding indigestible
@@ -6499,7 +6453,7 @@ end
}%
\else
\toks0={#1}%
- \xdef\lastchapterdefs{%
+ \xdef\currentchapterdefs{%
\gdef\noexpand\thischaptername{\the\toks0}%
\gdef\noexpand\thischapternum{\the\chapno}%
% \noexpand\putwordChapter avoids expanding indigestible
@@ -6519,18 +6473,18 @@ end
%
% Now the second mark, after the heading break. No break points
% between here and the heading.
- \let\prevchapterdefs=\lastchapterdefs
- \let\prevsectiondefs=\lastsectiondefs
+ \let\prevchapterdefs=\currentchapterdefs
+ \let\prevsectiondefs=\currentsectiondefs
\domark
%
{%
\chapfonts \rm
\let\footnote=\errfootnoteheading % give better error message
%
- % Have to define \lastsection before calling \donoderef, because the
+ % Have to define \currentsection before calling \donoderef, because the
% xref code eventually uses it. On the other hand, it has to be called
% after \pchapsepmacro, or the headline will change too soon.
- \gdef\lastsection{#1}%
+ \gdef\currentsection{#1}%
%
% Only insert the separating space if we have a chapter/appendix
% number, and don't print the unnumbered ``number''.
@@ -6619,10 +6573,10 @@ end
\csname #2fonts\endcsname \rm
%
% Insert first mark before the heading break (see notes for \domark).
- \let\prevsectiondefs=\lastsectiondefs
+ \let\prevsectiondefs=\currentsectiondefs
\ifx\temptype\Ynothingkeyword
\ifx\sectionlevel\seckeyword
- \gdef\lastsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}%
+ \gdef\currentsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}%
\gdef\thissection{\thissectionname}}%
\fi
\else\ifx\temptype\Yomitfromtockeyword
@@ -6630,7 +6584,7 @@ end
\else\ifx\temptype\Yappendixkeyword
\ifx\sectionlevel\seckeyword
\toks0={#1}%
- \xdef\lastsectiondefs{%
+ \xdef\currentsectiondefs{%
\gdef\noexpand\thissectionname{\the\toks0}%
\gdef\noexpand\thissectionnum{#4}%
% \noexpand\putwordSection avoids expanding indigestible
@@ -6643,7 +6597,7 @@ end
\else
\ifx\sectionlevel\seckeyword
\toks0={#1}%
- \xdef\lastsectiondefs{%
+ \xdef\currentsectiondefs{%
\gdef\noexpand\thissectionname{\the\toks0}%
\gdef\noexpand\thissectionnum{#4}%
% \noexpand\putwordSection avoids expanding indigestible
@@ -6669,28 +6623,28 @@ end
%
% Now the second mark, after the heading break. No break points
% between here and the heading.
- \global\let\prevsectiondefs=\lastsectiondefs
+ \global\let\prevsectiondefs=\currentsectiondefs
\domark
%
% Only insert the space after the number if we have a section number.
\ifx\temptype\Ynothingkeyword
\setbox0 = \hbox{}%
\def\toctype{unn}%
- \gdef\lastsection{#1}%
+ \gdef\currentsection{#1}%
\else\ifx\temptype\Yomitfromtockeyword
% for @headings -- no section number, don't include in toc,
- % and don't redefine \lastsection.
+ % and don't redefine \currentsection.
\setbox0 = \hbox{}%
\def\toctype{omit}%
\let\sectionlevel=\empty
\else\ifx\temptype\Yappendixkeyword
\setbox0 = \hbox{#4\enspace}%
\def\toctype{app}%
- \gdef\lastsection{#1}%
+ \gdef\currentsection{#1}%
\else
\setbox0 = \hbox{#4\enspace}%
\def\toctype{num}%
- \gdef\lastsection{#1}%
+ \gdef\currentsection{#1}%
\fi\fi\fi
%
% Write the toc entry (before \donoderef). See comments in \chapmacro.
@@ -6780,13 +6734,8 @@ end
% 1 and 2 (the page numbers aren't printed), and so are the first
% two pages of the document. Thus, we'd have two destinations named
% `1', and two named `2'.
- \ifpdf
+ \ifpdforxetex
\global\pdfmakepagedesttrue
- \else
- \ifx\XeTeXrevision\thisisundefined
- \else
- \global\pdfmakepagedesttrue
- \fi
\fi
}
@@ -7149,11 +7098,7 @@ end
% @cartouche ... @end cartouche: draw rectangle w/rounded corners around
% environment contents.
-\font\circle=lcircle10
-\newdimen\circthick
-\newdimen\cartouter\newdimen\cartinner
-\newskip\normbskip\newskip\normpskip\newskip\normlskip
-\circthick=\fontdimen8\circle
+
%
\def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth
\def\ctr{{\hskip 6pt\circle\char'010}}
@@ -7168,7 +7113,18 @@ end
%
\newskip\lskip\newskip\rskip
+% only require the font if @cartouche is actually used
+\def\cartouchefontdefs{%
+ \font\circle=lcircle10\relax
+ \circthick=\fontdimen8\circle
+}
+\newdimen\circthick
+\newdimen\cartouter\newdimen\cartinner
+\newskip\normbskip\newskip\normpskip\newskip\normlskip
+
+
\envdef\cartouche{%
+ \cartouchefontdefs
\ifhmode\par\fi % can't be in the midst of a paragraph.
\startsavinginserts
\lskip=\leftskip \rskip=\rightskip
@@ -7347,13 +7303,9 @@ end
% @raggedright does more-or-less normal line breaking but no right
-% justification. From plain.tex. Don't stretch around special
-% characters in urls in this environment, since the stretch at the right
-% should be enough.
+% justification. From plain.tex.
\envdef\raggedright{%
\rightskip0pt plus2.4em \spaceskip.3333em \xspaceskip.5em\relax
- \def\urefprestretchamount{0pt}%
- \def\urefpoststretchamount{0pt}%
}
\let\Eraggedright\par
@@ -7728,6 +7680,21 @@ end
\fi\fi
}
+% \dosubind {index}{topic}{subtopic}
+%
+% If SUBTOPIC is present, precede it with a space, and call \doind.
+% (At some time during the 20th century, this made a two-level entry in an
+% index such as the operation index. Nobody seemed to notice the change in
+% behaviour though.)
+\def\dosubind#1#2#3{%
+ \def\thirdarg{#3}%
+ \ifx\thirdarg\empty
+ \doind{#1}{#2}%
+ \else
+ \doind{#1}{#2\space#3}%
+ \fi
+}
+
% Untyped functions:
% @deffn category name args
@@ -7742,7 +7709,6 @@ end
% \deffngeneral {subind}category name args
%
\def\deffngeneral#1#2 #3 #4\endheader{%
- % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}.
\dosubind{fn}{\code{#3}}{#1}%
\defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}%
}
@@ -8030,36 +7996,18 @@ end
}
\fi
-% alias because \c means cedilla in @tex or @math
-\let\texinfoc=\c
-
-\newcount\savedcatcodeone
-\newcount\savedcatcodetwo
-
% Used at the time of macro expansion.
% Argument is macro body with arguments substituted
\def\scanmacro#1{%
\newlinechar`\^^M
\def\xeatspaces{\eatspaces}%
%
- % Temporarily undo catcode changes of \printindex. Set catcode of @ to
- % 0 so that @-commands in macro expansions aren't printed literally when
- % formatting an index file, where \ is used as the escape character.
- \savedcatcodeone=\catcode`\@
- \savedcatcodetwo=\catcode`\\
- \catcode`\@=0
- \catcode`\\=\active
- %
% Process the macro body under the current catcode regime.
- \scantokens{#1@texinfoc}%
+ \scantokens{#1@comment}%
%
- \catcode`\@=\savedcatcodeone
- \catcode`\\=\savedcatcodetwo
- %
- % The \texinfoc is to remove the \newlinechar added by \scantokens, and
- % can be noticed by \parsearg.
- % We avoid surrounding the call to \scantokens with \bgroup and \egroup
- % to allow macros to open or close groups themselves.
+ % The \comment is to remove the \newlinechar added by \scantokens, and
+ % can be noticed by \parsearg. Note \c isn't used because this means cedilla
+ % in math mode.
}
% Used for copying and captions
@@ -8160,12 +8108,14 @@ end
\def\macroargctxt{%
\scanctxt
\catcode`\ =\active
+ \catcode`\@=\other
\catcode`\^^M=\other
\catcode`\\=\active
}
\def\macrolineargctxt{% used for whole-line arguments without braces
\scanctxt
+ \catcode`\@=\other
\catcode`\{=\other
\catcode`\}=\other
}
@@ -8729,9 +8679,29 @@ end
% also remove a trailing comma, in case of something like this:
% @node Help-Cross, , , Cross-refs
\def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse}
-\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}}
+\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}\omittopnode}
+
+% Used so that the @top node doesn't have to be wrapped in an @ifnottex
+% conditional.
+% \doignore goes to more effort to skip nested conditionals but we don't need
+% that here.
+\def\omittopnode{%
+ \ifx\lastnode\wordTop
+ \expandafter\ignorenode\fi
+}
+\def\wordTop{Top}
+
+% Until the next @node or @bye command, divert output to a box that is not
+% output.
+\def\ignorenode{\setbox\dummybox\vbox\bgroup\def\node{\egroup\node}%
+\ignorenodebye
+}
+
+{\let\bye\relax
+\gdef\ignorenodebye{\let\bye\ignorenodebyedef}
+\gdef\ignorenodebyedef{\egroup(`Top' node ignored)\bye}}
+% The redefinition of \bye here is because it is declared \outer
-\let\nwnode=\node
\let\lastnode=\empty
% Write a cross-reference definition for the current node. #1 is the
@@ -8754,7 +8724,7 @@ end
% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
% anchor), which consists of three parts:
-% 1) NAME-title - the current sectioning name taken from \lastsection,
+% 1) NAME-title - the current sectioning name taken from \currentsection,
% or the anchor name.
% 2) NAME-snt - section number and type, passed as the SNT arg, or
% empty for anchors.
@@ -8776,7 +8746,7 @@ end
\write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
##1}{##2}}% these are parameters of \writexrdef
}%
- \toks0 = \expandafter{\lastsection}%
+ \toks0 = \expandafter{\currentsection}%
\immediate \writexrdef{title}{\the\toks0 }%
\immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
\safewhatsit{\writexrdef{pg}{\folio}}% will be written later, at \shipout
@@ -9206,19 +9176,6 @@ end
\catcode`\^^]=\other
\catcode`\^^^=\other
\catcode`\^^_=\other
- % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc.
- % in xref tags, i.e., node names. But since ^^e4 notation isn't
- % supported in the main text, it doesn't seem desirable. Furthermore,
- % that is not enough: for node names that actually contain a ^
- % character, we would end up writing a line like this: 'xrdef {'hat
- % b-title}{'hat b} and \xrdef does a \csname...\endcsname on the first
- % argument, and \hat is not an expandable control sequence. It could
- % all be worked out, but why? Either we support ^^ or we don't.
- %
- % The other change necessary for this was to define \auxhat:
- % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter
- % and then to call \auxhat in \setq.
- %
\catcode`\^=\other
%
% Special characters. Should be turned off anyway, but...
@@ -9236,14 +9193,7 @@ end
\catcode`\%=\other
\catcode`+=\other % avoid \+ for paranoia even though we've turned it off
%
- % This is to support \ in node names and titles, since the \
- % characters end up in a \csname. It's easier than
- % leaving it active and making its active definition an actual \
- % character. What I don't understand is why it works in the *value*
- % of the xrdef. Seems like it should be a catcode12 \, and that
- % should not typeset properly. But it works, so I'm moving on for
- % now. --karl, 15jan04.
- \catcode`\\=\other
+ \catcode`\\=\active
%
% @ is our escape character in .aux files, and we need braces.
\catcode`\{=1
@@ -9574,13 +9524,13 @@ end
\global\advance\floatno by 1
%
{%
- % This magic value for \lastsection is output by \setref as the
+ % This magic value for \currentsection is output by \setref as the
% XREFLABEL-title value. \xrefX uses it to distinguish float
% labels (which have a completely different output format) from
% node and anchor labels. And \xrdef uses it to construct the
% lists of floats.
%
- \edef\lastsection{\floatmagic=\safefloattype}%
+ \edef\currentsection{\floatmagic=\safefloattype}%
\setref{\floatlabel}{Yfloat}%
}%
\fi
@@ -9703,7 +9653,7 @@ end
% #1 is the control sequence we are passed; we expand into a conditional
% which is true if #1 represents a float ref. That is, the magic
-% \lastsection value which we \setref above.
+% \currentsection value which we \setref above.
%
\def\iffloat#1{\expandafter\doiffloat#1==\finish}
%
@@ -11191,21 +11141,14 @@ directory should work if nowhere else does.}
\relax
}
-% define all Unicode characters we know about, for the sake of @U.
+% Define all Unicode characters we know about. This makes UTF-8 the default
+% input encoding and allows @U to work.
\iftxinativeunicodecapable
\nativeunicodechardefsatu
\else
\utfeightchardefs
\fi
-
-% Make non-ASCII characters printable again for compatibility with
-% existing Texinfo documents that may use them, even without declaring a
-% document encoding.
-%
-\setnonasciicharscatcode \other
-
-
\message{formatting,}
\newdimen\defaultparindent \defaultparindent = 15pt
@@ -11521,11 +11464,9 @@ directory should work if nowhere else does.}
% \backslashcurfont outputs one backslash character in current font,
% as in \char`\\.
\global\chardef\backslashcurfont=`\\
-\global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work
-% \realbackslash is an actual character `\' with catcode other, and
-% \doublebackslash is two of them (for the pdf outlines).
-{\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}}
+% \realbackslash is an actual character `\' with catcode other.
+{\catcode`\\=\other @gdef@realbackslash{\}}
% In Texinfo, backslash is an active character; it prints the backslash
% in fixed width font.
@@ -11543,10 +11484,8 @@ directory should work if nowhere else does.}
@def@ttbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}}
@let@backslashchar = @ttbackslash % @backslashchar{} is for user documents.
-% \rawbackslash defines an active \ to do \backslashcurfont.
% \otherbackslash defines an active \ to be a literal `\' character with
-% catcode other. We switch back and forth between these.
-@gdef@rawbackslash{@let\=@backslashcurfont}
+% catcode other.
@gdef@otherbackslash{@let\=@realbackslash}
% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
@@ -11618,7 +11557,7 @@ directory should work if nowhere else does.}
@ifx\@eatinput @let\ = @ttbackslash @fi
@catcode13=5 % regular end of line
@enableemergencynewline
- @let@c=@texinfoc
+ @let@c=@comment
@let@parsearg@originalparsearg
% Also turn back on active characters that might appear in the input
% file name, in case not using a pre-dumped format.
diff --git a/macros/texinfo/texinfo/doc/texinfo.texi b/macros/texinfo/texinfo/doc/texinfo.texi
index 70567bb668..f0fb2412ab 100644
--- a/macros/texinfo/texinfo/doc/texinfo.texi
+++ b/macros/texinfo/texinfo/doc/texinfo.texi
@@ -40,14 +40,9 @@ Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 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 the freedom to copy and
-modify this GNU manual. Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
+Invariant Sections, 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
@end copying
@@ -114,7 +109,6 @@ Cover art by Etienne Suvasa.
@contents
-@ifnottex
@node Top
@top Texinfo
@@ -122,8 +116,6 @@ 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 using semantic markup.
-@end ifnottex
-
@ifinfo
The first part of this master menu lists the major nodes in this Info
document, including the @@-command and concept indices. The rest of
@@ -403,6 +395,7 @@ Indices
* Predefined Indices:: Use different indices for different kinds
of entries.
* Indexing Commands:: How to make an index entry.
+* Advanced Indexing:: Advanced indexing commands.
* Printing Indices & Menus:: How to print an index in hardcopy and
generate index menus in Info.
* Combining Indices:: How to combine indices.
@@ -639,7 +632,6 @@ HTML Cross-references
* 8-bit Expansion: HTML Xref 8-bit Character Expansion.
* Mismatch: HTML Xref Mismatch.
* Configuration: HTML Xref Configuration. htmlxref.cnf.
-* Preserving links: HTML Xref Link Preservation. MANUAL-noderename.cnf.
Sample Texinfo Files
@@ -1453,11 +1445,8 @@ regarding nesting of such commands, @pxref{Conditional Nesting}.)
@cindex Texinfo file minimum
By convention, the name of a Texinfo file ends with one of the
-extensions @file{.texinfo}, @file{.texi}, @file{.txi}, or
-@file{.tex}.@footnote{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.}
+extensions @file{.texi}, @file{.texinfo}, @file{.txi}, or
+@file{.tex}.
In order to be made into a printed manual and other output
formats, a Texinfo file must begin with lines like this:
@@ -1705,7 +1694,7 @@ This chapter expands on the minimal complete Texinfo source file
previously given (@pxref{Short Sample}).
Certain pieces of information must be provided at the beginning of a
-Texinfo file, such the title of the document and the Top node. A table
+Texinfo file, such as the title of the document and the Top node. A table
of contents is also generally produced here.
@cindex Frontmatter, text in
@@ -2204,8 +2193,6 @@ The @code{@@end titlepage} command starts a new page and turns on page
numbering (@pxref{Heading Generation}). 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
@@ -3455,7 +3442,7 @@ for the Info system as a whole. (Each directory with Info files is
intended to contain a file named @file{dir}.)
That's fine for Info, but for HTML output, one might well want the Up
-link from the Top node to go somewhere other than @samp{dir.html}.
+link from the Top node to go to some specific place.
For example, for GNU the natural place would be
@url{http://www.gnu.org/manual/} (a web page collecting links to most
GNU manuals), better specified as just @code{/manual/} if the manual
@@ -3467,7 +3454,8 @@ Customization Variables}), as in
$ @kbd{makeinfo --html -c TOP_NODE_UP_URL=/manual/} ...
@end example
-All links to @code{(dir)} will be replaced by the given url.
+@c the following line is not true anymore
+@c All links to @code{(dir)} will be replaced by the given url.
@item
@cindex Prev node of Top node
@@ -3554,7 +3542,7 @@ Section Section Section Section Section Section
@end group
@end example
-Using explicit pointers (not recommended, but for shown for purposes
+Using explicit pointers (not recommended, but shown for purposes
of the example), the fully-written command to start Chapter@tie{}2
would be this:
@@ -5508,23 +5496,25 @@ refer to printed works for which no Info form exists.
@section @code{@@url}, @code{@@uref@{@var{url}[, @var{text}][, @var{replacement}]@}}
@anchor{uref}@c old name
-@findex uref
+@anchor{url}
@cindex Uniform resource locator, referring to
@cindex URL, referring to
+@findex url
@cindex @code{href}, producing HTML
-@code{@@uref} produces a reference to a uniform resource locator
+@code{@@url} 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 and PDF
-output, @code{@@uref} produces a link you can follow. (To merely
+output, @code{@@url} produces a link you can follow. (To merely
indicate a url without creating a link people can follow, use
@code{@@indicateurl}, @pxref{@code{@@indicateurl}}.)
-@findex url
-@anchor{url}@code{@@url} is a synonym for @code{@@uref}.
-(Originally, @code{@@url} had the meaning of @code{@@indicateurl}, but
-in practice it was almost always misused. So we've changed the
-meaning.)
+@findex uref
+@code{@@uref} is a synonym for @code{@@url}.
+(Originally, @code{@@url} had the meaning of @code{@@indicateurl}
+and @code{@@uref} was required to produce a working link, but
+in practice @code{@@url} was almost always misused. So we've changed
+the meaning.)
The second argument, if specified, is the text to display (the default
is the url itself); in Info, DVI, and PDF output, but not in HTML
@@ -5555,25 +5545,25 @@ just one argument. The given url is both the target and the visible
text of the link:
@example
-The official GNU ftp site is @@uref@{http://ftp.gnu.org/gnu@}.
+The official GNU ftp site is @@url@{http://ftp.gnu.org/gnu@}.
@end example
@noindent produces:
@display
-The official GNU ftp site is @uref{http://ftp.gnu.org/gnu}.
+The official GNU ftp site is @url{http://ftp.gnu.org/gnu}.
@end display
@subsubheading Two-argument form of @code{@@url}
Here is an example of the two-argument form:
@example
-The official @@uref@{http://ftp.gnu.org/gnu, GNU ftp site@}
+The official @@url@{http://ftp.gnu.org/gnu, GNU ftp site@}
holds programs and texts.
@end example
@noindent which produces:
@display
-The official @uref{http://ftp.gnu.org/gnu, GNU ftp site}
+The official @url{http://ftp.gnu.org/gnu, GNU ftp site}
holds programs and texts.
@end display
@@ -5593,12 +5583,12 @@ holds programs and texts.
Finally, an example of the three-argument form:
@example
-The @@uref@{/man.cgi/1/ls,,ls@} program @dots{}
+The @@url@{/man.cgi/1/ls,,ls@} program @dots{}
@end example
@noindent which, except for HTML, produces:
@display
-The @uref{/man.cgi/1/ls,,ls} program @dots{}
+The @url{/man.cgi/1/ls,,ls} program @dots{}
@end display
@noindent but with HTML:
@@ -8925,7 +8915,7 @@ 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
+Texinfo provides several predefined kinds of indices: 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.
@@ -8934,6 +8924,7 @@ purpose. Lastly, you can define your own new indices.
* Predefined Indices:: Use different indices for different kinds
of entries.
* Indexing Commands:: How to make an index entry.
+* Advanced Indexing:: Advanced indexing commands.
* Index Entries:: Choose different words for index entries.
* Printing Indices & Menus:: How to print an index in hardcopy and
generate index menus in Info.
@@ -8952,37 +8943,37 @@ meanings, abbreviations, and the corresponding index entry commands:
@item cp
@cindex @code{cp} (concept) index
@findex cindex
-(@code{@@cindex}) concept index, for general concepts.
+(@code{@@cindex}) Concept index, for general concepts.
@item fn
@cindex @code{fn} (function) index
@findex findex
-(@code{@@findex}) function index, for function and function-like
+(@code{@@findex}) Function index, for function and function-like
names (such as entry points of libraries).
@item ky
@cindex @code{ky} (keystroke) index
@findex kindex
-(@code{@@kindex}) keystroke index, for keyboard commands.
+(@code{@@kindex}) Keystroke index, for keyboard commands.
@item pg
@cindex @code{pg} (program) index
@findex pindex
-(@code{@@pindex}) program index, for names of programs.
+(@code{@@pindex}) Program index, for names of programs.
@item tp
@cindex @code{tp} (data type) index
@findex tindex
-(@code{@@tindex}) data type index, for type names (such as structures
+(@code{@@tindex}) Data type index, for type names (such as structures
defined in header files).
@item vr
@cindex @code{vr} (variable) index
@findex vindex
-(@code{@@vindex}) variable index, for variable names (such as global
-variables of libraries).
+(@code{@@vindex}) Variable index, for variable names (such as library global
+variables).
@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).
+concept index and an @@-command index. (The latter 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
@@ -9001,7 +8992,7 @@ 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
+into one output index by using the @code{@@synindex} or
@code{@@syncodeindex} commands (@pxref{Combining Indices}).
@@ -9049,7 +9040,7 @@ Hello, there!
whatever context) ends up before the material, where readers want to
be, instead of after.
-Try to avoid using a colon in an index entry, as this may confuse some
+Try to avoid using a colon in index entries, as this may confuse some
Info readers. @xref{Menu Parts} for more information about the
structure of a menu entry.
@c At the time of writing, it always works in standalone info, and a
@@ -9067,10 +9058,10 @@ font (@pxref{Fonts}).
@cindex sort keys for index entries
@cindex index sorting
For the printed output, you may specify an explicit sort key for an
-index entry using @code{@@sortas} immediately following the index
-command. For example: @samp{@@findex @@sortas@{\@} \ @@r@{(literal
-\ in @@code@{@@@@math@})} sorts the index entry this produces under
-backslash.
+index entry using @code{@@sortas} following either the index command
+or the text of the entry. For example: @samp{@@findex @@sortas@{\@}
+\ @@r@{(literal \ in @@code@{@@@@math@})} sorts the index entry this
+produces under backslash.
@vindex txiindexbackslashignore
@vindex txiindexhyphenignore
@@ -9086,8 +9077,71 @@ and @samp{@@}, which are ignored by giving as an argument to the
@code{txiindexatsignignore}. For example, specifying @samp{@@set
txiindexbackslashignore} causes the @samp{\mathopsup} entry in the
index for this manual to be sorted as if it were @samp{mathopsup},
-so that it appears among the other entries beginning `M'.
+so that it appears among the other entries beginning with `M'.
+
+@node Advanced Indexing
+@section Advanced Indexing Commands
+@cindex Indexing, advanced
+@cindex Advanced indexing
+
+Texinfo provides several commands for doing advanced indexing,
+similar to the indices you may see in professionally published books.
+
+@findex @@subentry
+First, you can create @dfn{multilevel} index entries, allowing you
+to group many related subtopics under the same higher level topic.
+You do this by separating the parts of such an entry with the
+@code{@@subentry} command. Such commands might look like this:
+
+@example
+@@cindex Superhumans @@subentry villians
+@@cindex Superhumans @@subentry heros
+@end example
+
+You may have up to three levels in an entry:
+
+@example
+@@cindex coffee makers @@subentry electric @@subentry pink
+@@cindex coffee makers @@subentry electric @@subentry blue
+@end example
+
+You can use the @code{@@sortas} command mentioned earlier with any or
+all of the three parts of an entry to cause them to sort differently
+than they would by default.
+@findex @@seeentry
+Second, you may provide an index entry that points to another,
+using the @code{@@seeentry} (``see entry'') command. For example:
+
+@example
+@@cindex Indexes @@seeentry@{Indices@}
+@end example
+
+Such an entry should be unique in your document; the idea is to
+redirect the reader to the other entry where they will find all
+the information they are looking for.
+
+@findex @@seealso
+Finally, you may provide a ``see also'' entry using the @code{@@seealso}
+command. These entries go along with regular entries, and are grouped
+together with them in the final printed index. For example:
+
+@example
+@@cindex Coffee
+@@cindex Coffee @@subentry With milk and sugar
+@@cindex Coffee @@subentry With doughnuts
+@@cindex Coffee @@subentry Decaffeinated
+@@cindex Coffee @@seealso@{Tea@}
+@end example
+
+When using all three of these advanced commands, @emph{do not}
+place a comma betwen the different parts of the index text. The
+@command{texindex} program, which sorts the index entries and
+generates the indexing formatting commands, takes care of placing
+commas in the correct places for you.
+
+These features are most useful with printed documents created
+with @TeX{}, and when translating Texinfo to Docbook.
@node Index Entries
@section Making Index Entries
@@ -9108,7 +9162,7 @@ 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. Whichever
+convention: capitalize the first word of each entry. Whichever
case convention you use, use it consistently.
In any event, do not ever capitalize a case-sensitive name such as a C
@@ -9125,6 +9179,8 @@ index entries don't see undifferentiated lists. Consider this an
opportunity to make otherwise-identical index entries be more
specific, so readers can more easily find the exact place they are
looking for.
+The advanced indexing features described in @ref{Advanced Indexing}
+can help with this, as well.
When you are making index entries, it is good practice to think of the
@@ -9133,7 +9189,7 @@ different ways people may look for something. Different people
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 ``Indices'' are the general
+``Indices, two-letter names'', since ``Indices'' are 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
@@ -9162,12 +9218,12 @@ process of creating a printed manual, you must run a program called
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.
+Texinfo offers six separate types of predefined index, which suffice in
+most cases. See the other parts of this chapter for information on this,
+as well as advanced indexing commands, 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
@@ -9268,7 +9324,7 @@ would need to enclose every one of them between the braces of
@node @code{@@syncodeindex}
-@subsection @code{@@syncodeindex}: Combining indices using @code{@@code}
+@subsection @code{@@syncodeindex}: Combining Indices Using @code{@@code}
@anchor{syncodeindex}@c old name
@findex syncodeindex
@@ -9294,17 +9350,17 @@ For this purpose, the indices are given two-letter names:
@table @samp
@item cp
-concept index
+Concept index
@item fn
-function index
-@item vr
-variable index
+Function index
@item ky
-key index
+Key index
@item pg
-program index
+Program index
@item tp
-data type index
+Data type index
+@item vr
+Variable index
@end table
Write a @code{@@syncodeindex} command before or shortly after the
@@ -9317,7 +9373,7 @@ following:
@end example
@noindent
-This will cause all entries designated for the function index to merge
+This causes all entries designated for the function index to merge
in with the concept index instead.
To merge both a variables index and a function index into a concept
@@ -9340,7 +9396,7 @@ index into a concept index, all the function names are printed in the
@node @code{@@synindex}
-@subsection @code{@@synindex}: Combining indices
+@subsection @code{@@synindex}: Combining Indices
@anchor{synindex}@c old name
@findex synindex
@@ -9415,17 +9471,17 @@ the predefined indices. For example:
@end group
@end example
-The @code{@@defcodeindex} is like the @code{@@defindex} command,
+The @code{@@defcodeindex} command 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.
+@code{@@code} font by default instead of in 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}).
As mentioned earlier (@pxref{Predefined 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
+a single index in the final document whenever possible (no matter however many
+source indices you use), since then readers have only one place to
look.
When creating an index, @TeX{} creates a file whose extension is the
@@ -11102,8 +11158,7 @@ now produces:
The command @code{@@U@{@var{hex}@}} inserts a representation of the
Unicode character U+@var{hex}. For example, @code{@@U@{0132@}}
-inserts the Dutch `IJ' ligature (poorly shown here as simply the two
-letters `I' and `J').
+inserts the Dutch `IJ' ligature (`@U{0132}').
The @var{hex} value should be at least four hex digits; leading zeros
are @emph{not} added. In general, @var{hex} must specify a valid
@@ -11133,14 +11188,9 @@ entity reference of the form @samp{&#x@var{hex};}, as in
HTML document uses some other encoding (say, Latin@tie{}1) and the
given character is not supported in that encoding.
-@cindex UTF-8, output from @code{@@U}
-In Info and plain text, if the document encoding is specified
-explicitly to be UTF-8, the output will be the UTF-8 representation of
-the character U+@var{hex} (presuming it's a valid character). In all
-other cases, the output is the ASCII sequence @samp{U+@var{hex}}, as
-in the six ASCII characters @samp{U+0132} for the example above.
-
-That's all. No magic!
+In Info and plain text, if the output encoding is not UTF-8, the output
+is the ASCII sequence @samp{U+@var{hex}}, as in the six ASCII characters
+@samp{U+0132} for the example above.
@node Breaks
@@ -15515,29 +15565,30 @@ For more information, see:
@cindex @sortas{cshrc init} @file{.cshrc} initialization file
@cindex Initialization file for @TeX{} input
-@TeX{} needs to know where to find the @file{texinfo.tex} file that the
+@TeX{} needs 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
released for general use is available
from the usual GNU servers and mirrors:
-@smalldisplay
+@display
@uref{http://ftp.gnu.org/gnu/texinfo/texinfo.tex}
@uref{http://ftpmirror.gnu.org/texinfo/texinfo.tex}
-@end smalldisplay
+@end display
The latest development version is available from the Texinfo source
repository:
-@smalldisplay
-@uref{http://svn.savannah.gnu.org/viewvc/trunk/doc/texinfo.tex?root=texinfo&view=log}
-@end smalldisplay
+
+@display
+@uref{http://git.savannah.gnu.org/cgit/texinfo.git/plain/doc/texinfo.tex}
+@end display
@pindex texinfo.tex@r{, installing}
-@file{texinfo.tex} is essentially a standalone file, and compatibility
-is of utmost concern; so, if you need or want to try a newer version
+@file{texinfo.tex} is essentially a standalone file,
+so, if you need or want to try a newer version
than came with your system, it nearly always suffices to download it
-and put it anywhere that @TeX{} will find it (first). You can replace
+and put it anywhere that @TeX{} will find it. You can replace
any existing @file{texinfo.tex} with a newer version (of course saving
the original in case of disaster).
@@ -15558,74 +15609,54 @@ to have the European Computer Modern fonts (e.g., @file{ecrm1000}) and
To use the @code{@@euro} command, you'll need the @samp{feym*} fonts
(e.g., @file{feymr10}). @xref{@code{@@euro}}.
-All of the above files (and a whole lot more) should be installed by
-default in a reasonable @TeX{} installation.
+All of the above files should be installed by default in a reasonable
+@TeX{} installation.
@pindex texinfo.cnf @r{installation}
@cindex Customizing of @TeX{} for Texinfo
@cindex Site-wide Texinfo configuration file
Optionally, you may create a file @file{texinfo.cnf} for site configuration.
-This file is read by @TeX{} at the beginning of a Texinfo file.
-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
+When processing a Texinfo file, @TeX{} looks for this file
+in its search path, which includes the current directory and standard
+installation directories.
+You can use this file for local conventions. 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, 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{.profile} or @file{.cshrc} file.
-
-Whether you use @file{.profile} or @file{.cshrc} 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, respeictvely.
-
-In a @file{.profile} file, you could use the following @code{sh} command
-sequence:
+You can set the @code{TEXINPUTS} environment variable
+to allow @TeX{} to find @file{texinfo.cnf}.
+(This also works for @file{texinfo.tex} and any other file @TeX{}
+might read). For example, if you are using a Bourne shell-compatible shell
+(@code{sh}, @code{bash}, @code{ksh}, @dots{}), your @file{.profile} file
+could contain the lines:
@example
-@group
TEXINPUTS=.:/home/me/mylib:
export TEXINPUTS
-@end group
@end example
-@need 1000
-While in a @file{.cshrc} file, you could use the following @code{csh}
-command sequence:
-
-@example
-setenv TEXINPUTS .:/home/me/mylib:
-@end example
+@noindent
+These settings would cause @TeX{} first to look for an @file{\input} file
+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.)
-On MS-DOS/MS-Windows, you'd do this (note the use of the @samp{;}
+On MS-DOS/MS-Windows, you'd do this like this (note the use of the @samp{;}
character as directory separator, instead of @samp{:}):
@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.)
-
@node Overfull hboxes
@section Overfull ``hboxes''
@@ -16734,6 +16765,7 @@ The sections below give the details for each of these.
* Commands: Customization Variables for @@-Commands.
* Options: Customization Variables and Options.
* HTML: HTML Customization Variables.
+* latex2html: @command{latex2html} Customization Variables.
* Other: Other Customization Variables.
@end menu
@@ -16837,11 +16869,9 @@ meaning of the options.
@vindex NODE_FILES
@option{--node-files} @tab @code{NODE_FILES}
@item
-@vindex OUT
@vindex OUTFILE
@vindex SUBDIR
-@option{--output} @tab @code{OUT}, @code{OUTFILE},
- @code{SUBDIR}
+@option{--output} @tab @code{OUTFILE}, @code{SUBDIR}
@item
@vindex paragraphindent
@option{--paragraph-indent} @tab @code{paragraphindent}
@@ -16938,15 +16968,15 @@ exec texi2any -c TEXINPUT_OUTPUT_FORMAT=textcontent "$@@"
This table gives the customization variables which apply to HTML
output only. A few other customization variable apply to both HTML
-and other output formats; those are given in the next section.
+and other output formats; see @ref{Other Customization Variables}.
@vtable @code
@item AVOID_MENU_REDUNDANCY
-For HTML@. If set, and the menu entry and menu description are the
+If set, and the menu entry and menu description are the
same, then do not print the menu description; default false.
@item AFTER_BODY_OPEN
-For HTML@. If set, the corresponding text will appear at the
+If set, the corresponding text will appear at the
beginning of each HTML file; default unset.
@item AFTER_ABOUT
@@ -16955,7 +16985,7 @@ text will appear at the end of the About element; default unset.
@item AFTER_OVERVIEW
@itemx AFTER_TOC_LINES
-For HTML@. If set, the corresponding text is output after the short
+If set, the corresponding text is output after the short
table of contents for @code{AFTER_OVERVIEW} and after the table of
contents for @code{AFTER_TOC_LINES}; otherwise, a default string is
used. At the time of writing, a @code{</div>} element is closed.
@@ -16966,13 +16996,13 @@ In general, you should set @code{BEFORE_OVERVIEW} if
@item BASEFILENAME_LENGTH
-For HTML@. The maximum length of the base filenames; default 245.
+The maximum length of the base filenames; default 245.
Changing this would make cross-manual references to such long node
names invalid (@pxref{HTML Xref Link Basics}).
@item BEFORE_OVERVIEW
@itemx BEFORE_TOC_LINES
-For HTML@. If set, the corresponding text is output before the short
+If set, the corresponding text is output before the short
table of contents for @code{BEFORE_OVERVIEW} and before the table of
contents for @code{BEFORE_TOC_LINES}, otherwise a default string is
used. At the time of writing, a @code{<div ...>} element is opened.
@@ -16983,196 +17013,153 @@ In general you should set @code{AFTER_OVERVIEW} if
@item BIG_RULE
-For HTML@. Rule used after and before the top element and before
+Rule used after and before the top element and before
special elements, but not for footers and headers; default
@code{<hr>}.
@item BODYTEXT
@cindex @code{<body>} text, customizing
@opindex lang@r{, HTML attribute}
-For HTML, the text appearing in @code{<body>}. By default, sets the
+The text appearing in @code{<body>}. By default, sets the
HTML @code{lang} attribute to the document language
(@pxref{@code{@@documentlanguage}}).
@item CASE_INSENSITIVE_FILENAMES
-For HTML@. Construct output file names as if the filesystem were case
+Construct output file names as if the filesystem were case
insensitive (@pxref{HTML Splitting}); default false.
@item CHAPTER_HEADER_LEVEL
-For HTML@. Header formatting level used for chapter level sectioning
+Header formatting level used for chapter level sectioning
commands; default @samp{2}.
@item CHECK_HTMLXREF
-For HTML@. Check that manuals which are the target of external
+Check that manuals which are the target of external
cross-references (@pxref{Four and Five Arguments}) are present in
@file{htmlxref.cnf} (@pxref{HTML Xref Configuration}); default false.
@item COMPLEX_FORMAT_IN_TABLE
-For HTML@. If set, use tables for indentation of complex formats; default
+If set, use tables for indentation of complex formats; default
false.
@item CSS_LINES
-For HTML@. CSS output, automatically determined by default (@pxref{HTML CSS}).
+CSS output, automatically determined by default (@pxref{HTML CSS}).
@item DATE_IN_HEADER
-For HTML@. Put the document generation date in the header; off by default.
+Put the document generation date in the header; off by default.
@item DEF_TABLE
-For HTML@. If set, a @code{<table>} construction for @code{@@deffn}
+If set, a @code{<table>} construction for @code{@@deffn}
and similar @@-commands is used (looking more like the @TeX{} output),
instead of definition lists; default false.
@item DEFAULT_RULE
-For HTML@. Rule used between element, except before and after the
+Rule used between element, except before and after the
top element, and before special elements, and for footers and headers;
default @code{<hr>}.
@item DO_ABOUT
-For HTML@. If set to 0 never do an About special element;
+If set to 0 never do an About special element;
if set to 1 always do an About special element;
default 0.
@c @xref{Output Elements Defined}.
@item EXTERNAL_DIR
-For HTML@. Base directory for external manuals; default none. It is
+Base directory for external manuals; default none. It is
better to use the general external cross-reference mechanism
(@pxref{HTML Xref Configuration}) than this variable.
@item EXTRA_HEAD
-For HTML@. Additional text appearing within @code{<head>}; default unset.
+Additional text appearing within @code{<head>}; default unset.
@item FOOTNOTE_END_HEADER_LEVEL
-For HTML@. Header formatting level used for the footnotes header with
+Header formatting level used for the footnotes header with
the `end' footnotestyle; default @samp{4}. @xref{Footnote Styles}.
@item FOOTNOTE_SEPARATE_HEADER_LEVEL
-For HTML@. Header formatting level used for the footnotes header with
+Header formatting level used for the footnotes header with
the `separate' footnotestyle; default @samp{4}. @xref{Footnote
Styles}.
@item FRAMES
-For HTML@. If set, a file describing the frame layout is generated,
+If set, a file describing the frame layout is generated,
together with a file with the short table of contents; default false.
@item FRAMESET_DOCTYPE
-For HTML@. Same as DOCTYPE, but for the file containing the frame
+Same as DOCTYPE, but for the file containing the frame
description.
@item HEADER_IN_TABLE
-For HTML@. Use tables for header formatting rather than a simple
+Use tables for header formatting rather than a simple
@code{<div>} element; default false.
@item ICONS
-For HTML@. Use icons for the navigation panel; default false.
+Use icons for the navigation panel; default false.
@item IMAGE_LINK_PREFIX
-For HTML@. If set, the associated value is prepended to the image file
+If set, the associated value is prepended to the image file
links; default unset.
@item INLINE_CONTENTS
-For HTML@. If set, output the contents where the @code{@@contents} and
+If set, output the contents where the @code{@@contents} and
similar @@-commands are located; default true. This is ignored if
@code{@@set*contentsaftertitlepage} is set (@pxref{Contents}).
@item INLINE_CSS_STYLE
-For HTML@. Put CSS directly in HTML elements rather than at the
+Put CSS directly in HTML elements rather than at the
beginning of the output; default false.
@item KEEP_TOP_EXTERNAL_REF
-For HTML@. If set, do not ignore @samp{Top} as the first
+If set, do not ignore @samp{Top} as the first
argument for an external ref to a manual, as is done by default.
@xref{Referring to a Manual as a Whole}.
-@item L2H
-For HTML@. If set, @command{latex2html} is used to convert @code{@@math}
-and @code{@@tex} sections; default false. Best used with @option{--iftex}.
-
-@item L2H_CLEAN
-(Relevant only if @code{L2H} is set.) If set, the intermediate files
-generated in relation with @command{latex2html} are removed; default
-true.
-
-@item L2H_FILE
-(Relevant only if @code{L2H} is set.) If set, the given file is used
-as @command{latex2html}'s init file; default unset.
-
-@item L2H_HTML_VERSION
-(Relevant only if @code{L2H} is set.) The HTML version used in the
-@command{latex2html} call; default unset.
-
-@item L2H_L2H
-(Relevant only if @code{L2H} is set.) The program invoked as
-@command{latex2html}; default is @code{latex2html}.
-
-@item L2H_SKIP
-(Relevant only if @code{L2H} is set.) If set to a true value, the
-actual call to @command{latex2html} is skipped; previously generated
-content is reused instead. If set to 0, the cache is not used at all.
-If set to @samp{undef}, the cache is used for as many @TeX{} fragments as
-possible and for any remaining the command is run. The default is
-@samp{undef}.
-
-@item L2H_TMP
-(Relevant only if @code{L2H} is set.) Set the directory used for
-temporary files. None of the file name components in this directory
-name may start with @samp{.}; otherwise, @command{latex2html} will
-fail (because of @command{dvips}). The default is the empty string,
-which means the current directory.
-
@item MAX_HEADER_LEVEL
-For HTML@. Maximum header formatting level used (higher header
+Maximum header formatting level used (higher header
formatting level numbers correspond to lower sectioning levels);
default @samp{4}.
@item MENU_SYMBOL
-For HTML@. Symbol used in front of menu entries when node names are used
+Symbol used in front of menu entries when node names are used
for menu entries formatting; default @samp{&bull;}.
@item MONOLITHIC
-For HTML@. Output only one file including the table of contents. Set
+Output only one file including the table of contents. Set
by default, but only relevant when the output is not split.
@item NO_CSS
-For HTML@. Do not use CSS; default false. @xref{HTML CSS}.
-
-@item NODE_FILE_EXTENSION
-For HTML@. Extension for node files if @code{NODE_FILENAMES} is set;
-default @samp{html}.
+Do not use CSS; default false. @xref{HTML CSS}.
@item PRE_ABOUT
-For HTML, when an About element is output. If set to a text string,
+Used when an About element is output. If set to a text string,
this text will appear at the beginning of the About element. If set
to a reference on a subroutine, the result of the subroutine call will
appear at the beginning of the About element. If not set (the
default), default text is used.
@item PRE_BODY_CLOSE
-For HTML@. If set, the given text will appear at the footer of each
+If set, the given text will appear at the footer of each
HTML file; default unset.
@item PROGRAM_NAME_IN_FOOTER
-For HTML@. If set, output the program name and miscellaneous related
+If set, output the program name and miscellaneous related
information in the page footers; default false.
@item SECTION_NAME_IN_TITLE
-For HTML@. If set, when output is split, use the argument of the
-chapter structuring command (e.g., @code{@@chapter} or @code{@@section})
+If set, when output is split, use the argument of the chapter
+structuring command (e.g., @code{@@chapter} or @code{@@section})
in the @code{<title>} instead of the argument to @code{@@node}.
-@item SHORTEXTN
-For HTML@. If set, use @samp{.htm} as extension; default false.
-
@item SHOW_TITLE
-For HTML@. If set, output the title at the beginning of the document;
+If set, output the title at the beginning of the document;
default true.
@item SIMPLE_MENU
-For HTML@. If set, use a simple preformatted style for the menu,
+If set, use a simple preformatted style for the menu,
instead of breaking down the different parts of the menu; default false.
@xref{Menu Parts}.
@item TOC_LINKS
-For HTML@. If set, links from headings to toc entries are created;
+If set, links from headings to toc entries are created;
default false.
@item TOP_FILE
@@ -17181,60 +17168,55 @@ set appropriately, if necessary. This is used to override the default,
and is, in general, only taken into account when output is split, and
for HTML@.
-@item TOP_NODE_FILE
-For HTML@. File name used for the Top node, if @code{NODE_FILENAMES}
-is set; default is @code{index}.
-
@item TOP_NODE_FILE_TARGET
-For HTML@. File name used for the Top node in cross-references;
-default is @code{index}.
+File name used for the Top node in cross-references;
+default is @code{index.html}.
@item TOP_NODE_UP_URL
-For HTML@. A url used for @code{(dir)} references; the default is
-@code{undef}, meaning that the normal rules apply, typically leading
-to a link to @samp{dir.html} from an implicit or explicit reference to
-@samp{(dir)} (@pxref{HTML Xref}). For more about the Top node
-pointers, @pxref{First Node}. For overriding the Up pointer in other
-formats, see @code{TOP_NODE_UP} in @ref{Other Customization
-Variables}.
+A url used for Top node up references; the default is
+@code{undef}, in that case no Top node Up reference is generated.
+For more about the Top node pointers, @pxref{First Node}. For
+overriding the Up pointer name in cas @code{TOP_NODE_UP_URL} is set
+and for other formats, see @code{TOP_NODE_UP} in
+@ref{Other Customization Variables}.
@item USE_ACCESSKEY
@cindex @code{accesskey}, customization variable for
-For HTML@. Use @code{accesskey} in cross-references; default true.
+Use @code{accesskey} in cross-references; default true.
@item USE_ISO
-For HTML@. Use entities for doubled single-quote characters
+Use entities for doubled single-quote characters
(@pxref{Inserting Quotation Marks}), and @samp{---} and @samp{--}
(@pxref{Conventions}); default true.
@item USE_LINKS
@cindex @code{<link>} HTML tag, in @code{<head>}
@cindex @code{<head>} HTML tag, and @code{<link>}
-For HTML@. Generate @code{<link>} elements in the HTML @code{<head>}
+Generate @code{<link>} elements in the HTML @code{<head>}
output; default true.
@item USE_REL_REV
-For HTML@. Use @code{rel} in cross-references; default true.
+Use @code{rel} in cross-references; default true.
@item VERTICAL_HEAD_NAVIGATION
-For HTML@. If set, a vertical navigation panel is used; default false.
+If set, a vertical navigation panel is used; default false.
@item WORDS_IN_PAGE
@cindex Navigation panel, bottom of page
@cindex Navigation footer
-For HTML, with output split at nodes. Specifies the approximate
+When output is split by nodes, specifies the approximate
minimum page length at which a navigation panel is placed at the
bottom of a page. To avoid ever having the navigation buttons at the
bottom of a page, set this to a sufficiently large number. The
default is 300.
@item XREF_USE_FLOAT_LABEL
-For HTML@. If set, for the float name in cross-references, use the
+If set, for the float name in cross-references, use the
float label instead of the type followed by the float number
(@pxref{@code{@@float}}). The default is off.
@item XREF_USE_NODE_NAME_ARG
-For HTML@. Only relevant for cross-reference commands with no cross
+Only relevant for cross-reference commands with no cross
reference name (second argument). If set to@tie{}1, use the node name
(first) argument in cross-reference @@-commands for the text displayed
as the hyperlink. If set to@tie{}0, use the node name if
@@ -17246,6 +17228,53 @@ otherwise use the node name or section name depending on
@end vtable
+@node @command{latex2html} Customization Variables
+@subsection @command{latex2html} Customization Variables
+
+This table lists the customization variables which can be used when
+@command{latex2html} is being used.
+
+@vtable @code
+@item L2H
+For HTML@. If set, @command{latex2html} is used to convert @code{@@math}
+and @code{@@tex} sections; default false. Best used with @option{--iftex}.
+
+@item L2H_CLEAN
+(Relevant only if @code{L2H} is set.) If set, the intermediate files
+generated in relation with @command{latex2html} are removed; default
+true.
+
+@item L2H_FILE
+(Relevant only if @code{L2H} is set.) If set, the given file is used
+as @command{latex2html}'s init file; default unset.
+
+@item L2H_HTML_VERSION
+(Relevant only if @code{L2H} is set.) The HTML version used in the
+@command{latex2html} call; default unset.
+
+@item L2H_L2H
+(Relevant only if @code{L2H} is set.) The program invoked as
+@command{latex2html}; default is @code{latex2html}.
+
+@item L2H_SKIP
+(Relevant only if @code{L2H} is set.) If set to a true value, the
+actual call to @command{latex2html} is skipped; previously generated
+content is reused instead. If set to 0, the cache is not used at all.
+If set to @samp{undef}, the cache is used for as many @TeX{} fragments as
+possible and for any remaining the command is run. The default is
+@samp{undef}.
+
+@item L2H_TMP
+(Relevant only if @code{L2H} is set.) Set the directory used for
+temporary files. None of the file name components in this directory
+name may start with @samp{.}; otherwise, @command{latex2html} will
+fail (because of @command{dvips}). The default is the empty string,
+which means the current directory.
+
+@end vtable
+
+
+
@node Other Customization Variables
@subsection Other Customization Variables
@@ -17346,17 +17375,6 @@ default true. Do not warn about index entries, since parsing problems
there don't prevent navigation; readers can still relatively easily
find their way to the node in question.
-@item INPUT_ENCODING_NAME
-Normalized encoding name suitable for output. Should be a usable
-charset name in HTML, typically one of the preferred IANA encoding
-names. You should not need to use this variable, since it is set by
-@code{@@documentencoding} (@pxref{@code{@@documentencoding}}).
-
-@item INPUT_PERL_ENCODING
-Perl encoding used to process the Texinfo source. You should not need
-to use that variable, since it is set by @code{@@documentencoding}
-(@pxref{@code{@@documentencoding}}).
-
@item MAX_MACRO_CALL_NESTING
The maximal number of recursive calls of @@-commands defined through
@code{@@rmacro}; default 100000. The purpose of this variable is to
@@ -17371,11 +17389,6 @@ If set, do not use @code{@@setfilename} to set the document name;
instead, base the output document name only on the input file name.
The default is false.
-@item NODE_FILENAMES
-If set, node names are used to construct file names. By default, it
-is set if the output is split by node, or if @code{NODE_FILES} is set
-and the output is split in any way.
-
@item NODE_NAME_IN_INDEX
If set, use node names in index entries, otherwise prefer section names;
default true.
@@ -17398,12 +17411,11 @@ output uses a Unicode left quote.
Normalized encoding name used for output files. Should be a usable
charset name in HTML, typically one of the preferred IANA encoding
names. By default, if an input encoding is set (typically through
-@code{@@documentencoding} or @code{INPUT_ENCODING_NAME}), this
-information is used to set the output encoding name. If no input
-encoding is specified, the default output encoding name may be set by
-the output format. In particular, the XML-based formats use
-@code{utf-8} for @code{OUTPUT_ENCODING_NAME} if the encoding is not
-otherwise specified. @xref{@code{@@documentencoding}}.
+@code{@@documentencoding}), this information is used to set the output
+encoding name. If no input encoding is specified, the default output
+encoding name may be set by the output format. In particular, the
+XML-based formats use @code{utf-8} for @code{OUTPUT_ENCODING_NAME} if
+the encoding is not otherwise specified. @xref{@code{@@documentencoding}}.
@item OVERVIEW_LINK_TO_TOC
If set, the cross-references in the Overview link to the corresponding
@@ -17424,22 +17436,12 @@ The output file prefix, which is prepended to some output file names.
By default it is set by @code{@@setfilename} or from the input file
(@pxref{@code{@@setfilename}}). How this value is used depends on the
value of other customization variables or command line options, such
-as whether the output is split and @code{NODE_FILENAMES}. The default
-is unset.
+as whether the output is split. The default is unset.
@item PROGRAM
Name of the program used. By default, it is set to the name of the
program launched, with a trailing @samp{.pl} removed.
-@item RENAMED_NODES_FILE
-If set, use the value for the renamed nodes description file. If not
-set, the file is @file{@var{doc_basename}-noderename.cnf}.
-@xref{HTML Xref Link Preservation}.
-
-@item RENAMED_NODES_REDIRECTIONS
-If set, create redirection files for renamed nodes. Set by default
-when generating HTML@.
-
@item SHOW_MENU
@vindex HEADERS
@opindex --no-headers
@@ -17492,9 +17494,11 @@ For stripped text content output (i.e., when
also output comments. Default false.
@item TOP_NODE_UP
-Up node for the Top node; default @samp{(dir)}. For overriding the
-url in HTML output, see @code{TOP_NODE_UP_URL} in @ref{HTML
-Customization Variables}.
+Up node for the Top node; default @samp{(dir)}. This node name is
+supposed to be already formatted for the output format. In HTML
+can be used in attribute, so should not contain any element. Used for
+HTML output only if @code{TOP_NODE_UP_URL} is set to override the url,
+see @code{TOP_NODE_UP_URL} in @ref{HTML Customization Variables}.
@item TREE_TRANSFORMATIONS
The associated value is a comma separated list of transformations that
@@ -19004,7 +19008,6 @@ The algorithm was primarily devised by Patrice Dumas in 2003--04.
* 8-bit Expansion: HTML Xref 8-bit Character Expansion.
* Mismatch: HTML Xref Mismatch.
* Configuration: HTML Xref Configuration. htmlxref.cnf.
-* Preserving links: HTML Xref Link Preservation. MANUAL-noderename.cnf.
@end menu
@@ -19488,67 +19491,6 @@ usual. You can get the latest version from
@url{http://ftpmirror.gnu.org/@/texinfo/@/htmlxref.cnf}.
-@node HTML Xref Link Preservation
-@subsection HTML Cross-reference Link Preservation: @var{manual}@file{-noderename.cnf}
-
-@pindex noderename.cnf
-@pindex @var{manual}-noderename.cnf
-@cindex HTML cross-reference link preservation
-@cindex Preserving HTML links to old nodes
-@cindex Old nodes, preserving links to
-@cindex Renaming nodes, and preserving links
-@cindex Links, preserving to renamed nodes
-@cindex Node renaming, and preserving links
-
-Occasionally changes in a program require removing (or renaming) nodes
-in the manual in order to have the best documentation. Given the
-nature of the web, however, links may exist anywhere to such a removed
-node (renaming appears the same as removal for this purpose), and it's
-not ideal for those links to simply break.
-
-The preferred approach to preserving links to deleted or renamed nodes
-is to use anchors (@pxref{@code{@@anchor}}), as this works with all
-output formats, including Info.
-However, Texinfo provides an alternative method to do this for HTML
-output via a separate file which specifes old
-node names and the new nodes to which the old names should be
-redirected.
-This method is deprecated, and support for these files will be removed
-in future Texinfo releases. It is specific to HTML and supporting
-@@-commands in node names in these files in practice complicates the
-implementation in @command{texi2any}.
-
-@vindex RENAMED_NODES_FILE
-The @dfn{renamed nodes file} is named
-@var{manual}@file{-noderename.cnf}, where
-@var{manual} is the base name of the manual.
-For example, the manual
-@file{texinfo.texi} would be supplemented by a file
-@file{texinfo-noderename}.cnf. (This name can be overridden by
-setting the @file{RENAMED_NODES_FILE} customization variable;
-@pxref{Customization Variables}).
-
-The file is read in pairs of lines, as follows:
-
-@example
-@var{old-node-name}
-@@@@@{@} @var{new-node-name}
-@end example
-
-The usual conversion from Texinfo node names to HTML names is applied;
-see this entire section for details (@pxref{HTML Xref}). The unusual
-@samp{@@@@@{@}} separator is used because it is not a valid Texinfo
-construct, so can't appear in the node names.
-
-The effect is that @command{makeinfo} generates a redirect from
-@var{old-node-name} to @var{new-node-name} when producing HTML output.
-Thus, external links to the old node are preserved.
-
-Lines consisting only of whitespace are ignored. Comments are
-indicated with a @samp{@@c} at the beginning of a line, optionally
-preceded by whitespace.
-
-
@node @@-Command Details
@appendix @@-Command Details
@@ -21572,14 +21514,15 @@ plain text output, where it's not clear what should be done.
@item
@pindex automake@r{, and version info}
@vindex UPDATED @r{Automake variable}
+@vindex UPDATED-MONTH @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,,, 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}).
+automatically by Automake (@pxref{Texinfo,,, automake, GNU Automake}).
+It sets the @samp{VERSION}, @samp{UPDATED} and @samp{UPDATED-MONTH}
+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
diff --git a/macros/texinfo/texinfo/doc/tp_api/Makefile.in b/macros/texinfo/texinfo/doc/tp_api/Makefile.in
index f6f0e281ad..8eddd0f905 100644
--- a/macros/texinfo/texinfo/doc/tp_api/Makefile.in
+++ b/macros/texinfo/texinfo/doc/tp_api/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -289,6 +289,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -444,6 +445,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -511,11 +513,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -581,6 +585,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -601,6 +606,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -635,6 +641,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -649,6 +656,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -727,8 +735,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -744,7 +750,6 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
# Use the programs built in our distribution, taking account of possible
@@ -753,8 +758,8 @@ MAKEINFO = $(PERL) -I $(top_srcdir)/tp/ $(top_srcdir)/tp/texi2any.pl
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -844,6 +849,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -877,6 +883,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -889,6 +896,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -907,6 +915,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -1010,6 +1019,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Common.texi b/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Common.texi
index aa97e56374..772afd7522 100644
--- a/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Common.texi
+++ b/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Common.texi
@@ -355,6 +355,14 @@ Return true if the @emph{$name} is a known tree transformation name
that may be passed with @code{TREE_TRANSFORMATIONS} to modify a texinfo
tree.
+@item collect_commands_in_tree($tree, $commands_list)
+@anchor{Texinfo::Common collect_commands_in_tree($tree@comma{} $commands_list)}
+
+Returns a hash reference with keys @@-commands names specified
+in the @emph{$commands_list} array reference and values arrays of
+tree elements corresponding to those @@-command found in @emph{$tree}
+by traversing the tree.
+
@end table
@node Texinfo::Common SEE ALSO
diff --git a/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Convert-Converter.texi b/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Convert-Converter.texi
index ca99e329cf..6bc88b1215 100644
--- a/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Convert-Converter.texi
+++ b/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Convert-Converter.texi
@@ -245,8 +245,8 @@ Patrice Dumas, <pertusus@@free.fr>
Hey! @strong{The above document had some coding errors, which are explained below:}
@table @asis
-@item Around line 1760:
-@anchor{Texinfo::Convert::Converter Around line 1760:}
+@item Around line 1727:
+@anchor{Texinfo::Convert::Converter Around line 1727:}
'=item' outside of any '=over'
diff --git a/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Parser.texi b/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Parser.texi
index 26fadf340c..332281ba6f 100644
--- a/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Parser.texi
+++ b/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Parser.texi
@@ -442,17 +442,6 @@ A string, the command name associated with @code{@@clickstyle}.
A string corresponding to a document language set by @code{@@documentlanguage}.
-@item INPUT_ENCODING_NAME
-@anchor{Texinfo::Parser INPUT_ENCODING_NAME}
-
-@item INPUT_PERL_ENCODING
-@anchor{Texinfo::Parser INPUT_PERL_ENCODING}
-
-@code{INPUT_ENCODING_NAME} string is the encoding name as set
-by @code{@@documentencoding}.
-@code{INPUT_PERL_ENCODING} string is a corresponding perl encoding name.
-In general those two strings should be set simultaneously.
-
@item indices
@anchor{Texinfo::Parser indices}
diff --git a/macros/texinfo/texinfo/doc/txi-ja.tex b/macros/texinfo/texinfo/doc/txi-ja.tex
index 0374efe1d3..c80a2f0dc6 100644
--- a/macros/texinfo/texinfo/doc/txi-ja.tex
+++ b/macros/texinfo/texinfo/doc/txi-ja.tex
@@ -191,21 +191,6 @@
#1%
\parseargline\empty% Insert the \empty token, see \finishparsearg below.
}
- % Re-define texinfo.tex's \comment
- \def\comment{\begingroup \catcode`\^^M=\active%
- \ifx\ltjlineendcomment\thisisundefined
- % Ignore U+FFFFF for LuaTeX-ja <= 20160208.0
- \catcode"FFFFF=9%
- \else
- % Ignore the character \ltjlineendcomment for LuaTeX-ja > 20160208.0
- \catcode\ltjlineendcomment=9%
- \fi
- \catcode`\@=\other \catcode`\{=\other \catcode`\}=\other\commentxxx}%
- % Re-let \comment related macros
- \let\setfilename=\comment
- \let\dircategory=\comment
- \let\definfoenclose=\comment
- \let\footnotestyle=\comment
% Re-define texinfo.tex's \c
\def\c{\begingroup \catcode`\^^M=\active%
\ifx\ltjlineendcomment\thisisundefined
@@ -218,7 +203,12 @@
\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other%
\cxxx}
% Re-let \c related macro
- \let\texinfoc=\c
+ \let\comment=\c
+ % Re-let \comment related macros
+ \let\setfilename=\comment
+ \let\dircategory=\comment
+ \let\definfoenclose=\comment
+ \let\footnotestyle=\comment
\fi % LuaTeX
%
diff --git a/macros/texinfo/texinfo/doc/version-stnd.texi b/macros/texinfo/texinfo/doc/version-stnd.texi
index bd8d35fb8b..f73a179aa9 100644
--- a/macros/texinfo/texinfo/doc/version-stnd.texi
+++ b/macros/texinfo/texinfo/doc/version-stnd.texi
@@ -1,4 +1,4 @@
-@set UPDATED 16 February 2019
-@set UPDATED-MONTH February 2019
-@set EDITION 6.6
-@set VERSION 6.6
+@set UPDATED 23 September 2019
+@set UPDATED-MONTH September 2019
+@set EDITION 6.7
+@set VERSION 6.7
diff --git a/macros/texinfo/texinfo/doc/version.texi b/macros/texinfo/texinfo/doc/version.texi
index bd8d35fb8b..f73a179aa9 100644
--- a/macros/texinfo/texinfo/doc/version.texi
+++ b/macros/texinfo/texinfo/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 16 February 2019
-@set UPDATED-MONTH February 2019
-@set EDITION 6.6
-@set VERSION 6.6
+@set UPDATED 23 September 2019
+@set UPDATED-MONTH September 2019
+@set EDITION 6.7
+@set VERSION 6.7