branch master updated: * doc/texinfo.tex (\linemacro): Parameter list in macro definition is in braces and surrounded by commas, the same as for @macro. Suggestion from Patrice.

[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 4fa527a484 * doc/texinfo.tex (\linemacro): Parameter list in macro 
definition is in braces and surrounded by commas, the same as for @macro. 
Suggestion from Patrice.
4fa527a484 is described below

commit 4fa527a484b03c83e0774809805ac2946eaed0b7
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Mon Mar 13 16:57:29 2023 +0000

    * doc/texinfo.tex (\linemacro): Parameter list in macro definition
    is in braces and surrounded by commas, the same as for @macro.
    Suggestion from Patrice.
---
 ChangeLog                 |  6 ++++++
 doc/texinfo-tex-test.texi | 10 +++++-----
 doc/texinfo.tex           | 15 ++++-----------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 67b174e5aa..c0f727ff6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-03-13  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * doc/texinfo.tex (\linemacro): Parameter list in macro definition
+       is in braces and surrounded by commas, the same as for @macro.
+       Suggestion from Patrice.
+
 2023-03-12  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/parsetexi/separator.c (handle_comma): when at the end
diff --git a/doc/texinfo-tex-test.texi b/doc/texinfo-tex-test.texi
index b21dbced1c..830a62904c 100644
--- a/doc/texinfo-tex-test.texi
+++ b/doc/texinfo-tex-test.texi
@@ -684,7 +684,7 @@ Like an argument to @b{@@footnote}.
 @expansion{} this is the expansion
 @end example
 
-@linemacro onearg arg
+@linemacro onearg {arg}
 @result{}\arg\@result{}
 @end linemacro
  
@@ -692,7 +692,7 @@ Like an argument to @b{@@footnote}.
 
 @result{}aaaaa@result{}
 
-@linemacro twoargs one two
+@linemacro twoargs {one, two}
 foo @samp{\one\} `\two\' bar
 @end linemacro
 
@@ -700,7 +700,7 @@ foo @samp{\one\} `\two\' bar
 
 foo @samp{AA} `BB' bar
 
-@linemacro twoargs one two
+@linemacro twoargs {one, two}
 foo @samp{\one\} `\two\' bar
 @end linemacro
 
@@ -708,7 +708,7 @@ foo @samp{\one\} `\two\' bar
 
 foo @samp{AA} `' bar
 
-@linemacro two arg argii
+@linemacro two {arg, argii}
 @example
 @expansion{}\arg\@expansion{}\argii\@pounds{}
 @end example
@@ -731,7 +731,7 @@ foo @samp{AA} `' bar
 @heading With @code{@@defblock}
 
 @defcodeindex BI
-@linemacro defbuiltin symbol rest
+@linemacro defbuiltin {symbol, rest}
 @BIindex \symbol\
 @defline Builtin \symbol\ \rest\
 @end linemacro
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index e0d064d542..0f25aa5bac 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-12.18}
+\def\texinfoversion{2023-03-13.16}
 %
 % Copyright 1985, 1986, 1988, 1990-2023 Free Software Foundation, Inc.
 %
@@ -8591,27 +8591,20 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 % @linemacro
 
 \parseargdef\linemacro{%
-  \linegetargs#1 \linegetargs
+  \getargs{#1}% now \macname is the macname and \argl the arglist
   \expandafter\linegetparamlist\argl;%
   \begingroup \macrobodyctxt \usembodybackslash
   \parselinemacrobody
 }
 
-% Parse the arguments to a @linemacro line.  Set \macname to the name
-% of the macro and \argl to the list of arguments.
-\def\linegetargs#1 #2\linegetargs{%
-  \macname={#1}%
-  \def\argl{#2}%
-}
-
 % Build up \paramlist which will be used as the parameter text for the macro.
 % At the end it will be like "#1 #2 #3\endlinemacro".
 \def\linegetparamlist#1;{%
   \paramno=0\def\paramlist{}%
   \let\hash\relax
-  \linegetparamlistxxx#1; %
+  \linegetparamlistxxx#1,;,%
 }
-\def\linegetparamlistxxx#1 {%
+\def\linegetparamlistxxx#1,{%
   \if#1;\let\next=\linegetparamlistxxxx
   \else \let\next=\linegetparamlistxxx
     \advance\paramno by 1