[7591] use test -n instead of test -v and clear cache variable

[gavinsmith0123]

Revision: 7591
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7591
Author:   gavin
Date:     2016-12-31 13:18:35 +0000 (Sat, 31 Dec 2016)
Log Message:
-----------
use test -n instead of test -v and clear cache variable

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/texinfo-tex-test.texi
    trunk/doc/texinfo.tex
    trunk/doc/version-stnd.texi
    trunk/doc/version.texi
    trunk/tp/Texinfo/Convert/XSParagraph/configure.ac
    trunk/tp/Texinfo/MiscXS/configure.ac

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-12-31 00:56:59 UTC (rev 7590)
+++ trunk/ChangeLog     2016-12-31 13:18:35 UTC (rev 7591)
@@ -1,3 +1,10 @@
+2016-12-31  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Convert/XSParagraph/configure.ac,
+       * tp/Texinfo/MiscXS/configure.ac: Use 'test -n' instead of
+       'test -v' for better portability.  Clear another cache variable 
+       used internally by autoconf.
+
 2016-12-30  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/MiscXS/miscxs.c (xs_merge_text, xs_abort_empty_line):

Modified: trunk/doc/texinfo-tex-test.texi
===================================================================
--- trunk/doc/texinfo-tex-test.texi     2016-12-31 00:56:59 UTC (rev 7590)
+++ trunk/doc/texinfo-tex-test.texi     2016-12-31 13:18:35 UTC (rev 7591)
@@ -294,6 +294,59 @@
 @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 00:56:59 UTC (rev 7590)
+++ trunk/doc/texinfo.tex       2016-12-31 13:18:35 UTC (rev 7591)
@@ -165,6 +165,9 @@
 % 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 = `\_
@@ -950,21 +953,14 @@
 % @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}}
-% See comment in \scanmacro about why the definitions of @c and @comment differ
+%
+\let\comment\c
 
 % @paragraphindent NCHARS
 % We'll use ems for NCHARS, close enough.
@@ -8031,9 +8027,6 @@
   }
 \fi
 
-\let\aftermacroxxx\relax
-\def\aftermacro{\aftermacroxxx}
-
 % alias because \c means cedilla in @tex or @math
 \let\texinfoc=\c
 
@@ -8055,18 +8048,13 @@
   \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.
 }
@@ -8538,7 +8526,13 @@
   \ifcase\paramno
   % 0
     \expandafter\xdef\csname\the\macname\endcsname{%
-      \noexpand\scanmacro{\macrobody}}%
+      \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}}%
   \or % 1
     \expandafter\xdef\csname\the\macname\endcsname{%
        \bgroup

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

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

Modified: trunk/tp/Texinfo/Convert/XSParagraph/configure.ac
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/configure.ac   2016-12-31 00:56:59 UTC 
(rev 7590)
+++ trunk/tp/Texinfo/Convert/XSParagraph/configure.ac   2016-12-31 13:18:35 UTC 
(rev 7591)
@@ -52,7 +52,7 @@
 if test x$disable_xs != xyes; then
   AC_PATH_PROG([PERL], [perl])
   
-  if test -v PERL_EXT_CC ; then
+  if test -n "$PERL_EXT_CC" ; then
     CC=$PERL_EXT_CC
   else
     # It's essential that we use the same compiler that was used to build
@@ -62,8 +62,9 @@
     CC=$conf_value
   fi
 
-  # Wipe the cache value in case -C was given at the top level
+  # Wipe cache values in case -C was given at the top level
   ac_cv_prog_CC= ; unset ac_cv_prog_CC
+  ac_cv_prog_ac_ct_CC= ; unset ac_cv_prog_ac_ct_CC
 fi
 
 AC_PROG_CC

Modified: trunk/tp/Texinfo/MiscXS/configure.ac
===================================================================
--- trunk/tp/Texinfo/MiscXS/configure.ac        2016-12-31 00:56:59 UTC (rev 
7590)
+++ trunk/tp/Texinfo/MiscXS/configure.ac        2016-12-31 13:18:35 UTC (rev 
7591)
@@ -52,7 +52,7 @@
 if test x$disable_xs != xyes; then
   AC_PATH_PROG([PERL], [perl])
   
-  if test -v PERL_EXT_CC ; then
+  if test -n "$PERL_EXT_CC" ; then
     CC=$PERL_EXT_CC
   else
     # It's essential that we use the same compiler that was used to build
@@ -62,8 +62,9 @@
     CC=$conf_value
   fi
 
-  # Wipe the cache value in case -C was given at the top level
+  # Wipe cache values in case -C was given at the top level
   ac_cv_prog_CC= ; unset ac_cv_prog_CC
+  ac_cv_prog_ac_ct_CC= ; unset ac_cv_prog_ac_ct_CC
 fi
 
 AC_PROG_CC