rm dvipdfmx-def, replaced by graphics-def

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

15 files changed, 2 insertions, 674 deletions

diff --git a/Master/texmf-dist/doc/latex/dvipdfmx-def/README b/Master/texmf-dist/doc/latex/dvipdfmx-def/README
deleted file mode 100644
index 2a4202639e3..00000000000
--- a/Master/texmf-dist/doc/latex/dvipdfmx-def/README
+++ /dev/null
@@ -1,26 +0,0 @@
-                    README for dvipdfmx-def
-
-This directory contains the LaTeX graphics driver 'dvipdfmx.def'
-used with the driver program 'dvipdfmx'
-Version: 4.09; 2016-06-22.
-
-The canonical source is the subversion repository at
-https://puszcza.gnu.org.ua/projects/latexfmxdef.
-
-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
-of the LaTeX Project Public License Distributed from CTAN
-archives in directory macros/latex/base/lppl.txt; either
-version 1 of the License, or any later version.
-
-To install:
-  (1) copy dvipdfmx.def to a directory
-      suitable-texmf/tex/latex/dvipdfmx-def
-  (2) copy all files in a subdirectory 'doc' to a directory
-      suitable-texmf/doc/latex/dvipdfmx-def
-  (3) update TeX's file database.
-
-----------------------------------------------------------------
-Akira Kakuto <kakuto at fuk dot kindai dot ac dot jp>
diff --git a/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/Makefile b/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/Makefile
deleted file mode 100644
index 3d7aab9463e..00000000000
--- a/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Makefile to test pagebox=artbox etc. in platex with dvipdfmx
-#
-# files pagebox-dx.tex, pagebox-pd.tex, image1.tex, image2.tex
-# are written by Y. Terada.
-#
-
-all: pagebox-dx.pdf pagebox-pd.pdf
-
-pagebox-dx.pdf: pagebox-dx.tex image1.pdf image2.pdf
-	platex pagebox-dx.tex
-	dvipdfmx pagebox-dx.dvi
-
-pagebox-pd.pdf: pagebox-pd.tex image1.pdf image2.pdf
-	pdflatex pagebox-pd.tex
-
-image1.pdf: image1.tex
-	pdflatex $<
-
-image2.pdf: image2.tex
-	pdflatex $<
-
-clean::
-	rm -f *~ *.log *.aux *.dvi pagebox-dx.pdf pagebox-pd.pdf
diff --git a/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/image1.tex b/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/image1.tex
deleted file mode 100644
index a9e2db41bec..00000000000
--- a/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/image1.tex
+++ /dev/null
@@ -1,28 +0,0 @@
-%!pdflatex
-\documentclass{article}
-% The papersize is set to 250bp x 250bp, which will
-% make the MediaBox equal [0 0 250 250].
-\usepackage[papersize=250bp,margin=0pt,noheadfoot]{geometry}
-\usepackage{tikz}
-\pagestyle{empty}
-% No compression; PDF version still might be 1.5.
-\pdfcompresslevel=0
-\pdfobjcompresslevel=0
-\setlength{\parindent}{0pt}
-\begin{document}
-\pdfpageattr{%
-% Enable or disable each of the following lines.
-%/CropBox [30 30 220 100]
-/BleedBox [5 45 170 200]
-/TrimBox [70 20 150 120]
-/ArtBox [60 10 100 150]
-}
-\begin{tikzpicture}[x=1bp,y=1bp,inner sep=0pt,color=red,thick]
-\useasboundingbox(0,0) rectangle (250,250);
-\draw ( 0, 0) node[anchor=south west] {M} rectangle (250,250) node[anchor=north east] {M};
-%\draw (30,30) node[anchor=south west] {C} rectangle (220,100) node[anchor=north east] {C};
-\draw ( 5,45) node[anchor=south west] {B} rectangle (170,200) node[anchor=north east] {B};
-\draw (70,20) node[anchor=south west] {T} rectangle (150,120) node[anchor=north east] {T};
-\draw (60,10) node[anchor=south west] {A} rectangle (100,150) node[anchor=north east] {A};
-\end{tikzpicture}
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/image2.tex b/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/image2.tex
deleted file mode 100644
index 11363bc89f7..00000000000
--- a/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/image2.tex
+++ /dev/null
@@ -1,28 +0,0 @@
-%!pdflatex
-\documentclass{article}
-% The papersize is set to 250bp x 250bp, which will
-% make the MediaBox equal [0 0 250 250].
-\usepackage[papersize=250bp,margin=0pt,noheadfoot]{geometry}
-\usepackage{tikz}
-\pagestyle{empty}
-% No compression; PDF version still might be 1.5.
-\pdfcompresslevel=0
-\pdfobjcompresslevel=0
-\setlength{\parindent}{0pt}
-\begin{document}
-\pdfpageattr{%
-% Enable or disable each of the following lines.
-/CropBox [30 30 220 100]
-/BleedBox [5 45 170 200]
-/TrimBox [70 20 150 120]
-/ArtBox [60 10 100 150]
-}
-\begin{tikzpicture}[x=1bp,y=1bp,inner sep=0pt,color=red,thick]
-\useasboundingbox(0,0) rectangle (250,250);
-\draw ( 0, 0) node[anchor=south west] {M} rectangle (250,250) node[anchor=north east] {M};
-\draw (30,30) node[anchor=south west] {C} rectangle (220,100) node[anchor=north east] {C};
-\draw ( 5,45) node[anchor=south west] {B} rectangle (170,200) node[anchor=north east] {B};
-\draw (70,20) node[anchor=south west] {T} rectangle (150,120) node[anchor=north east] {T};
-\draw (60,10) node[anchor=south west] {A} rectangle (100,150) node[anchor=north east] {A};
-\end{tikzpicture}
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/mps.txt b/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/mps.txt
deleted file mode 100644
index cd885781030..00000000000
--- a/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/mps.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-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/doc/latex/dvipdfmx-def/doc/pagebox-dx.pdf b/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/pagebox-dx.pdf
deleted file mode 100644
index 19a67f6ac77..00000000000
--- a/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/pagebox-dx.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/pagebox-dx.tex b/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/pagebox-dx.tex
deleted file mode 100644
index 4db096982c0..00000000000
--- a/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/pagebox-dx.tex
+++ /dev/null
@@ -1,44 +0,0 @@
-% platex + dvipdfmx
-\documentclass[a4paper,dvipdfmx]{article}
-\usepackage[paperheight=60cm,margin=2cm]{geometry}
-\usepackage{graphicx}
-\setlength{\parindent}{0pt}
-\pagestyle{empty}
-
-\makeatletter
-\def\test#1#2{%
-  \def\@temp{#1}%
-  \ifx\@temp\@empty
-    \makebox[5.5cm][l]{\texttt{\LARGE pagebox is absent}}\fbox{\includegraphics{#2.pdf}}%
-  \else
-    \makebox[5.5cm][l]{\texttt{\LARGE pagebox=#1box}}\fbox{\includegraphics[pagebox=#1box]{#2.pdf}}%
-  \fi
-  \par
-}
-\makeatother
-
-\begin{document}
-\section{test: image1}
-\test{}{image1}
-\test{media}{image1}
-\test{}{image1}
-\test{art}{image1}
-\test{}{image1}
-\test{bleed}{image1}
-\test{}{image1}
-\test{trim}{image1}
-\test{}{image1}
-\newpage
-\section{test: image2}
-\test{}{image2}
-\test{media}{image2}
-\test{}{image2}
-\test{art}{image2}
-\test{}{image2}
-\test{bleed}{image2}
-\test{}{image2}
-\test{trim}{image2}
-\test{}{image2}
-\test{crop}{image2}
-\test{}{image2}
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/pagebox-dx.txt b/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/pagebox-dx.txt
deleted file mode 100644
index f60e6f49088..00000000000
--- a/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/pagebox-dx.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-                          pagebox-dx.txt
-
-This directory contains examples for a new feature of dvipdfmx.def:
-support of an option [pagebox=artbox, etc.] in PDF inclusion, like
-that in pdflatex, in the case of latex, platex, and uplatex with the
-driver program dvipdfmx. The feature is supported in dvipdfmx.def
-version 4.06 or later ones. It requires a new dvipdfmx which is not
-in TeX Live 2015. The new dvipdfmx will be available in TeX Live 2016.
-Interested users may build themselves the new dvipdfmx by using new
-sources in the TeX Live repository.
-
-There is a Makefile for GNU Make. All test files are written by Y. Terada.
-
-Note that results are different in the case of dvipdfmx, pagebox-dx.pdf,
-compared with those for pdflatex, pagebox-pd.pdf, when the pagebox option
-is not given. This is because BoundingBox is determined in the order of
-precedence: CropBox --> ArtBox --> TrimBox --> BleedBox --> MediaBox
-in the case of dvipdfmx. We keep the order for compatibility with old
-documents which use dvipdfmx. In the case of pdflatex and xelatex, the
-order is CropBox --> MediaBox --> BleedBox --> TrimBox --> ArtBox.
- 
---------------------------------------------------------------------
-Akira Kakuto <kakuto at fuk dot kindai dot ac dot jp>
diff --git a/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/pagebox-pd.pdf b/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/pagebox-pd.pdf
deleted file mode 100644
index 83a810151c3..00000000000
--- a/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/pagebox-pd.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/pagebox-pd.tex b/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/pagebox-pd.tex
deleted file mode 100644
index c85d27981b9..00000000000
--- a/Master/texmf-dist/doc/latex/dvipdfmx-def/doc/pagebox-pd.tex
+++ /dev/null
@@ -1,44 +0,0 @@
-% pdflatex
-\documentclass[a4paper]{article}
-\usepackage[paperheight=60cm,margin=2cm]{geometry}
-\usepackage{graphicx}
-\setlength{\parindent}{0pt}
-\pagestyle{empty}
-
-\makeatletter
-\def\test#1#2{%
-  \def\@temp{#1}%
-  \ifx\@temp\@empty
-    \makebox[5.5cm][l]{\texttt{\LARGE pagebox is absent}}\fbox{\includegraphics{#2.pdf}}%
-  \else
-    \makebox[5.5cm][l]{\texttt{\LARGE pagebox=#1box}}\fbox{\includegraphics[pagebox=#1box]{#2.pdf}}%
-  \fi
-  \par
-}
-\makeatother
-
-\begin{document}
-\section{test: image1}
-\test{}{image1}
-\test{media}{image1}
-\test{}{image1}
-\test{art}{image1}
-\test{}{image1}
-\test{bleed}{image1}
-\test{}{image1}
-\test{trim}{image1}
-\test{}{image1}
-\newpage
-\section{test: image2}
-\test{}{image2}
-\test{media}{image2}
-\test{}{image2}
-\test{art}{image2}
-\test{}{image2}
-\test{bleed}{image2}
-\test{}{image2}
-\test{trim}{image2}
-\test{}{image2}
-\test{crop}{image2}
-\test{}{image2}
-\end{document}
diff --git a/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def b/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def
deleted file mode 100644
index 2e857a4cc56..00000000000
--- a/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def
+++ /dev/null
@@ -1,430 +0,0 @@
-%% 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-2016 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/dvipdfmx-def
-%% 
-%% The original source files were:
-%% drivers.dtx  (with options: `dvipdf,color1,psrulesZ')
-%%             Copyright (C) 1995 1996 1997 1998 1999, 2014 David Carlisle
-%%             Copyright (C) 1994 David Carlisle Sebastian Rahtz
-%%
-% emacs-page
-\ProvidesFile{dvipdfmx.def}
-  [2016/06/22 v4.09 LaTeX color/graphics driver for dvipdfmx (TeX Live/ChoF)]
-%
-\def\c@lor@arg#1{%
-  \dimen@#1\p@
-  \ifdim\dimen@<\z@\dimen@\maxdimen\fi
-  \ifdim\dimen@>\p@
-    \PackageError{color}{Argument `#1' not in range [0,1]}\@ehd
-  \fi}
-\def\color@gray#1#2{%
-  \c@lor@arg{#2}%
-  \edef#1{[#2]}%
-  }
-\def\color@cmyk#1#2{\c@lor@@cmyk#2\@@#1}
-\def\c@lor@@cmyk#1,#2,#3,#4\@@#5{%
-  \c@lor@arg{#4}%
-  \c@lor@arg{#1}%
-  \c@lor@arg{#2}%
-  \c@lor@arg{#3}%
-  \edef#5{[#1 #2 #3 #4]}%
-  }
-\def\color@rgb#1#2{\c@lor@@rgb#2\@@#1}
-\def\c@lor@@rgb#1,#2,#3\@@#4{%
-  \c@lor@arg{#1}%
-  \c@lor@arg{#2}%
-  \c@lor@arg{#3}%
-  \edef#4{[#1 #2 #3]}%
-  }
-\def\color@RGB#1#2{\c@lor@@RGB#2\@@#1}
-\def\c@lor@@RGB#1,#2,#3\@@#4{%
- \c@lor@RGB@rgb{#1}\@tempa
- \c@lor@RGB@rgb{#2}\@tempb
- \c@lor@RGB@rgb{#3}\@tempc
- \c@lor@@rgb\@tempa,\@tempb,\@tempc\@@#4%
-  }
-\def\c@lor@RGB@rgb#1#2{%
-  \dimen@#1\p@
-  \divide\dimen@\@cclv
-  \edef#2{\strip@pt\dimen@}}
-%%
-%% the following 7 lines do not work. (2016/06/22)
-%%\def\color@hsb#1#2{\c@lor@@hsb#2\@@#1}
-%%\def\c@lor@@hsb#1,#2,#3\@@#4{%
-%%  \c@lor@arg{#1}%
-%%  \c@lor@arg{#2}%
-%%  \c@lor@arg{#3}%
-%%  \edef#4{[#1 #2 #3] hsb}%
-%%  }
-\def\color@named#1#2{\c@lor@@named#2,,\@@#1}
-\def\c@lor@@named#1,#2,#3\@@#4{%
-  \@ifundefined{col@#1}%
-    {\PackageError{color}{Undefined color `#1'}\@ehd}%
-  {\edef#4{ #1}}%
-  }
-\def\c@lor@to@ps#1 #2\@@{\csname c@lor@ps@#1\endcsname#2 \@@}
-\def\c@lor@ps@#1 #2\@@{TeXDict begin #1 end}
-\def\c@lor@ps@rgb#1\@@{#1 setrgbcolor}
-\def\c@lor@ps@hsb#1\@@{#1 sethsbcolor}
-\def\c@lor@ps@cmyk#1\@@{#1 setcmykcolor}
-\def\c@lor@ps@gray#1\@@{#1 setgray}
-\def\current@color{[0]}
-\def\set@color{%
-            \special{pdf:bcolor \current@color
-                          }\aftergroup\reset@color}
-\def\reset@color{\special{%
-         pdf:ecolor}}
-\def\set@page@color{\special{%
-         pdf:bgcolor \current@color}}
-\def\define@color@named#1#2{%
-  \expandafter\let\csname col@#1\endcsname\@nnil}
-%
-% Graphics
-%
-\def\declareimagemask{%
-  \@ifnextchar[\declareimagemask@i{\declareimagemask@i[]}}
-\def\declareimagemask@i[#1]#2#3{%
-  \special{pdf:image @#2\space hide (#3) #1}}
-%
-% import from pdftex.def
-%
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname RequirePackage\endcsname\relax
-  \input infwarerr.sty\relax
-  \input ltxcmds.sty\relax
-\else
-  \RequirePackage{infwarerr}[2007/09/09]%
-  \RequirePackage{ltxcmds}[2010/12/07]%
-\fi
-
-\def\GPT@error{\@PackageError{dvipdfmx.def}}%
-\def\GPT@warn{\@PackageWarning{dvipdfmx.def}}%
-\let\GPT@pagebox@option\ltx@empty
-\begingroup
-\toks@{%
-\define@key{Gin}{page}{\def\Gin@page{#1}}
-\define@key{Gin}{mask}{\def\Gin@mask{#1}}
-\define@key{Gin}{interpolate}[true]{%
-  \lowercase{\Gin@boolkey{#1}}{interpolate}}
-\define@key{Gin}{pagebox}{%
-  \expandafter\let\expandafter\GPT@pagebox%
-      \csname GPT@pagebox@#1\endcsname
-  \ifx\GPT@pagebox\relax
-    \let\GPT@pagebox\ltx@empty
-    \GPT@warn{%
-      Unknown value `#1' for `pagebox'.\MessageBreak
-      Supported values:\MessageBreak
-      mediabox, cropbox, bleedbox, trimbox, artbox%
-    }%
-  \else%
-    \def\GPT@pagebox@option{-B \GPT@pagebox\space}%
-  \fi%
-}%
-}
-\ltx@IfUndefined{define@key}{
-    \edef\x{\endgroup
-      \noexpand\AtBeginDocument{%
-        \noexpand\ltx@IfUndefined{define@key}{}{\the\toks@}%
-      }%
-    }\x
-  }{%
-    \expandafter\endgroup\the\toks@
-  }%
-
-\def\GPT@pagebox@cropbox{cropbox}%
-\def\GPT@pagebox@mediabox{mediabox}%
-\def\GPT@pagebox@artbox{artbox}%
-\def\GPT@pagebox@trimbox{trimbox}%
-\def\GPT@pagebox@bleedbox{bleedbox}%
-%
-% end (import from pdftex.def)
-%
-% improved by N. Abe to cache BoundingBox for pdfpages package
-%
-\def\Gread@pdf#1{%
-\edef\@tempa{pdf@bbox@cache@\Gin@page @\GPT@pagebox @#1}%
-\expandafter\expandafter\expandafter\@ifundefined\expandafter{\@tempa}{\Gread@@pdf{#1}}{%
-\edef\@gtempa{\csname\@tempa\endcsname}%
-\expandafter\Gread@parse@bb\@gtempa\\}}
-\def\Gread@@pdf#1{%
-  \begingroup
-  \@tempcnta\z@
-  \loop\ifnum\@tempcnta<\@xxxii
-     \catcode\@tempcnta14 %
-     \advance\@tempcnta\@ne
-  \repeat
-  \catcode`\^^?14 %
-  \let\do\@makeother
-  \dospecials
-  \catcode`\ 10 %
-  \catcode`\^^I10 %
-  \catcode\endlinechar5 %
-  \@makeother\:%
-  \@makeother\-%
-  \immediate\openin\@inputcheck"#1" % allow spaces in a name of a .xbb file
-  \ifeof\@inputcheck
-    \def\@tempc{!}%
-    \ifx\Gin@page\@tempc
-      \def\@tempc{}%
-    \else
-      \def\@tempc{-p \Gin@page\space}%
-    \fi
-    \immediate\openin\@inputcheck="|extractbb \GPT@pagebox@option \@tempc -O \Gin@base\Gin@ext"%
-  \fi
-  \Gread@true
-  \let\@tempb\Gread@false
-  \ifeof\@inputcheck
-    \@latex@error
-      {Cannot run pipe command. Try --shell-escape^^J%
-       (--enable-pipes in MikTeX) option}%
-      \@ehc
-  \else
-    \loop
-      \read\@inputcheck to\@tempa
-      \ifeof\@inputcheck
-        \Gread@false
-      \else
-        \expandafter\Gread@find@bb\@tempa:.\\%
-      \fi
-      \ifGread@
-      \repeat
-    \immediate\closein\@inputcheck
-  \fi
-%
-% If BoundingBox is not obtained, extractbb may be an old one which does not
-% support the -p and/or -B options, and usage of extractbb is printed to stdout.
-% Thus we retry without the -p and/or -B optons.
-%
-  \ifGin@bbox\else
-    \immediate\openin\@inputcheck="|extractbb -O \Gin@base\Gin@ext"%
-    \message{^^JI try without the new options^^J}%
-    \Gread@true
-    \let\@tempb\Gread@false
-    \ifeof\@inputcheck
-      \@latex@error
-        {Cannot run pipe command. Try --shell-escape^^J%
-         (--enable-pipes in MikTeX) option}%
-        \@ehc
-    \else
-      \loop
-        \read\@inputcheck to\@tempa
-        \ifeof\@inputcheck
-          \Gread@false
-        \else
-          \expandafter\Gread@find@bb\@tempa:.\\%
-        \fi
-        \ifGread@
-        \repeat
-      \immediate\closein\@inputcheck
-      \aftergroup\Gin@clear@pagebox
-    \fi
-  \fi
-%
-% improved by N. Abe to cache BoundingBox for pdfpages package
-%
-  \ifGin@bbox
-    \edef\@tempa{pdf@bbox@cache@\Gin@page @\GPT@pagebox @#1}%
-    \expandafter\expandafter\expandafter\xdef\expandafter\csname\@tempa\endcsname{\@gtempa}%
-  \else
-    \@latex@error
-      {Cannot determine size of image (no BoundingBox)}%
-      \@ehc
-    \gdef\@gtempa{0 0 72 72 }%
-  \fi
-  \endgroup
-  \expandafter\Gread@parse@bb\@gtempa\\}
-\def\Gin@clear@pagebox{%
-  \let\GPT@pagebox\@empty}
-\let\Gread@bmp\Gread@pdf
-\def\Gin@page{!}
-\def\Gin@mask{!}
-\newif\ifGin@interpolate\Gin@interpolatefalse
-\let\GPT@pagebox\ltx@empty
-\def\Ginclude@pdf#1{%
- \message{<#1>}%
-  \bgroup
-  \def\@tempa{!}%
-    \special{pdf:epdf\space
-      \ifx\Gin@page\@tempa\else page\space\Gin@page\space\fi
-      \ifx\GPT@pagebox\ltx@empty\else pagebox\space\GPT@pagebox\space\fi
-      bbox\space\Gin@llx\space\Gin@lly\space\Gin@urx\space\Gin@ury\space
-      clip\space\ifGin@clip 1\else 0\fi\space
-      \ifx\Gin@scalex\@tempa\else width\space\the\Gin@req@width\space\fi
-      \ifx\Gin@scaley\@tempa\else height\space\the\Gin@req@height\space\fi
-      (#1)\space
-      \ifx\Gin@mask\@tempa
-        \ifGin@interpolate<</Interpolate\space true>>\fi
-      \else
-        <</SMask @\Gin@mask\space%
-        \ifGin@interpolate/Interpolate\space true\fi>>%
-      \fi}%
-  \egroup}
-\def\Ginclude@bmp#1{%
- \message{<#1>}%
-  \bgroup
-  \def\@tempa{!}%
-    \special{pdf:image\space
-      \ifx\Gin@page\@tempa\else page\space\Gin@page\space\fi
-      % 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
-      \ifx\Gin@scalex\@tempa\else width\space\the\Gin@req@width\space\fi
-      \ifx\Gin@scaley\@tempa\else height\space\the\Gin@req@height\space\fi
-      (#1)\space
-      \ifx\Gin@mask\@tempa
-        \ifGin@interpolate<</Interpolate\space true>>\fi
-      \else
-        <</SMask @\Gin@mask\space%
-        \ifGin@interpolate/Interpolate\space true\fi>>%
-      \fi}%
-  \egroup}
-\newif\if@trim@vport
-\def\Ginclude@eps#1{%
- \message{<#1>}%
-  \bgroup
-  \ifx\Undefined\Gin@vllx\else\@trim@vporttrue\fi
-  \def\@tempa{!}%
-  \dimen@\Gin@urx\p@
-  \advance\dimen@ -\Gin@llx\p@
-  \if@trim@vport
-  \advance\dimen@ \Gin@vllx\p@
-  \fi
-  \edef\Gin@urx{\strip@pt\dimen@}%
-  \dimen@\Gin@ury\p@
-  \advance\dimen@ -\Gin@lly\p@
-  \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
-      \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}}
-\def\Gscale@start{%
-\special{pdf:btrans xscale \Gscale@x\space yscale \Gscale@y}}
-\def\Gscale@end{\special{pdf:etrans}}
-\def\Gin@PS@raw#1{\special{ps: #1}}
-\def\Gin@PS@restored#1{\special{" #1}}
-\def\Gin@PS@literal@header#1{\AtBeginDvi{\special{! #1}}}
-\def\Gin@PS@file@header#1{\AtBeginDvi{\special{header=#1}}}
-\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,.mps,.MPS,%
-  .pz,.eps.Z,.ps.Z,.ps.gz,.eps.gz}
-%
-\@namedef{Gin@rule@.pdf}#1{{pdf}{.xbb}{#1}}
-\@namedef{Gin@rule@.PDF}#1{{pdf}{.xbb}{#1}}
-%
-\@namedef{Gin@rule@.ai}#1{{pdf}{.xbb}{#1}}
-\@namedef{Gin@rule@.AI}#1{{pdf}{.xbb}{#1}}
-%
-\@namedef{Gin@rule@.jp2}#1{{bmp}{.xbb}{#1}}
-\@namedef{Gin@rule@.JP2}#1{{bmp}{.xbb}{#1}}
-%
-\@namedef{Gin@rule@.jpf}#1{{bmp}{.xbb}{#1}}
-\@namedef{Gin@rule@.JPF}#1{{bmp}{.xbb}{#1}}
-%
-\@namedef{Gin@rule@.png}#1{{bmp}{.xbb}{#1}}
-\@namedef{Gin@rule@.PNG}#1{{bmp}{.xbb}{#1}}
-%
-\@namedef{Gin@rule@.jpg}#1{{bmp}{.xbb}{#1}}
-\@namedef{Gin@rule@.JPG}#1{{bmp}{.xbb}{#1}}
-%
-\@namedef{Gin@rule@.jpeg}#1{{bmp}{.xbb}{#1}}
-\@namedef{Gin@rule@.JPEG}#1{{bmp}{.xbb}{#1}}
-%
-\@namedef{Gin@rule@.jp2}#1{{bmp}{.xbb}{#1}}
-\@namedef{Gin@rule@.JP2}#1{{bmp}{.xbb}{#1}}
-%
-\@namedef{Gin@rule@.jpf}#1{{bmp}{.xbb}{#1}}
-\@namedef{Gin@rule@.JPF}#1{{bmp}{.xbb}{#1}}
-%
-\@namedef{Gin@rule@.bmp}#1{{bmp}{.xbb}{#1}}
-\@namedef{Gin@rule@.BMP}#1{{bmp}{.xbb}{#1}}
-%
-\@namedef{Gin@rule@.ps}#1{{eps}{.ps}{#1}}
-\@namedef{Gin@rule@.PS}#1{{eps}{.ps}{#1}}
-%
-\@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}}
-\@namedef{Gin@rule@.ps.Z}#1{{eps}{.ps.xbb}{`gunzip -c #1}}
-\@namedef{Gin@rule@.ps.gz}#1{{eps}{.ps.xbb}{`gunzip -c #1}}
-\@namedef{Gin@rule@.eps.gz}#1{{eps}{.eps.xbb}{`gunzip -c #1}}
-%
-\@namedef{Gin@rule@*}#1{{eps}{\Gin@ext}{#1}}
-\endinput
-%%
-%% End of file `dvipdfmx.def'.
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 5232639860e..8c4735616d1 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -209,7 +209,7 @@ my @TLP_working = qw(
     drm droid droit-fr drs drv dsptricks
     dtk dtxgallery dtxgen
     dtxtut duerer duerer-latex duotenzor dutchcal
-    dvdcoll dvgloss dviasm dviincl dvipdfmx-def
+    dvdcoll dvgloss dviasm dviincl
     dvipsconfig dvisvgm-def dynamicnumber dynblocks dyntree
   e-french ean ean13isbn easy easy-todo easyfig easylist easyreview
     ebezier ebgaramond ebgaramond-maths ebong ebook ebproof ebsthesis
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 7d083b6bfce..b5e0dcc4757 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -361,6 +361,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'dtxtut',      "&setup",  # straight copy
  'duplicat',    "die 'skipping, use piff'",
  'dutchcal',    "&MAKEcopy",
+ 'dvipdfmx-def',"die 'skipping, replaced by graphics-def'",
  'easy',        "&MAKEeasy",
  'easylatex',   "die 'skipping, complicated perl modules, sorry'",
  'ean13isbn',   "&MAKEcopy",
diff --git a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
index 6a420076ea7..c6512b71c4f 100644
--- a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
@@ -12,7 +12,6 @@ depend amsfonts
 depend bibtex
 depend cm
 depend dvipdfmx
-depend dvipdfmx-def
 depend dvips
 depend enctex
 depend etex
diff --git a/Master/tlpkg/tlpsrc/dvipdfmx-def.tlpsrc b/Master/tlpkg/tlpsrc/dvipdfmx-def.tlpsrc
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/Master/tlpkg/tlpsrc/dvipdfmx-def.tlpsrc
+++ /dev/null