texinfo/tp TODO Texinfo/Convert/HTML.pm

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/06/23 22:52:47

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

Log message:
        Handle a configuration hash refernce for renamed names.
        Add error message if renamed node is associated with an empty file name.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.135&r2=1.136
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.93&r2=1.94

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- TODO        21 Jun 2011 23:01:01 -0000      1.135
+++ TODO        23 Jun 2011 22:52:46 -0000      1.136
@@ -231,6 +231,9 @@
 sectioning/
 node_footnote_end
 
+equivalent_nodes mainly for equivalent_nodes-noderename.cnf parsing and renamed
+nodes handling.
+
 formatting/
 inter_item_commands.texi
 

Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- Texinfo/Convert/HTML.pm     23 Jun 2011 16:16:39 -0000      1.93
+++ Texinfo/Convert/HTML.pm     23 Jun 2011 22:52:46 -0000      1.94
@@ -3783,6 +3783,9 @@
       $self->{$formatting_references->[0]} = $formatting_references->[1];
     }
   }
+  if ($Texinfo::Config::renamed_nodes) {
+    %{$self->{'renamed_nodes'}} = %{$Texinfo::Config::renamed_nodes};
+  }
 
   $self->{'document_context'} = [],
   $self->_new_document_context('_toplevel_context');
@@ -5438,7 +5441,8 @@
   # collect renamed nodes
   ($self->{'renamed_nodes'}, $self->{'renamed_nodes_lines'}, 
        $self->{'renamed_nodes_file'})
-    = Texinfo::Common::collect_renamed_nodes($self, $self->{'document_name'});
+    = Texinfo::Common::collect_renamed_nodes($self, $self->{'document_name'},
+                                             $self->{'renamed_nodes'});
 
   # This should return undef if called on a tree without node or sections.
   my ($elements, $special_elements, $special_pages) 
@@ -5682,6 +5686,10 @@
           $self->document_error(sprintf($self->__(
                "Node `%s' that is to be renamed exists"), $old_node_name));
           $parsed_old_node = undef;
+        } elsif ($parsed_old_node->{'normalized'} !~ /[^-]/) {
+          $self->document_error(sprintf($self->__(
+               "File empty for renamed node `%s'"), $old_node_name));
+          $parsed_old_node = undef;
         }
       }
       my $new_node_name = $self->{'renamed_nodes'}->{$old_node_name};