fix from ross for bp vs. pt, 0.93

git-svn-id: svn://tug.org/texlive/trunk@15901 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 10 insertions, 32 deletions

diff --git a/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def b/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def
index b60dc9d0d7d..c5107f3ee63 100644
--- a/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def
+++ b/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def
@@ -2,7 +2,7 @@
 %% This is file `xetex.def',
 %% based upon other drivers for LaTeX color and graphics support.
 %%
-%%  Copyright 2004, 2005  Ross Moore <ross@maths.mq.edu.au>
+%%  Copyright 2004, 2005, 2006, 2009  Ross Moore <ross@maths.mq.edu.au>
 %%                        modified by Jonathan Kew <jonathan_kew@sil.org>
 %%
 %% This file is *not yet* part of the Standard LaTeX `Graphics Bundle'.
@@ -13,8 +13,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%  Version History
 %%
-%%  2007/10/25  [JK] Version v0.93  added EPS support from dvipdfmx.def
-%%              (for use with xdvipdfmx, default driver in xetex 0.997)
+%%  2009/10/28  [RRM] Version v0.93  fix big-point incompatibility;
 %%
 %%  2006/08/10  [JK] Version v0.92  correct type-check in \G@measure@QTm;
 %%              remove \G@PDF@ext, apply \lowercase instead;
@@ -59,7 +58,7 @@
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \ProvidesFile{xetex.def}
-        [2006/08/10 v0.92 LaTeX color/graphics driver for XeTeX (RRM, mod. JK)]
+        [2009/10/28 v0.93 LaTeX color/graphics driver for XeTeX (RRM, mod. JK)]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % make sure we can use " with correct catcode
@@ -345,9 +344,11 @@
   \dimen@\Gin@urx\p@
   \advance\dimen@ -\Gin@vllx\p@
   \wd\@tempboxa\strip@pt\dimen@ bp\relax
+%  \wd\@tempboxa\dimen@ \relax
   \dimen@\Gin@ury\p@
   \advance\dimen@ -\Gin@vlly\p@
   \ht\@tempboxa\strip@pt\dimen@ bp\relax
+%  \ht\@tempboxa\dimen@ \relax
   %  when clipping is implemented for XeTeX
   %  make the changes here:
   \box\@tempboxa
@@ -377,8 +378,9 @@
      \piccommand
     }\dimen0=\wd0 \dimen2=\ht0
    \edef\next{\egroup
-     \def\noexpand\Gin@urx{\strip@pt\dimen0}%
-     \def\noexpand\Gin@ury{\strip@pt\dimen2}}%
+     \edef\noexpand\Gin@urx{\the\dimen0}%
+     \edef\noexpand\Gin@ury{\the\dimen2}%
+     }%
   \next
   \Gin@defaultbp\Gin@llx{0}%
   \Gin@defaultbp\Gin@lly{0}%
@@ -420,32 +422,8 @@
 % ... though this default rule will try QuickTime anyway ...
 \@namedef{Gin@rule@*}#1{{QTm}{QTm}{#1}}
 
-% ... and add its extension here
-\def\Gin@extensions{.pdf,.eps,.ps,%
-                    .png,.jpg,.bmp,.pict,.tif,.psd,.mac,.sga,.tga,.gif}
-
-% xdvipdfmx is now the default driver, and can support EPS images,
-% so we borrow code for this from dvipdfmx.def (and add the extensions above)
-\def\Ginclude@eps#1{%
- \message{<#1>}%
-  \bgroup
-  \def\@tempa{!}%
-  \dimen@\Gin@req@width
-  \dimen@ii.1bp%
-  \divide\dimen@\dimen@ii
-  \@tempdima\Gin@req@height
-  \divide\@tempdima\dimen@ii
-    \special{PSfile="#1"\space
-      llx=\Gin@llx\space
-      lly=\Gin@lly\space
-      urx=\Gin@urx\space
-      ury=\Gin@ury\space
-      \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\space\fi
-      \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\space\fi
-      \ifGin@clip clip\fi}%
-  \egroup}
-\@namedef{Gin@rule@.ps}#1{{eps}{.ps}{#1}}
-\@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}}
+% ... and add it's extension here
+\def\Gin@extensions{.pdf,.png,.jpg,.bmp,.pict,.tif,.psd,.mac,.sga,.tga,.gif}
 
 %
 % Rotation & Scaling