texinfo/makeinfo toc.c,1.4,1.5 files.c,1.2,1.3

[dirt]

Update of /cvsroot/texinfo/texinfo/makeinfo
In directory sheep:/tmp/cvs-serv13545/makeinfo

Modified Files:
        toc.c files.c 
Log Message:
2004-01-08  Alper Ersoy  <address@hidden>

        * makeinfo/toc.c (cm_contents): moved the call to html_output_head
        to ...

        * makeinfo/files.c (register_delayed_write): here.



Index: toc.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/toc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** toc.c       8 Jan 2004 15:17:13 -0000       1.4
--- toc.c       8 Jan 2004 16:07:37 -0000       1.5
***************
*** 387,393 ****
    if (!handling_delayed_writes)
      {
-       if (!executing_string && html)
-         html_output_head ();
- 
        register_delayed_write (STREQ (command, "contents")
            ? "@contents" : "@shortcontents");
--- 387,390 ----

Index: files.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/files.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** files.c     8 Jan 2004 15:12:21 -0000       1.2
--- files.c     8 Jan 2004 16:07:37 -0000       1.3
***************
*** 593,596 ****
--- 593,601 ----
      return;
  
+   /* We need the HTML header in the output,
+      to get a proper output_position.  */
+   if (!executing_string && html)
+     html_output_head ();
+   /* Get output_position updated.  */
    flush_output ();