[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[6982] xetex @image
From: |
Gavin D. Smith |
Subject: |
[6982] xetex @image |
Date: |
Fri, 05 Feb 2016 07:10:26 +0000 |
Revision: 6982
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6982
Author: gavin
Date: 2016-02-05 07:10:25 +0000 (Fri, 05 Feb 2016)
Log Message:
-----------
xetex @image
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/texinfo.tex
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2016-02-02 19:44:04 UTC (rev 6981)
+++ trunk/ChangeLog 2016-02-05 07:10:25 UTC (rev 6982)
@@ -1,3 +1,9 @@
+2016-02-05 Masamichi Hosoda <address@hidden>
+
+ * doc/texinfo.tex (\doxeteximage):
+ @image support for XeTeX.
+ (\image): @image support for XeTeX.
+
2016-02-02 Gavin Smith <address@hidden>
* NEWS: Move NEWS about XS earlier and mention that pure Perl
Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex 2016-02-02 19:44:04 UTC (rev 6981)
+++ trunk/doc/texinfo.tex 2016-02-05 07:10:25 UTC (rev 6982)
@@ -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-02-02.19}
+\def\texinfoversion{2016-02-05.07}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -1449,6 +1449,56 @@
\let\pdfmakeoutlines = \relax
\fi % \ifx\pdfoutput
+%
+% @image support for XeTeX
+%
+\newif\ifxeteximgpdf
+\ifx\XeTeXrevision\thisisundefined
+\else
+ %
+ % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
+ \def\doxeteximage#1#2#3{%
+ \def\xeteximagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
+ \def\xeteximageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
+ %
+ % XeTeX (and the PDF format) support .pdf, .png, .jpg (among
+ % others). Let's try in that order, PDF first since if
+ % 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
+ \openin 1 #1.png \ifeof 1
+ \openin 1 #1.jpg \ifeof 1
+ \openin 1 #1.jpeg \ifeof 1
+ \openin 1 #1.JPG \ifeof 1
+ \errmessage{Could not find image file #1 for XeTeX}%
+ \else \gdef\xeteximgext{JPG}%
+ \fi
+ \else \gdef\xeteximgext{jpeg}%
+ \fi
+ \else \gdef\xeteximgext{jpg}%
+ \fi
+ \else \gdef\xeteximgext{png}%
+ \fi
+ \else \gdef\xeteximgext{PDF} \global\xeteximgpdftrue%
+ \fi
+ \else \gdef\xeteximgext{pdf} \global\xeteximgpdftrue%
+ \fi
+ \closein 1
+ \endgroup
+ %
+ \ifxeteximgpdf
+ \XeTeXpdffile "#1".\xeteximgext ""
+ \else
+ \XeTeXpicfile "#1".\xeteximgext ""
+ \fi
+ \ifdim \wd0 >0pt width \xeteximagewidth \fi
+ \ifdim \wd2 >0pt height \xeteximageheight \fi \relax
+ }
+\fi
\message{fonts,}
@@ -9084,12 +9134,21 @@
%
% Output the image.
\ifpdf
+ % For pdfTeX and LuaTeX <= 0.80
\dopdfimage{#1}{#2}{#3}%
\else
- % \epsfbox itself resets \epsf?size at each figure.
- \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi
- \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi
- \epsfbox{#1.eps}%
+ \ifx\XeTeXrevision\thisisundefined
+ % For epsf.tex
+ % \epsfbox itself resets \epsf?size at each figure.
+ \setbox0 = \hbox{\ignorespaces #2}%
+ \ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi
+ \setbox0 = \hbox{\ignorespaces #3}%
+ \ifdim\wd0 > 0pt \epsfysize=#3\relax \fi
+ \epsfbox{#1.eps}%
+ \else
+ % For XeTeX
+ \doxeteximage{#1}{#2}{#3}%
+ \fi
\fi
%
\ifimagevmode
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [6982] xetex @image,
Gavin D. Smith <=