texinfo/makeinfo float.c,1.10,1.11

[dirt]

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

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

        * makeinfo/float.c (cm_listoffloats): adapted for delayed writing,
        and slightly fixed formatting with no_headers.



Index: float.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/float.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** float.c     7 Jan 2004 00:18:23 -0000       1.10
--- float.c     8 Jan 2004 16:06:21 -0000       1.11
***************
*** 23,26 ****
--- 23,27 ----
  #include "makeinfo.h"
  #include "cmds.h"
+ #include "files.h"
  #include "float.h"
  #include "sectioning.h"
***************
*** 164,169 ****
            "type=\"%s\"", text_expansion (float_type));
        xml_insert_element (LISTOFFLOATS, END);
      }
!   else if (!xml)
      {
        FLOAT_ELT *temp = (FLOAT_ELT *) reverse_list (float_stack);
--- 165,187 ----
            "type=\"%s\"", text_expansion (float_type));
        xml_insert_element (LISTOFFLOATS, END);
+ 
+       return;
      }
! 
!   if (!handling_delayed_writes)
!     {
!       int command_len = sizeof ("@ ") + strlen (command) + strlen 
(float_type);
!       char *list_command = xmalloc (command_len);
! 
!       /* These are for the text following @listoffloats command.
!          Handling them with delayed writes is too late.  */
!       close_paragraph ();
!       cm_noindent ();
! 
!       snprintf (list_command, command_len, "@%s %s", command, float_type);
!       register_delayed_write (list_command);
!       free (list_command);
!     }
!   else
      {
        FLOAT_ELT *temp = (FLOAT_ELT *) reverse_list (float_stack);
***************
*** 171,179 ****
  
        if (html)
!         add_html_block_elt ("<div class=\"listoffloats\">\n");
!       else if (!no_headers)
          {
!           close_paragraph ();
!           if (!node_has_listoffloats)
              insert_string ("* Menu:\n\n");
          }
--- 189,196 ----
  
        if (html)
!         insert_string ("<div class=\"listoffloats\">\n");
!       else
          {
!           if (!no_headers && !node_has_listoffloats)
              insert_string ("* Menu:\n\n");
          }
***************
*** 189,193 ****
                    execute_string ("@ref{%s, %s %s}", temp->id, temp->number,
                        temp->title);
!                   add_word ("<br>\n");
                  }
                else
--- 206,210 ----
                    execute_string ("@ref{%s, %s %s}", temp->id, temp->number,
                        temp->title);
!                   insert_string ("<br>\n");
                  }
                else
***************
*** 313,317 ****
          {
            inhibit_paragraph_indentation = 1;
!           add_word ("</div>\n\n");
          }
        else
--- 330,334 ----
          {
            inhibit_paragraph_indentation = 1;
!           insert_string ("</div>\n\n");
          }
        else
***************
*** 321,325 ****
        temp = new_start;
        float_stack = (FLOAT_ELT *) reverse_list (temp);
!     } /* !xml */
  
    free (float_type);
--- 338,342 ----
        temp = new_start;
        float_stack = (FLOAT_ELT *) reverse_list (temp);
!     } /* handling_delayed_writes */
  
    free (float_type);