[7049] Improve XeTeX @image support

[Masamichi Hosoda]

Revision: 7049
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7049
Author:   trueroad
Date:     2016-03-21 09:54:17 +0000 (Mon, 21 Mar 2016)
Log Message:
-----------
Improve XeTeX @image support

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/texinfo.tex

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-03-21 07:49:18 UTC (rev 7048)
+++ trunk/ChangeLog     2016-03-21 09:54:17 UTC (rev 7049)
@@ -1,3 +1,8 @@
+2016-03-21  Masamichi Hosoda  <address@hidden>
+
+       * doc/texinfo.tex (\ifxeteximgpdf): Remove.
+       (\doxeteximage): Improve XeTeX @image support.
+
 2016-03-21  Thomas Klausner  <address@hidden> (tiny change)
 
        *  tp/Texinfo/Convert/XSParagraph/xspara.c (xspara_add_text):

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2016-03-21 07:49:18 UTC (rev 7048)
+++ trunk/doc/texinfo.tex       2016-03-21 09:54:17 UTC (rev 7049)
@@ -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{2016-03-20.19}
+\def\texinfoversion{2016-03-21.09}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -1601,7 +1601,6 @@
 %
 % @image support for XeTeX
 %
-\newif\ifxeteximgpdf
 \ifx\XeTeXrevision\thisisundefined
 \else
   %
@@ -1615,7 +1614,6 @@
     % someone has a scalable image, presumably better to use that than a
     % bitmap.
     \let\xeteximgext=\empty
-    \xeteximgpdffalse
     \begingroup
       \openin 1 #1.pdf \ifeof 1
         \openin 1 #1.PDF \ifeof 1
@@ -1632,17 +1630,23 @@
             \fi
           \else \gdef\xeteximgext{png}%
           \fi
-        \else \gdef\xeteximgext{PDF} \global\xeteximgpdftrue%
+        \else \gdef\xeteximgext{PDF}%
         \fi
-      \else \gdef\xeteximgext{pdf} \global\xeteximgpdftrue%
+      \else \gdef\xeteximgext{pdf}%
       \fi
       \closein 1
     \endgroup
     %
-    \ifxeteximgpdf
+    \def\xetexpdfext{pdf}%
+    \ifx\xeteximgext\xetexpdfext
       \XeTeXpdffile "#1".\xeteximgext ""
     \else
-      \XeTeXpicfile "#1".\xeteximgext ""
+      \def\xetexpdfext{PDF}%
+      \ifx\xeteximgext\xetexpdfext
+        \XeTeXpdffile "#1".\xeteximgext ""
+      \else
+        \XeTeXpicfile "#1".\xeteximgext ""
+      \fi
     \fi
     \ifdim \wd0 >0pt width \xeteximagewidth \fi
     \ifdim \wd2 >0pt height \xeteximageheight \fi \relax