texinfo update (Mon Feb 13 19:52:01 EST 2006)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.568
retrieving revision 1.570
diff -u -r1.568 -r1.570
--- ChangeLog   12 Feb 2006 01:15:25 -0000      1.568
+++ ChangeLog   14 Feb 2006 00:44:10 -0000      1.570
@@ -1,3 +1,16 @@
+2006-02-13  Karl Berry  <address@hidden>
+
+       * doc/texinfo.tex (\doignore): move \obeylines here.
+       (\dodoignore): from here.  (just putting catcode changes together.)
+       (\doignoretextyyy): revert to previous code, no ##2^^M;
+       that caused blank lines in verbatim envs inside failing conditionals.
+       (\enddoignore): ignore any text after the @end #1 here, instead.
+       Bug report from Bob Wilson, 5 Oct 2005 21:22:33 -0700,
+       amended fix from Stepan, 13 Feb 2006 21:57:07 +0100.
+
+       * info/nodes.c (info_get_node): don't try man Top and man top and
+       man TOP.  Debian bug 234848.
+
 2006-02-11  Karl Berry  <address@hidden>
 
        * makeinfo/makeinfo.c (write_trailer): new fn.
Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.207
retrieving revision 1.209
diff -u -r1.207 -r1.209
--- doc/texinfo.tex     27 Jan 2006 22:49:32 -0000      1.207
+++ doc/texinfo.tex     14 Feb 2006 00:44:40 -0000      1.209
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2006-01-27.14}
+\def\texinfoversion{2006-02-13.16}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
@@ -2957,6 +2957,7 @@
 
 \def\doignore#1{\begingroup
   % Scan in ``verbatim'' mode:
+  \obeylines
   \catcode`\@ = \other
   \catcode`\{ = \other
   \catcode`\} = \other
@@ -2977,19 +2978,16 @@
   \gdef\dodoignore#1{%
     % #1 contains the command name as a string, e.g., `ifinfo'.
     %
-    % Define a command to find the next address@hidden #1', which must be on a 
line
-    % by itself.  Ignore anything after the `#1'; this matters in
-    % verbatim environments, where otherwise the newline after an
-    % ignored conditional would result in a blank line in the output.
-    address@hidden #1##2^^M{%
+    % Define a command to find the next address@hidden #1'.
+    address@hidden #1{%
       address@hidden
+    %
     % And this command to find another #1 command, at the beginning of a
     % line.  (Otherwise, we would consider a line address@hidden @ifset', for
     % example, to count as an @ifset for nesting.)
     address@hidden
     %
     % And now expand that command.
-    \obeylines %
     \doignoretext ^^M%
   }%
 }
@@ -3019,7 +3017,12 @@
 }
 
 % Finish off ignored text.
-\def\enddoignore{\endgroup\ignorespaces}
+{ \obeylines%
+  % Ignore anything after the last address@hidden #1'; this matters in verbatim
+  % environments, where otherwise the newline after an ignored conditional
+  % would result in a blank line in the output.
+  \gdef\enddoignore#1^^M{\endgroup\ignorespaces}%
+}
 
 
 % @set VAR sets the variable VAR to an empty value.
Index: info/nodes.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/nodes.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/nodes.c        15 May 2005 00:00:07 -0000      1.5
+++ info/nodes.c        14 Feb 2006 00:25:58 -0000      1.6
@@ -1,8 +1,8 @@
 /* nodes.c -- how to get an Info file and node.
-   $Id: nodes.c,v 1.5 2005/05/15 00:00:07 karl Exp $
+   $Id: nodes.c,v 1.6 2006/02/14 00:25:58 karl Exp $
 
-   Copyright (C) 1993, 1998, 1999, 2000, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1998, 1999, 2000, 2002, 2003, 2004, 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
@@ -116,8 +116,11 @@
   /* Look for the node.  */
   node = info_get_node_of_file_buffer (nodename, file_buffer);
 
-  /* If the node not found was "Top", try again with different case.  */
-  if (!node && (nodename == NULL || strcasecmp (nodename, "Top") == 0))
+  /* If the node not found was "Top", try again with different case,
+     unless this was a man page.  */
+  if (!node
+      && strcasecmp (filename, MANPAGE_FILE_BUFFER_NAME) != 0
+      && (nodename == NULL || strcasecmp (nodename, "Top") == 0))
     {
       node = info_get_node_of_file_buffer ("Top", file_buffer);
       if (!node)
P ChangeLog
P doc/texinfo.tex
P info/nodes.c