texinfo ChangeLog doc/texinfo.txi doc/texinfo.tex

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       11/10/19 15:56:06

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi texinfo.tex 

Log message:
        reset sentence spacing for @var, @abbr, @acronym

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1269&r2=1.1270
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.391&r2=1.392
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.tex?cvsroot=texinfo&r1=1.350&r2=1.351

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1269
retrieving revision 1.1270
diff -u -b -r1.1269 -r1.1270
--- ChangeLog   17 Oct 2011 17:49:07 -0000      1.1269
+++ ChangeLog   19 Oct 2011 15:56:05 -0000      1.1270
@@ -1,3 +1,16 @@
+2011-10-19  Karl Berry  <address@hidden>
+
+       * doc/texinfo.tex (\var, \doabbr, \doacronym): reset \spacefactor=1000
+       so capital letters in arg don't change spacing.
+       * doc/texinfo.txi (Not Ending a Sentence): briefly mention
+       commands which change the normal sentence-spacing rules.
+
+2011-10-18  Karl Berry  <address@hidden>
+
+       * util/texindex.c, util/texi2pdf,
+       info/info.c, info/infokey.c,
+       install-info/install-info.c: update copyright year.
+
 2011-10-17  Karl Berry  <address@hidden>
 
        * tp/Makefile.am: rename include to Makefile.tres.

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -b -r1.391 -r1.392
--- doc/texinfo.txi     16 Oct 2011 23:16:29 -0000      1.391
+++ doc/texinfo.txi     19 Oct 2011 15:56:06 -0000      1.392
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.391 2011/10/16 23:16:29 karl Exp $
address@hidden $Id: texinfo.txi,v 1.392 2011/10/19 15:56:06 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.
 
@@ -10571,14 +10571,12 @@
 @iftex
 produces the following.  If you look carefully at this printed output,
 you will see a little extraneous space after the @samp{vs.}@: and
address@hidden(this?)}@: in the second line.
address@hidden(or?)}@: in the second line.
 @end iftex
 
 @quotation
 foo vs.@: bar (or?)@: address@hidden
 foo vs. bar (or?) address@hidden
-foo vs.@: address@hidden
-foo vs. bar
 @end quotation
 
 @noindent
@@ -10590,6 +10588,15 @@
 
 Do not put braces after @code{@@:} (or any non-alphabetic command).
 
+A few Texinfo commands force normal interword spacing, so that you
+don't have to insert @code{@@:} or @code{@@.} and companions (see next
+section) where you otherwise would.  These are the code-like
+highlighting commands, @code{@@var}, @code{@@abbr}, @code{@@acronym}
+(@pxref{Useful Highlighting}), and @code{@@TeX}.  For example, that
+sentence ended with @samp{@@address@hidden@@@@address@hidden; @code{@@.} was 
not
+needed.  Another example: in @samp{@@address@hidden address@hidden the period 
is
+not considered the end of a sentence, and no extra space is inserted.
+
 
 @node Ending a Sentence
 @subsection Ending a Sentence
@@ -10636,6 +10643,9 @@
 
 Do not put braces after any of these commands.
 
+See the end of the previous section for a few commands which
+special-case following spacing.
+
 
 @node Multiple Spaces
 @subsection Multiple Spaces
@@ -21092,7 +21102,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.391 2011/10/16 23:16:29 karl Exp $
+$Id: texinfo.txi,v 1.392 2011/10/19 15:56:06 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}
@@ -21163,7 +21173,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.391 2011/10/16 23:16:29 karl Exp $
address@hidden $Id: texinfo.txi,v 1.392 2011/10/19 15:56:06 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi

Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -b -r1.350 -r1.351
--- doc/texinfo.tex     23 Sep 2011 16:43:22 -0000      1.350
+++ doc/texinfo.tex     19 Oct 2011 15:56:06 -0000      1.351
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2011-09-23.09}
+\def\texinfoversion{2011-10-19.08}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2372,7 +2372,9 @@
   \else\ifx\next-%
   \else\ifx\next.%
   \else\ptexslash
-  \fi\fi\fi}
+  \fi\fi\fi
+  \aftersmartic
+}
 
 % like \smartslanted except unconditionally uses \ttsl, and no ic.
 % @var is set to this for defun arguments.
@@ -2382,9 +2384,15 @@
 % ttsl for book titles, do we?
 \def\cite#1{{\sl #1}\futurelet\next\smartitaliccorrection}
 
+\def\aftersmartic{}
+\def\var#1{%
+  \let\saveaftersmartic = \aftersmartic
+  \def\aftersmartic{\null\let\aftersmartic=\saveaftersmartic}%
+  \smartslanted{#1}%
+}
+
 \let\i=\smartitalic
 \let\slanted=\smartslanted
-\def\var#1{\smartslanted{#1}}
 \let\dfn=\smartslanted
 \let\emph=\smartitalic
 
@@ -2480,7 +2488,7 @@
     \plainfrenchspacing
     #1%
   }%
-  \null
+  \null % reset spacefactor to 1000
 }
 
 % We *must* turn on hyphenation at `-' and `_' in @code.
@@ -2762,6 +2770,7 @@
   \ifx\temp\empty \else
     \space ({\unsepspaces \ignorespaces \temp \unskip})%
   \fi
+  \null % reset \spacefactor=1000
 }
 
 % @abbr for "Comput. J." and the like.
@@ -2774,6 +2783,7 @@
   \ifx\temp\empty \else
     \space ({\unsepspaces \ignorespaces \temp \unskip})%
   \fi
+  \null % reset \spacefactor=1000
 }
 
 % @asis just yields its argument.  Used with @table, for example.
@@ -8103,7 +8113,7 @@
 % space to prevent strange expansion errors.)
 \def\supereject{\par\penalty -20000\footnoteno =0 }
 
-% @footnotestyle is meaningful for info output only.
+% @footnotestyle is meaningful for Info output only.
 \let\footnotestyle=\comment
 
 {\catcode address@hidden
@@ -8166,6 +8176,8 @@
   % expands into a box, it must come within the paragraph, lest it
   % provide a place where TeX can split the footnote.
   \footstrut
+  %
+  % Invoke rest of plain TeX footnote routine.
   address@hidden
 }
 }%end \catcode address@hidden