xetex-def (2apr14)

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

1 files changed, 33 insertions, 10 deletions

diff --git a/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def b/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def
index 94bdada3cdf..9f9b7fe1170 100644
--- a/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def
+++ b/Master/texmf-dist/tex/xelatex/xetex-def/xetex.def
@@ -1,18 +1,29 @@
-%%
-%% This is file `xetex.def',
+%% This is file `xetex.def' for XeTeX,
 %% based upon other drivers for LaTeX color and graphics support.
 %%
-%%  Copyright 2004-2007, 2009, 2013  Ross Moore <ross@maths.mq.edu.au>
-%%                     modified by Jonathan Kew et al.
+%%  Copyright 2004-2007, 2009, 2013-2014
+%%  Ross Moore <ross@maths.mq.edu.au>
+%%  modified by Jonathan Kew et al.
 %%
-%% This file is *not yet* part of the Standard LaTeX `Graphics Bundle'.
+%% This file is not part of the Standard LaTeX `Graphics Bundle'.
 %% It may be distributed under the terms of the LaTeX Project Public
 %% License, as described in lppl.txt in the base LaTeX distribution.
 %% Either version 1.0 or, at your option, any later version.
 %%
+%% This driver is developed at:
+%%   http://puszcza.gnu.org.ua/projects/latexfmxdef
+%% Please report bugs and patches through the tracker there.
+%% Official releases, though, are made through CTAN:
+%%   http://www.ctan.org/pkg/xetex-def
+%%   http://www.ctan.org/pkg/xetex-def
+%% 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%  Version History
 %%
+%%  2013/03/24  [AK] [v0.98] non-origin viewport, avoid double bp conversion.
+%%
+%%  2013/03/21  [KB] doc tweaks for project home at puszcza.gnu.org.ua.
+%%  
 %%  2013/05/27  [KB] Version v0.97  non-commutative operations.
 %%              (code provided by Bruno Voisin)
 %%
@@ -70,10 +81,10 @@
 %%
 %%  2004/04/22  Version v0.4 designed to work with XeTeX v0.4
 %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \ProvidesFile{xetex.def}
-        [2013/04/29 v0.96 LaTeX color/graphics driver for XeTeX (RRM/JK)]
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+        [2014/03/24 v0.98 LaTeX color/graphics driver for XeTeX (RRM/JK)]
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % make sure we can use " with correct catcode
 {\catcode`\"=12
@@ -469,19 +480,31 @@
 \def\Ginclude@eps#1{%
  \message{<#1>}%
   \bgroup
+  \newif\if@trim@vport
+  \ifx\Undefined\Gin@vllx\else\@trim@vporttrue\fi
   \def\@tempa{!}%
   \dimen@\Gin@urx\p@
   \advance\dimen@ -\Gin@llx\p@
-  \Gin@defaultbp\Gin@urx\dimen@
+  \if@trim@vport
+  \advance\dimen@ \Gin@vllx\p@
+  \fi
+  \edef\Gin@urx{\strip@pt\dimen@}
   \dimen@\Gin@ury\p@
   \advance\dimen@ -\Gin@lly\p@
-  \Gin@defaultbp\Gin@ury\dimen@
+  \if@trim@vport
+  \advance\dimen@ \Gin@vlly\p@
+  \fi
+  \edef\Gin@ury{\strip@pt\dimen@}
   \dimen@\Gin@req@width
   \dimen@ii.1bp%
   \divide\dimen@\dimen@ii
   \@tempdima\Gin@req@height
   \divide\@tempdima\dimen@ii
     \special{PSfile="#1"\space
+      \if@trim@vport
+      llx=\Gin@vllx\space
+      lly=\Gin@vlly\space
+      \fi
       urx=\Gin@urx\space
       ury=\Gin@ury\space
       \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\space\fi