texinfo/makeinfo float.c,1.13,1.14 index.c,1.4,1.5

[dirt]

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

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

        * makeinfo/index.c (cm_printindex): adapted to delayed writing,
        decreased the space between the columns of plaintext output.

        * makeinfo/float.c (cm_listoffloats): disabled menu header checks,
        synced column_width with @printindex.



Index: float.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/float.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** float.c     8 Jan 2004 19:15:49 -0000       1.13
--- float.c     8 Jan 2004 21:05:47 -0000       1.14
***************
*** 233,237 ****
                    if (no_headers)
                      {
!                       column_width = 48;
                        /* We'll be adding a colon for readability.  */
                        aux_chars_len = sizeof (":");
--- 233,237 ----
                    if (no_headers)
                      {
!                       column_width = 43;
                        /* We'll be adding a colon for readability.  */
                        aux_chars_len = sizeof (":");
***************
*** 339,343 ****
        temp = new_start;
        float_stack = (FLOAT_ELT *) reverse_list (temp);
!       node_has_listoffloats = 1;
      } /* handling_delayed_writes */
  
--- 339,343 ----
        temp = new_start;
        float_stack = (FLOAT_ELT *) reverse_list (temp);
!       /* node_has_listoffloats = 1; */
      } /* handling_delayed_writes */
  

Index: index.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/index.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** index.c     8 Jan 2004 19:15:49 -0000       1.4
--- index.c     8 Jan 2004 21:05:47 -0000       1.5
***************
*** 19,22 ****
--- 19,23 ----
  
  #include "system.h"
+ #include "files.h"
  #include "index.h"
  #include "lang.h"
***************
*** 665,668 ****
--- 666,687 ----
        insert_string (index_name);
        xml_insert_element (PRINTINDEX, END);
+ 
+       return;
+     }
+   else if (!handling_delayed_writes)
+     {
+       char *index_name;
+       char *index_command;
+       int command_len;
+ 
+       get_rest_of_line (0, &index_name);
+       command_len = sizeof ("@ ") + strlen (command) + strlen (index_name);
+       index_command = xmalloc (command_len);
+ 
+       close_paragraph ();
+ 
+       snprintf (index_command, command_len, "@%s %s", command, index_name);
+       register_delayed_write (index_command);
+       free (index_command);
      }
    else
***************
*** 681,685 ****
        unsigned output_line_number_len;
  
-       close_paragraph ();
        get_rest_of_line (0, &index_name);
  
--- 700,703 ----
***************
*** 836,840 ****
                       index.  Instead, output the number or name of the
                       section that corresponds to that node.  */
!                   sprintf (line, "%-*s ", number_sections ? 50 : 1, 
index->entry);
                    line[strlen (index->entry)] = ':';
                    insert_string (line);
--- 854,858 ----
                       index.  Instead, output the number or name of the
                       section that corresponds to that node.  */
!                   sprintf (line, "%-*s ", number_sections ? 46 : 1, 
index->entry);
                    line[strlen (index->entry)] = ':';
                    insert_string (line);
***************
*** 846,850 ****
                      }
                    else
!                     { /* Sigh, @float in an @unnumbered. :-\  */
                        insert_string ("\n          ");
                        insert_string (_("See "));
--- 864,868 ----
                      }
                    else
!                     { /* Sigh, index in an @unnumbered. :-\  */
                        insert_string ("\n          ");
                        insert_string (_("See "));