summaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2006-05-08 07:22:19 +0000
committerJim Meyering <jim@meyering.net>2006-05-08 07:22:19 +0000
commitb8b7669b3e5cdfb17300524f2d1934d8946e661f (patch)
treec2fa05b3eba45b36e4e2136d637a5c930e6756be /build-aux
parentd4d3446babc8032595dd52beff7c3d814c0dd35e (diff)
downloadcoreutils-b8b7669b3e5cdfb17300524f2d1934d8946e661f.tar.gz
coreutils-b8b7669b3e5cdfb17300524f2d1934d8946e661f.tar.bz2
coreutils-b8b7669b3e5cdfb17300524f2d1934d8946e661f.zip
update from gnulib
Diffstat (limited to 'build-aux')
-rw-r--r--build-aux/texinfo.tex11
1 files changed, 6 insertions, 5 deletions
diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex
index f6ac94ed7..fcddd2689 100644
--- 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{2006-05-05.09}
+\def\texinfoversion{2006-05-07.15}
%
% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
@@ -1237,9 +1237,10 @@ where each line of input produces a line of output.}
\ifpdf
\input pdfcolor
\pdfcatalog{/PageMode /UseOutlines}%
+ % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
\def\dopdfimage#1#2#3{%
- \def\imagewidth{#2}%
- \def\imageheight{#3}%
+ \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
+ \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
% without \immediate, pdftex seg faults when the same image is
% included twice. (Version 3.14159-pre-1.0-unofficial-20010704.)
\ifnum\pdftexversion < 14
@@ -1247,8 +1248,8 @@ where each line of input produces a line of output.}
\else
\immediate\pdfximage
\fi
- \ifx\empty\imagewidth\else width \imagewidth \fi
- \ifx\empty\imageheight\else height \imageheight \fi
+ \ifdim \wd0 >0pt width \imagewidth \fi
+ \ifdim \wd2 >0pt height \imageheight \fi
\ifnum\pdftexversion<13
#1.pdf%
\else