[6581] automatic comma insertion for cross-references to same manual

[Gavin D. Smith]

Revision: 6581
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6581
Author:   gavin
Date:     2015-08-26 16:54:20 +0000 (Wed, 26 Aug 2015)
Log Message:
-----------
automatic comma insertion for cross-references to same manual

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/info-stnd.texi
    trunk/doc/texinfo.tex

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-08-26 13:30:39 UTC (rev 6580)
+++ trunk/ChangeLog     2015-08-26 16:54:20 UTC (rev 6581)
@@ -1,6 +1,18 @@
 2015-08-26  Gavin Smith  <address@hidden>
 
-       * doc/texinfo.tex (Cross References): Don't mention nodes and 
+       * doc/texinfo.tex (\pxref, \xref, \ref): If there isn't 
+       punctuation after the argument when we output the page number,
+       supply a comma after the page number.
+
+       (\enablebackslashhack): Also use @c to turn off initial 
+       definition of backslash.
+       
+       * doc/info-stnd.texi: Remove commas following cross-references 
+       where they aren't needed.
+
+2015-08-26  Gavin Smith  <address@hidden>
+
+       * doc/texinfo.texi (Cross References): Don't mention nodes and 
        anchors in summary, for simplicity.
        (Cross Reference Commands): Say there are only three main 
        cross-reference commands, and not four, and also mention @uref.

Modified: trunk/doc/info-stnd.texi
===================================================================
--- trunk/doc/info-stnd.texi    2015-08-26 13:30:39 UTC (rev 6580)
+++ trunk/doc/info-stnd.texi    2015-08-26 16:54:20 UTC (rev 6581)
@@ -543,9 +543,8 @@
 @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.)
+modeled after Emacs.  (@xref{Custom Key Bindings} for a more general way 
+of altering GNU Info's key bindings.)
 
 @item --where
 @itemx --location
@@ -558,7 +557,7 @@
 @end table
 
 Finally, Info defines many default key bindings and variables.
address@hidden Key Bindings}, for information on how to customize these
address@hidden Key Bindings} for information on how to customize these
 settings.
 
 @c FIXME: the feature with lowercasing the file name isn't documented
@@ -572,7 +571,7 @@
 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},
+Readline manual.  @xref{User Input,,, emacs, The GNU Emacs Manual}
 if you are unfamiliar with the notation.  @footnote{Here's a short
 summary.  @address@hidden means press the @kbd{CTRL} key and the
 key @var{x}.  @address@hidden means press the @kbd{META} key and
@@ -588,8 +587,8 @@
 Emacs Manual}, for more detailed information.} command name (displayed
 in parentheses), and a short description of what the command does.
 All of the cursor motion commands can take a @dfn{numeric} argument
-(see @ref{Miscellaneous Commands, @code{universal-argument}, to find
-out how to supply them}.  With a numeric argument, the motion commands
+(see @ref{Miscellaneous Commands, @code{universal-argument}} to find
+out how to supply them).  With a numeric argument, the motion commands
 are simply executed that many times; for example, a numeric argument
 of 4 given to @code{next-line} causes the cursor to move down 4 lines.
 With a negative numeric argument, the motion is reversed; an argument
@@ -694,7 +693,7 @@
 
 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},
+designated with ``vi-like operation''.  @xref{Custom Key Bindings}
 for information on arbitrarily customizing key bindings and variable
 settings.
 
@@ -1275,7 +1274,7 @@
 
 Normally, the search pattern should not be shorter than some
 predefined limit.  By default, this limit is set to 1 character.
address@hidden, for more information on this.
address@hidden for more information on this.
 
 
 @node Index Commands

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2015-08-26 13:30:39 UTC (rev 6580)
+++ trunk/doc/texinfo.tex       2015-08-26 16:54:20 UTC (rev 6581)
@@ -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{2015-08-25.18}
+\def\texinfoversion{2015-08-26.18}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -8117,9 +8117,12 @@
 % node name, #4 the name of the Info file, #5 the name of the printed
 % manual.  All but the node name can be omitted.
 %
-\def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]}
-\def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
-\def\ref#1{\xrefX[#1,,,,,,,]}
+\def\pxref{\putwordsee{} \xrefXX}
+\def\xref{\putwordSee{} \xrefXX}
+\def\ref{\xrefXX}
+
+\def\xrefXX#1{\def\xrefXXarg{#1}\futurelet\tokenafterxref\xrefXXX}
+\def\xrefXXX{\expandafter\xrefX\expandafter[\xrefXXarg,,,,,,,]}
 %
 \newbox\toprefbox
 \newbox\printedrefnamebox
@@ -8263,6 +8266,12 @@
       %
       % output the `page 3'.
       \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
+           \ifx,\tokenafterxref
+      \else\ifx.\tokenafterxref
+      \else\ifx;\tokenafterxref
+      \else\ifx)\tokenafterxref
+      \else,% add a , if xref not followed by punctuation
+      \fi\fi\fi\fi
     \fi\fi
   \fi
   \endlink
@@ -10403,11 +10412,13 @@
 % If the file did not have a `\input texinfo', then it is turned off after
 % the first line; otherwise the first `\' in the file would cause an error.
 % This is used on the very last line of this file, texinfo.tex.
+% We also use @c to call @fixbackslash, in case ends of lines are hidden.
 {
 @address@hidden
 @address@hidden@address@hidden
   @address@hidden = @eatinput%
   @address@hidden
+  @address@hidden@address@hidden
   @def address@hidden@secondlinenl}%
   @gdef @address@hidden@thirdlinenl}%
   @gdef @address@hidden
@@ -10419,6 +10430,7 @@
 @address@hidden
   @address@hidden @let\ = @ttbackslash @fi
   @catcode13=5 % regular end of line
+  @address@hidden@texinfoc
   % Also turn back on active characters that might appear in the input
   % file name, in case not using a pre-dumped format.
   @address@hidden