[6984] check for commands following closing brace of xref

[Gavin D. Smith]

Revision: 6984
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6984
Author:   gavin
Date:     2016-02-05 08:05:22 +0000 (Fri, 05 Feb 2016)
Log Message:
-----------
check for commands following closing brace of xref

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/texinfo.tex

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-02-05 07:26:20 UTC (rev 6983)
+++ trunk/ChangeLog     2016-02-05 08:05:22 UTC (rev 6984)
@@ -1,5 +1,15 @@
 2016-02-05  Gavin Smith  <address@hidden>
 
+       * doc/texinfo.tex (\xrefX): Check for some commands following 
+       the closing brace of an @xref command which add space.  
+       Suggestion from Karl Berry.
+
+       * doc/texinfo-tex-test.texi (Cross-references): Add examples 
+       with tab, newline, @SPACE, @TAB, @NL, @*, and @: following 
+       @xref.
+
+2016-02-05  Gavin Smith  <address@hidden>
+
        * doc/texinfo.texi (@inforef): Remove statement saying that 
        @inforef must be followed by a comma or a full stop.  Reported 
        by Karl Berry.

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2016-02-05 07:26:20 UTC (rev 6983)
+++ trunk/doc/texinfo.tex       2016-02-05 08:05:22 UTC (rev 6984)
@@ -8657,9 +8657,15 @@
       %
       % output the `page 3'.
       \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
-      \if\noexpand\tokenafterxref\space
-        ,% add a , if xref not followed by punctuation
-      \fi
+      % Add a , if xref followed by a space
+      \if\space\noexpand\tokenafterxref ,%
+      \else\ifx\       \tokenafterxref ,% @TAB
+      \else\ifx\*\tokenafterxref ,%   @*
+      \else\ifx\ \tokenafterxref ,%   @SPACE
+      \else\ifx\
+                \tokenafterxref ,%    @NL
+      \else\ifx\tie\tokenafterxref ,% @tie
+      \fi\fi\fi\fi\fi\fi
     \fi\fi
   \fi
   \endlink