texinfo/tp Texinfo/Convert/Info.pm t/30sectioni...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/02/27 15:24:38

Modified files:
        tp/Texinfo/Convert: Info.pm 
        tp/t           : 30sectioning.t 
        tp/t/results/sectioning: double_node_anchor_float.pl 

Log message:
        Don't output duplicate nodes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/30sectioning.t?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl?cvsroot=texinfo&r1=1.16&r2=1.17

Patches:
Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- Texinfo/Convert/Info.pm     27 Feb 2011 15:07:40 -0000      1.39
+++ Texinfo/Convert/Info.pm     27 Feb 2011 15:24:38 -0000      1.40
@@ -513,6 +513,7 @@
 
   
   my $result = '';
+  return '' if (!defined($node->{'extra'}->{'normalized'}));
   if (!$self->{'empty_lines_count'}) {
     $result .= "\n";
     $self->_add_text_count("\n");
@@ -520,7 +521,11 @@
 
   #Â May happen when only converting a fragment
   my $output_filename = $self->{'output_filename'};
-  $output_filename = '' if (!defined($self->{'output_filename'}));
+  if (defined($self->{'output_filename'})) {
+    $output_filename = $self->{'output_filename'};
+  } else {
+    $output_filename = '';
+  }
 
   $self->_add_location($node);
   my $node_begin = "\x{1F}\nFile: $output_filename,  Node: ";

Index: t/30sectioning.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/30sectioning.t,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/30sectioning.t    27 Feb 2011 12:06:56 -0000      1.22
+++ t/30sectioning.t    27 Feb 2011 15:24:38 -0000      1.23
@@ -299,6 +299,28 @@
 
 @bye
 '],
+['double_node_anchor_float',
+'@node node1
+
address@hidden node1
+
address@hidden
+
address@hidden
+
address@hidden anchor1
+
address@hidden Text, node1
address@hidden float
+
address@hidden Text, anchor1
address@hidden float
+
address@hidden Text, float1
address@hidden float
+
address@hidden float1
+'],
 );
 
 my @test_cases = (
@@ -438,28 +460,6 @@
 '@anchor{}. 
 @anchor{   }.
 '],
-['double_node_anchor_float',
-'@node node1
-
address@hidden node1
-
address@hidden
-
address@hidden
-
address@hidden anchor1
-
address@hidden Text, node1
address@hidden float
-
address@hidden Text, anchor1
address@hidden float
-
address@hidden Text, float1
address@hidden float
-
address@hidden float1
-'],
 ['double_top',
 '@node ToP, top
 

Index: t/results/sectioning/double_node_anchor_float.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/sectioning/double_node_anchor_float.pl    6 Feb 2011 00:03:52 
-0000       1.16
+++ t/results/sectioning/double_node_anchor_float.pl    27 Feb 2011 15:24:38 
-0000      1.17
@@ -807,4 +807,36 @@
 };
 
 
+
+$result_converted{'info'}->{'double_node_anchor_float'} = 'This is , produced 
by makeinfo version 4.13 from .
+
+
+File: ,  Node: node1
+
+Text
+
+Text
+
+Text 1
+
+
+
+Tag Table:
+Node: node152
+Ref: anchor176
+Ref: float188
+
+End Tag Table
+';
+
+$result_converted_errors{'info'}->{'double_node_anchor_float'} = [
+  {
+    'error_line' => 'warning: Document without Top node.
+',
+    'text' => 'Document without Top node.',
+    'type' => 'warning'
+  }
+];
+
+
 1;