texinfo/makeinfo insertion.c,1.10,1.11 float.c,1.5,1.6

[dirt]

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

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

        * makeinfo/insertion.c (begin_insertion): fixed a thinko in @float
        arguments parsing code, regarding string termination; changed manual
        input text skipping with skip_whitespace_and_newlines for proper
        line_number handling; and changed magic number 10 with sizeof for
        improved readability.

        * makeinfo/float.c (cm_listoffloats): end paragraph before the menu
        header.  Use add_html_block_elt to insert <div> element.



Index: insertion.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** insertion.c 6 Jan 2004 14:50:10 -0000       1.10
--- insertion.c 6 Jan 2004 21:08:49 -0000       1.11
***************
*** 2,6 ****
     $Id$
  
!    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software
     Foundation, Inc.
  
--- 2,6 ----
     $Id$
  
!    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
  
***************
*** 756,759 ****
--- 756,771 ----
                  if (insertion_stack->item_function[i] == ',')
                    {
+                     switch (t)
+                       {
+                       case 0:
+                         floattype[c] = '\0';
+                         break;
+                       case 1:
+                         xreflabel[c] = '\0';
+                         break;
+                       case 2:
+                         position[c] = '\0';
+                         break;
+                       }
                      c = 0;
                      t++;
***************
*** 777,789 ****
                  i++;
                }
- 
-             floattype[c] = '\0';
-             xreflabel[c] = '\0';
-             position[c] = '\0';
            }
  
!         /* Skip leading whitespace.  */
!         while (curchar () == '\n')
!           input_text_offset++;
  
          start_of_end = get_until ("address@hidden float", &text);
--- 789,795 ----
                  i++;
                }
            }
  
!         skip_whitespace_and_newlines ();
  
          start_of_end = get_until ("address@hidden float", &text);
***************
*** 794,798 ****
          if (i > -1)
            {
!             input_text_offset = i + 10;
              get_until_in_braces ("address@hidden float", &caption);
              input_text_offset = save_input_text_offset;
--- 800,804 ----
          if (i > -1)
            {
!             input_text_offset = i + sizeof ("address@hidden") - 1;
              get_until_in_braces ("address@hidden float", &caption);
              input_text_offset = save_input_text_offset;

Index: float.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/float.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** float.c     6 Jan 2004 15:05:32 -0000       1.5
--- float.c     6 Jan 2004 21:08:49 -0000       1.6
***************
*** 154,160 ****
  
        if (html)
!         add_word ("<div class=\"listoffloats\">\n");
        else if (!no_headers)
!         insert_string ("* Menu:\n\n");
  
        while (temp)
--- 154,163 ----
  
        if (html)
!         add_html_block_elt ("<div class=\"listoffloats\">\n");
        else if (!no_headers)
!         {
!           close_paragraph ();
!           insert_string ("* Menu:\n\n");
!         }
  
        while (temp)