update from texinfo

[gnulib.git] / build-aux / texinfo.tex

diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex
index 1661a1b..94d7188 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
 %
-\def\texinfoversion{2011-01-19.09}
+\def\texinfoversion{2011-02-01.10}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2627,6 +2627,27 @@ end
       \ifpdf
         \unhbox0             % PDF: 2nd arg given, show only it
       \else
+        \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url
+      \fi
+    \else
+      \code{#1}% only url given, so show it
+    \fi
+  \fi
+  \endlink
+\endgroup}
+
+\def\nouref#1,#2,#3,#4\finish{\begingroup  % doesn't work in @example
+  \unsepspaces
+  \pdfurl{#1}%
+  \setbox0 = \hbox{\ignorespaces #3}%
+  \ifdim\wd0 > 0pt
+    \unhbox0 % third arg given, show only that
+  \else
+    \setbox0 = \hbox{\ignorespaces #2}%
+    \ifdim\wd0 > 0pt
+      \ifpdf
+        \unhbox0             % PDF: 2nd arg given, show only it
+      \else
         % \empty at the end of \scantokens arg gets rid of
         % trailing newline (and ultimate spurious whitespace).
         \unhbox0\ (\urefcode{\scantokens{#1\empty}})% DVI: 2nd arg given,