texinfo/tp Texinfo/Parser.pm t/16raw.t t/result...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/09/27 22:06:16

Modified files:
        tp/Texinfo     : Parser.pm 
        tp/t           : 16raw.t 
Added files:
        tp/t/results/raw: raw_in_para.pl 

Log message:
        Raw command except verbatim don't stop paragraphs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/16raw.t?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/raw_in_para.pl?cvsroot=texinfo&rev=1.1

Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- Texinfo/Parser.pm   27 Sep 2010 20:18:58 -0000      1.23
+++ Texinfo/Parser.pm   27 Sep 2010 22:06:15 -0000      1.24
@@ -254,6 +254,9 @@
 # commands that have a possible content before an item
 my %block_item_commands;
 
+# commands that forces closing an opened paragraph.
+my %close_paragraph_commands;
+
 my %def_commands;
 foreach my $def_command(
   'deffn',
@@ -420,9 +423,11 @@
 foreach my $block_command (keys(%block_commands)) {
   $begin_line_commands{$block_command} = 1;
   $default_no_paragraph_commands{$block_command} = 1;
+  $close_paragraph_commands{$block_command} = 1 
+     unless ($block_commands{$block_command} eq 'raw');
 }
+$close_paragraph_commands{'verbatim'} = 1;
 
-my %close_paragraph_commands;
 foreach my $close_paragraph_command ('titlefont', 'insertcopying', 'sp',
   'verbatiminclude', 'page', 'item', 'itemx', 'tab', 'headitem', 
   'printindex', 'listoffloats') {
@@ -1126,7 +1131,6 @@
             $current = $current->{'contents'}->[-1];
             last;
           } else {
-            $current = _end_paragraph($self, $current, $line_nr);
             $line =~ s/\s*//;
             # the def command holds a line_def* which corresponds with the
             # definition line.  This allows to have a treatement similar

Index: t/16raw.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/16raw.t,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/16raw.t   25 Sep 2010 10:01:34 -0000      1.4
+++ t/16raw.t   27 Sep 2010 22:06:16 -0000      1.5
@@ -37,6 +37,27 @@
 in verbatim2
 @end verbatim
 '],
+['raw_in_para',
+'para
address@hidden
+in verbatim
address@hidden verbatim
+
+para b html
address@hidden
+in html
address@hidden html
+in para
+
+para b tex
address@hidden
+in tex1
+
+in tex2
address@hidden tex
+
+End.
+']
 );
 
 our ($arg_test_case, $arg_generate, $arg_debug);

Index: t/results/raw/raw_in_para.pl
===================================================================
RCS file: t/results/raw/raw_in_para.pl
diff -N t/results/raw/raw_in_para.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/raw/raw_in_para.pl        27 Sep 2010 22:06:16 -0000      1.1
@@ -0,0 +1,166 @@
+use vars qw(%result_texts %result_trees %result_errors);
+
+$result_trees{'raw_in_para'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'para
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    },
+    {
+      'cmdname' => 'verbatim',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'in verbatim
+',
+          'type' => 'raw'
+        }
+      ],
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'normal_line'
+    },
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'para b html
+'
+        },
+        {
+          'cmdname' => 'html',
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => 'in html
+',
+              'type' => 'raw'
+            }
+          ],
+          'parent' => {}
+        },
+        {
+          'parent' => {},
+          'text' => 'in para
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'normal_line'
+    },
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'para b tex
+'
+        },
+        {
+          'cmdname' => 'tex',
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => 'in tex1
+',
+              'type' => 'raw'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'raw'
+            },
+            {
+              'parent' => {},
+              'text' => 'in tex2
+',
+              'type' => 'raw'
+            }
+          ],
+          'parent' => {}
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'normal_line'
+    },
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'End.
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    }
+  ]
+};
+$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'raw_in_para'}{'contents'}[0];
+$result_trees{'raw_in_para'}{'contents'}[0]{'parent'} = 
$result_trees{'raw_in_para'};
+$result_trees{'raw_in_para'}{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'raw_in_para'}{'contents'}[1];
+$result_trees{'raw_in_para'}{'contents'}[1]{'parent'} = 
$result_trees{'raw_in_para'};
+$result_trees{'raw_in_para'}{'contents'}[2]{'parent'} = 
$result_trees{'raw_in_para'};
+$result_trees{'raw_in_para'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'raw_in_para'}{'contents'}[3];
+$result_trees{'raw_in_para'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'raw_in_para'}{'contents'}[3]{'contents'}[1];
+$result_trees{'raw_in_para'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'raw_in_para'}{'contents'}[3];
+$result_trees{'raw_in_para'}{'contents'}[3]{'contents'}[2]{'parent'} = 
$result_trees{'raw_in_para'}{'contents'}[3];
+$result_trees{'raw_in_para'}{'contents'}[3]{'parent'} = 
$result_trees{'raw_in_para'};
+$result_trees{'raw_in_para'}{'contents'}[4]{'parent'} = 
$result_trees{'raw_in_para'};
+$result_trees{'raw_in_para'}{'contents'}[5]{'contents'}[0]{'parent'} = 
$result_trees{'raw_in_para'}{'contents'}[5];
+$result_trees{'raw_in_para'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'raw_in_para'}{'contents'}[5]{'contents'}[1];
+$result_trees{'raw_in_para'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'raw_in_para'}{'contents'}[5]{'contents'}[1];
+$result_trees{'raw_in_para'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'raw_in_para'}{'contents'}[5]{'contents'}[1];
+$result_trees{'raw_in_para'}{'contents'}[5]{'contents'}[1]{'parent'} = 
$result_trees{'raw_in_para'}{'contents'}[5];
+$result_trees{'raw_in_para'}{'contents'}[5]{'parent'} = 
$result_trees{'raw_in_para'};
+$result_trees{'raw_in_para'}{'contents'}[6]{'parent'} = 
$result_trees{'raw_in_para'};
+$result_trees{'raw_in_para'}{'contents'}[7]{'contents'}[0]{'parent'} = 
$result_trees{'raw_in_para'}{'contents'}[7];
+$result_trees{'raw_in_para'}{'contents'}[7]{'parent'} = 
$result_trees{'raw_in_para'};
+
+$result_texts{'raw_in_para'} = 'para
address@hidden
+in verbatim
address@hidden verbatim
+
+para b html
address@hidden
+in html
address@hidden html
+in para
+
+para b tex
address@hidden
+in tex1
+
+in tex2
address@hidden tex
+
+End.
+';
+
+$result_errors{'raw_in_para'} = [];
+
+