texinfo/tp TODO Texinfo/Common.pm Texinfo/Parse...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/07/10 05:53:28

Modified files:
        tp             : TODO 
        tp/Texinfo     : Common.pm Parser.pm 
        tp/t           : 02coverage.t 
        tp/t/results/info_tests: split_no_copying.pl 
Added files:
        tp/t/results/coverage: setfilename_in_paragraph.pl 

Log message:
        @setfilename stops paragraphs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.139&r2=1.140
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.264&r2=1.265
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/02coverage.t?cvsroot=texinfo&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/setfilename_in_paragraph.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/split_no_copying.pl?cvsroot=texinfo&r1=1.8&r2=1.9

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- TODO        9 Jul 2011 06:35:38 -0000       1.139
+++ TODO        10 Jul 2011 05:53:28 -0000      1.140
@@ -113,7 +113,9 @@
 In html, test 
  empty lines at the begining, 
  content ignored before setfilename, 
-for the different cases of element/no element.
+for the different cases of element/no element.  This is to be done with 
+real input files, or test_utils.pl should be changed to parse entry like 
+a file.
 In html test empty @top for title, with different cases for 
 setcontentsaftertit* and for anchors.
 

Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- Texinfo/Common.pm   21 Jun 2011 23:01:03 -0000      1.49
+++ Texinfo/Common.pm   10 Jul 2011 05:53:28 -0000      1.50
@@ -569,7 +569,8 @@
 foreach my $close_paragraph_command ('titlefont', 'insertcopying', 'sp',
   'verbatiminclude', 'page', 'item', 'itemx', 'tab', 'headitem',
   'printindex', 'listoffloats', 'center', 'dircategory', 'contents',
-  'shortcontents', 'summarycontents', 'caption', 'shortcaption') {
+  'shortcontents', 'summarycontents', 'caption', 'shortcaption',
+  'setfilename') {
   $close_paragraph_commands{$close_paragraph_command} = 1;
 }
 

Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -b -r1.264 -r1.265
--- Texinfo/Parser.pm   9 Jul 2011 19:11:16 -0000       1.264
+++ Texinfo/Parser.pm   10 Jul 2011 05:53:28 -0000      1.265
@@ -742,9 +742,9 @@
   return $new_lines;
 }
 
-# entry point for text fragments
-# it does not seems to be used anywhere, so not sure it is usefull.
-# Note that it has not asociated root type a oppoed to pare_texi_line
+# entry point for text fragments.
+# Used in tests.
+# Note that it has not asociated root type a opposed to parse_texi_line
 # and parse_texi_file.
 sub parse_texi_text($$;$$$$)
 {

Index: t/02coverage.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/02coverage.t,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- t/02coverage.t      9 Jul 2011 06:35:39 -0000       1.50
+++ t/02coverage.t      10 Jul 2011 05:53:28 -0000      1.51
@@ -312,7 +312,7 @@
 
 @end quotation
 '],
-['flushleft_flushright_in_quotation',
+['flushleft_flushright_in_quotation', # FIXME test in HTML
 '
 @quotation
 @flushleft
@@ -501,6 +501,10 @@
 ['at_after_accent_command',
 '@ringaccent @@. @^@@.
 '],
+['setfilename_in_paragraph',
+'Some text
address@hidden filename.info
+']
 );
 
 my @test_invalid = (

Index: t/results/info_tests/split_no_copying.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/info_tests/split_no_copying.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/info_tests/split_no_copying.pl    9 Jul 2011 06:35:41 -0000       
1.8
+++ t/results/info_tests/split_no_copying.pl    10 Jul 2011 05:53:28 -0000      
1.9
@@ -15,6 +15,10 @@
               'parent' => {},
               'text' => '\\input texinfo
 '
+            }
+          ],
+          'parent' => {},
+          'type' => 'paragraph'
             },
             {
               'args' => [
@@ -53,10 +57,6 @@
                 'macro' => ''
               },
               'parent' => {}
-            }
-          ],
-          'parent' => {},
-          'type' => 'paragraph'
         },
         {
           'parent' => {},
@@ -425,14 +425,14 @@
   'type' => 'document_root'
 };
 
$result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[0];
-$result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[0];
 $result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'split_no_copying'}{'contents'}[0];
+$result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[1];
+$result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[1];
 $result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'split_no_copying'}{'contents'}[0];
+$result_trees{'split_no_copying'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'split_no_copying'}{'contents'}[0];
 $result_trees{'split_no_copying'}{'contents'}[0]{'parent'} = 
$result_trees{'split_no_copying'};
 
$result_trees{'split_no_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'split_no_copying'}{'contents'}[1];
 
$result_trees{'split_no_copying'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'split_no_copying'}{'contents'}[1]{'args'}[0];

Index: t/results/coverage/setfilename_in_paragraph.pl
===================================================================
RCS file: t/results/coverage/setfilename_in_paragraph.pl
diff -N t/results/coverage/setfilename_in_paragraph.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/coverage/setfilename_in_paragraph.pl      10 Jul 2011 05:53:28 
-0000      1.1
@@ -0,0 +1,86 @@
+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{'setfilename_in_paragraph'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'Some text
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'filename.info'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'spaces_at_end'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'setfilename',
+      'extra' => {
+        'text_arg' => 'filename.info'
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 2,
+        'macro' => ''
+      },
+      'parent' => {}
+    }
+  ],
+  'type' => 'text_root'
+};
+$result_trees{'setfilename_in_paragraph'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'setfilename_in_paragraph'}{'contents'}[0];
+$result_trees{'setfilename_in_paragraph'}{'contents'}[0]{'parent'} = 
$result_trees{'setfilename_in_paragraph'};
+$result_trees{'setfilename_in_paragraph'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'setfilename_in_paragraph'}{'contents'}[1];
+$result_trees{'setfilename_in_paragraph'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'setfilename_in_paragraph'}{'contents'}[1]{'args'}[0];
+$result_trees{'setfilename_in_paragraph'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'setfilename_in_paragraph'}{'contents'}[1]{'args'}[0];
+$result_trees{'setfilename_in_paragraph'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'setfilename_in_paragraph'}{'contents'}[1]{'args'}[0];
+$result_trees{'setfilename_in_paragraph'}{'contents'}[1]{'args'}[0]{'parent'} 
= $result_trees{'setfilename_in_paragraph'}{'contents'}[1];
+$result_trees{'setfilename_in_paragraph'}{'contents'}[1]{'parent'} = 
$result_trees{'setfilename_in_paragraph'};
+
+$result_texis{'setfilename_in_paragraph'} = 'Some text
address@hidden filename.info
+';
+
+
+$result_texts{'setfilename_in_paragraph'} = 'Some text
+';
+
+$result_errors{'setfilename_in_paragraph'} = [];
+
+
+
+$result_converted{'plaintext'}->{'setfilename_in_paragraph'} = 'Some text
+';
+
+1;