[texinfo-doc-nonfree] 01/03: New upstream version 6.4.0
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texinfo-doc-nonfree.
commit 942445c92036712994a76d879845b43281db0c95
Author: Norbert Preining <preining@debian.org>
Date: Sat Jun 24 11:38:47 2017 +0900
New upstream version 6.4.0
---
info-stnd.texi | 327 ++++++++++++++++++++++--------------------------------
texinfo.texi | 158 ++++++++++++++++----------
version-stnd.texi | 8 +-
version.texi | 8 +-
4 files changed, 243 insertions(+), 258 deletions(-)
diff --git a/info-stnd.texi b/info-stnd.texi
index d7934a9..34c7174 100644
--- a/info-stnd.texi
+++ b/info-stnd.texi
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
-@c $Id: info-stnd.texi 6989 2016-02-06 10:38:22Z gavin $
+@c $Id: info-stnd.texi 7808 2017-05-21 11:13:39Z gavin $
@c We must \input texinfo.tex instead of texinfo, otherwise make
@c distcheck in the Texinfo distribution fails, because the texinfo Info
@c file is made first, and texi2dvi must include . first in the path.
@@ -19,7 +19,7 @@ This manual is for Stand-alone GNU Info (version @value{VERSION},
Copyright @copyright{} 1992, 1993, 1996, 1997, 1998, 1999, 2001,
2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-2013, 2014, 2015, 2016 Free Software Foundation, Inc.
+2013, 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -280,8 +280,11 @@ to select one. This menu node can be brought back at any time by
pressing @kbd{C-x f}. If there is only one match, @command{info}
starts as usual.
-The @option{--index-search} and @option{--node} options cannot be used
-together with this option.
+When used with the @option{--index-search} option, @command{info}
+displays a menu of matching index entries (just as the
+@code{virtual-index} command does; see @ref{Index Commands}).
+
+The @option{--node} option cannot be used together with this option.
@anchor{--apropos}
@item --apropos=@var{string}
@@ -411,6 +414,10 @@ status. This can be used from another program as a way to provide
online help, or as a quick way of starting to read an Info file at a
certain node when you don't know the exact name of that node.
+When used with the @option{--all} option, @command{info}
+displays a menu of matching index entries (just as the
+@code{virtual-index} command does; see @ref{Index Commands}).
+
This command can also be invoked from inside Info; @pxref{Searching
Commands}.
@@ -545,9 +552,9 @@ Prints the version information of Info and exits.
@cindex vi-like key bindings
@cindex Less-like key bindings
This option binds functions to keys differently, to emulate the key
-bindings of @code{vi} and Less. The default key bindings are generally
-modeled after Emacs. (@xref{Custom Key Bindings} for a more general way
-of altering GNU Info's key bindings.)
+bindings of @code{vi} and Less. The bindings activated by this option
+are documented in @ref{@t{infokey} format}. (@xref{Custom Key Bindings}
+for a more general way of altering GNU Info's key bindings.)
@item --where
@itemx --location
@@ -572,15 +579,15 @@ settings.
@cindex moving the cursor
GNU Info has several commands which allow you to move the cursor about
-the screen. The notation used in this manual to describe keystrokes
-is the same as the notation used within the Emacs manual, and the GNU
-Readline manual. @xref{User Input,,, emacs, The GNU Emacs Manual}
-if you are unfamiliar with the notation. @footnote{Here's a short
-summary. @kbd{C-@var{x}} means press the @kbd{CTRL} key and the
+the screen.
+The notation used in this manual to describe keystrokes
+is the same as the notation used within the Emacs manual
+(@pxref{User Input,,, emacs, The GNU Emacs Manual}).
+@kbd{C-@var{x}} means press the @kbd{CTRL} key and the
key @var{x}. @kbd{M-@var{x}} means press the @kbd{META} key and
the key @var{x}. On many terminals the @kbd{META} key is known as
the @kbd{ALT} key. @kbd{SPC} is the space bar. The other keys are
-usually called by the names imprinted on them.}
+usually called by the names imprinted on them.
The following table lists the basic cursor movement commands in Info.
Each entry consists of the key sequence you should type to execute the
@@ -658,11 +665,9 @@ Move the cursor backward a word.
@item @kbd{M-<} (@code{beginning-of-node})
@itemx @kbd{C-@key{Home}} (on DOS/Windows only)
@itemx @kbd{b}
-@itemx @kbd{M-b}, vi-like operation
@kindex b, in Info windows
@kindex M-<
@kindex C-Home
-@kindex M-b, vi-like operation
@findex beginning-of-node
Move the cursor to the start of the current node.
@@ -694,12 +699,6 @@ current paragraph you are reading is visible on the screen. The
commands detailed in this section are used to shift which part of the
current node is visible on the screen.
-Scrolling commands are bound differently when @samp{--vi-keys}
-operation is in effect (@pxref{--vi-keys}). These key bindings are
-designated with ``vi-like operation''. @xref{Custom Key Bindings}
-for information on arbitrarily customizing key bindings and variable
-settings.
-
@table @asis
@item @key{SPC} (@code{scroll-forward})
@kindex SPC, in Info windows
@@ -717,29 +716,18 @@ redisplaying almost a completely new screenful of lines. If you are at
the end of a node, @key{SPC} takes you to the ``next'' node, so that you can
read an entire manual from start to finish by repeating @key{SPC}.
-The default scroll size is one screenful, but it can be changed by
-invoking the (@code{scroll-forward-page-only-set-window}) command,
-@samp{z} under @samp{--vi-keys}, with a numeric argument.
-
@kindex PageDown
The @key{NEXT} key is known as the @key{PageDown} key on some
keyboards.
@item @kbd{C-v} (@code{scroll-forward-page-only})
-@itemx @kbd{C-f}, vi-like operation
-@itemx @kbd{f}, vi-like operation
-@itemx @kbd{M-SPC}, vi-like operation
@kindex C-v
-@kindex C-f, vi-like operation
-@kindex f, vi-like operation
-@kindex M-SPC, vi-like operation
@findex scroll-forward-page-only
Shift the text in this window up. This is identical to the @key{SPC}
operation above, except that it never scrolls beyond the end of the
current node.
-@item @kbd{z} (@code{scroll-forward-page-only-set-window}, vi-like operation)
-@kindex z, vi-like operation
+@item @code{M-x scroll-forward-page-only-set-window}
@findex scroll-forward-page-only-set-window
Scroll forward, like with @kbd{C-v}, but if a numeric argument is
specified, it becomes the default scroll size for subsequent
@@ -756,8 +744,8 @@ Shift the text in this window down. The inverse of
If you are at the start of a node, @key{DEL} takes you to the
``previous'' node, so that you can read an entire manual from finish to
start by repeating @key{DEL}. The default scroll size can be changed by
-invoking the (@code{scroll-backward-page-only-set-window}) command,
-@samp{w} under @samp{--vi-keys}, with a numeric argument.
+invoking the (@code{scroll-backward-page-only-set-window}) command with
+a numeric argument.
@kindex BS (backspace)
If your keyboard lacks the @key{DEL} key, look for a key called
@@ -769,73 +757,43 @@ The @key{PREVIOUS} key is the @key{PageUp} key on many keyboards. Emacs
refers to it by the name @key{PRIOR}.
@item @kbd{M-v} (@code{scroll-backward-page-only})
-@itemx @kbd{b}, vi-like operation
-@itemx @kbd{C-b}, vi-like operation
@kindex M-v
-@kindex b, vi-like operation
-@kindex C-b, vi-like operation
@findex scroll-backward-page-only
Shift the text in this window down. The inverse of
@code{scroll-forward-page-only}. Does not scroll beyond the start of
the current node. The default scroll size can be changed by invoking
-the @code{scroll-backward-page-only-set-window} command, @samp{w} under
-@samp{--vi-keys}, with a numeric argument.
+the @code{scroll-backward-page-only-set-window} command with a numeric
+argument.
-@item @kbd{w} (@code{scroll-backward-page-only-set-window}, vi-like operation)
-@kindex w, vi-like operation
+@item @code{M-x scroll-backward-page-only-set-window}
@findex scroll-backward-page-only-set-window
Scroll backward, like with @kbd{M-v}, but if a numeric argument is
specified, it becomes the default scroll size for subsequent
@code{scroll-forward} and @code{scroll-backward} commands.
-@item @kbd{C-n} (@code{down-line}, vi-like operation)
-@itemx @kbd{C-e}, vi-like operation
-@itemx @key{RET}, vi-like operation
-@itemx @key{LFD}, vi-like operation
-@itemx @key{DOWN}, vi-like operation
-@kindex C-n, vi-like operation
-@kindex C-e, vi-like operation
-@kindex RET, vi-like operation
-@kindex LFD, vi-like operation
-@kindex DOWN, vi-like operation
+@item @code{M-x down-line}
@findex down-line
Scroll forward by one line. With a numeric argument, scroll forward
that many lines.
-@item @kbd{C-p} (@code{up-line}, vi-like operation)
-@itemx @key{UP}, vi-like operation
-@itemx @kbd{y}, vi-like operation
-@itemx @kbd{k}, vi-like operation
-@itemx @kbd{C-k}, vi-like operation
-@itemx @kbd{C-y}, vi-like operation
-@kindex C-p, vi-like operation
-@kindex UP, vi-like operation
-@kindex y, vi-like operation
-@kindex k, vi-like operation
-@kindex C-k, vi-like operation
-@kindex C-y, vi-like operation
+@item @code{M-x up-line}
@findex up-line
Scroll backward one line. With a numeric argument, scroll backward that
many lines.
-@item @kbd{d} (@code{scroll-half-screen-down}, vi-like operation)
-@itemx @kbd{C-d}, vi-like operation
-@kindex d, vi-like operation
-@kindex C-d, vi-like operation
+@item @code{M-x scroll-half-screen-down}
@findex scroll-half-screen-down
Scroll forward by half of the screen size. With a numeric argument,
scroll that many lines. If an argument is specified, it becomes the new
-default number of lines to scroll for subsequent @samp{d} and @samp{u}
-commands.
+default number of lines to scroll for subsequent
+@code{scroll-half-screen-down} and @code{scroll-half-screen-up} commands.
-@item @kbd{u} (@code{scroll-half-screen-up}, vi-like operation)
-@itemx @kbd{C-u}, vi-like operation
-@kindex u, vi-like operation
-@kindex C-u, vi-like operation
+@item @code{M-x scroll-half-screen-up}
@findex scroll-half-screen-up
Scroll back by half of the screen size. With a numeric argument,
scroll that many lines. If an argument is specified, it becomes the new
-default number of lines to scroll for subsequent @samp{u} and @samp{d}
+default number of lines to scroll for subsequent
+@code{scroll-half-screen-down} and @code{scroll-half-screen-up}
commands.
@end table
@@ -883,9 +841,7 @@ This section details the numerous Info commands which select a new node
to view in the current window.
The most basic node commands are @samp{n}, @samp{p}, @samp{u}, and
-@samp{l}. Note that the commands to select nodes are mapped differently
-when @samp{--vi-keys} is in effect; these keybindings are designated
-below as ``vi-like operation''.
+@samp{l}.
When you are viewing a node, the top line of the node contains some Info
@dfn{pointers} which describe where the next, previous, and up nodes
@@ -895,10 +851,8 @@ when you use the following commands:
@table @asis
@item @kbd{n} (@code{next-node})
@itemx @kbd{C-@key{NEXT}} (on DOS/Windows only)
-@itemx @kbd{C-x @kbd{n}}, vi-like operation
@kindex n
@kindex C-NEXT
-@kindex C-x n, vi-like operation
@findex next-node
Select the `Next' node.
@@ -919,10 +873,8 @@ keyboards.
@item @kbd{u} (@code{up-node})
@itemx @kbd{C-@key{UP}} (an arrow key on DOS/Windows only)
-@itemx @kbd{C-x @kbd{u}}, vi-like operation
@kindex u
@kindex C-UP
-@kindex C-x u, vi-like operation
@findex up-node
Select the `Up' node.
@end table
@@ -941,10 +893,8 @@ entire history of that window is discarded.
@table @asis
@item @kbd{l} (@code{history-node})
@itemx @kbd{C-@key{CENTER}} (on DOS/Windows only)
-@itemx @kbd{'}, vi-like operation
@kindex l
@kindex C-CENTER
-@kindex ', vi-like operation
@findex history-node
Pop the most recently selected node in this window from the node
history.
@@ -955,16 +905,12 @@ selected nodes; they are @samp{t} and @samp{d}.
@table @asis
@item @kbd{t} (@code{top-node})
-@itemx @kbd{M-t}, vi-like operation
@kindex t
-@kindex M-t, vi-like operation
@findex top-node
Select the node @samp{Top} in the current Info file.
@item @kbd{d} (@code{dir-node})
-@itemx @kbd{M-d}, vi-like operation
@kindex d
-@kindex M-d, vi-like operation
@findex dir-node
Select the directory node (i.e., the node @samp{(dir)}).
@end table
@@ -974,9 +920,7 @@ of a different node in the current window:
@table @asis
@item @kbd{<} (@code{first-node})
-@itemx @kbd{g}, vi-like operation
@kindex <
-@kindex g, vi-like operation
@findex first-node
Selects the first node which appears in this file. This node is most
often @samp{Top}, but it does not have to be. With a numeric argument
@@ -984,9 +928,7 @@ often @samp{Top}, but it does not have to be. With a numeric argument
argument of zero is the same as the argument of 1.
@item @kbd{>} (@code{last-node})
-@itemx @kbd{G}, vi-like operation
@kindex >
-@kindex G, vi-like operation
@findex last-node
Select the last node which appears in this file. With a numeric argument
@var{N}, select the @var{N}th node (the first node is node 1). An
@@ -996,16 +938,16 @@ node.
@item @kbd{]} (@code{global-next-node})
@kindex ]
@findex global-next-node
-Move forward or down through node structure. If the node that you are
-currently viewing has a @samp{Next} pointer, that node is selected.
-Otherwise, if this node has a menu, the first menu item is selected. If
-there is no @samp{Next} and no menu, the same process is tried with the
-@samp{Up} node of this node.
+Move forward through the node structure. If the node that you are
+currently viewing has a menu, select the first menu item. Otherwise,
+if this node has a @samp{Next} pointer, follow it. If there is no menu
+and no @samp{Next} pointer, then follow @samp{Up} pointers until there
+is a @samp{Next} pointer, and then follow it.
@item @kbd{[} (@code{global-prev-node})
@kindex [
@findex global-prev-node
-Move backward or up through node structure. If the node that you are
+Move backward through the node structure. If the node that you are
currently viewing has a @samp{Prev} pointer, that node is selected.
Otherwise, if the node has an @samp{Up} pointer, that node is selected,
and if it has a menu, the last item in the menu is selected.
@@ -1018,16 +960,11 @@ You can get the same behavior as @code{global-next-node} and
@table @asis
@anchor{goto-node}
@item @kbd{g} (@code{goto-node})
-@itemx @kbd{C-x @kbd{g}}, vi-like operation
@kindex g
-@kindex C-x g, vi-like operation
@findex goto-node
-Read the name of a node and select it. While reading the node name,
-completion (@pxref{The Echo Area, completion}) is only done for the
-nodes which reside in one of the Info files that were loaded in the
-current Info session; if the desired node resides in some other file,
-you must type the node exactly as it appears in that Info file, and you
-must include the Info file of the other file. For example,
+Read the name of a node and select it. If the desired node resides in
+some other file, you must type the node as it appears in that Info file,
+and include the name of the other file. For example,
@example
@code{g(emacs)Buffers}
@@ -1036,11 +973,13 @@ must include the Info file of the other file. For example,
@noindent
finds the node @samp{Buffers} in the Info file @file{emacs}.
+While reading the node name, completion (@pxref{The Echo Area,
+completion}) is only done for the nodes which reside in one of the Info
+files that were loaded in the current Info session.
+
@anchor{goto-invocation}
@item @kbd{O} (@code{goto-invocation})
-@itemx @kbd{I}, vi-like operation
@kindex O
-@kindex I, vi-like operation
@findex goto-invocation
@cindex finding the Invocation node
Read the name of a program and look for a node in the current Info file
@@ -1159,10 +1098,8 @@ occurrence of the string. Negative arguments search forward.
@anchor{repeated-search}
@item @kbd{C-x @kbd{n}} (@code{search-next})
@itemx @kbd{@}}
-@itemx @kbd{n}, vi-like operation
@kindex C-x n
@kindex @}
-@kindex n, vi-like operation
@findex search-next
@cindex repeated search
Search forwards for the string used for the last search command.
@@ -1177,10 +1114,8 @@ lines.
@item @kbd{C-x @kbd{N}} (@code{search-previous})
@itemx @kbd{@{}
-@itemx @kbd{N}, vi-like operation
@kindex C-x N
@kindex @{
-@kindex n, vi-like operation
@findex search-previous
Just like @code{search-next}, but in reverse. You can use
@code{search-next} and @code{search-previous} together to move forward
@@ -1198,7 +1133,7 @@ Toggle between using regular expressions and literal strings for
searching. Info uses so-called `extended' regular expression syntax
(@pxref{Regular Expressions,,, grep, GNU Grep}).
-@item @kbd{S} (@code{search-case-sensitively}
+@item @kbd{S} (@code{search-case-sensitively})
@kindex S
@findex search-case-sensitively
@cindex search, case-sensitive
@@ -1331,30 +1266,30 @@ your system. It can also be invoked from the command line; see
@node Xref Commands
-@chapter Selecting Cross References
+@chapter Selecting Cross-references
We have already discussed the @samp{Next}, @samp{Prev}, and @samp{Up}
pointers which appear at the top of a node. In addition to these
pointers, a node may contain other pointers which refer you to a
different node, perhaps in another Info file. Such pointers are called
-@dfn{cross references}, or @dfn{xrefs} for short.
+@dfn{cross-references}, or @dfn{xrefs} for short.
@menu
-* Parts of an Xref:: What a cross reference is made of.
+* Parts of an Xref:: What a cross-reference is made of.
* Selecting Xrefs:: Commands for selecting menu or note items.
@end menu
@node Parts of an Xref
@section Parts of an Xref
-Cross references have two major parts: the first part is called the
+Cross-references have two major parts: the first part is called the
@dfn{label}; it is the name that you can use to refer to the cross
reference, and the second is the @dfn{target}; it is the full name of
-the node that the cross reference points to.
+the node that the cross-reference points to.
The target is separated from the label by a colon @samp{:}; first the
label appears, and then the target. For example, in the sample menu
-cross reference below, the single colon separates the label from the
+cross-reference below, the single colon separates the label from the
target.
@example
@@ -1375,7 +1310,7 @@ stand for a target name which is the same as the label name:
In the above example, the name of the target is the same as the name of
the label, in this case @code{Foo Commands}.
-You will normally see two types of cross reference while viewing nodes:
+You will normally see two types of cross-reference while viewing nodes:
@dfn{menu} references, and @dfn{note} references. Menu references
appear within a node's menu; they begin with a @samp{*} at the beginning
of a line, and continue with a label, a target, and a comment which
@@ -1384,10 +1319,10 @@ describes what the contents of the node pointed to contains.
Note references appear within the body of the node text; they begin with
@code{*Note}, and continue with a label and a target.
-Like @samp{Next}, @samp{Prev}, and @samp{Up} pointers, cross references
+Like @samp{Next}, @samp{Prev}, and @samp{Up} pointers, cross-references
can point to any valid node. They are used to refer you to a place
where more detailed information can be found on a particular subject.
-Here is a cross reference which points to a node within the Texinfo
+Here is a cross-reference which points to a node within the Texinfo
documentation: @xref{xref, , Writing an Xref, texinfo, the Texinfo
Manual}, for more information on creating your own texinfo cross
references.
@@ -1434,20 +1369,16 @@ Area, completion}.
Move the cursor to the start of this node's menu.
@end table
-This table lists the Info commands which operate on cross references.
+This table lists the Info commands which operate on cross-references.
@table @asis
@item @kbd{f} (@code{xref-item})
@itemx @kbd{r}
-@item @kbd{M-f}, vi-like operation
-@itemx @kbd{C-x @kbd{r}}, vi-like operation
@kindex f
@kindex r
-@kindex M-f, vi-like operation
-@kindex C-x r, vi-like operation
@findex xref-item
-Reads the name of a note cross reference in the echo area and selects
-its node. Completion is available while reading the cross reference
+Reads the name of a note cross-reference in the echo area and selects
+its node. Completion is available while reading the cross-reference
label. @xref{The Echo Area, completion}.
@end table
@@ -1475,9 +1406,7 @@ The @kbd{BackTab} key can be produced on some terminals with
@kbd{Shift-@key{TAB}}.
@item @key{RET} (@code{select-reference-this-line})
-@itemx @kbd{M-g}, vi-like operation
@kindex RET, in Info windows
-@kindex M-g, vi-like operation
@findex select-reference-this-line
Select the menu item or note reference appearing on this line.
@end table
@@ -1633,41 +1562,31 @@ read in the echo area:
@table @asis
@item @kbd{C-f} (@code{echo-area-forward})
@itemx @key{RIGHT} (an arrow key)
-@itemx @kbd{M-h}, vi-like operation
@kindex C-f, in the echo area
@kindex RIGHT, in the echo area
-@kindex M-h, in the echo area, vi-like operation
@findex echo-area-forward
Move forward a character.
@item @kbd{C-b} (@code{echo-area-backward})
@itemx @key{LEFT} (an arrow key)
-@itemx @kbd{M-l}, vi-like operation
@kindex LEFT, in the echo area
@kindex C-b, in the echo area
-@kindex M-l, in the echo area, vi-like operation
@findex echo-area-backward
Move backward a character.
@item @kbd{C-a} (@code{echo-area-beg-of-line})
-@itemx @kbd{M-0}, vi-like operation
@kindex C-a, in the echo area
-@kindex M-0, in the echo area, vi-like operation
@findex echo-area-beg-of-line
Move to the start of the input line.
@item @kbd{C-e} (@code{echo-area-end-of-line})
-@itemx @kbd{M-$}, vi-like operation
@kindex C-e, in the echo area
-@kindex M-$, vi-like operation
@findex echo-area-end-of-line
Move to the end of the input line.
@item @kbd{M-f} (@code{echo-area-forward-word})
@itemx @kbd{C-@key{RIGHT}} (DOS/Windows only)
-@itemx @kbd{M-w}, vi-like operation
@kindex M-f, in the echo area
-@kindex M-w, in the echo area, vi-like operation
@findex echo-area-forward-word
Move forward a word.
@@ -1684,9 +1603,7 @@ Move backward a word.
On DOS/Windows, @kbd{C-@key{LEFT}} moves backward by words.
@item @kbd{C-d} (@code{echo-area-delete})
-@itemx @kbd{M-x}, vi-like operation
@kindex C-d, in the echo area
-@kindex M-x, in the echo area, vi-like operation
@findex echo-area-delete
Delete the character under the cursor.
@@ -1700,9 +1617,7 @@ On some keyboards, this key is designated @key{BS}, for
echo area to @code{echo-area-delete}.
@item @kbd{C-g} (@code{echo-area-abort})
-@itemx @kbd{C-u}, vi-like operation
@kindex C-g, in the echo area
-@kindex C-u, in the echo area, vi-like operation
@findex echo-area-abort
Cancel or quit the current operation. If completion is being read, this
command discards the text of the input line which does not match any
@@ -1714,9 +1629,7 @@ completion. If the input line is empty, it aborts the calling function.
Accept (or forces completion of) the current input line.
@item @kbd{C-q} (@code{echo-area-quoted-insert})
-@itemx @kbd{C-v}, vi-like operation
@kindex C-q, in the echo area
-@kindex C-v, in the echo area, vi-like operation
@findex echo-area-quoted-insert
Insert the next character verbatim. This is how you can insert control
characters into a search string, for example, or the @samp{?} character
@@ -1754,9 +1667,7 @@ text. (Sometimes these operations are called @dfn{cut} and
@table @asis
@item @kbd{M-d} (@code{echo-area-kill-word})
-@itemx @kbd{M-X}, vi-like operation
@kindex M-d, in the echo area
-@kindex M-X, in the echo area, vi-like operation
@findex echo-area-kill-word
Kill the word following the cursor.
@@ -1916,23 +1827,19 @@ a key sequence which can be typed in order to invoke that command.
@item @kbd{H} (@code{get-help-window})
@itemx @key{F1} (on DOS/Windows only)
-@itemx @kbd{h} and @kbd{H}, vi-like operation
@kindex C-h
@kindex ?, in Info windows
@kindex F1
-@kindex h, vi-like operation
@findex get-help-window
Create (or Move into) the window displaying @code{*Help*}, and place
a node containing a quick reference card into it. This window displays
the most concise information about GNU Info available.
@item @kbd{h} (@code{get-info-help-node})
-@itemx @kbd{M-h}, vi-like operation
@kindex h
-@kindex M-h, vi-like operation
@findex get-info-help-node
Try hard to visit the node @code{(info)Help}. The Info file
-@file{info.texi} distributed with GNU Info (and GNU Emacs) contains
+@file{info.texi} distributed with GNU Emacs contains
this node. Of course, the file must first be processed with
@code{makeinfo}, and then placed into the location of your Info directory.
@@ -1940,7 +1847,6 @@ this node. Of course, the file must first be processed with
@cindex current file, information about
@findex display-file-info
@kindex =, in Info windows
-@kindex C-g, vi-like operation
Show information about what's currently being viewed in the echo area:
the Info file name, and current line number and percentage within the
current node.
@@ -2007,34 +1913,27 @@ be able to insert the @samp{-} character itself; use @kbd{M--} instead,
if you need to specify negative arguments in the echo area.
@end table
-@key{C-g} (@kbd{C-c} in vi-like mode) is used to abort the reading of
-a multi-character key sequence, to cancel lengthy operations (such as
-multi-file searches) and to cancel reading input in the echo area.
+@key{C-g} is used to abort the reading of a multi-character key
+sequence, to cancel lengthy operations (such as multi-file searches) and
+to cancel reading input in the echo area.
@table @asis
@item @kbd{C-g} (@code{abort-key})
-@itemx @kbd{C-c}, vi-like operation
@cindex cancelling typeahead
@cindex cancelling the current operation
@kindex C-g, in Info windows
-@kindex C-c, vi-like operation
@findex abort-key
Cancel current operation.
@end table
-The @samp{q} command of Info simply quits running Info. Under
-@samp{--vi-keys} (@pxref{--vi-keys}), you can also exit with @samp{:q}
-or @samp{ZZ}.
+The @samp{q} command of Info simply quits running Info.
@table @asis
@item @kbd{q} (@code{quit})
@itemx @kbd{C-x C-c}
-@itemx @kbd{:q}, vi-like operation
-@itemx @kbd{ZZ}, vi-like operation
@cindex quitting
@kindex q
@kindex C-x C-c
-@kindex ZZ, vi-like operation
@findex quit
Exit GNU Info.
@end table
@@ -2293,7 +2192,7 @@ the last node. Possible values are:
@table @code
@item Stop
-Do not scroll. Display the @samp{No more nodes within this document.}
+Do not scroll. Display the @samp{No more nodes within this document}
message. This is the default.
@item Top
@@ -2390,8 +2289,8 @@ Turn off any color that was in effect, using the terminal's default color.
@cindex Coloured background
Use the color specified for the background.
-@item nocolour
-@itemx nocolor
+@item bgnocolour
+@itemx bgnocolor
Use the terminal's default background color.
@item underline
@@ -2476,36 +2375,78 @@ file.
@cindex @file{.infokey} format
@cindex format of @file{.infokey}
-The format of the @file{.infokey} file is most easily illustrated by
-example. For instance, here is a sample init file suitable for aficionados
-of @command{vi} or @command{less}:
+Here is an example @file{.infokey} file which specifies the key
+bindings that are activated by the @option{--vi-keys} option to Info
+(@pxref{--vi-keys}).
@example
#info
+g first-node
+G last-node
+\mb beginning-of-node
+\me end-of-node
j next-line
k prev-line
-l forward-char
-h backward-char
+
+f scroll-forward-page-only
+^f scroll-forward-page-only
+\m\ scroll-forward-page-only
+z scroll-forward-page-only-set-window
+
+b scroll-backward-page-only
+^b scroll-backward-page-only
+w scroll-backward-page-only-set-window
+
\kd down-line
+^e down-line
+^j down-line
+^m down-line
\ku up-line
-\ scroll-forward
-\kD scroll-forward-page-only
-b scroll-backward
-\kU scroll-backward-page-only
-g beginning-of-node
-\kh beginning-of-node
-G end-of-node
-\ke end-of-node
-\t select-reference-this-line
-- history-node
-n next-node
-p prev-node
-u up-node
-t top-node
-d dir-node
-\mu clear-search
-#var
-highlight-searches=On
+^y up-line
+^k up-line
+
+d scroll-half-screen-down
+^d scroll-half-screen-down
+u scroll-half-screen-up
+^u scroll-half-screen-up
+
+^xn next-node
+^xp prev-node
+^xu up-node
+' last-node
+\mt top-node
+\md dir-node
+
+^xg goto-node
+I goto-invocation-node
+
+n search-next
+N search-previous
+
+\mf xref-item
+^xr xref-item
+
+\mg select-reference-this-line
+^x^j select-reference-this-line
+^x^m select-reference-this-line
+
+^c abort-key
+
+\mh get-info-help-node
+
+:q quit
+ZZ quit
+
+#echo-area
+\mh echo-area-backward
+\ml echo-area-forward
+\m0 echo-area-beg-of-line
+\m$ echo-area-end-of-line
+\mw echo-area-forward-word
+\mx echo-area-delete
+\mu echo-area-abort
+^v echo-area-quoted-insert
+\mX echo-area-kill-word
@end example
The file consists of one or more @dfn{sections}. Each section starts with
diff --git a/texinfo.texi b/texinfo.texi
index 4bd3926..0c4305c 100644
--- a/texinfo.texi
+++ b/texinfo.texi
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
-@c $Id: texinfo.texi 7287 2016-07-30 20:37:16Z gavin $
+@c $Id: texinfo.texi 7814 2017-05-24 19:46:36Z gavin $
@c Everything between the start/end of header lines will be passed by
@c Emacs's {texinfo,makeinfo}-format region commands. See the `start of
@@ -583,6 +583,7 @@ Format with @command{tex}/@command{texindex}
* Reference Implementation:: @command{texi2any}: the reference implementation.
* Invoking @command{texi2any}:: Running the translator from a shell.
+* @command{texi2any} Environment Variables::
* @command{texi2any} Printed Output:: Calling @command{texi2dvi}.
* Pointer Validation:: How to check that pointers point somewhere.
* Customization Variables:: Configuring @command{texi2any}.
@@ -707,10 +708,10 @@ Info Format General Layout
Info Format Text Constructs
-* Menu: Info Format Menu.
-* Image: Info Format Image.
-* Printindex: Info Format Printindex.
-* Xref: Info Format Cross Reference.
+* Info Format Menu::
+* Info Format Image::
+* Info Format Printindex::
+* Info Format Cross Reference::
@end detailmenu
@end menu
@@ -5935,13 +5936,13 @@ Here are some cases for which it is preferable @emph{not} to use @code{@@code}:
@itemize @bullet
@item
-For shell command names such as @command{ls} (use @code{@@command}).
+For shell command names, such as @command{ls} (use @code{@@command}).
@item
-For environment variable such as @env{TEXINPUTS} (use @code{@@env}).
+For environment variables, such as @env{TEXINPUTS} (use @code{@@env}).
@item
-For shell options such as @samp{-c} when such options stand alone (use
+For shell options, such as @samp{-c}, when such options stand alone (use
@code{@@option}).
@item
@@ -6688,8 +6689,8 @@ For example,
@example
@group
-@@strong@{Caution:@} @@samp@{rm *@}
-removes @@emph@{all@} normal files.
+@@strong@{Caution:@} @@samp@{rm * .[^.]*@}
+removes @@emph@{all@} files in the directory.
@end group
@end example
@@ -6698,7 +6699,7 @@ produces the following:
@quotation
@strong{Caution}: @samp{rm * .[^.]*}
-removes @emph{all} normal files.
+removes @emph{all} files in the directory.
@end quotation
The @code{@@strong} command is seldom used except to mark what is, in
@@ -7165,7 +7166,7 @@ Examples are often, logically speaking, ``in the middle'' of a
paragraph, and the text that continues afterwards should not be
indented, as in the example above. The @code{@@noindent} command
prevents a piece of text from being indented as if it were a new
-paragraph (@pxref{@code{@@noindent}}.
+paragraph (@pxref{@code{@@noindent}}).
If you want to embed code fragments within sentences, instead of
displaying them, use the @code{@@code} command or its relatives
@@ -7514,7 +7515,7 @@ beginning of the line is fully flush left with the
line that follows after it.
@end display
-The standard usage of @code{@@indent} is just as above: at the
+The standard usage of @code{@@noindent} is just as above: at the
beginning of what would otherwise be a paragraph, to eliminate the
indentation that normally happens there. It can either be followed by
text or be on a line by itself. There is no reason to use it
@@ -7600,7 +7601,7 @@ Info, you'll see the @code{@@cartouche} had no effect):
@cartouche
@example
% pwd
-/usr/local/info
+/usr/local/share/emacs
@end example
@end cartouche
@@ -8025,7 +8026,7 @@ with each one, such as a list of definitions.
Write the @code{@@table} command at the beginning of a line, after a
blank line, and follow it on the same line with an argument that is an
-`indicating'' command, such as @code{@@code}, @code{@@samp},
+`indicating' command, such as @code{@@code}, @code{@@samp},
@code{@@var}, @code{@@option}, or @code{@@kbd} (@pxref{Indicating}).
This command will be applied to the text in the first column. For
example, @code{@@table @@code} will cause the text in the first column
@@ -10248,12 +10249,12 @@ Both distributions include installation instructions.
@cindex Single right-pointing angle quotation mark
@findex guillemetleft
@findex guillemotleft
-@cindex @guillemetleft{}
+@cindex @sortas{<<} @guillemetleft{}
@findex guillemetright
@findex guillemotright
@cindex @guillemetright{}
@findex guilsinglleft
-@cindex @guilsinglleft{}
+@cindex @sortas{<} @guilsinglleft{}
@findex guilsinglright
@cindex @guilsinglright{}
@c The third column doesn't have the full text in the prototype so that
@@ -12616,7 +12617,7 @@ that for functions except that variables do not take arguments.
@cindex Internationalization
Texinfo has some support for writing in languages other than English,
although this area still needs considerable work. (If you are
-yourself helping to translate the fixed strings written to documents,
+the one helping to translate the fixed strings written to documents,
@pxref{Internationalization of Document Strings}.)
For a list of the various accented and special characters Texinfo
@@ -12659,7 +12660,7 @@ Germany).
@cindex Document strings, translation of
For Info and other online output, this command changes the translation
of various @dfn{document strings} such as ``see'' in cross-references
-(@pxref{Cross References}), ``Function' in defuns (@pxref{Definition
+(@pxref{Cross References}), ``Function'' in defuns (@pxref{Definition
Commands}), and so on. Some strings, such as ``Node:'', ``Next:'',
``Menu:'', etc., are keywords in Info output, so are not translated
there; they are translated in other output formats.
@@ -13576,10 +13577,10 @@ Good, @@samp@{@@@@node@} is defined.
@noindent will output the expected `Good, @samp{@@node} is defined.'.
-This conditional will also consider true any new commands defined by
+This conditional will also consider any new commands defined by
the document via @code{@@macro}, @code{@@alias},
@code{@@definfoenclose}, and @code{@@def@r{(}code@r{)}index}
-(@pxref{Defining New Texinfo Commands}). Caveat: the @TeX{}
+(@pxref{Defining New Texinfo Commands}) to be true. Caveat: the @TeX{}
implementation reports internal @TeX{} commands, in addition to all
the Texinfo commands, as being ``defined''; the @code{makeinfo}
implementation is reliable in this regard, however.
@@ -14033,6 +14034,38 @@ macros containing line-oriented commands or text, such as
@code{@@example} environments, may behave unpredictably in @TeX{}.
@item
+If you have problems using conditionals within a macro, an alternative
+is to use separate macro definitions inside conditional blocks. For
+example, instead of
+
+@example
+@@macro Mac
+@@iftex
+text for TeX output
+@@end iftex
+@@ifnottex
+text for not TeX output
+@@end ifnottex
+@@end macro
+@end example
+
+@noindent you can do the following instead:
+
+@example
+@@iftex
+@@macro Mac
+text for TeX output
+@@end macro
+@@end iftex
+
+@@ifnottex
+@@macro Mac
+text for not TeX output
+@@end macro
+@@end ifnottex
+@end example
+
+@item
Texinfo commands in the expansion of a macro in the text of an index
entry may end up being typeset as literal text (including an ``@@''
sign), instead of being interpreted with their intended meaning.
@@ -14075,11 +14108,10 @@ Fran@,cois+.
@item
Ending a macro body with @samp{@@c} may cause text following the macro
invocation to be ignored as a comment in @command{makeinfo}. This is
-not the case when processing with @TeX{} (in case you really want to
-comment out following text, use @samp{@@comment} instead). This was
-often done to ``comment out'' an unwanted newline at the end of a macro
-body, but this is not necessary any more, as the final newline before
-@samp{@@end macro} is not included in the macro body anyway.
+not the case when processing with @TeX{}. This was often done
+to ``comment out'' an unwanted newline at the end of a macro body, but
+this is not necessary any more, as the final newline before @samp{@@end
+macro} is not included in the macro body anyway.
@item
In general, you can't arbitrarily substitute a macro (or
@@ -14869,7 +14901,7 @@ instead of DVI (@pxref{PDF Output}), by running @command{pdftex}
instead of @command{tex}. Alternatively, the command
@command{texi2pdf} is an abbreviation for running @samp{texi2dvi
--pdf}. The command @command{pdftexi2dvi} is also provided as a
-convenience for AUC-@TeX{} (@pxref{Top,,, auctex, AUC-@TeX{}}, as it
+convenience for AUC-@TeX{} (@pxref{Top,,, auctex, AUC-@TeX{}}), as it
prefers to merely prepend @samp{pdf} to DVI producing tools to have
PDF producing tools.
@@ -15928,6 +15960,7 @@ The rest of this chapter goes into the details.
@menu
* Reference Implementation:: @command{texi2any}: the reference implementation.
* Invoking @command{texi2any}:: Running the translator from a shell.
+* @command{texi2any} Environment Variables::
* @command{texi2any} Printed Output:: Calling @command{texi2dvi}.
* Pointer Validation:: How to check that pointers point somewhere.
* Customization Variables:: Configuring @command{texi2any}.
@@ -16022,7 +16055,7 @@ turn. If an input file name is @samp{-}, standard input is read.
@cindex @code{texi2any} options
@cindex Options for @code{texi2any}
-The @command{texi2any} program accept many options. Perhaps the
+The @command{texi2any} program accepts many options. Perhaps the
most basic are those that change the output format. By default,
@command{texi2any} outputs Info.
@@ -16501,6 +16534,10 @@ Generate Texinfo XML output (rather than Info).
@end table
+
+@node @command{texi2any} Environment Variables
+@section Environment Variables Recognized by @command{texi2any}
+
@vindex TEXINFO_OUTPUT_FORMAT
@cindex Environment variable @code{TEXINFO_OUTPUT_FORMAT}
@command{makeinfo} also reads the environment variable
@@ -16517,6 +16554,38 @@ The customization variable of the same name is also read; if set, that
overrides an environment variable setting, but not a command-line
option. @xref{Customization Variables and Options}.
+@vindex TEXINFO_XS
+@cindex Perl extension modules (XS)
+You can control @command{texi2any}'s use of Perl extension modules
+by setting the @env{TEXINFO_XS} environment variable. These modules
+are compiled native code that the interpreted Perl code can use.
+Ideally, these extension modules should just work, and the only noticable
+difference they should make is that @command{texi2any} finishes running
+sooner. However, you can use this environment variable for the purposes
+of troubleshooting: for example, if you have problems with the output of
+@command{texi2any} varying depending on whether the extension modules are
+in use.
+
+The following values of @env{TEXINFO_XS} are recognized by
+@command{texi2any}:
+
+@table @samp
+@item default
+The default behavior. Try to load extension modules, and silently fall
+back to the interpreted Perl implementations if this fails.
+
+@item warn
+Try to load extension modules, and if this fails, give a warning message
+before falling back to the interpreted Perl implementations.
+
+@item debug
+Try to load extension modules, printing many messages while doing so.
+
+@item omit
+Do not use extension modules.
+
+@end table
+
@node @command{texi2any} Printed Output
@section @command{texi2any} Printed Output
@@ -16717,7 +16786,6 @@ meaning of the options.
@item
@vindex ENABLE_ENCODING
@option{--enable-encoding} @tab @code{ENABLE_ENCODING}
-@vindex documentlanguage
@item
@option{--document-language} @tab @code{documentlanguage}
@item
@@ -16739,8 +16807,6 @@ meaning of the options.
@vindex MACRO_EXPAND
@option{--macro-expand} @tab @code{MACRO_EXPAND}
@item
-@vindex HEADERS
-@vindex SHOW_MENU
@option{--headers} @tab @code{HEADERS}, @code{SHOW_MENU}
@item
@vindex NO_WARN
@@ -16807,10 +16873,6 @@ These correspond to the command-line options (and
@code{TEXINFO_OUTPUT_FORMAT} environment variable values) of the same
name. @xref{Invoking @command{texi2any}}.
-@item debugcount
-Instead of generating a regular output format, output the count of
-bytes and lines obtained when converting to Info, and other information.
-
@item debugtree
@cindex tree representation, for debugging
@cindex debugging document, with tree representation
@@ -17141,6 +17203,7 @@ For HTML@. 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
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
@@ -17288,10 +17351,6 @@ 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 MACRO_BODY_IGNORES_LEADING_SPACE
-Ignore white space at the beginning of user defined macro body line,
-mimicking a @TeX{} limitation (@pxref{Macro Details}). Default off.
-
@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
@@ -17376,6 +17435,7 @@ If set, create redirection files for renamed nodes. Set by default
when generating HTML@.
@item SHOW_MENU
+@vindex HEADERS
@opindex --no-headers
If set, Texinfo menus are output. By default, it is set unless
generating Docbook or if @option{--no-headers} is specified.
@@ -17416,11 +17476,6 @@ Name of the command used to produce PostScript, PDF, and DVI; default
Generate HTML and try to be as compatible as possible with
@command{texi2html}; default false.
-@item TEXINFO_COLUMN_FOR_DESCRIPTION
-Used with the @code{indent_menu_descriptions} tree transformation,
-described below; default 32 (matching
-@code{texinfo-column-for-description} in Emacs)).
-
@item TEXINFO_DTD_VERSION
For XML@. Version of the DTD used in the XML output preamble. The
default is set based on a variable in @file{configure.ac}.
@@ -17472,10 +17527,6 @@ Adds empty @code{@@unnumbered...} sections in a tree to fill gaps in
sectioning. For example, an @code{@@unnumberedsec} will be inserted
if a @code{@@chapter} is followed by a @code{@@subsection}.
-@item indent_menu_descriptions
-Reformat menus so that descriptions start at column
-@code{TEXINFO_COLUMN_DESCRIPTION}.
-
@item insert_nodes_for_sectioning_commands
Insert nodes for sectioning commands lacking a corresponding node.
@@ -18693,7 +18744,7 @@ To achieve maximum portability and accessibility among browsers (both
graphical and text-based), systems, and users, the HTML output is
intentionally quite plain and generic. It has always been our goal
for users to be able to customize the output to their wishes via CSS
-(@pxref{HTML CSS}) or other means (@pxref{Customization Variables}.
+(@pxref{HTML CSS}) or other means (@pxref{Customization Variables}).
If you cannot accomplish a reasonable customization, feel free to
report that.
@@ -21482,7 +21533,7 @@ Control System}) and other version control systems, which expand it
into a string such as:
@example
-$Id: texinfo.texi 7287 2016-07-30 20:37:16Z gavin $
+$Id: texinfo.texi 7814 2017-05-24 19:46:36Z gavin $
@end example
(This is potentially useful in all sources that use version control,
@@ -23925,13 +23976,6 @@ described next.
These special Info constructs can appear within the text of a node.
-@menu
-* Menu: Info Format Menu.
-* Image: Info Format Image.
-* Printindex: Info Format Printindex.
-* Xref: Info Format Cross Reference.
-@end menu
-
@node Info Format Menu
@subsection Info Format: Menu
diff --git a/version-stnd.texi b/version-stnd.texi
index d896dc5..4dc9225 100644
--- a/version-stnd.texi
+++ b/version-stnd.texi
@@ -1,4 +1,4 @@
-@set UPDATED 6 February 2016
-@set UPDATED-MONTH February 2016
-@set EDITION 6.3
-@set VERSION 6.3
+@set UPDATED 21 May 2017
+@set UPDATED-MONTH May 2017
+@set EDITION 6.4
+@set VERSION 6.4
diff --git a/version.texi b/version.texi
index 7db7969..fa97e95 100644
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 30 July 2016
-@set UPDATED-MONTH July 2016
-@set EDITION 6.3
-@set VERSION 6.3
+@set UPDATED 24 May 2017
+@set UPDATED-MONTH May 2017
+@set EDITION 6.4
+@set VERSION 6.4
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texinfo-doc-nonfree.git
Reply to: