texinfo update (Wed Jan 23 14:53:01 EST 2008)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.805
retrieving revision 1.806
diff -u -r1.805 -r1.806
--- ChangeLog   22 Jan 2008 01:02:59 -0000      1.805
+++ ChangeLog   23 Jan 2008 19:28:21 -0000      1.806
@@ -1,3 +1,9 @@
+2008-01-23  Karl Berry  <address@hidden>
+
+       * makeinfo/insertion.c (begin_insertion) <direntry>: ignore
+       whitespace beginning a * line inside @direntry.
+       Report from Norbert Preining, 14 Jan 2008 09:09:01.
+
 2008-01-21  Karl Berry  <address@hidden>
 
        * info/info.c (main): silently switch to info-stnd if given
Index: makeinfo/.gdbinit
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/.gdbinit,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- makeinfo/.gdbinit   24 Oct 2007 20:03:35 -0000      1.39
+++ makeinfo/.gdbinit   23 Jan 2008 19:28:22 -0000      1.40
@@ -266,3 +266,6 @@
 
 # spurious </bookinfo>
 set args -o /tmp/b.xml --docbook $ttests/binutils.tex
+
+# removing wrong direntry indentation in source
+set args -o - $ttests/direntryspace.tex
Index: makeinfo/insertion.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- makeinfo/insertion.c        19 Dec 2007 23:39:05 -0000      1.66
+++ makeinfo/insertion.c        23 Jan 2008 19:28:21 -0000      1.67
@@ -1,8 +1,8 @@
 /* insertion.c -- insertions for Texinfo.
-   $Id: insertion.c,v 1.66 2007/12/19 23:39:05 karl Exp $
+   $Id: insertion.c,v 1.67 2008/01/23 19:28:21 karl Exp $
 
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2008 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
@@ -476,7 +476,7 @@
       if (xml)
         {
           xml_insert_element (DETAILMENU, START);
-          skip_whitespace_and_newlines();
+          skip_whitespace_and_newlines ();
         }
       else
         in_fixed_width_font++;
@@ -489,6 +489,11 @@
       filling_enabled = no_indent = 0;
       inhibit_paragraph_indentation = 1;
       add_word ("START-INFO-DIR-ENTRY\n");
+      
+      /* The zsh manual, maybe others, wrongly indents the * line of the
+         direntry in the source.  Ignore that whitespace.  */
+      skip_whitespace_and_newlines ();
+      no_discard++;
       break;
 
     case documentdescription:
P ChangeLog
P makeinfo/.gdbinit
P makeinfo/insertion.c