[7592] revert files commited by mistake

[gavinsmith0123]

Revision: 7592
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7592
Author:   gavin
Date:     2016-12-31 13:23:40 +0000 (Sat, 31 Dec 2016)
Log Message:
-----------
revert files commited by mistake

Modified Paths:
--------------
    trunk/doc/texinfo-tex-test.texi
    trunk/doc/texinfo.tex
    trunk/doc/version-stnd.texi
    trunk/doc/version.texi

Modified: trunk/doc/texinfo-tex-test.texi
===================================================================
--- trunk/doc/texinfo-tex-test.texi     2016-12-31 13:18:35 UTC (rev 7591)
+++ trunk/doc/texinfo-tex-test.texi     2016-12-31 13:23:40 UTC (rev 7592)
@@ -294,59 +294,6 @@
 @end example
 x
 
-x
address@hidden
address@hidden
-groff [ -abceghijklpstvzCEGNRSUVXZ ]
address@hidden group
address@hidden example
-x
-
-x
address@hidden
address@hidden@c
-groff [ -abceghijklpstvzCEGNRSUVXZ ]
address@hidden group
address@hidden example
-x
-
-xxxxxxxxxxxxxxxxxxxxxx
-
address@hidden
address@hidden@c
-groff [ -abceghijklpstvzCEGNRSUVXZ ]
address@hidden group
address@hidden example
-
-xxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-xxxxxxxxxxxxxxxxxxxxxx
-
address@hidden
-groff [ -abceghijklpstvzCEGNRSUVXZ ]
address@hidden
-
-xxxxxxxxxxxxxxxxxxxxxxxxxxx
-
address@hidden Braceless at end of line
-
address@hidden Mac
-value
address@hidden macro
-
-Okay, we are here. The @Mac
-on next line now.
-
-With braces. The @Mac{}
-on next line now.
-
-With space and braces. The @Mac{}
-on next line now.
-
-With space and braces. The @Mac{}
-
-in next paragraph now.
-
 @section @,c in macro argument
 
 @macro mactwo{argfirst, argsecond}

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2016-12-31 13:18:35 UTC (rev 7591)
+++ trunk/doc/texinfo.tex       2016-12-31 13:23:40 UTC (rev 7592)
@@ -165,9 +165,6 @@
 % Give the space character the catcode for a space.
 \def\spaceisspace{\catcode`\ =10\relax}
 
-% Likewise for ^^M, the end of line character.
-\def\endlineisspace{\catcode13=10\relax}
-
 \chardef\dashChar  = `\-
 \chardef\slashChar = `\/
 \chardef\underChar = `\_
@@ -953,14 +950,21 @@
 % @comment ...line which is ignored...
 % @c is the same as @comment
 % @ignore ... @end ignore  is another way to write a comment
+%
+\def\comment{\begingroup \catcode`\^^M=\active%
address@hidden \catcode`\{=\other \catcode`\}=\other\commentxxx}%
 
+{\catcode`\^^M=\active%
+\gdef\commentxxx#1^^M{\endgroup%
+\futurelet\nexttoken\commentxxxx}%
+\gdef\commentxxxx{\ifx\nexttoken\aftermacro\expandafter\comment\fi}%
+}
 
 \def\c{\begingroup \catcode`\^^M=\active%
 address@hidden \catcode`\{=\other \catcode`\}=\other%
 \cxxx}
 {\catcode`\^^M=\active \gdef\cxxx#1^^M{\endgroup}}
-%
-\let\comment\c
+% See comment in \scanmacro about why the definitions of @c and @comment differ
 
 % @paragraphindent NCHARS
 % We'll use ems for NCHARS, close enough.
@@ -8027,6 +8031,9 @@
   }
 \fi
 
+\let\aftermacroxxx\relax
+\def\aftermacro{\aftermacroxxx}
+
 % alias because \c means cedilla in @tex or @math
 \let\texinfoc=\c
 
@@ -8048,13 +8055,18 @@
   \catcode`\\=\active
   %
   % Process the macro body under the current catcode regime.
-  address@hidden
+  address@hidden
   %
   address@hidden
   \catcode`\\=\savedcatcodetwo
   %
   % The \texinfoc is to remove the \newlinechar added by \scantokens, and
   % can be noticed by \parsearg.
+  %   The \aftermacro allows a \comment at the end of the macro definition
+  % to duplicate itself past the final \newlinechar added by \scantokens:
+  % this is used in the definition of \group to comment out a newline.  We
+  % don't do the same for \c to support Texinfo files with macros that ended
+  % with a @c, which should no longer be necessary.
   %   We avoid surrounding the call to \scantokens with \bgroup and \egroup
   % to allow macros to open or close groups themselves.
 }
@@ -8526,13 +8538,7 @@
   \ifcase\paramno
   % 0
     \expandafter\xdef\csname\the\macname\endcsname{%
-      \bgroup
-      \noexpand\spaceisspace
-      \noexpand\endlineisspace
-      \noexpand\expandafter % skip any spaces after the macro invocation.
-      \expandafter\noexpand\csname\the\macname @@@\endcsname}%
-    \expandafter\xdef\csname\the\macname @@@\endcsname{%
-      \egroup\noexpand\scanmacro{\macrobody}}%
+      \noexpand\scanmacro{\macrobody}}%
   \or % 1
     \expandafter\xdef\csname\the\macname\endcsname{%
        \bgroup

Modified: trunk/doc/version-stnd.texi
===================================================================
--- trunk/doc/version-stnd.texi 2016-12-31 13:18:35 UTC (rev 7591)
+++ trunk/doc/version-stnd.texi 2016-12-31 13:23:40 UTC (rev 7592)
@@ -1,4 +1,4 @@
 @set UPDATED 6 February 2016
 @set UPDATED-MONTH February 2016
address@hidden EDITION 6.3dev
address@hidden VERSION 6.3dev
address@hidden EDITION 6.3
address@hidden VERSION 6.3

Modified: trunk/doc/version.texi
===================================================================
--- trunk/doc/version.texi      2016-12-31 13:18:35 UTC (rev 7591)
+++ trunk/doc/version.texi      2016-12-31 13:23:40 UTC (rev 7592)
@@ -1,4 +1,4 @@
address@hidden UPDATED 27 December 2016
address@hidden UPDATED-MONTH December 2016
address@hidden EDITION 6.3dev
address@hidden VERSION 6.3dev
address@hidden UPDATED 30 July 2016
address@hidden UPDATED-MONTH July 2016
address@hidden EDITION 6.3
address@hidden VERSION 6.3