summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-29 16:34:36 +0000
committerKarl Berry <karl@freefriends.org>2013-04-29 16:34:36 +0000
commitd5cab929cd87635980d9239b07cbf79d65d24e80 (patch)
treef99b91e14c1cb416c3a34f312a3da8499d35f79c
parent315aaf77b748babb0a2385e030a4e6c785d2fc84 (diff)
finish dvipdfm removal/merge into dvipdfmx package
git-svn-id: svn://tug.org/texlive/trunk@30161 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/tex/latex/dvipdfm/dvipdfm.def131
-rw-r--r--Master/tlpkg/tlpsrc/collection-basic.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/dvipdfm.tlpsrc11
-rw-r--r--Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc8
4 files changed, 7 insertions, 144 deletions
diff --git a/Master/texmf-dist/tex/latex/dvipdfm/dvipdfm.def b/Master/texmf-dist/tex/latex/dvipdfm/dvipdfm.def
deleted file mode 100644
index e554f00c053..00000000000
--- a/Master/texmf-dist/tex/latex/dvipdfm/dvipdfm.def
+++ /dev/null
@@ -1,131 +0,0 @@
-%%
-%% This is file `dvipdfm.def',
-%% and was *not* generated with the docstrip utility.
-%%
-%% It was hand edited from several docstripped def
-%% files that are distributed with the Graphics Bundle
-%%
-%% A modified version of this file may be distributed, but it should
-%% be distributed with a *different* name. Changed files must be
-%% distributed *together with a complete and unchanged* distribution
-%% of these files.
-%%
-%% In compliance with the above statement, the unmodified graphics
-%% bundle is available from the same site you obtained this
-%% modified file. However, it is contained in a separate
-%% tar file to conserve bandwidth. You can get the
-%% unmodified Graphics Bundle at
-%%
-%% http://odo.kettering.edu/dvipdfm/
-%%
-\ProvidesFile{dvipdfm.def}
- [1999/9/6 vx.x Driver-dependant file]
-\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{gray #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{cmyk #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{rgb #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@}}
-\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{(not implemented yet) [ #1 #2 #3 ] }%
- }
-\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 beginclude@ #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{gray 0}
-\def\set@color{%
- \special{color push \current@color}\aftergroup\reset@color}
-\def\reset@color{\special{color pop}}
-\def\set@page@color{\special{background \current@color}}
-\def\define@color@named#1#2{%
- \expandafter\let\csname col@#1\endcsname\@nnil}
-\def\Ginclude@bmp#1{%
-\message{<#1>}%
- \special{pdf: image width \the\Gin@req@width\space height
-\the\Gin@req@height\space depth \the\z@ (#1)}}
-\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}
-\def\Grot@start{%
-\special{ps: gsave currentpoint currentpoint translate
-\Grot@angle\space neg rotate neg exch neg exch translate}}
-\def\Grot@end{\special{ps: currentpoint grestore moveto}}
-\def\Gscale@start{\special{ps: gsave currentpoint currentpoint translate
-\Gscale@x\space\Gscale@y\space scale neg exch neg exch translate}}
-% \def\Gscale@start{\special{ps: currentpoint currentpoint translate
-% \Gscale@x\space\Gscale@y\space scale neg exch neg exch translate}}
-\def\Gscale@end{\special{ps: currentpoint grestore moveto}}
-% \def\Gscale@end{\special{ps: currentpoint currentpoint translate
-% 1 \Gscale@x\space div 1 \Gscale@x\space div scale neg exch neg exch translate}}
-% \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{.jpg,.jpeg,.pdf,.png}
-\@namedef{Gin@rule@.jpg}#1{{bmp}{.bb}{#1}}
-\@namedef{Gin@rule@.jpeg}#1{{bmp}{.bb}{#1}}
-\@namedef{Gin@rule@.png}#1{{bmp}{.bb}{#1}}
-\@namedef{Gin@rule@.pdf}#1{{eps}{.bb}{#1}}
-\@namedef{Gin@rule@*}#1{{eps}{\Gin@ext}{#1}}
-\endinput
-%%
-%% End of file `dvipdfm.def'.
-
diff --git a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
index ec861a304a5..6ebddb3882d 100644
--- a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
@@ -9,7 +9,6 @@ depend collection-documentation-base
depend amsfonts
depend bibtex
depend cm
-depend dvipdfm
depend dvipdfmx
depend dvipdfmx-def
depend dvips
diff --git a/Master/tlpkg/tlpsrc/dvipdfm.tlpsrc b/Master/tlpkg/tlpsrc/dvipdfm.tlpsrc
deleted file mode 100644
index 9bc676bf332..00000000000
--- a/Master/tlpkg/tlpsrc/dvipdfm.tlpsrc
+++ /dev/null
@@ -1,11 +0,0 @@
-category TLCore
-runpattern d texmf-dist/dvipdfm
-runpattern f texmf-dist/tex/latex/dvipdfm/*
-#
-docpattern f texmf-dist/doc/dvipdfm/*
-docpattern f texmf-dist/doc/man/man1/dvipdfm.*
-docpattern f texmf-dist/doc/man/man1/dvipdft.*
-docpattern f texmf-dist/doc/man/man1/ebb.*
-#
-binpattern f bin/${ARCH}/dvipdfm
-binpattern f bin/${ARCH}/dvipdft
diff --git a/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc b/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc
index 8705362735a..13bf438a199 100644
--- a/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc
@@ -10,9 +10,15 @@ runpattern d texmf-dist/fonts/cmap/dvipdfmx
runpattern d texmf-dist/fonts/map/dvipdfmx/updmap
runpattern f texmf-dist/fonts/map/dvipdfmx/*.map
#
+binpattern f bin/${ARCH}/dvipdfm
binpattern f bin/${ARCH}/dvipdfmx
+binpattern f bin/${ARCH}/dvipdft
binpattern f bin/${ARCH}/ebb
binpattern f bin/${ARCH}/extractbb
#
-docpattern f texmf-dist/doc/man/man1/extractbb*
+docpattern d texmf-dist/doc/dvipdfm
docpattern d texmf-dist/doc/dvipdfmx
+docpattern f texmf-dist/doc/man/man1/dvipdfm.*
+docpattern f texmf-dist/doc/man/man1/dvipdft.*
+docpattern f texmf-dist/doc/man/man1/ebb.*
+docpattern f texmf-dist/doc/man/man1/extractbb*