texinfo/tp TODO Texinfo/Convert/HTML.pm

[Patrice Dumas]

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

Modified files:
        tp             : TODO 
        tp/Texinfo/Convert: HTML.pm 

Log message:
        Use consistently _element_is_top to determine whether a node is rendered
        as top or not.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.186&r2=1.187
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.171&r2=1.172

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -b -r1.186 -r1.187
--- TODO        2 Oct 2011 13:15:21 -0000       1.186
+++ TODO        5 Oct 2011 06:53:42 -0000       1.187
@@ -299,6 +299,7 @@
 NO_MONOLITHIC
 in layout/no_monolithic
           no_monolithic_only_toc_out
+   layout/navigation_*
 
 done: test/invalid. Not completly incorporated
 error_in_footnote_caption.texi    (at least partly done in 

Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -b -r1.171 -r1.172
--- Texinfo/Convert/HTML.pm     4 Oct 2011 19:28:09 -0000       1.171
+++ Texinfo/Convert/HTML.pm     5 Oct 2011 06:53:43 -0000       1.172
@@ -2076,11 +2076,9 @@
       my $is_top = $self->_element_is_top($element);
       my $first_in_page = ($element->{'parent'} 
                and $element->{'parent'}->{'contents'}->[0] eq $element);
-      my $previous_is_top = 0;
-      if ($self->{'global_target_elements'}->{'Top'}) {
-       $previous_is_top = (defined($element->{'element_prev'}) 
-          and $self->{'global_target_elements'}->{'Top'} eq 
$element->{'element_prev'});
-      }
+      #my $previous_is_top = 0;
+      my $previous_is_top = ($element->{'element_prev'} 
+                     and $self->_element_is_top($element->{'element_prev'}));
       print STDERR "Header ($previous_is_top, $is_top, $first_in_page): "
         .Texinfo::Structuring::_print_root_command_texi($command)."\n"
           if ($self->get_conf('DEBUG'));
@@ -3983,9 +3981,8 @@
   $result .= $content unless ($special_element);
 
   my $is_top = $self->_element_is_top($element);
-  my $next_is_top = ($self->{'global_target_elements'}->{'Top'}
-    and defined($element->{'element_next'})
-    and $self->{'global_target_elements'}->{'Top'} eq 
$element->{'element_next'});
+  my $next_is_top = ($element->{'element_next'} 
+                     and $self->_element_is_top($element->{'element_next'}));
   my $next_is_special = (defined($element->{'element_next'})
     and $element->{'element_next'}->{'extra'}->{'special_element'});
   # no 'parent' defined happens if there are no pages, and there are elements 
@@ -4572,7 +4569,8 @@
         = &$Texinfo::Config::sectioning_command_target_name($self, 
                                      $command, $target, $id,
                                      $target_contents, $id_contents,
-                                     $target_shortcontents, $id_shortcontents);
+                                     $target_shortcontents, $id_shortcontents,
+                                     $filename);
   }
   if ($self->get_conf('DEBUG')) {
     print STDERR "Register $command->{'cmdname'} $target, $id\n";