texinfo/tp TODO Texinfo/Convert/HTML.pm

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/05/02 07:04:22

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

Log message:
        Use SEC_Top for top node anchor only if the @top is empty.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.124&r2=1.125
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.49&r2=1.50

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- TODO        1 May 2011 22:24:53 -0000       1.124
+++ TODO        2 May 2011 07:04:22 -0000       1.125
@@ -116,6 +116,13 @@
 test node non automatic directions, especially in html and for external
 nodes.
 
+In html, test 
+ empty lines at the begining, 
+ content ignored before setfilename, 
+for the different cases of element/no element.
+In html test empty @top for title, with different cases for 
+setcontentsaftertit* and for anchors.
+
 @address@hidden leads to R( in @var?  Test in 
 plaintext_tests/characters_and_commands_in_var
 

Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- Texinfo/Convert/HTML.pm     1 May 2011 22:24:54 -0000       1.49
+++ Texinfo/Convert/HTML.pm     2 May 2011 07:04:22 -0000       1.50
@@ -2638,16 +2638,13 @@
         next if (!defined($root_command->{'cmdname'}) 
                  or $self->{'targets'}->{$root_command});
         if ($Texinfo::Common::root_commands{$root_command->{'cmdname'}}) {
-          my $target_base;
-          # FIXME this is a bit ad-hoc.  Keep it like that or not?
-          if ($root_command->{'cmdname'} eq 'top' 
-              and defined($self->{'misc_elements_targets'}->{'Top'})) {
-            $target_base = $self->{'misc_elements_targets'}->{'Top'};
-          } else {
-           $target_base = _normalized_to_id(
+          my $target_base = _normalized_to_id(
              Texinfo::Convert::NodeNameNormalization::transliterate_texinfo(
                 {'contents' => $root_command->{'extra'}->{'misc_content'}},
                 $no_unidecode));
+          if ($target_base !~ /\S/ and $root_command->{'cmdname'} eq 'top' 
+              and defined($self->{'misc_elements_targets'}->{'Top'})) {
+            $target_base = $self->{'misc_elements_targets'}->{'Top'};
           }
           my $nr=0;
           my $target = $target_base;