dvipdfmx-def (6apr16)

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

3 files changed, 65 insertions, 5 deletions

diff --git a/Master/texmf-dist/doc/latex/dvipdfmx-def/README b/Master/texmf-dist/doc/latex/dvipdfmx-def/README
index 222dfb380d9..682b5b1d0fa 100644
--- a/Master/texmf-dist/doc/latex/dvipdfmx-def/README
+++ b/Master/texmf-dist/doc/latex/dvipdfmx-def/README
@@ -2,12 +2,12 @@
 
 This directory contains the LaTeX graphics driver 'dvipdfmx.def'
 used with the driver program 'dvipdfmx'
-Version: 4.07; 2015-11-04.
+Version: 4.08; 2016-04-06.
 
 The canonical source is the subversion repository at
 https://puszcza.gnu.org.ua/projects/latexfmxdef.
 
-Copyright (C) 2005-2015 Jin-Hwan Cho, Shunsaku Hirata
+Copyright (C) 2005-2016 Jin-Hwan Cho, Shunsaku Hirata
 (with contributions from many others)
 
 This program can be redistributed and/or modified under the terms
diff --git a/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/mps.txt b/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/mps.txt
new file mode 100644
index 00000000000..cd885781030
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/mps.txt
@@ -0,0 +1,25 @@
+In TeX Live 2016 and later, a new suffix .mps (or .MPS) is supported
+by dvipdfmx and xdvipdfmx. Usual eps files are included by converting
+into pdf files with the help of Ghostscript. We are using -dEPSCrop
+option for Ghostscript in the conversion. In this case, we are forced
+to translate llx, lly, urx, and ury in \Ginclude@eps accordingly.
+On the other hand, eps files created by MetaPost are included directly
+without the help of Ghostscript. Thus the above translation should be
+negated by translating the origin, if we use \Ginclude@eps also for eps
+files created by MetaPost. The translation of the origin was the default
+in TeX Live 2015. However in TeX Live 2016, the origin is translated only
+if the option --mvorigin is given for dvipdfmx or xdvipdfmx. This feature
+may a bit be inconvenient. Thus we introduce a new command \Ginclude@mps
+which is used for files with a suffix .mps (or .MPS). In \Ginclude@mps,
+llx, lly, urx, and ury are natural compared with those in \Ginclude@eps.
+Thus --mvorigin should not be given in the case of \Ginclude@mps.
+
+In summary, there are two ways to include eps files created by MetaPost
+in TeX Live 2016 and later:
+(1) Use a suffix .mps (or .MPS) like foo.mps. In this case, don't give the
+    option --mvorigin for dvipdfmx and xdvipdfmx.
+(2) In other cases, such as foo.1, foo.2, foo.eps, foo.ps ..., the option
+    --mvorigin for dvipdfmx and xdvipdfmx is inevitable.
+
+Note that the option --mvorigin is relevant only for MetaPost-created
+eps files. The option does nothing for other files.
diff --git a/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def b/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def
index d7c9c374837..0c836098e4c 100644
--- a/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def
@@ -1,7 +1,7 @@
 %% This is file `dvipdfmx.def' for DVIPDFMx by J.-H. Cho and S. Hirata
 %% based upon `dvipdf.def' in the LaTeX `Graphics Bundle'.
 %%
-%% Copyright 2005-2015 Jin-Hwan Cho, Shunsaku Hirata
+%% Copyright 2005-2016 Jin-Hwan Cho, Shunsaku Hirata
 %% (with contributions from many others)
 %% 
 %% This file is not part of the Standard LaTeX `Graphics Bundle'.
@@ -22,7 +22,7 @@
 %%
 % emacs-page
 \ProvidesFile{dvipdfmx.def}
-  [2015/11/04 v4.07 LaTeX color/graphics driver for dvipdfmx (TeX Live/ChoF)]
+  [2016/04/06 v4.08 LaTeX color/graphics driver for dvipdfmx (TeX Live/ChoF)]
 %
 \def\c@lor@arg#1{%
   \dimen@#1\p@
@@ -328,6 +328,39 @@
       \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\space\fi
       \ifGin@clip clip\fi}%
   \egroup}
+%
+% In the above \Ginclude@eps, llx, lly, urx, and ury are translated to match
+% the -dEPSCrop option for Ghostscript to convert eps to pdf.
+% In the case of eps files created by MetaPost, the files are included
+% directly without the help of Ghostscript. That is, we have to translate
+% the origin accordingly if we use \Ginclude@eps for eps files created by
+% MetaPost. In TeX Live 2015, the translation of the origin was the default.
+% After TeX Live 2016, however, the translation of the origin is enabled only
+% if the --mvorigin option is given for dvipdfmx or xdvipdfmx.
+% This may be a bit inconvenient, especially in the case of XeTeX where
+% xdvipdfmx is usually called as a pipe. Therefore we introduce a new suffix
+% .mps(or .MPS) to support inclusion of eps files created by MetaPost without
+% the option --mvorigin.
+%
+\def\Ginclude@mps#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}
+%
 \def\Grot@start{%
 \special{pdf:btrans rotate \Grot@angle}}
 \def\Grot@end{\special{pdf:etrans}}
@@ -341,7 +374,7 @@
 \def\Gin@extensions{% order here is like xetex.def, except for PS
   .pdf,.PDF,.ai,.AI,%
   .png,.PNG,.jpg,.JPG,.jpeg,.JPEG,.jp2,.JP2,.jpf,.JPF,.bmp,.BMP,%
-  .ps,.PS,.eps,.EPS,%
+  .ps,.PS,.eps,.EPS,.mps,.MPS,%
   .pz,.eps.Z,.ps.Z,.ps.gz,.eps.gz}
 %
 \@namedef{Gin@rule@.pdf}#1{{pdf}{.xbb}{#1}}
@@ -380,6 +413,8 @@
 \@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}}
 \@namedef{Gin@rule@.EPS}#1{{eps}{.eps}{#1}}
 %
+\@namedef{Gin@rule@.mps}#1{{mps}{.mps}{#1}}
+\@namedef{Gin@rule@.MPS}#1{{mps}{.mps}{#1}}
 % (don't bother with uppercase versions for these Unixish extensions)
 \@namedef{Gin@rule@.pz}#1{{eps}{.xbb}{`gunzip -c #1}}
 \@namedef{Gin@rule@.eps.Z}#1{{eps}{.eps.xbb}{`gunzip -c #1}}