texinfo update (Sun Jun 6 21:22:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.348
retrieving revision 1.349
diff -c -r1.348 -r1.349
*** ChangeLog   6 Jun 2004 14:04:55 -0000       1.348
--- ChangeLog   7 Jun 2004 00:57:16 -0000       1.349
***************
*** 1,5 ****
--- 1,11 ----
  2004-06-06  Karl Berry  <address@hidden>
  
+       * makeinfo/index.c (index_add_arg): ensure all elements are always
+       initialized, including output_file, section, and section_name.
+       (cm_printindex): don't pass index->output_file to
+       add_html_block_elt_args if it is null.  Also do
+       not pass spurious extra index_name argument.
+ 
        * makeinfo/makeinfo.c (add_char): don't call html_output_head if
        only_macro_expansion (e.g., a macro call in the
        Top menu).  From: Yuri D'Elia <address@hidden>,
Index: makeinfo/index.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/index.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** makeinfo/index.c    11 Apr 2004 17:56:47 -0000      1.14
--- makeinfo/index.c    7 Jun 2004 00:52:08 -0000       1.15
***************
*** 1,5 ****
  /* index.c -- indexing for Texinfo.
!    $Id: index.c,v 1.14 2004/04/11 17:56:47 karl Exp $
  
     Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation,
     Inc.
--- 1,5 ----
  /* index.c -- indexing for Texinfo.
!    $Id: index.c,v 1.15 2004/06/07 00:52:08 karl Exp $
  
     Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation,
     Inc.
***************
*** 180,187 ****
          flush_output ();
  
        new->next = the_indices[which];
-       new->entry_text = index_entry;
        new->entry = NULL;
        /* Since footnotes are handled at the very end of the document,
           node name in the non-split HTML outputs always show the last
           node.  We artificially make it ``Footnotes''.  */
--- 180,187 ----
          flush_output ();
  
        new->next = the_indices[which];
        new->entry = NULL;
+       new->entry_text = index_entry;
        /* Since footnotes are handled at the very end of the document,
           node name in the non-split HTML outputs always show the last
           node.  We artificially make it ``Footnotes''.  */
***************
*** 197,202 ****
--- 197,207 ----
            else
              new->section_name = "";
          }
+       else
+         {
+           new->section = NULL;
+           new->section_name = NULL;
+         }
        new->code = tem->code;
        new->defining_line = line_number - 1;
        new->output_line = no_headers ? output_line_number : node_line_number;
***************
*** 204,212 ****
           something that goes away, for example, inside a macro.
           (see the findexerr test).  */
        new->defining_file = xstrdup (input_filename);
-       the_indices[which] = new;
- 
-       new->entry_number = index_counter;
  
        if (html && splitting)
          {
--- 209,214 ----
***************
*** 215,220 ****
--- 217,227 ----
            else
              new->output_file = xstrdup ("");
          }
+       else
+         new->output_file = NULL;        
+ 
+       new->entry_number = index_counter;
+       the_indices[which] = new;
  
  #if 0
        /* The index breaks if there are colons in the entry.
***************
*** 832,838 ****
                escaped_entry = escape_string (escaped_entry);
                expanded_entry = expansion (escaped_entry, index->code);
                add_html_block_elt_args ("\n<li><a href=\"%s#index-",
!                   (splitting ? index->output_file : ""), index_name);
                add_escaped_anchor_name (index->entry_text);
                add_word_args ("-%d\">%s</a>: ", index->entry_number,
                    expanded_entry);
--- 839,846 ----
                escaped_entry = escape_string (escaped_entry);
                expanded_entry = expansion (escaped_entry, index->code);
                add_html_block_elt_args ("\n<li><a href=\"%s#index-",
!                   (splitting && index->output_file)
!                    ? index->output_file : "");
                add_escaped_anchor_name (index->entry_text);
                add_word_args ("-%d\">%s</a>: ", index->entry_number,
                    expanded_entry);
P ChangeLog
P makeinfo/index.c