texinfo/tp/t 60macro.t results/macro/macro_in

texinfo-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp/t 60macro.t results/macro/macro_in_m...

From:	Patrice Dumas
Subject:	texinfo/tp/t 60macro.t results/macro/macro_in_m...
Date:	Sun, 10 Oct 2010 18:53:06 +0000
CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/10/10 18:53:06

Modified files:
        tp/t           : 60macro.t 
        tp/t/results/macro: macro_in_menu.pl 

Log message:
        Test for user-defined macros for colon in menu.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/60macro.t?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_menu.pl?cvsroot=texinfo&r1=1.4&r2=1.5

Patches:
Index: 60macro.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/60macro.t,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- 60macro.t   9 Oct 2010 23:10:34 -0000       1.15
+++ 60macro.t   10 Oct 2010 18:53:06 -0000      1.16
@@ -222,12 +222,17 @@
 ::
 @end macro
 
address@hidden colon
+:
address@hidden macro
+
 @menu
 @star-spaces{}menu address@hidden description
 @spaces{}
 menu comment
 @star{} node::
 @address@hidden node::
+* node colon address@hidden@address@hidden
 * 3rd node: address@hidden
 @end menu
 '],

Index: results/macro/macro_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_in_menu.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- results/macro/macro_in_menu.pl      10 Oct 2010 00:59:22 -0000      1.4
+++ results/macro/macro_in_menu.pl      10 Oct 2010 18:53:06 -0000      1.5
@@ -164,6 +164,37 @@
       'type' => 'empty_line'
     },
     {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'colon',
+          'type' => 'macro_name'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => ':
+',
+          'type' => 'raw'
+        }
+      ],
+      'parent' => {},
+      'special' => {
+        'macro_line' => ' colon
+',
+        'macrobody' => ':
+'
+      }
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
       'cmdname' => 'menu',
       'contents' => [
         {
@@ -305,6 +336,43 @@
               'contents' => [
                 {
                   'parent' => {},
+                  'text' => 'node colon macro'
+                }
+              ],
+              'parent' => {},
+              'type' => 'menu_entry_node'
+            },
+            {
+              'parent' => {},
+              'text' => ':: ',
+              'type' => 'menu_entry_separator'
+            },
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'description
+'
+                }
+              ],
+              'parent' => {},
+              'type' => 'menu_entry_description'
+            }
+          ],
+          'parent' => {},
+          'type' => 'menu_entry'
+        },
+        {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => '* ',
+              'type' => 'menu_entry_leading_text'
+            },
+            {
+              'contents' => [
+                {
+                  'parent' => {},
                   'text' => '3rd node'
                 }
               ],
@@ -372,41 +440,52 @@
 $result_trees{'macro_in_menu'}{'contents'}[9]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[9];
 $result_trees{'macro_in_menu'}{'contents'}[9]{'parent'} = 
$result_trees{'macro_in_menu'};
 $result_trees{'macro_in_menu'}{'contents'}[10]{'parent'} = 
$result_trees{'macro_in_menu'};
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[0];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[0]{'args'}[1];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[0];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[0]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[0];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[0]{'args'}[3];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[0]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[11];
 $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[11];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[11];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[2];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[11];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[1];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[3];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[11];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[1];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[3];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[11];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[1];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[3];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[4]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[5];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[5]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[11];
 $result_trees{'macro_in_menu'}{'contents'}[11]{'parent'} = 
$result_trees{'macro_in_menu'};
+$result_trees{'macro_in_menu'}{'contents'}[12]{'parent'} = 
$result_trees{'macro_in_menu'};
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[0]{'args'}[1];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[0]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[0]{'args'}[3];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[0]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[13];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[13];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[2];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[13];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[3];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[3]{'args'}[1];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[3]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[3];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[3]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[3];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[3]{'args'}[3];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[3]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[3];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[13];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[4];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[4]{'args'}[1];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[4]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[4];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[4]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[4];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[4]{'args'}[3];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[4]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[4];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[4]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[13];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[5];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[5]{'args'}[1];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[5]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[5];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[5]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[5];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[5]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[5]{'args'}[3];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[5]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[5];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[5]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[13];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[6];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[6]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[6]{'args'}[1];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[6]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[6];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[6]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[6];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[6]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[6]{'args'}[3];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[6]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[6];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[6]{'args'}[4]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[6];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[6]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[6]{'args'}[5];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[6]{'args'}[5]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[6];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'contents'}[6]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[13];
+$result_trees{'macro_in_menu'}{'contents'}[13]{'parent'} = 
$result_trees{'macro_in_menu'};
 
 $result_texts{'macro_in_menu'} = '
 @macro star
@@ -429,12 +508,17 @@
 ::
 @end macro
 
address@hidden colon
+:
address@hidden macro
+
 @menu
 * menu entry:: description
   
 menu comment
 * node::
 * other node::
+* node colon macro:: description
 * 3rd node: entry. description
 @end menu
 ';
[Prev in Thread]
Current Thread
[Next in Thread]
texinfo/tp/t 60macro.t results/macro/macro_in_m..., Patrice Dumas <=
Prev by Date: texinfo/tp Texinfo/Parser.pm t/results/coverage...
Next by Date: texinfo/tp TODO t/55conditionals.t t/results/co...
Previous by thread: texinfo/tp Texinfo/Parser.pm t/results/coverage...
Next by thread: texinfo/tp TODO t/55conditionals.t t/results/co...
Index(es):
- Date
- Thread