Index: makeinfo/float.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/float.c,v
retrieving revision 1.22
diff -u -p -r1.22 float.c
--- makeinfo/float.c	17 Feb 2004 15:44:15 -0000	1.22
+++ makeinfo/float.c	20 Feb 2004 13:40:13 -0000
@@ -24,6 +24,7 @@
 #include "cmds.h"
 #include "files.h"
 #include "float.h"
+#include "html.h"
 #include "sectioning.h"
 #include "xml.h"
 
@@ -215,8 +216,35 @@ cm_listoffloats (void)
                   /* A bit of space for HTML reabality.  */
                   insert_string ("  ");
                   add_html_block_elt ("<li>");
-                  execute_string ("@ref{%s, %s %s: %s}", temp->id, float_type,
-                      temp->number, temp->title);
+
+                  /* 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");
                 }
               else