texinfo ChangeLog doc/texinfo.txi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/07/12 00:34:25

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 

Log message:
        double space only at end of sentences

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1057&r2=1.1058
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.254&r2=1.255

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1057
retrieving revision 1.1058
diff -u -b -r1.1057 -r1.1058
--- ChangeLog   25 Jun 2010 13:17:37 -0000      1.1057
+++ ChangeLog   12 Jul 2010 00:34:25 -0000      1.1058
@@ -1,3 +1,9 @@
+2010-07-11  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (frenchspacing): no double space after
+       semicolons, just at end of sentences.
+       Report from Tim Landscheidt, help-texinfo 07 Jul 2010 22:29:55.
+
 2010-06-24  gettextize  <address@hidden>
 
        * gnulib/m4/lib-link.m4: Upgrade to gettext-0.18.1.

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -b -r1.254 -r1.255
--- doc/texinfo.txi     20 Jun 2010 23:49:07 -0000      1.254
+++ doc/texinfo.txi     12 Jul 2010 00:34:25 -0000      1.255
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.254 2010/06/20 23:49:07 karl Exp $
address@hidden $Id: texinfo.txi,v 1.255 2010/07/12 00:34:25 karl Exp $
 @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
 @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
 
@@ -10325,8 +10325,8 @@
 @@address@hidden argument@@address@hidden@} containing a address@hidden
 @end example
 
-Although @comma{} can be used nearly anywhere, there is no need for it
-anywhere except in this unusual case.
+Although @samp{@@address@hidden@}} can be used nearly anywhere, there is no
+need for it anywhere except in this unusual case.
 
 
 @node Inserting Quote Characters
@@ -10555,9 +10555,9 @@
 @cindex Space, after sentences
 
 In American typography, it is traditional and correct to put extra
-space at the end of a sentence, after a semi-colon, and so on.  This
-is the default in Texinfo.  In French typography (and many others),
-this extra space is wrong; all spaces are uniform.
+space at the end of a sentence.  This is the default in Texinfo.  In
+French typography (and many others), this extra space is wrong; all
+spaces are uniform.
 
 Therefore Texinfo provides the @code{@@frenchspacing} command to
 control the spacing after punctuation.  It reads the rest of the line
@@ -16566,7 +16566,7 @@
 @code{texinfo-format-buffer} automatically creates a tag table
 for its Info file;  @code{makeinfo} always creates a tag table.  With
 a @dfn{tag table}, Info can jump to new nodes more quickly than it can
address@hidden
+otherwise.
 
 @cindex Indirect subfiles
 In addition, if the Texinfo file contains more than about 300,000
@@ -16866,7 +16866,7 @@
 
 @cindex Colon, last in @env{INFOPATH}
 However you set @env{INFOPATH}, if its last character is a
address@hidden MS-DOS/MS-Windows systems, use semi-colon instead.}, this
address@hidden MS-DOS/MS-Windows systems, use semicolon instead.}, this
 is replaced by the default (compiled-in) path.  This gives you a way to
 augment the default path with new directories without having to list all
 the standard places.  For example (using @code{sh} syntax):
@@ -17427,6 +17427,7 @@
 * Command Expansion: HTML Xref Command Expansion.
 * 8-bit Expansion:   HTML Xref 8-bit Character Expansion.
 * Mismatch:          HTML Xref Mismatch.
+* Configuration:     HTML Xref Configuration.
 @end menu
 
 
@@ -17806,33 +17807,114 @@
 control which manuals are available from where, and how.
 
 
address@hidden
--- not yet --
address@hidden HTML Xref Configuration
address@hidden HTML Cross-reference Configuration: @file{htmlxref.cnf}
+
address@hidden htmlxref.cnf
address@hidden HTML cross-reference configuration
address@hidden Cross-reference configuration, for HTML
address@hidden Configuration, for HTML cross-manual references
+
address@hidden reads a file named @file{htmlxref.cnf} to gather
+information for cross-references to other manuals in HTML output.  It
+is looked for in the following directories:
+
address@hidden @file
address@hidden @var{srcdir}/.texinfo/
+(where @var{srcdir} is the directory with the Texinfo input file)
+
address@hidden ~/.texinfo/
+(where @code{~} is the current user's home directory)
+
address@hidden @var{sysconfdir}/texinfo/
+(where @var{sysconfdir} is the system configuration directory
+specified at compile-time, e.g., @file{/usr/local/etc})
+
address@hidden @var{datadir}/texinfo/
+(likewise specified at compile time, e.g., @file{/usr/local/share})
address@hidden table
 
-external information
---------------------
+The first file found is used.  The Texinfo distribution includes a
+default file which handles many GNU manuals; it is installed in the
+last of the above directories, i.e.,
address@hidden@var{datadir}/texinfo/htmlxref.cnf}.
+
+The file is line-oriented.  Lines consisting only of whitespace are
+ignored.  Comments are indicated with a @samp{#} at the beginning of a
+line, optionally preceded by whitespace.  Since @samp{#} can occur in
+url's (like almost any character), it does not otherwise start a
+comment.
 
-The information for the reference is searched in the file
-`htmlxref.cnf' present in the following directories:
-<srcdir>/.texinfo/, ~/.texinfo/,  SYSCONFDIR/texinfo/,
-DATADIR/texinfo/
-The first match should be used.
-
-The file is line-oriented, with the following format:
-  <manualname> <whitespace> <keyword> <whitespace> <urlprefix>
-with <keyword> being "mono" or "split". Thus
-texinfo split http://www.gnu.org/software/texinfo/manual/texinfo/html_node/
-texinfo mono http://www.gnu.org/software/texinfo/manual/texinfo/texinfo.html
-
-If the keyword is 'split', that is the target is split, the urlprefix gives
-the directory and host name.
-If the keyword is 'mono', that is the target is mono, the urlprefix gives
-directory, host and file name.
+Each non-blank non-comment line must be either a @dfn{variable
+assignment} or @dfn{manual information}.
 
-'#' followed by a space begins comments. '#' followed by another character
-cannot begin comments as there are # in urls.
+A variable assignment line looks like this:
 
address@hidden ignore
address@hidden
address@hidden = @var{varvalue}
address@hidden example
+
+Whitespace around the @samp{=} is optional and ignored.  The
address@hidden should consist of letters; case is significant.  The
address@hidden is an arbitrary string, continuing to the end of the
+line.  Variables are then referenced with @address@hidden@address@hidden;
+variable references can occur in the @var{varvalue}.
+
+A manual information line looks like this:
+
address@hidden
address@hidden @var{keyword} @var{urlprefix}
address@hidden example
+
address@hidden
+with @var{manual} the short identifier for a manual, @var{keyword}
+being one of: @code{mono}, @code{node}, @code{section},
address@hidden, and @var{urlprefix} described below.  Variable
+references can occur only in the @var{urlprefix}.  For example (used
+in the canonical @file{htmlxref.cnf}):
+
address@hidden
+R = http://www.gnu.org
+RS = address@hidden@}/software
+hello mono    address@hidden@}/hello/manual/hello.html
+hello node    address@hidden@}/hello/manual/html_node/
+hello section address@hidden@}/hello/manual/html_section/
+hello chapter address@hidden@}/hello/manual/html_chapter/
address@hidden smallexample
+
address@hidden monolithic manuals, for HTML cross-references
+If the keyword is @code{mono}, @var{urlprefix} gives the host,
+directory, and file name for @var{manual} as one monolithic file.
+
address@hidden split manuals, for HTML cross-references
+If the keyword is @code{node}, @code{section}, or @code{chapter},
address@hidden gives the host and directory for @var{manual} split
+into nodes, sections, or chapters, respectively.
+
+When available, @command{makeinfo} will use the ``corresponding''
+value for cross-references between manuals.  That is, when generating
+monolithic output (@option{--no-split}), the @code{mono} url will be
+used, when generating output split by node, the @code{node} url will
+be used, etc.  However, if a manual is not available in that form,
+whatever is available will be used.  Here is the search order for each
+style that can be generated:
+
address@hidden
+node    => node,    section, chapter, mono
+section => section, chapter, node,    mono
+chapter => chapter, section, node,    mono
+mono    => mono,    chapter, section, split
address@hidden smallexample
+
address@hidden address@hidden, and HTML cross-references}
+These section- and chapter-level cross-manual references can succeed
+only when the target manual was created using @option{--node-files},
+which is the default for @code{makeinfo}.
+
+If you have additions or corrections to the @file{htmlxref.cnf}
+distributed with Texinfo, please email @email{bug-texinfo@@gnu.org}.
+You can get the latest version from
address@hidden://ftpmirror.gnu.org/@/texinfo/@/htmlxref.cnf}.
 
 
 @node Command List
@@ -19706,7 +19788,7 @@
 (@url{http://www.gnu.org/software/rcs}) version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.254 2010/06/20 23:49:07 karl Exp $
+$Id: texinfo.txi,v 1.255 2010/07/12 00:34:25 karl Exp $
 @end example
 (This is useful in all sources that use version control, not just manuals.)
 You may wish to include the @samp{$Id:} comment in the @code{@@copying}
@@ -19785,7 +19867,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.254 2010/06/20 23:49:07 karl Exp $
address@hidden $Id: texinfo.txi,v 1.255 2010/07/12 00:34:25 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi