texinfo/makeinfo xref.c,1.11,1.12

[karl]

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

Modified Files:
        xref.c 
Log Message:
(cm_xref): ignore any directory part or extension
in html case, warn if nothing left.


Index: xref.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xref.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** xref.c      15 Mar 2004 15:43:34 -0000      1.11
--- xref.c      18 Mar 2004 22:54:48 -0000      1.12
***************
*** 231,246 ****
  
                if (html)
!                 {
!                   /* html fixxme: revisit this; external node name not
!                      much use to us with numbered nodes. */
                    add_html_elt ("<a href=");
  
                    /* If there's a dot, make it a NULL terminator, so the
                       extension does not get into the way.  */
!                   {
!                     char *p = strrchr (arg4 , '.');
                      if (p != NULL)
                        *p = 0;
                    }
  
                    /* Note that if we are splitting, and the referenced
--- 231,256 ----
  
                if (html)
!                 { /* More to do eventually, down to Unicode
!                      Normalization Form C.  See the HTML Xref nodes in
!                      the manual.  */
!                   char *file_arg = arg4;
                    add_html_elt ("<a href=");
  
+                   {
+                     /* If there's a directory part, ignore it.  */
+                     char *p = strrchr (file_arg, '/');
+                     if (p)
+                       file_arg = p + 1;
+ 
                    /* If there's a dot, make it a NULL terminator, so the
                       extension does not get into the way.  */
!                     p = strrchr (file_arg , '.');
                      if (p != NULL)
                        *p = 0;
                    }
+                   
+                   if (! *file_arg)
+                 warning (_("Empty file name for HTML cross reference in 
`%s'"),
+                            arg4);
  
                    /* Note that if we are splitting, and the referenced
***************
*** 252,258 ****
                       with that problem.  */
                    if (splitting)
!                     execute_string ("\"../%s/", arg4);
                    else
!                     execute_string ("\"%s.html", arg4);
                    /* Do not collapse -- to -, etc., in references.  */
                    in_fixed_width_font++;
--- 262,268 ----
                       with that problem.  */
                    if (splitting)
!                     execute_string ("\"../%s/", file_arg);
                    else
!                     execute_string ("\"%s.html", file_arg);
                    /* Do not collapse -- to -, etc., in references.  */
                    in_fixed_width_font++;
***************
*** 262,266 ****
                    free (tem);
                    add_word ("\">");
!                   execute_string ("%s (%s)", ref_name, *arg5 ? arg5 : arg4);
                    add_word ("</a>");
                  }
--- 272,276 ----
                    free (tem);
                    add_word ("\">");
!                   execute_string ("%s (%s)",ref_name, *arg5 ? arg5 : 
file_arg);
                    add_word ("</a>");
                  }