texinfo update (Mon Apr 26 10:22:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.340
retrieving revision 1.339
diff -c -r1.340 -r1.339
*** ChangeLog   26 Apr 2004 13:58:02 -0000      1.340
--- ChangeLog   26 Apr 2004 13:09:03 -0000      1.339
***************
*** 1,11 ****
  2004-04-26  Karl Berry  <address@hidden>
  
-       * lib/system.h (STRCASEEQ, STRNCASEEQ): new #defines for
-               convenience.
-       * makeinfo/cmds.c (cm_strong): actually change the output to avoid a
-       spurious xref.  Suggestion from Jan Nieuwenhuizen
-       <address@hidden>, 26 Apr 2004 00:04:04 +0200, emacs-devel.
- 
        * automake 1.8.4.
  
  2004-04-24  Karl Berry  <address@hidden>
--- 1,5 ----
Index: lib/system.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/lib/system.h,v
retrieving revision 1.12
retrieving revision 1.11
diff -c -r1.12 -r1.11
*** lib/system.h        26 Apr 2004 13:56:57 -0000      1.12
--- lib/system.h        11 Apr 2004 17:56:46 -0000      1.11
***************
*** 1,5 ****
  /* system.h: system-dependent declarations; include this first.
!    $Id: system.h,v 1.12 2004/04/26 13:56:57 karl Exp $
  
     Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
--- 1,5 ----
  /* system.h: system-dependent declarations; include this first.
!    $Id: system.h,v 1.11 2004/04/11 17:56:46 karl Exp $
  
     Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
***************
*** 274,281 ****
  
  /* For convenience.  */
  #define STREQ(s1,s2) (strcmp (s1, s2) == 0)
- #define STRCASEEQ(s1,s2) (strcasecmp (s1, s2) == 0)
- #define STRNCASEEQ(s1,s2,n) (strncasecmp (s1, s2, n) == 0)
  
  /* We don't need anything fancy.  If we did need something fancy, gnulib
     has it.  */
--- 274,279 ----
Index: makeinfo/cmds.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.47
retrieving revision 1.46
diff -c -r1.47 -r1.46
*** makeinfo/cmds.c     26 Apr 2004 13:56:12 -0000      1.47
--- makeinfo/cmds.c     20 Apr 2004 00:30:48 -0000      1.46
***************
*** 1,5 ****
  /* cmds.c -- Texinfo commands.
!    $Id: cmds.c,v 1.47 2004/04/26 13:56:12 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
--- 1,5 ----
  /* cmds.c -- Texinfo commands.
!    $Id: cmds.c,v 1.46 2004/04/20 00:30:48 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
***************
*** 1084,1098 ****
    if (!xml && !html && !docbook && !no_headers
        && arg == END
        && end_pos - start_pos >= 6
!       && (STRNCASEEQ ((char *) output_paragraph + start_pos, "*Note:", 6)
!           || STRNCASEEQ ((char *) output_paragraph + start_pos, "*Note ", 6)))
!     {
!       /* Translators: "Note:" is literal here and should not be
!          translated.  @strong{Nota}, say, does not cause the problem.  */
!       warning (_("@strong{Note...} produces a spurious cross-reference in 
Info; reword to avoid that"));
!       /* Adjust the output to avoid writing the bad xref.  */
!       output_paragraph[start_pos + 5] = '_';
!     }
  }
  
  void
--- 1084,1094 ----
    if (!xml && !html && !docbook && !no_headers
        && arg == END
        && end_pos - start_pos >= 6
!       && strncmp ((char *) output_paragraph + start_pos, "*Note:*", 6) == 0)
!     /* Translators: "Note:" is literal here and should not be
!        translated.  @strong{Nota}, say, does not cause the problem.  */
!     warning (_("@strong{Note:} produces a spurious cross-reference in Info; 
reword to avoid that"));
! 
  }
  
  void
P ChangeLog
P lib/system.h
P makeinfo/cmds.c