texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/Makefile.tres, tp/t/60macro.t: add macro_end


From: Patrice Dumas
Subject: branch master updated: * tp/Makefile.tres, tp/t/60macro.t: add macro_end_call_in_ignored_raw test with a macro call end within an ignored raw format block.
Date: Fri, 10 Feb 2023 17:02:54 -0500

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 599a5262ea * tp/Makefile.tres, tp/t/60macro.t: add 
macro_end_call_in_ignored_raw test with a macro call end within an ignored raw 
format block.
599a5262ea is described below

commit 599a5262ea520df2cebd9d89aefca1bba7240d4f
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Feb 10 23:02:44 2023 +0100

    * tp/Makefile.tres, tp/t/60macro.t: add macro_end_call_in_ignored_raw
    test with a macro call end within an ignored raw format block.
---
 ChangeLog                                          |   5 +
 tp/Makefile.tres                                   |   1 +
 tp/t/60macro.t                                     |   9 ++
 .../results/macro/macro_end_call_in_ignored_raw.pl | 175 +++++++++++++++++++++
 4 files changed, 190 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index dbc1d0ad62..fef13cf219 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-02-10  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Makefile.tres, tp/t/60macro.t: add macro_end_call_in_ignored_raw
+       test with a macro call end within an ignored raw format block.
+
 2023-02-10  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ParserNonXS.pm (_expand_macro_arguments),
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index b8614acb61..fe958b1cb4 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -1202,6 +1202,7 @@ test_files_generated_list = 
$(test_tap_files_generated_list) \
   t/results/macro/macro_after_paragraph.pl \
   t/results/macro/macro_before_specific_line_command_args.pl \
   t/results/macro/macro_call_empty_middle_arg.pl \
+  t/results/macro/macro_end_call_in_ignored_raw.pl \
   t/results/macro/macro_expands_to_empty.pl \
   t/results/macro/macro_expansion.pl \
   t/results/macro/macro_for_dot_in_menu_not_separator.pl \
diff --git a/tp/t/60macro.t b/tp/t/60macro.t
index 8c22c6bf42..3fe55ff58a 100644
--- a/tp/t/60macro.t
+++ b/tp/t/60macro.t
@@ -508,6 +508,15 @@ after end of line
 In text.
 @mymacro{}
 '],
+['macro_end_call_in_ignored_raw',
+'@macro startraw
+@tex
+inT
+@end macro
+
+@startraw{}
+@end tex
+'],
 ['nested_macro_call',
 '@macro machin{}
 (machin)
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_raw.pl 
b/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
new file mode 100644
index 0000000000..e1b5df6bb6
--- /dev/null
+++ b/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
@@ -0,0 +1,175 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'macro_end_call_in_ignored_raw'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'args' => [
+            {
+              'text' => 'startraw',
+              'type' => 'macro_name'
+            }
+          ],
+          'cmdname' => 'macro',
+          'contents' => [
+            {
+              'text' => '@tex
+',
+              'type' => 'raw'
+            },
+            {
+              'text' => 'inT
+',
+              'type' => 'raw'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'macro'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'text_arg' => 'macro'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 4,
+                'macro' => ''
+              }
+            }
+          ],
+          'info' => {
+            'arg_line' => ' startraw
+'
+          },
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 1,
+            'macro' => ''
+          }
+        },
+        {
+          'source_marks' => [
+            {
+              'counter' => 1,
+              'element' => {
+                'extra' => {
+                  'name' => 'startraw'
+                },
+                'type' => 'macro_call'
+              },
+              'position' => 1,
+              'sourcemark_type' => 'macro_expansion',
+              'status' => 'start'
+            }
+          ],
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'info' => {
+                'spaces_after_argument' => {
+                  'text' => '
+'
+                }
+              },
+              'type' => 'block_line_arg'
+            }
+          ],
+          'cmdname' => 'tex',
+          'contents' => [
+            {
+              'type' => 'elided_block'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'text' => 'tex'
+                    }
+                  ],
+                  'info' => {
+                    'spaces_after_argument' => {
+                      'text' => '
+'
+                    }
+                  },
+                  'type' => 'line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'text_arg' => 'tex'
+              },
+              'info' => {
+                'spaces_before_argument' => {
+                  'text' => ' '
+                }
+              },
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 7,
+                'macro' => ''
+              }
+            }
+          ],
+          'source_info' => {
+            'file_name' => '',
+            'line_nr' => 6,
+            'macro' => 'startraw'
+          }
+        }
+      ],
+      'type' => 'before_node_section'
+    }
+  ],
+  'type' => 'document_root'
+};
+
+$result_texis{'macro_end_call_in_ignored_raw'} = '@macro startraw
+@tex
+inT
+@end macro
+
+@tex
+@end tex
+';
+
+
+$result_texts{'macro_end_call_in_ignored_raw'} = '
+';
+
+$result_errors{'macro_end_call_in_ignored_raw'} = [];
+
+
+$result_floats{'macro_end_call_in_ignored_raw'} = {};
+
+
+1;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]