branch master updated: * tp/Makefile.tres, tp/t/65linemacro.t: add end_conditional_in_linemacro test.

[Patrice Dumas]

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new dfae1d54da * tp/Makefile.tres, tp/t/65linemacro.t: add 
end_conditional_in_linemacro test.
dfae1d54da is described below

commit dfae1d54da4b804d4584996599335f63ce949a49
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Jul 14 10:09:22 2023 +0200

    * tp/Makefile.tres, tp/t/65linemacro.t: add
    end_conditional_in_linemacro test.
---
 ChangeLog                                              |  5 +++++
 tp/Makefile.tres                                       |  2 ++
 tp/t/65linemacro.t                                     | 10 ++++++++++
 tp/t/results/linemacro/end_conditional_in_linemacro.pl |  8 ++++----
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5344f279f6..5596e40628 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-07-14  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Makefile.tres, tp/t/65linemacro.t: add
+       end_conditional_in_linemacro test.
+
 2023-07-14  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ParserNonXS.pm (_end_line, _handle_macro)
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index db1b3af268..aaa8b7c36a 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -210,6 +210,7 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   t/results/converters_tests/inlineifsetifclearspaces.pl \
   t/results/converters_tests/inlinerawspaces.pl \
   t/results/converters_tests/line_breaks.pl \
+  t/results/converters_tests/link.pl \
   t/results/converters_tests/minimal_empty_empty.pl \
   t/results/converters_tests/minimal_empty_empty/res_docbook \
   t/results/converters_tests/minimal_empty_empty/res_html \
@@ -1211,6 +1212,7 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   t/results/linemacro/brace_command_not_closed.pl \
   t/results/linemacro/braces_after_text.pl \
   t/results/linemacro/empty_last_argument.pl \
+  t/results/linemacro/end_conditional_in_linemacro.pl \
   t/results/linemacro/last_argument_with_braces.pl \
   t/results/linemacro/missing_formal_arg.pl \
   t/results/linemacro/nested_linemacro_calls.pl \
diff --git a/tp/t/65linemacro.t b/tp/t/65linemacro.t
index 49fa48a449..9a96505889 100644
--- a/tp/t/65linemacro.t
+++ b/tp/t/65linemacro.t
@@ -244,6 +244,16 @@ inside {\a\ operator \b\}
 @outside {type} {@inside {X} {Y}} ( remaining, type typed )
 @end defblock
 '],
+# FIXME this construct is ok in Texinfo TeX, should be valid
+['end_conditional_in_linemacro',
+'@linemacro lm {a}
+\a\
+@end linemacro
+
+@ifclear aa
+@lm {text
+  @end ifclear}
+']
 # TODO
 # add recursive linemacro call
 # add macro call in linemacro
diff --git a/tp/t/results/linemacro/end_conditional_in_linemacro.pl 
b/tp/t/results/linemacro/end_conditional_in_linemacro.pl
index 893ae31425..ae140aa81e 100644
--- a/tp/t/results/linemacro/end_conditional_in_linemacro.pl
+++ b/tp/t/results/linemacro/end_conditional_in_linemacro.pl
@@ -128,7 +128,7 @@ $result_trees{'end_conditional_in_linemacro'} = {
                         ],
                         'info' => {
                           'spaces_after_argument' => {
-                            'text' => ' 
+                            'text' => '
 '
                           }
                         },
@@ -158,7 +158,7 @@ $result_trees{'end_conditional_in_linemacro'} = {
         {
           'contents' => [
             {
-              'text' => 'text 
+              'text' => 'text
 '
             }
           ],
@@ -232,13 +232,13 @@ $result_texis{'end_conditional_in_linemacro'} = 
'@linemacro lm {a}
 \\a\\
 @end linemacro
 
-text 
+text
 
   ';
 
 
 $result_texts{'end_conditional_in_linemacro'} = '
-text 
+text
 
 ';