texinfo update (Wed Jan 25 20:22:01 EST 2006)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.561
retrieving revision 1.562
diff -c -r1.561 -r1.562
*** ChangeLog   18 Jan 2006 14:44:43 -0000      1.561
--- ChangeLog   26 Jan 2006 01:06:05 -0000      1.562
***************
*** 1,3 ****
--- 1,9 ----
+ 2006-01-25  Karl Berry  <address@hidden>
+ 
+       * makeinfo/lang.c (cm_accent_generic_no_headers): do nothing
+       if end == 0 (accent command in @menu with --no-headers).
+       Report from Akim Demaille, 23 Jan 2006 16:41:38 +0100.
+ 
  2006-01-18  Karl Berry  <address@hidden>
  
        * doc/texinfo.txi (key): more examples.
Index: makeinfo/lang.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/lang.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** makeinfo/lang.c     15 May 2005 00:00:07 -0000      1.16
--- makeinfo/lang.c     26 Jan 2006 01:06:05 -0000      1.17
***************
*** 1,8 ****
  /* lang.c -- language-dependent support.
!    $Id: lang.c,v 1.16 2005/05/15 00:00:07 karl Exp $
  
!    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
!    Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
--- 1,8 ----
  /* lang.c -- language-dependent support.
!    $Id: lang.c,v 1.17 2006/01/26 01:06:05 karl Exp $
  
!    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
!    Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
***************
*** 15,22 ****
     GNU General Public License for more details.
  
     You should have received a copy of the GNU General Public License
!    along with this program; if not, write to the Free Software
!    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 
USA.
  
     Originally written by Karl Heinz Marbaise <address@hidden>.  */
  
--- 15,22 ----
     GNU General Public License for more details.
  
     You should have received a copy of the GNU General Public License
!    along with this program; if not, write to the Free Software Foundation,
!    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  
     Originally written by Karl Heinz Marbaise <address@hidden>.  */
  
***************
*** 791,801 ****
  }
  
  
  static void
  cm_accent_generic_no_headers (int arg, int start, int end, int single,
      char *html_solo)
  {
!   if (arg == END)
      {
        if (no_encoding)
          add_char (single);
--- 791,806 ----
  }
  
  
+ /* If END is zero, there is nothing in the paragraph to accent.  This
+    can happen when we're in a menu with an accent command and
+    --no-headers is given, so the base character is not added.  In this
+    case we're not producing any output anyway, so just forget it.
+    Otherwise, produce the ASCII version of the accented char.  */
  static void
  cm_accent_generic_no_headers (int arg, int start, int end, int single,
      char *html_solo)
  {
!   if (arg == END && end > 0)
      {
        if (no_encoding)
          add_char (single);
P ChangeLog
P makeinfo/lang.c