# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1239031721 14400
# Node ID b5a1a2d0be7e4ec8a2d4e7862aea1ce84a1472e4
# Parent  2e35cfcf6a6a32cf7c7e6a6affecd4f40892d11e
texinfo.tex: prefer pdf images if generating pdf output

diff -r 2e35cfcf6a6a -r b5a1a2d0be7e doc/ChangeLog
--- a/doc/ChangeLog	Mon Apr 06 11:16:20 2009 +0200
+++ b/doc/ChangeLog	Mon Apr 06 11:28:41 2009 -0400
@@ -1,3 +1,7 @@
+2009-04-06  John W. Eaton  <jwe@octave.org>
+
+	* texinfo.tex: Prefer PDF image files if generating PDF output.
+
 2009-03-27  Rik  <rdrider0-list@yahoo.com>
 
 	* interpreter/intro.txi: Add new sample section on elementary 
diff -r 2e35cfcf6a6a -r b5a1a2d0be7e doc/texinfo.tex
--- a/doc/texinfo.tex	Mon Apr 06 11:16:20 2009 +0200
+++ b/doc/texinfo.tex	Mon Apr 06 11:28:41 2009 -0400
@@ -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{2009-03-07.09}
+\def\texinfoversion{2009-04-06.11}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -1375,26 +1375,26 @@
     % others).  Let's try in that order.
     \let\pdfimgext=\empty
     \begingroup
-      \openin 1 #1.png \ifeof 1
-        \openin 1 #1.jpg \ifeof 1
-          \openin 1 #1.jpeg \ifeof 1
-            \openin 1 #1.JPG \ifeof 1
-              \openin 1 #1.pdf \ifeof 1
-                \openin 1 #1.PDF \ifeof 1
+      \openin 1 #1.pdf \ifeof 1
+        \openin 1 #1.PDF \ifeof 1
+          \openin 1 #1.png \ifeof 1
+            \openin 1 #1.jpg \ifeof 1
+              \openin 1 #1.jpeg \ifeof 1
+                \openin 1 #1.JPG \ifeof 1
                   \errhelp = \nopdfimagehelp
                   \errmessage{Could not find image file #1 for pdf}%
-                \else \gdef\pdfimgext{PDF}%
+                 \else \gdef\pdfimgext{JPG}%
+                 \fi
+                \else \gdef\pdfimgext{jpeg}%
                 \fi
-              \else \gdef\pdfimgext{pdf}%
+              \else \gdef\pdfimgext{jpg}%
               \fi
-            \else \gdef\pdfimgext{JPG}%
+            \else \gdef\pdfimgext{png}%
             \fi
-          \else \gdef\pdfimgext{jpeg}%
+          \else \gdef\pdfimgext{PDF}%
           \fi
-        \else \gdef\pdfimgext{jpg}%
+        \else \gdef\pdfimgext{pdf}%
         \fi
-      \else \gdef\pdfimgext{png}%
-      \fi
       \closein 1
     \endgroup
     %