branch master updated: * doc/texinfo.tex (\linemacro): Fix definition of zero-arg @linemacro so not to break literal backslash in macro body. * doc/texinfo-tex-test.texi (Line macros): More tests.

[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 03b6ad1b37 * doc/texinfo.tex (\linemacro): Fix definition of zero-arg 
@linemacro so not to break literal backslash in macro body. * 
doc/texinfo-tex-test.texi (Line macros): More tests.
03b6ad1b37 is described below

commit 03b6ad1b37a8a9adff4163eae8e9c6693fcb28f8
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Mon Mar 13 19:09:41 2023 +0000

    * doc/texinfo.tex (\linemacro): Fix definition of zero-arg
    @linemacro so not to break literal backslash in macro body.
    * doc/texinfo-tex-test.texi (Line macros): More tests.
---
 ChangeLog                 |  6 ++++++
 doc/texinfo-tex-test.texi | 32 ++++++++++++++++++++++++++++----
 doc/texinfo.tex           | 16 +++++++++-------
 3 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c0f727ff6a..34fa9bbd0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-03-13  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * doc/texinfo.tex (\linemacro): Fix definition of zero-arg
+       @linemacro so not to break literal backslash in macro body.
+       * doc/texinfo-tex-test.texi (Line macros): More tests.
+
 2023-03-13  Gavin Smith <gavinsmith0123@gmail.com>
 
        * doc/texinfo.tex (\linemacro): Parameter list in macro definition
diff --git a/doc/texinfo-tex-test.texi b/doc/texinfo-tex-test.texi
index 830a62904c..05bb59de38 100644
--- a/doc/texinfo-tex-test.texi
+++ b/doc/texinfo-tex-test.texi
@@ -684,6 +684,26 @@ Like an argument to @b{@@footnote}.
 @expansion{} this is the expansion
 @end example
 
+@linemacro bs
+A\\B
+@end linemacro
+
+@bs
+
+A\B
+
+@linemacro noargii {}
+@example
+@expansion{}another test
+@end example
+@end linemacro
+
+@noargii
+
+@example
+@expansion{}another test
+@end example
+
 @linemacro onearg {arg}
 @result{}\arg\@result{}
 @end linemacro
@@ -700,10 +720,6 @@ foo @samp{\one\} `\two\' bar
 
 foo @samp{AA} `BB' bar
 
-@linemacro twoargs {one, two}
-foo @samp{\one\} `\two\' bar
-@end linemacro
-
 @twoargs AA {}
 
 foo @samp{AA} `' bar
@@ -726,6 +742,14 @@ foo @samp{AA} `' bar
 @expansion{}BB@expansion{}CC@pounds{}
 @end example
 
+@linemacro nospace{one, two, three}
+\three\@bullet{}\two\@minus{}\one\
+@end linemacro
+
+@nospace X Y Z
+
+Z@bullet{}Y@minus{}X
+
 
 
 @heading With @code{@@defblock}
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 0f25aa5bac..72058d2507 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-13.16}
+\def\texinfoversion{2023-03-13.19}
 %
 % Copyright 1985, 1986, 1988, 1990-2023 Free Software Foundation, Inc.
 %
@@ -8592,7 +8592,13 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 
 \parseargdef\linemacro{%
   \getargs{#1}% now \macname is the macname and \argl the arglist
-  \expandafter\linegetparamlist\argl;%
+  \ifx\argl\empty
+    \paramno=0
+    \let\hash\relax
+    \def\paramlist{\hash 1\endlinemacro}%
+  \else
+    \expandafter\linegetparamlist\argl;%
+  \fi
   \begingroup \macrobodyctxt \usembodybackslash
   \parselinemacrobody
 }
@@ -8613,11 +8619,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
     \edef\paramlist{\paramlist\hash\the\paramno\space}%
   \fi\next}
 \def\linegetparamlistxxxx{%
-  \ifx\paramlist\empty
-     \def\paramlist{\hash 1\endlinemacro}%
-  \else
-    \expandafter\fixparamlist\paramlist\fixparamlist
-  \fi
+  \expandafter\fixparamlist\paramlist\fixparamlist
 }
 % Replace final space token
 \def\fixparamlist#1 \fixparamlist{%