texinfo/tp TODO t/60macro.t t/results/macro/com...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/10/12 18:06:18

Modified files:
        tp             : TODO 
        tp/t           : 60macro.t 
Added files:
        tp/t/results/macro: complete_macro_for_end.pl macro_in_accent.pl 
                            space_macro_after_end.pl 

Log message:
        More tests for user macro expansion in accents and after @end commands.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/60macro.t?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/complete_macro_for_end.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_accent.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/space_macro_after_end.pl?cvsroot=texinfo&rev=1.1

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- TODO        12 Oct 2010 16:45:06 -0000      1.12
+++ TODO        12 Oct 2010 18:06:18 -0000      1.13
@@ -10,6 +10,11 @@
 involved would be a matter of checking if the column number was < or >
 the place where the error occurred.
 
+Following should be an error:
address@hidden
address@hidden A heading
address@hidden example
+
 
 test invalid, especially commands not closed/bad nesting
 test root_commands, like nodes and sections

Index: t/60macro.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/60macro.t,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/60macro.t 10 Oct 2010 23:23:03 -0000      1.17
+++ t/60macro.t 12 Oct 2010 18:06:18 -0000      1.18
@@ -216,6 +216,21 @@
 @cartouche
 @my-end{} cartouche
 '],
+['complete_macro_for_end',
+'@macro the-end
address@hidden cartouche
address@hidden macro
+
address@hidden
address@hidden'],
+['space_macro_after_end',
+'@macro spaces
+  
address@hidden macro
+
address@hidden
+in html
address@hidden html @spaces{}'],
 ['macro_in_menu',
 '
 @macro star
@@ -264,6 +279,22 @@
 
 Before @truc{} after truc.
 '],
+['macro_in_accent',
+'@macro a-letter
+a
address@hidden macro
+
address@hidden space
+  
address@hidden macro
+
address@hidden @a-letter{}.
address@hidden@a-letter{}.
address@hidden@a-letter{}.
address@hidden@a-letter{}}.
+
address@hidden@address@hidden
+'],
 ['two_macros_on_a_line',
 '@macro mymacro
 in mymacro

Index: t/results/macro/complete_macro_for_end.pl
===================================================================
RCS file: t/results/macro/complete_macro_for_end.pl
diff -N t/results/macro/complete_macro_for_end.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/macro/complete_macro_for_end.pl   12 Oct 2010 18:06:18 -0000      
1.1
@@ -0,0 +1,79 @@
+use vars qw(%result_texts %result_trees %result_errors);
+
+$result_trees{'complete_macro_for_end'} = {
+  'contents' => [
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'the-end',
+          'type' => 'macro_name'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => '@end cartouche
+',
+          'type' => 'raw'
+        }
+      ],
+      'parent' => {},
+      'special' => {
+        'arg_line' => ' the-end
+',
+        'macrobody' => '@end cartouche
+'
+      }
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'cmdname' => 'cartouche',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line_after_command'
+        }
+      ],
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '',
+      'type' => 'empty_line_after_command'
+    }
+  ]
+};
+$result_trees{'complete_macro_for_end'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complete_macro_for_end'}{'contents'}[0];
+$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complete_macro_for_end'}{'contents'}[0];
+$result_trees{'complete_macro_for_end'}{'contents'}[0]{'parent'} = 
$result_trees{'complete_macro_for_end'};
+$result_trees{'complete_macro_for_end'}{'contents'}[1]{'parent'} = 
$result_trees{'complete_macro_for_end'};
+$result_trees{'complete_macro_for_end'}{'contents'}[2]{'parent'} = 
$result_trees{'complete_macro_for_end'};
+$result_trees{'complete_macro_for_end'}{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'complete_macro_for_end'}{'contents'}[3];
+$result_trees{'complete_macro_for_end'}{'contents'}[3]{'parent'} = 
$result_trees{'complete_macro_for_end'};
+$result_trees{'complete_macro_for_end'}{'contents'}[4]{'parent'} = 
$result_trees{'complete_macro_for_end'};
+
+$result_texts{'complete_macro_for_end'} = '@macro the-end
address@hidden cartouche
address@hidden macro
+
address@hidden
address@hidden cartouche';
+
+$result_errors{'complete_macro_for_end'} = [];
+
+

Index: t/results/macro/macro_in_accent.pl
===================================================================
RCS file: t/results/macro/macro_in_accent.pl
diff -N t/results/macro/macro_in_accent.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/macro/macro_in_accent.pl  12 Oct 2010 18:06:18 -0000      1.1
@@ -0,0 +1,239 @@
+use vars qw(%result_texts %result_trees %result_errors);
+
+$result_trees{'macro_in_accent'} = {
+  'contents' => [
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'a-letter',
+          'type' => 'macro_name'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'a
+',
+          'type' => 'raw'
+        }
+      ],
+      'parent' => {},
+      'special' => {
+        'arg_line' => ' a-letter
+',
+        'macrobody' => 'a
+'
+      }
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'space',
+          'type' => 'macro_name'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => '  
+',
+          'type' => 'raw'
+        }
+      ],
+      'parent' => {},
+      'special' => {
+        'arg_line' => ' space
+',
+        'macrobody' => '  
+'
+      }
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'contents' => [
+        {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => 'a',
+              'type' => 'space_command_arg'
+            }
+          ],
+          'cmdname' => 'ringaccent',
+          'parent' => {},
+          'special' => {
+            'spaces' => ' '
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '.
+'
+        },
+        {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => 'a',
+              'type' => 'space_command_arg'
+            }
+          ],
+          'cmdname' => 'ringaccent',
+          'parent' => {}
+        },
+        {
+          'parent' => {},
+          'text' => '.
+'
+        },
+        {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => 'a'
+            }
+          ],
+          'cmdname' => '~',
+          'parent' => {}
+        },
+        {
+          'parent' => {},
+          'text' => '.
+'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'a'
+                }
+              ],
+              'parent' => {},
+              'type' => 'brace_command_arg'
+            }
+          ],
+          'cmdname' => '~',
+          'contents' => [],
+          'parent' => {},
+          'remaining_args' => 0
+        },
+        {
+          'parent' => {},
+          'text' => '.
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'contents' => [
+        {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => 'a',
+              'type' => 'space_command_arg'
+            }
+          ],
+          'cmdname' => 'ringaccent',
+          'parent' => {},
+          'special' => {
+            'spaces' => '  '
+          }
+        },
+        {
+          'parent' => {},
+          'text' => '.
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    }
+  ]
+};
+$result_trees{'macro_in_accent'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[0];
+$result_trees{'macro_in_accent'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[0];
+$result_trees{'macro_in_accent'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_accent'};
+$result_trees{'macro_in_accent'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_accent'};
+$result_trees{'macro_in_accent'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_accent'};
+$result_trees{'macro_in_accent'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[3];
+$result_trees{'macro_in_accent'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[3];
+$result_trees{'macro_in_accent'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_accent'};
+$result_trees{'macro_in_accent'}{'contents'}[4]{'parent'} = 
$result_trees{'macro_in_accent'};
+$result_trees{'macro_in_accent'}{'contents'}[5]{'parent'} = 
$result_trees{'macro_in_accent'};
+$result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[0];
+$result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[6];
+$result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[6];
+$result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[2];
+$result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[6];
+$result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[6];
+$result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[4];
+$result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[4]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[6];
+$result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[5]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[6];
+$result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[6]{'args'}[0];
+$result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[6];
+$result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[6]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[6];
+$result_trees{'macro_in_accent'}{'contents'}[6]{'contents'}[7]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[6];
+$result_trees{'macro_in_accent'}{'contents'}[6]{'parent'} = 
$result_trees{'macro_in_accent'};
+$result_trees{'macro_in_accent'}{'contents'}[7]{'parent'} = 
$result_trees{'macro_in_accent'};
+$result_trees{'macro_in_accent'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_accent'}{'contents'}[8]{'contents'}[0];
+$result_trees{'macro_in_accent'}{'contents'}[8]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[8];
+$result_trees{'macro_in_accent'}{'contents'}[8]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_accent'}{'contents'}[8];
+$result_trees{'macro_in_accent'}{'contents'}[8]{'parent'} = 
$result_trees{'macro_in_accent'};
+
+$result_texts{'macro_in_accent'} = '@macro a-letter
+a
address@hidden macro
+
address@hidden space
+  
address@hidden macro
+
address@hidden a.
address@hidden
address@hidden
address@hidden
+
address@hidden  a.
+';
+
+$result_errors{'macro_in_accent'} = [];
+
+

Index: t/results/macro/space_macro_after_end.pl
===================================================================
RCS file: t/results/macro/space_macro_after_end.pl
diff -N t/results/macro/space_macro_after_end.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/macro/space_macro_after_end.pl    12 Oct 2010 18:06:18 -0000      
1.1
@@ -0,0 +1,87 @@
+use vars qw(%result_texts %result_trees %result_errors);
+
+$result_trees{'space_macro_after_end'} = {
+  'contents' => [
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'spaces',
+          'type' => 'macro_name'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => '  
+',
+          'type' => 'raw'
+        }
+      ],
+      'parent' => {},
+      'special' => {
+        'arg_line' => ' spaces
+',
+        'macrobody' => '  
+'
+      }
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'cmdname' => 'html',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line_after_command'
+        },
+        {
+          'parent' => {},
+          'text' => 'in html
+',
+          'type' => 'raw'
+        }
+      ],
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '   ',
+      'type' => 'empty_line_after_command'
+    }
+  ]
+};
+$result_trees{'space_macro_after_end'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'space_macro_after_end'}{'contents'}[0];
+$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'space_macro_after_end'}{'contents'}[0];
+$result_trees{'space_macro_after_end'}{'contents'}[0]{'parent'} = 
$result_trees{'space_macro_after_end'};
+$result_trees{'space_macro_after_end'}{'contents'}[1]{'parent'} = 
$result_trees{'space_macro_after_end'};
+$result_trees{'space_macro_after_end'}{'contents'}[2]{'parent'} = 
$result_trees{'space_macro_after_end'};
+$result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[0]{'parent'} 
= $result_trees{'space_macro_after_end'}{'contents'}[3];
+$result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[1]{'parent'} 
= $result_trees{'space_macro_after_end'}{'contents'}[3];
+$result_trees{'space_macro_after_end'}{'contents'}[3]{'parent'} = 
$result_trees{'space_macro_after_end'};
+$result_trees{'space_macro_after_end'}{'contents'}[4]{'parent'} = 
$result_trees{'space_macro_after_end'};
+
+$result_texts{'space_macro_after_end'} = '@macro spaces
+  
address@hidden macro
+
address@hidden
+in html
address@hidden html   ';
+
+$result_errors{'space_macro_after_end'} = [];
+
+