texinfo/makeinfo float.c,1.22,1.23

[dirt]

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

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

        * makeinfo/float.c (cm_listoffloats): create HTML hyperlinks with
        add_word instead of using @ref to avoid problems with commas in
        captions.



Index: float.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/float.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** float.c     17 Feb 2004 15:44:15 -0000      1.22
--- float.c     20 Feb 2004 13:40:28 -0000      1.23
***************
*** 25,28 ****
--- 25,29 ----
  #include "files.h"
  #include "float.h"
+ #include "html.h"
  #include "sectioning.h"
  #include "xml.h"
***************
*** 216,221 ****
                    insert_string ("  ");
                    add_html_block_elt ("<li>");
!                   execute_string ("@ref{%s, %s %s: %s}", temp->id, float_type,
!                       temp->number, temp->title);
                    add_html_block_elt ("</li>\n");
                  }
--- 217,249 ----
                    insert_string ("  ");
                    add_html_block_elt ("<li>");
! 
!                   /* Simply relying on @ref command doesn't work here, because
!                      commas in the caption may confuse the argument parsing.  
*/
!                   add_word ("<a href=\"");
!                   add_anchor_name (temp->id, 1);
!                   add_word ("\">");
! 
!                   if (strlen (float_type) > 0)
!                     execute_string (float_type);
! 
!                   if (strlen (temp->id) > 0)
!                     {
!                       if (strlen (float_type) > 0)
!                         add_char (' ');
! 
!                       add_word (temp->number);
!                     }
! 
!                   if (strlen (temp->title) > 0)
!                     {
!                       if (strlen (float_type) > 0
!                           || strlen (temp->id) > 0)
!                         insert_string (": ");
! 
!                       execute_string (temp->title);
!                     }
! 
!                   add_word ("</a>");
! 
                    add_html_block_elt ("</li>\n");
                  }