branch master updated: * doc/texinfo-tex-test.texi (Macros): Show desired output for all test cases to make it easier to check.

[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 9c48137b4d * doc/texinfo-tex-test.texi (Macros): Show desired output 
for all test cases to make it easier to check.
9c48137b4d is described below

commit 9c48137b4d4708f66ccadd7475fe8a03ae4b589a
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Mar 11 12:30:01 2023 +0000

    * doc/texinfo-tex-test.texi (Macros):
    Show desired output for all test cases to make it easier to
    check.
---
 ChangeLog                 |   6 +
 doc/texinfo-tex-test.texi | 306 ++++++++++++++++++++++++++++++++--------------
 2 files changed, 220 insertions(+), 92 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e33473ace3..b414337313 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-03-11  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * doc/texinfo-tex-test.texi (Macros):
+       Show desired output for all test cases to make it easier to
+       check.
+
 2023-03-11  Gavin Smith <gavinsmith0123@gmail.com>
 
        Avoid spurious space in macro expansion
diff --git a/doc/texinfo-tex-test.texi b/doc/texinfo-tex-test.texi
index bc9c962d40..4e6a5ecc62 100644
--- a/doc/texinfo-tex-test.texi
+++ b/doc/texinfo-tex-test.texi
@@ -176,132 +176,233 @@ line
 @paragraphindent 0
 
 @chapter Macros
+
+Each line should occur twice throughout, first line uses macro, second
+line should be the output.
+
 @section Backslashes in macro arguments
 
 @macro Mac{x}
-A\x\A
+(\x\)
 @end macro
 
+@Mac{}
+
+()
+
+@Mac{a}
+
+(a)
+
+@Mac{a}X
+
+(a)X
+
+@Mac{a\\}
+
+(a\)
+
+@Mac{a\}X
+
+(a\)X
+
+@Mac{b\\}X
+
+(b\)X
+
+@Mac{c\\\}X
+
+(c\\)X
+
+@Mac{\}X
+
+(\)X
+
+@Mac{\a}X
+
+(\a)X
+
+@Mac{\\b}X
+
+(\b)X
+
+@Mac{\\}X
+
+(\)X
+
+@Mac{\\\}X
+
+(\\)X
+
+@Mac{\\\aaa\}X
+
+(\\aaa\)X
+
+@Mac{\a\\b}X
+
+(\a\b)X
+
+@subsection Line arguments
+
+
+@Mac a
+
+(a)
+
+@Mac a\
+
+(a\)
+
+@Mac a\\
+
+(a\\)
+
+@Mac a\\\
+
+(a\\\)
+
+@Mac \a\\b
+
+(\a\\b)
+
+@subsection In @t{@@code}
+
+@code{@Mac{a\}}
+
+@code{(a\)}
+
+@code{@Mac{b\\}}
+
+@code{(b\)}
+
+@code{@Mac{c\\\}}
+
+@code{(c\\)}
+
+@code{@Mac{\\\\d}}
+
+@code{(\\d)}
+
+
+
+@subsection Macros with two arguments
+
 @macro Mactwo{x, y}
-<\x\>.<\y\>@.
+<\x\>.<\y\>
 @end macro
 
 @rmacro RMac{x}
 Z\x\Z
 @end rmacro
 
-The number refers to the number of backslashes that should appear
 
-0 @Mac{}
 
-0 @Mac{a}
+@Mactwo{A,B}
+
+<A>.<B>
+
+@Mactwo{A, C}
+
+<A>.<C>
+
+@Mactwo{\A, B}
+
+<\A>.<B>
+
+@Mactwo{A, \\B}
+
+<A>.<\B>
+
+@Mactwo{\\\A, \\B}
+
+<\\A>.<\B>
 
-0 @Mac{a}X
+@Mactwo{\\\A, \\\\B}
 
-1 @Mac{a\\}
+<\\A>.<\\B>
 
-1 @Mac{a\}X
+@subsubsection Space between macro name and opening brace
 
-1 @Mac{a\\}X
+@Mactwo {A,B}
 
-2 @Mac{a\\\}X
+<A>.<B>
 
-1 @Mac{\}X
+@Mactwo {A, C}
 
-1 @Mac{\a}X
+<A>.<C>
 
-1 @Mac{\\a}X
+@Mactwo {\A, B}
 
-1 @Mac{\\}X
+<\A>.<B>
 
-2 @Mac{\\\}X
+@Mactwo {A, \\B}
 
-2 and 1 @Mac{\\\aaa\}X
+<A>.<\B>
 
-1 and 1 @Mac{\a\\b}X
+@Mactwo {\\\A, \\B}
 
-one backslash outside \
+<\\A>.<\B>
 
-two backslashes outside \\
+@Mactwo {\\\A, \\\\B}
 
-three backslashes outside \\\
+<\\A>.<\\B>
 
-0 @Mac a 
 
-1 @Mac a\
+@subsection Spaces and backslashes
 
-2 @Mac a\\ 
+@Mac{\ \}
 
-3 @Mac a\\\
+(\ \)
 
-1 and 2 @Mac \a\\b
+@Mac \ \x
 
-in @@code:@*
-1 @code{@Mac{\}}@*
-1 @code{@Mac{\\}}@*
-2 @code{@Mac{\\\}}@*
-2 @code{@Mac{\\\\}}
+(\ \x)
 
-one backslash outside \
+@Mactwo{\ \\, \ \\}
 
-two backslashes outside \\
+<\ \>.<\ \>
 
-three backslashes outside \\\
+x@Mactwo{\\ \\, \\ \\}
 
-Macros with two arguments:
-0+0 @Mactwo{A,B}
-0+0 @Mactwo{A, B}
-1+0 @Mactwo{\A, B}
-0+1 @Mactwo{A, \\B}
-2+1 @Mactwo{\\\A, \\B}
-2+2 @Mactwo{\\\A, \\\\B}
+x<\ \>.<\ \>
 
-Space between macro name and opening brace (thus: @samp{@@Mactwo @{}):
+@Mactwo{\\ a, \\ b}
 
-0+0 @Mactwo {A,B}
-0+0 @Mactwo {A, B}
-1+0 @Mactwo {\A, B}
-0+1 @Mactwo {A, \\B}
-2+1 @Mactwo {\\\A, \\B}
-2+2 @Mactwo {\\\A, \\\\B}
+<\ a>.<\ b>
 
-space between backslashes: @Mac{\ \}@*
-space between backslashes line arg: @Mac \ \
+y@Mactwo{\ a, \ b}
 
-space after backslashes, two arguments:@*
-@Mactwo{\ \\, \ \\}@*
-@Mactwo{\\ \\, \\ \\}@*
-@Mactwo{\\ a, \\ b}@*
-@Mactwo{\ a, \ b}@*
+y<\ a>.<\ b>
 
-other spaces:@*
-@Mactwo{h \\, i \\}@*
-@Mactwo{h \\, i \\}@*
-@Mactwo{h a, i b}@*
+@Mactwo{h \\, i \\}
 
+<h \>.<i \>
 
-@section Special characters in macro argument
+@Mactwo{h a, i b}
 
-Braceless single line macro invocation with special characters.  Compare:
+<h a>.<i b>
+
+
+@section Braceless single line macro invocation with special characters
 
 @Mac "+<>^+|~@@@{@}
 
-A"+<>^+|~@@@{@}A
+("+<>^+|~@@@{@})
 
 
 @section Spaces in macro bodies
 
-Distance between the two x's should be the same
-
 @macro Mac
 @example
 x  x
 @end example
 @end macro
+
+@Mac
+
 @example
 x  x
 @end example
-@Mac
 
 @section Macro use inside macro argument
 
@@ -315,29 +416,22 @@ xx \arg\ xx
 @end macro
 
 @Outermac{@Innermac{e}}
-should be@*
+
 xx e xx
 
 @section Closing brace following empty macro argument
 
 @macro Mac{x}
-A@acronym{\x\}A
+(@acronym{\x\})
 @end macro
 
 @Mac{}
 
-AA
+()
 
 @page
 @section Trailing newlines in macro bodies
 
-Output should be doubled:
-
-1y
-
-z
-x2
-
 @macro nbsp
 y
               
@@ -347,8 +441,14 @@ x
 
 1@nbsp{}2
 
-Output should be doubled:
+1y
 
+z
+x2
+
+@example
+1@nbsp{}2
+@end example
 
 @example
 1y
@@ -357,9 +457,6 @@ z
 x2
 @end example
 
-@example
-1@nbsp{}2
-@end example
 
 @section Open or close a group in a macro
 
@@ -429,28 +526,51 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxx
 value
 @end macro
 
-Okay, we are here. The @Mac
-on next line now.
+A @Mac
+BB.
+
+A valueBB.
 
-With spaces and newline. The @Mac       
-on next line now.
+C @Mac       
+DD.
 
-With braces. The @Mac{}
-on next line now.
+C valueDD.
 
-With space and braces. The @Mac {}
-on next line now.
+E@Mac{}
+F
 
-With two spaces and braces. The @Mac  {}
-on next line now.
+Evalue F
 
-With braces and two newlines. The @Mac{}
+E @Mac {}
+F
 
-in next paragraph now.
+E value F
 
-With two newlines. The @Mac
+EE @Mac  {}
+FF
 
-in next paragraph now.
+EE value FF
+
+GG @Mac{}
+
+HHH
+
+GG value
+
+HHH
+
+II JJ @Mac
+
+KLM
+
+II JJ valueKLM
+
+KK LL @Mac
+
+
+MMM
+
+KK LL valueMMM
 
 @section @,c in macro argument
 
@@ -471,6 +591,8 @@ Fran@,cois+.
 
 exceeds @math{@frak{1,16}} pt
 
+exceeds @math{1 @over 16} pt
+
 
 @section Trim whitespace from macro arguments