branch master updated: * doc/texinfo.tex (\linemacrodef): Do not append space to macro argument line. Require empty final argument to be given explicitly as {}. Avoid extra space before arg in @example environment. * doc/texinfo-tex-test.texi (Line macros): Update. Add case with substitution into @example environment.

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new be563c149c * doc/texinfo.tex (\linemacrodef): Do not append space to 
macro argument line.  Require empty final argument to be given explicitly as 
{}.  Avoid extra space before arg in @example environment. * 
doc/texinfo-tex-test.texi (Line macros): Update.  Add case with substitution 
into @example environment.
be563c149c is described below

commit be563c149cdb4120f5b1d4ec497d3a8695ae8f7d
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Mar 12 16:35:28 2023 +0000

    * doc/texinfo.tex (\linemacrodef): Do not append space to macro
    argument line.  Require empty final argument to be given explicitly
    as {}.  Avoid extra space before arg in @example environment.
    * doc/texinfo-tex-test.texi (Line macros): Update.  Add case with
    substitution into @example environment.
---
 ChangeLog                 |  8 ++++++++
 doc/texinfo-tex-test.texi | 49 ++++++++++++++++++++++++++++++++++++-----------
 doc/texinfo.tex           |  9 +++------
 3 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e404977498..db0996c173 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-03-12  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * doc/texinfo.tex (\linemacrodef): Do not append space to macro
+       argument line.  Require empty final argument to be given explicitly
+       as {}.  Avoid extra space before arg in @example environment.
+       * doc/texinfo-tex-test.texi (Line macros): Update.  Add case with
+       substitution into @example environment.
+
 2023-03-12  Patrice Dumas  <pertusus@free.fr>
 
        Update po files
diff --git a/doc/texinfo-tex-test.texi b/doc/texinfo-tex-test.texi
index 4e6a5ecc62..b21dbced1c 100644
--- a/doc/texinfo-tex-test.texi
+++ b/doc/texinfo-tex-test.texi
@@ -672,8 +672,6 @@ Like an argument to @b{@@footnote}.
 
 @chapter Line macros
 
-No args
-
 @linemacro noarg
 @example
 @expansion{} this is the expansion
@@ -682,8 +680,9 @@ No args
 
 @noarg
 
-
-One arg
+@example
+@expansion{} this is the expansion
+@end example
 
 @linemacro onearg arg
 @result{}\arg\@result{}
@@ -691,7 +690,7 @@ One arg
  
 @onearg aaaaa
 
-Two args
+@result{}aaaaa@result{}
 
 @linemacro twoargs one two
 foo @samp{\one\} `\two\' bar
@@ -699,13 +698,35 @@ foo @samp{\one\} `\two\' bar
 
 @twoargs AA BB
 
-With empty second arg:
+foo @samp{AA} `BB' bar
 
 @linemacro twoargs one two
 foo @samp{\one\} `\two\' bar
 @end linemacro
 
-@twoargs AA
+@twoargs AA {}
+
+foo @samp{AA} `' bar
+
+@linemacro two arg argii
+@example
+@expansion{}\arg\@expansion{}\argii\@pounds{}
+@end example
+@end linemacro
+
+@two AA {}
+
+@example
+@expansion{}AA@expansion{}@pounds{}
+@end example
+
+@two BB CC
+
+@example
+@expansion{}BB@expansion{}CC@pounds{}
+@end example
+
+
 
 @heading With @code{@@defblock}
 
@@ -717,15 +738,21 @@ foo @samp{\one\} `\two\' bar
 
 @defblock
 @defbuiltin One (more)
-hallo
-@defbuiltin Nothing
-hallo agin
+one
+@defbuiltin Nothing {}
+two
 @end defblock
 
-@printindex BI
 
 
+@defblock
+@defline Builtin One (more)
+one
+@defline Builtin Nothing
+two
+@end defblock
 
+@printindex BI
 
 
 
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index ef83988bdf..1b3a9a1106 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -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{2023-03-11.10}
+\def\texinfoversion{2023-03-12.16}
 %
 % Copyright 1985, 1986, 1988, 1990-2023 Free Software Foundation, Inc.
 %
@@ -8643,7 +8643,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 % Make the definition
 \def\linemacrodef{%
   \let\hash=##%
-  \let\xeatspaces\relax
+  \def\xeatspaces{\string\xeatspaces}%
   \expandafter\xdef\csname\the\macname\endcsname{%
     \bgroup
     \noexpand\scanctxt
@@ -8653,10 +8653,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
   \expandafter\xdef\csname\the\macname @@\endcsname##1{%
     \egroup
     \expandafter\noexpand
-    \csname\the\macname @@@\endcsname##1 \noexpand\endlinemacro
-    % Note that we append a space to the macro line to terminate the last
-    % argument in case the final argument is empty.  @xeatspaces may be needed
-    % to remove this space.
+    \csname\the\macname @@@\endcsname##1\noexpand\endlinemacro
   }
   \expandafter\expandafter
   \expandafter\xdef