summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-04-02 21:41:20 +0000
committerKarl Berry <karl@freefriends.org>2014-04-02 21:41:20 +0000
commit1ae286c053ed5bb3417aee141a3a20964d002e72 (patch)
treed126ee5496dfc63f0352cf9273bc3530f10c4dd5 /Master/texmf-dist/tex
parent6573b1c5a1734b8e66c8ddd3ac071fbed52f3925 (diff)
dvipdfmx-def (2apr14)
git-svn-id: svn://tug.org/texlive/trunk@33354 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def52
1 files changed, 36 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def b/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def
index 4cd1911681d..cfe96f7788c 100644
--- a/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def
@@ -1,24 +1,28 @@
%% This is file `dvipdfmx.def' for DVIPDFMx by J.-H. Cho and S. Hirata
-%% which is written based on `dvipdf.def' in the LaTeX `Graphics Bundle'.
+%% based upon `dvipdf.def' in the LaTeX `Graphics Bundle'.
%%
-%% This was file `dvipdf.def',
-%% generated with the docstrip utility.
+%% Copyright (C) 2005-2014 Jin-Hwan Cho, Shunsaku Hirata
+%% (with contributions from many others)
+%%
+%% 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
+%%
%% The original source files were:
-%%
%% drivers.dtx (with options: `dvipdf,color1,psrulesZ')
-%%
-%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2005-2014 Jin-Hwan Cho, Shunsaku Hirata
-%%
-%% This file is not part of the Standard LaTeX `Graphics Bundle' but still
-%% 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.
+%% Copyright (C) 1994 David Carlisle Sebastian Rahtz
%%
\ProvidesFile{dvipdfmx.def}
- [2014/01/23 v3.4 LaTeX graphics driver for dvipdfmx (TeX Live/ChoF)]
+ [2014/03/31 v3.5 LaTeX graphics driver for dvipdfmx (TeX Live/ChoF)]
\def\c@lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
@@ -169,7 +173,11 @@
\def\@tempa{!}%
\special{pdf:image\space
\ifx\Gin@page\@tempa\else page\space\Gin@page\space\fi
- \ifGin@bbox
+ % The next line was \ifGin@bbox previously. However, LaTeX can read
+ % BoundingBox from a .xbb file even when \Gin@bboxfalse.
+ % Thus, we give bbox in the cases of trim/viewport, since
+ % trim/viewport don't work without bbox.
+ \ifx\Gin@ollx\@undefined\else
bbox\space\Gin@llx\space\Gin@lly\space\Gin@urx\space\Gin@ury\space
clip\space\ifGin@clip 1\else 0\fi\space
\fi
@@ -186,19 +194,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