texinfo ChangeLog doc/texinfo.txi

[karl]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     12/11/26 18:42:30

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 

Log message:
        attempt to clarify sentence ending rules

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1459&r2=1.1460
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.494&r2=1.495

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1459
retrieving revision 1.1460
diff -u -b -r1.1459 -r1.1460
--- ChangeLog   26 Nov 2012 18:30:49 -0000      1.1459
+++ ChangeLog   26 Nov 2012 18:42:30 -0000      1.1460
@@ -1,5 +1,10 @@
 2012-11-26  Karl Berry  <address@hidden>
 
+       * doc/texinfo.txi (Not Ending a Sentence): Attempt
+       to document the sentence-ending heuristic more clearly.
+       Suggestion from Eli Zaretskii in <http://bugs.gnu.org/12973#14>,
+       draft from Paul Eggert in bug-texinfo 24 Nov 2012 18:02:27.
+
        * install-info/defs.in (findprog): new fn, from texi2dvi.
        * install-info/tests/ii-0050-test,
        * install-info/tests/ii-0041-test: use it to check for zdiff

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -b -r1.494 -r1.495
--- doc/texinfo.txi     26 Nov 2012 01:46:07 -0000      1.494
+++ doc/texinfo.txi     26 Nov 2012 18:42:30 -0000      1.495
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.494 2012/11/26 01:46:07 karl Exp $
address@hidden $Id: texinfo.txi,v 1.495 2012/11/26 18:42:30 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.
 
@@ -470,9 +470,9 @@
 
 Inserting Space
 
+* Multiple Spaces::             Inserting multiple spaces.
 * Not Ending a Sentence::       Sometimes a . doesn't end a sentence.
 * Ending a Sentence::           Sometimes it does.
-* Multiple Spaces::             Inserting multiple spaces.
 * frenchspacing::               Specifying end-of-sentence spacing.
 * dmn::                         How to format a dimension.
 
@@ -10701,14 +10701,59 @@
 kinds within and after sentences.
 
 @menu
+* Multiple Spaces::             Inserting multiple spaces.
 * Not Ending a Sentence::       Sometimes a . doesn't end a sentence.
 * Ending a Sentence::           Sometimes it does.
-* Multiple Spaces::             Inserting multiple spaces.
 * frenchspacing::               Specifying end-of-sentence spacing.
 * dmn::                         How to format a dimension.
 @end menu
 
 
address@hidden Multiple Spaces
address@hidden Multiple Spaces
+
address@hidden Multiple spaces
address@hidden Whitespace, inserting
address@hidden Space, inserting horizontal
address@hidden <space>
address@hidden <tab>
address@hidden <newline>
+
+Ordinarily, multiple whitespace characters (space, tab, and newline)
+are collapsed into a single space.
+
+Occasionally, you may want to produce several consecutive spaces,
+either for purposes of example (e.g., what your program does with
+multiple spaces as input), or merely for purposes of appearance in
+headings or lists.  Texinfo supports three commands:
address@hidden@@@kbd{SPACE}}, @code{@@@kbd{TAB}}, and @code{@@@kbd{NL}}, all
+of which insert a single space into the output.  (Here,
address@hidden@@@kbd{SPACE}} represents an @samp{@@} character followed by a
+space, i.e., @samp{@@ }, @kbd{TAB} represents an actual tab character,
+and @kbd{NL} represent the tab character and end-of-line, i.e., when
address@hidden@@} is the last character on a line.)
+
+For example,
address@hidden
+Spacey@@ @@ @@ @@
+example.
address@hidden example
+
address@hidden produces
+
address@hidden
+Spacey@ @ @ @
+example.
address@hidden example
+
+Other possible uses of @code{@@@kbd{SPACE}} have been subsumed by
address@hidden@@multitable} (@pxref{Multi-column Tables}).
+
+Do not follow any of these commands with braces.
+
+To produce a non-breakable space, see @ref{tie, @code{@@tie}}.
+
+
 @node Not Ending a Sentence
 @subsection Not Ending a Sentence
 
@@ -10729,8 +10774,8 @@
 @findex <colon> @r{(suppress end-of-sentence space)}
 Use the @code{@@:}@: command after a period, question mark,
 exclamation mark, or colon that should not be followed by extra space.
-For example, use @code{@@:}@: after periods that end abbreviations
-which are not at the ends of sentences.
+For example, use @code{@@:}@: after periods that end (lowercase)
+abbreviations which are not at the ends of sentences.
 
 Also, when a parenthetical remark in the middle of a sentence (like
 this one!)@: ends with a period, exclamation point, or question mark,
@@ -10782,11 +10827,15 @@
 @findex ! @r{(end of sentence)}
 @findex ? @r{(end of sentence)}
 @cindex Spacing, at ends of sentences
+As mentioned above, Texinfo normally inserts additional space after
+the end of a sentence.  It uses a simple heuristic for this: a
+sentence ends with a period, exclamation point, or question mark
+followed by optional closing punctuation and then whitespace, and
address@hidden preceded by a capital letter.
+
 Use @code{@@.}@: instead of a period, @code{@@!}@: instead of an
-exclamation point, and @code{@@?}@: instead of a question mark at the end
-of a sentence that ends with a capital letter.  Otherwise, the formatter
-will think the letter is an abbreviation and will not insert the correct
-end-of-sentence spacing.  Here is an example:
+exclamation point, and @code{@@?}@: instead of a question mark at the
+end of a sentence that does end with a capital letter.  For example:
 
 @example
 Give it to M.I.B. and to M.E.W@@.  Also, give it to R.J.C@@.
@@ -10802,12 +10851,12 @@
 Give it to M.I.B. and to M.E.W.  Also, give it to R.J.C.
 @end quotation
 
-In the HTML file output, @code{@@.}@: is equivalent to a simple
address@hidden; likewise for @code{@@!}@: and @code{@@?}@:.
+In the HTML output, @code{@@.}@: is equivalent to a simple @samp{.};
+likewise for @code{@@!}@: and @code{@@?}@:.
 
-The meanings of @code{@@:} and @code{@@.}@: in Texinfo are designed to
-work well with the Emacs sentence motion commands (@pxref{Sentences,,,
-emacs, The GNU Emacs Manual}).
+The meanings of @code{@@:} and @code{@@.}, etc.@: in Texinfo are
+designed to work well with the Emacs sentence motion commands
+(@pxref{Sentences,,, emacs, The GNU Emacs Manual}).
 
 Do not put braces after any of these commands.
 
@@ -10817,53 +10866,8 @@
 for code-like highlighting commands, @code{@@var} arguments ending
 with a capital letter, and @code{@@TeX}.  For example, that sentence
 ended with @samp{@@address@hidden@@@@address@hidden; @code{@@.} was not 
needed.  Also
-in @code{... @@address@hidden@}. Text} the period ends the sentence,
-there is no need to insert @code{@@.}.
-
-
address@hidden Multiple Spaces
address@hidden Multiple Spaces
-
address@hidden Multiple spaces
address@hidden Whitespace, inserting
address@hidden Space, inserting horizontal
address@hidden <space>
address@hidden <tab>
address@hidden <newline>
-
-Ordinarily, multiple whitespace characters (space, tab, and newline)
-are collapsed into a single space.
-
-Occasionally, you may want to produce several consecutive spaces,
-either for purposes of example (e.g., what your program does with
-multiple spaces as input), or merely for purposes of appearance in
-headings or lists.  Texinfo supports three commands:
address@hidden@@@kbd{SPACE}}, @code{@@@kbd{TAB}}, and @code{@@@kbd{NL}}, all
-of which insert a single space into the output.  (Here,
address@hidden@@@kbd{SPACE}} represents an @samp{@@} character followed by a
-space, i.e., @samp{@@ }, @kbd{TAB} represents an actual tab character,
-and @kbd{NL} represent the tab character and end-of-line, i.e., when
address@hidden@@} is the last character on a line.)
-
-For example,
address@hidden
-Spacey@@ @@ @@ @@
-example.
address@hidden example
-
address@hidden produces
-
address@hidden
-Spacey@ @ @ @
-example.
address@hidden example
-
-Other possible uses of @code{@@@kbd{SPACE}} have been subsumed by
address@hidden@@multitable} (@pxref{Multi-column Tables}).
-
-Do not follow any of these commands with braces.
-
-To produce a non-breakable space, see @ref{tie, @code{@@tie}}.
+in @code{... @@address@hidden@}. Text} the period after @var{VARNAME}
+ends the sentence; there is no need to use @code{@@.}.
 
 
 @node frenchspacing
@@ -21663,7 +21667,7 @@
 or other version control systems, which expand it into a string such
 as:
 @example
-$Id: texinfo.txi,v 1.494 2012/11/26 01:46:07 karl Exp $
+$Id: texinfo.txi,v 1.495 2012/11/26 18:42:30 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}