texinfo/makeinfo footnote.c,1.5,1.6 index.c,1.19,1.20

[dirt]

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

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

        * makeinfo/index.c (index_add_arg): make entry node name 'Footnotes'
        if the output format is non-split HTML, and we are handling footnotes.

        * makeinfo/footnote.c (output_pending_notes): added anchor at the
        start of footnotes block for the non-split HTML output, so @printindex
        can refer to that point as the nodename.



Index: footnote.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/footnote.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** footnote.c  13 Feb 2004 22:01:38 -0000      1.5
--- footnote.c  1 Mar 2004 15:28:06 -0000       1.6
***************
*** 295,301 ****
    if (html)
      {
!       add_html_block_elt ("<div class=\"footnote\">\n<hr>\n<h4>");
!       add_word ((char *) _("Footnotes"));
!       add_word ("</h4>\n");
      }
    else
--- 295,304 ----
    if (html)
      {
!       add_html_block_elt ("<div class=\"footnote\">\n<hr>\n");
!       /* We add an anchor here so @printindex can refer to this point
!          (as the node name) for entries defined in footnotes.  */
!       if (!splitting)
!         add_word_args ("<a name=\"%s\"></a>", _("Footnotes"));
!       add_word_args ("<h4>%s</h4>", (char *) _("Footnotes"));
      }
    else

Index: index.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/index.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** index.c     29 Feb 2004 13:19:12 -0000      1.19
--- index.c     1 Mar 2004 15:28:06 -0000       1.20
***************
*** 21,24 ****
--- 21,25 ----
  #include "system.h"
  #include "files.h"
+ #include "footnote.h"
  #include "html.h"
  #include "index.h"
***************
*** 182,186 ****
        new->entry_text = index_entry;
        new->entry = NULL;
!       new->node = current_node ? current_node : xstrdup ("");
        if (!html && !xml && no_headers)
          {
--- 183,193 ----
        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''.  */
!       if (html && !splitting && already_outputting_pending_notes)
!         new->node = xstrdup (_("Footnotes"));
!       else
!         new->node = current_node ? current_node : xstrdup ("");
        if (!html && !xml && no_headers)
          {