[6574] always remove space after @sortas{...}

[Gavin D. Smith]

Revision: 6574
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6574
Author:   gavin
Date:     2015-08-25 16:28:36 +0000 (Tue, 25 Aug 2015)
Log Message:
-----------
always remove space after @sortas{...}

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-08-25 15:43:38 UTC (rev 6573)
+++ trunk/ChangeLog     2015-08-25 16:28:36 UTC (rev 6574)
@@ -1,5 +1,11 @@
 2015-08-25  Gavin Smith  <address@hidden>
 
+       * doc/texinfo.tex (\sortas): Expand to \eatspaces, to remove a 
+       following space.
+       * doc/texinfo.texi (\mathopsup): Use @sortas{mathopsup}.
+
+2015-08-25  Gavin Smith  <address@hidden>
+
        * doc/texinfo.texi (Indexing Commands): Document @sortas{}.  
        Move example usage earlier.  Move discussion of typeface 
        earlier, leaving general advice on writing index entries at the 

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2015-08-25 15:43:38 UTC (rev 6573)
+++ trunk/doc/texinfo.tex       2015-08-25 16:28:36 UTC (rev 6574)
@@ -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.12}
+\def\texinfoversion{2015-08-25.18}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -4826,7 +4826,7 @@
 }
 
 % Definition for writing index entry text.
-\def\sortas#1{}%
+\def\sortas#1{\eatspaces}%
 
 % Definition for writing index entry sort key.  @sortas{} must occur at
 % the beginning of the index entry, like
@@ -4862,9 +4862,7 @@
   % sorted result.
   \edef\temp{%
     \write\writeto{%
-      \string\entry{\indexsortkey}{\noexpand\folio}%
-                   {\expandafter\eatspaces\expandafter{\the\toks0}}}%
-                         % This (^) removes a space after a @sortas.
+      \string\entry{\indexsortkey}{\noexpand\folio}{\the\toks0}}%
   }%
   \temp
 }

Modified: trunk/doc/texinfo.texi
===================================================================
--- trunk/doc/texinfo.texi      2015-08-25 15:43:38 UTC (rev 6573)
+++ trunk/doc/texinfo.texi      2015-08-25 16:28:36 UTC (rev 6574)
@@ -10766,7 +10766,7 @@
 (no use of MathML, etc.).  The HTML output is enclosed by
 @code{<em>...</em>}, but nothing more.
 
address@hidden \mathopsup
address@hidden @sortas{mathopsup} \mathopsup
 However, as far as the @TeX{} output is concerned, plain @TeX{}
 mathematical commands are allowed in @code{@@math}, starting with
 @samp{\}.  In essence, @code{@@math} switches into plain @TeX{} math