[5359] Add test cases for macro and @set in ignored @inlinefmt.

[Patrice Dumas]

Revision: 5359
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5359
Author:   pertusus
Date:     2013-09-07 20:20:49 +0000 (Sat, 07 Sep 2013)
Log Message:
-----------
Add test cases for macro and @set in ignored @inlinefmt.

Modified Paths:
--------------
    trunk/tp/t/50value.t
    trunk/tp/t/60macro.t

Added Paths:
-----------
    trunk/tp/t/results/macro/ignored_macro_definition.pl
    trunk/tp/t/results/value/ignored_value_definition.pl

Modified: trunk/tp/t/50value.t
===================================================================
--- trunk/tp/t/50value.t        2013-09-07 20:10:16 UTC (rev 5358)
+++ trunk/tp/t/50value.t        2013-09-07 20:20:49 UTC (rev 5359)
@@ -339,7 +339,17 @@
 @set ll 
 
 @address@hidden @value{hh}. @value{ll}}.
-', {'test_formats' => ['xml']}]
+', {'test_formats' => ['xml']}
+],
+['ignored_value_definition',
+'@set aa outside
+
address@hidden,
address@hidden aa in inlinefmt tex
+}
+
address@hidden
+']
 );
 
 our ($arg_test_case, $arg_generate, $arg_debug);

Modified: trunk/tp/t/60macro.t
===================================================================
--- trunk/tp/t/60macro.t        2013-09-07 20:10:16 UTC (rev 5358)
+++ trunk/tp/t/60macro.t        2013-09-07 20:20:49 UTC (rev 5359)
@@ -969,6 +969,21 @@
 
 '
 ],
+['ignored_macro_definition',
+'@macro mymacro{}
+outside
address@hidden macro
+
+
address@hidden,
address@hidden mymacro
address@hidden mymacro{}
+in inlinefmt tex
address@hidden macro
+}
+
address@hidden
+']
 );
 
 my @todo =(

Added: trunk/tp/t/results/macro/ignored_macro_definition.pl
===================================================================
--- trunk/tp/t/results/macro/ignored_macro_definition.pl                        
        (rev 0)
+++ trunk/tp/t/results/macro/ignored_macro_definition.pl        2013-09-07 
20:20:49 UTC (rev 5359)
@@ -0,0 +1,269 @@
+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);
+
+use utf8;
+
+$result_trees{'ignored_macro_definition'} = {
+  'contents' => [
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'mymacro',
+          'type' => 'macro_name'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'outside',
+          'type' => 'raw'
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'last_raw_newline'
+        }
+      ],
+      'extra' => {
+        'arg_line' => ' mymacro{}
+',
+        'macrobody' => 'outside
+',
+        'spaces_after_command' => {
+          'extra' => {
+            'command' => {}
+          },
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line_after_command'
+        }
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 1,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {},
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'contents' => [
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'tex'
+                }
+              ],
+              'parent' => {},
+              'type' => 'brace_command_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => '
+',
+                  'type' => 'empty_spaces_before_argument'
+                },
+                {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => 'mymacro',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'unmacro',
+                  'extra' => {
+                    'arg_line' => ' mymacro
+',
+                    'misc_args' => [
+                      'mymacro'
+                    ]
+                  },
+                  'parent' => {}
+                },
+                {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => 'mymacro',
+                      'type' => 'macro_name'
+                    }
+                  ],
+                  'cmdname' => 'macro',
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'in inlinefmt tex',
+                      'type' => 'raw'
+                    },
+                    {
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'last_raw_newline'
+                    }
+                  ],
+                  'extra' => {
+                    'arg_line' => ' mymacro{}
+',
+                    'macrobody' => 'in inlinefmt tex
+',
+                    'spaces_after_command' => {
+                      'extra' => {
+                        'command' => {}
+                      },
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'empty_line_after_command'
+                    }
+                  },
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 8,
+                    'macro' => ''
+                  },
+                  'parent' => {}
+                },
+                {}
+              ],
+              'parent' => {},
+              'type' => 'brace_command_arg'
+            }
+          ],
+          'cmdname' => 'inlinefmt',
+          'contents' => [],
+          'extra' => {
+            'brace_command_contents' => [
+              [
+                {}
+              ],
+              [
+                {},
+                {},
+                {}
+              ]
+            ],
+            'format' => 'tex',
+            'spaces_before_argument' => {
+              'text' => '',
+              'type' => 'empty_spaces_before_argument'
+            }
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 6,
+            'macro' => ''
+          },
+          'parent' => {}
+        },
+        {
+          'parent' => {},
+          'text' => '
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'outside.
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    }
+  ],
+  'type' => 'text_root'
+};
+$result_trees{'ignored_macro_definition'}{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'ignored_macro_definition'}{'contents'}[0];
+$result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ignored_macro_definition'}{'contents'}[0];
+$result_trees{'ignored_macro_definition'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'ignored_macro_definition'}{'contents'}[0];
+$result_trees{'ignored_macro_definition'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
 = $result_trees{'ignored_macro_definition'}{'contents'}[0];
+$result_trees{'ignored_macro_definition'}{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
 = $result_trees{'ignored_macro_definition'};
+$result_trees{'ignored_macro_definition'}{'contents'}[0]{'parent'} = 
$result_trees{'ignored_macro_definition'};
+$result_trees{'ignored_macro_definition'}{'contents'}[1] = 
$result_trees{'ignored_macro_definition'}{'contents'}[0]{'extra'}{'spaces_after_command'};
+$result_trees{'ignored_macro_definition'}{'contents'}[2]{'parent'} = 
$result_trees{'ignored_macro_definition'};
+$result_trees{'ignored_macro_definition'}{'contents'}[3]{'parent'} = 
$result_trees{'ignored_macro_definition'};
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[0];
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0];
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[1];
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1];
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
 = 
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'}{'parent'}
 = 
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1];
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1];
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[3]
 = 
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'};
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0];
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
 = 
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
 = 
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[1];
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][1]
 = 
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][2]
 = 
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'extra'}{'spaces_after_command'};
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'ignored_macro_definition'}{'contents'}[4];
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'ignored_macro_definition'}{'contents'}[4];
+$result_trees{'ignored_macro_definition'}{'contents'}[4]{'parent'} = 
$result_trees{'ignored_macro_definition'};
+$result_trees{'ignored_macro_definition'}{'contents'}[5]{'parent'} = 
$result_trees{'ignored_macro_definition'};
+$result_trees{'ignored_macro_definition'}{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'ignored_macro_definition'}{'contents'}[6];
+$result_trees{'ignored_macro_definition'}{'contents'}[6]{'parent'} = 
$result_trees{'ignored_macro_definition'};
+
+$result_texis{'ignored_macro_definition'} = '@macro mymacro{}
+outside
address@hidden macro
+
+
address@hidden,
address@hidden mymacro
address@hidden mymacro{}
+in inlinefmt tex
address@hidden macro
+}
+
+outside.
+';
+
+
+$result_texts{'ignored_macro_definition'} = '
+
+
+
+outside.
+';
+
+$result_errors{'ignored_macro_definition'} = [];
+
+
+1;

Added: trunk/tp/t/results/value/ignored_value_definition.pl
===================================================================
--- trunk/tp/t/results/value/ignored_value_definition.pl                        
        (rev 0)
+++ trunk/tp/t/results/value/ignored_value_definition.pl        2013-09-07 
20:20:49 UTC (rev 5359)
@@ -0,0 +1,181 @@
+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);
+
+use utf8;
+
+$result_trees{'ignored_value_definition'} = {
+  'contents' => [
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'aa',
+          'type' => 'misc_arg'
+        },
+        {
+          'parent' => {},
+          'text' => 'outside',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'set',
+      'extra' => {
+        'arg_line' => ' aa outside
+',
+        'misc_args' => [
+          'aa',
+          'outside'
+        ]
+      },
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'contents' => [
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'tex'
+                }
+              ],
+              'parent' => {},
+              'type' => 'brace_command_arg'
+            },
+            {
+              'contents' => [
+                {
+                  'text' => '
+',
+                  'type' => 'empty_spaces_before_argument'
+                },
+                {
+                  'args' => [
+                    {
+                      'parent' => {},
+                      'text' => 'aa',
+                      'type' => 'misc_arg'
+                    },
+                    {
+                      'parent' => {},
+                      'text' => 'in inlinefmt tex',
+                      'type' => 'misc_arg'
+                    }
+                  ],
+                  'cmdname' => 'set',
+                  'extra' => {
+                    'arg_line' => ' aa in inlinefmt tex
+',
+                    'misc_args' => [
+                      'aa',
+                      'in inlinefmt tex'
+                    ]
+                  },
+                  'parent' => {}
+                }
+              ],
+              'parent' => {},
+              'type' => 'brace_command_arg'
+            }
+          ],
+          'cmdname' => 'inlinefmt',
+          'contents' => [],
+          'extra' => {
+            'brace_command_contents' => [
+              [
+                {}
+              ],
+              [
+                {}
+              ]
+            ],
+            'format' => 'tex',
+            'spaces_before_argument' => {
+              'text' => '',
+              'type' => 'empty_spaces_before_argument'
+            }
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 3,
+            'macro' => ''
+          },
+          'parent' => {}
+        },
+        {
+          'parent' => {},
+          'text' => '
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'outside.
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    }
+  ],
+  'type' => 'text_root'
+};
+$result_trees{'ignored_value_definition'}{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'ignored_value_definition'}{'contents'}[0];
+$result_trees{'ignored_value_definition'}{'contents'}[0]{'args'}[1]{'parent'} 
= $result_trees{'ignored_value_definition'}{'contents'}[0];
+$result_trees{'ignored_value_definition'}{'contents'}[0]{'parent'} = 
$result_trees{'ignored_value_definition'};
+$result_trees{'ignored_value_definition'}{'contents'}[1]{'parent'} = 
$result_trees{'ignored_value_definition'};
+$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[0];
+$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0];
+$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1];
+$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[1]{'parent'}
 = 
$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1];
+$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1];
+$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0];
+$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
 = 
$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
 = 
$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1];
+$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'ignored_value_definition'}{'contents'}[2];
+$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'ignored_value_definition'}{'contents'}[2];
+$result_trees{'ignored_value_definition'}{'contents'}[2]{'parent'} = 
$result_trees{'ignored_value_definition'};
+$result_trees{'ignored_value_definition'}{'contents'}[3]{'parent'} = 
$result_trees{'ignored_value_definition'};
+$result_trees{'ignored_value_definition'}{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'ignored_value_definition'}{'contents'}[4];
+$result_trees{'ignored_value_definition'}{'contents'}[4]{'parent'} = 
$result_trees{'ignored_value_definition'};
+
+$result_texis{'ignored_value_definition'} = '@set aa outside
+
address@hidden,
address@hidden aa in inlinefmt tex
+}
+
+outside.
+';
+
+
+$result_texts{'ignored_value_definition'} = '
+
+
+outside.
+';
+
+$result_errors{'ignored_value_definition'} = [];
+
+
+1;