update from texinfo

diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex
index 7eddd5d1703ef78475164a0a2ce60498d7d75d34..6d05226278d0631959b29631c1a5733545af78da 100644 (file)
--- a/build-aux/texinfo.tex
+++ b/build-aux/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %

-\def\texinfoversion{2010-06-10.11}
+\def\texinfoversion{2010-06-15.17}

 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,


@@ -6393,21 +6393,29 @@ end
 
 % Setup for the @verbatim environment
 %
 
 % Setup for the @verbatim environment
 %

-% Real tab expansion
+% Real tab expansion.

 \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
 %
 \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
 %

-\def\starttabbox{\setbox0=\hbox\bgroup}
+% We typeset each line of the verbatim in an \hbox, so we can handle
+% tabs.  The \global is in case the verbatim line starts with an accent,
+% or some other command that starts with a begin-group.  Otherwise, the
+% entire \verbbox would disappear at the corresponding end-group, before
+% it is typeset.  Meanwhile, we can't have nested verbatim commands
+% (can we?), so the \global won't be overwriting itself.
+\newbox\verbbox
+\def\starttabbox{\global\setbox\verbbox=\hbox\bgroup}

 %
 %

+%\def\`#1{\accent18 #1\relax}

 \begingroup
   \catcode`\^^I=\active
   \gdef\tabexpand{%
     \catcode`\^^I=\active
     \def^^I{\leavevmode\egroup
 \begingroup
   \catcode`\^^I=\active
   \gdef\tabexpand{%
     \catcode`\^^I=\active
     \def^^I{\leavevmode\egroup

-      \dimen0=\wd0 % the width so far, or since the previous tab
-      \divide\dimen0 by\tabw
-      \multiply\dimen0 by\tabw % compute previous multiple of \tabw
-      \advance\dimen0 by\tabw  % advance to next multiple of \tabw
-      \wd0=\dimen0 \box0 \starttabbox
+      \dimen\verbbox=\wd\verbbox % the width so far, or since the previous tab
+      \divide\dimen\verbbox by\tabw
+      \multiply\dimen\verbbox by\tabw % compute previous multiple of \tabw
+      \advance\dimen\verbbox by\tabw  % advance to next multiple of \tabw
+      \wd\verbbox=\dimen\verbbox \box\verbbox \starttabbox

     }%
   }
 \endgroup
     }%
   }
 \endgroup


@@ -6418,13 +6426,13 @@ end
   \nonfillstart
   % Easiest (and conventionally used) font for verbatim
   \tt
   \nonfillstart
   % Easiest (and conventionally used) font for verbatim
   \tt

-  \def\par{\leavevmode\egroup\box0\endgraf}%
+  \def\par{\egroup\box\verbbox\endgraf}%

   \tabexpand
   \setupmarkupstyle{verbatim}%
   % Respect line breaks,
   % print special symbols as themselves, and
   \tabexpand
   \setupmarkupstyle{verbatim}%
   % Respect line breaks,
   % print special symbols as themselves, and

-  % make each space count
-  % must do in this order:
+  % make each space count.
+  % Must do in this order:

   \obeylines \uncatcodespecials \sepspaces
   \everypar{\starttabbox}%
 }
   \obeylines \uncatcodespecials \sepspaces
   \everypar{\starttabbox}%
 }