rename supp-pdf to mptopdf, and include the other mptopdf-related files, while excluding them from context. enable mptopdf.fmt. after discussions with taco.

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

25 files changed, 65 insertions, 40 deletions

diff --git a/Master/bin/alpha-linux/mptopdf b/Master/bin/alpha-linux/mptopdf
new file mode 120000
index 00000000000..deeeeae0fbc
--- /dev/null
+++ b/Master/bin/alpha-linux/mptopdf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/perl/mptopdf.pl
\ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/mptopdf b/Master/bin/amd64-freebsd/mptopdf
new file mode 120000
index 00000000000..deeeeae0fbc
--- /dev/null
+++ b/Master/bin/amd64-freebsd/mptopdf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/perl/mptopdf.pl
\ No newline at end of file
diff --git a/Master/bin/amd64-kfreebsd/mptopdf b/Master/bin/amd64-kfreebsd/mptopdf
new file mode 120000
index 00000000000..deeeeae0fbc
--- /dev/null
+++ b/Master/bin/amd64-kfreebsd/mptopdf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/perl/mptopdf.pl
\ No newline at end of file
diff --git a/Master/bin/i386-cygwin/mptopdf b/Master/bin/i386-cygwin/mptopdf
new file mode 120000
index 00000000000..deeeeae0fbc
--- /dev/null
+++ b/Master/bin/i386-cygwin/mptopdf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/perl/mptopdf.pl
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/mptopdf b/Master/bin/i386-freebsd/mptopdf
new file mode 120000
index 00000000000..deeeeae0fbc
--- /dev/null
+++ b/Master/bin/i386-freebsd/mptopdf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/perl/mptopdf.pl
\ No newline at end of file
diff --git a/Master/bin/i386-kfreebsd/mptopdf b/Master/bin/i386-kfreebsd/mptopdf
new file mode 120000
index 00000000000..deeeeae0fbc
--- /dev/null
+++ b/Master/bin/i386-kfreebsd/mptopdf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/perl/mptopdf.pl
\ No newline at end of file
diff --git a/Master/bin/i386-linux/mptopdf b/Master/bin/i386-linux/mptopdf
new file mode 120000
index 00000000000..deeeeae0fbc
--- /dev/null
+++ b/Master/bin/i386-linux/mptopdf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/perl/mptopdf.pl
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/mptopdf b/Master/bin/i386-netbsd/mptopdf
new file mode 120000
index 00000000000..deeeeae0fbc
--- /dev/null
+++ b/Master/bin/i386-netbsd/mptopdf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/perl/mptopdf.pl
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/mptopdf b/Master/bin/i386-solaris/mptopdf
new file mode 120000
index 00000000000..deeeeae0fbc
--- /dev/null
+++ b/Master/bin/i386-solaris/mptopdf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/perl/mptopdf.pl
\ No newline at end of file
diff --git a/Master/bin/mips-irix/mptopdf b/Master/bin/mips-irix/mptopdf
new file mode 120000
index 00000000000..deeeeae0fbc
--- /dev/null
+++ b/Master/bin/mips-irix/mptopdf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/perl/mptopdf.pl
\ No newline at end of file
diff --git a/Master/bin/powerpc-aix/mptopdf b/Master/bin/powerpc-aix/mptopdf
new file mode 120000
index 00000000000..deeeeae0fbc
--- /dev/null
+++ b/Master/bin/powerpc-aix/mptopdf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/perl/mptopdf.pl
\ No newline at end of file
diff --git a/Master/bin/powerpc-linux/mptopdf b/Master/bin/powerpc-linux/mptopdf
new file mode 120000
index 00000000000..deeeeae0fbc
--- /dev/null
+++ b/Master/bin/powerpc-linux/mptopdf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/perl/mptopdf.pl
\ No newline at end of file
diff --git a/Master/bin/sparc-linux/mptopdf b/Master/bin/sparc-linux/mptopdf
new file mode 120000
index 00000000000..deeeeae0fbc
--- /dev/null
+++ b/Master/bin/sparc-linux/mptopdf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/perl/mptopdf.pl
\ No newline at end of file
diff --git a/Master/bin/sparc-solaris/mptopdf b/Master/bin/sparc-solaris/mptopdf
new file mode 120000
index 00000000000..deeeeae0fbc
--- /dev/null
+++ b/Master/bin/sparc-solaris/mptopdf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/perl/mptopdf.pl
\ No newline at end of file
diff --git a/Master/bin/universal-darwin/mptopdf b/Master/bin/universal-darwin/mptopdf
new file mode 120000
index 00000000000..deeeeae0fbc
--- /dev/null
+++ b/Master/bin/universal-darwin/mptopdf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/perl/mptopdf.pl
\ No newline at end of file
diff --git a/Master/bin/win32/mptopdf.exe b/Master/bin/win32/mptopdf.exe
new file mode 100755
index 00000000000..5777d90a17a
--- /dev/null
+++ b/Master/bin/win32/mptopdf.exe
diff --git a/Master/bin/x86_64-darwin/mptopdf b/Master/bin/x86_64-darwin/mptopdf
new file mode 120000
index 00000000000..deeeeae0fbc
--- /dev/null
+++ b/Master/bin/x86_64-darwin/mptopdf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/perl/mptopdf.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-linux/mptopdf b/Master/bin/x86_64-linux/mptopdf
new file mode 120000
index 00000000000..deeeeae0fbc
--- /dev/null
+++ b/Master/bin/x86_64-linux/mptopdf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/perl/mptopdf.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/mptopdf b/Master/bin/x86_64-solaris/mptopdf
new file mode 120000
index 00000000000..deeeeae0fbc
--- /dev/null
+++ b/Master/bin/x86_64-solaris/mptopdf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/perl/mptopdf.pl
\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/context/perl/mptopdf.pl b/Master/texmf-dist/scripts/context/perl/mptopdf.pl
index ec08c5306b3..ec08c5306b3 100644..100755
--- a/Master/texmf-dist/scripts/context/perl/mptopdf.pl
+++ b/Master/texmf-dist/scripts/context/perl/mptopdf.pl
diff --git a/Master/texmf/web2c/fmtutil.cnf b/Master/texmf/web2c/fmtutil.cnf
index afef20cd65e..ed79a138ad3 100644
--- a/Master/texmf/web2c/fmtutil.cnf
+++ b/Master/texmf/web2c/fmtutil.cnf
@@ -93,6 +93,9 @@ utf8mex pdftex mexconf.tex -enc *utf8mex.ini
 mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini
 mllatex pdftex language.dat -translate-file=cp227.tcx -mltex mllatex.ini
 #
+# from mptopdf:
+mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex
+#
 # from pdftex:
 pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
 etex pdftex language.def -translate-file=cp227.tcx *etex.ini
diff --git a/Master/tlpkg/tlpsrc/collection-latex.tlpsrc b/Master/tlpkg/tlpsrc/collection-latex.tlpsrc
index 64ca3f7c2aa..385c9460e12 100644
--- a/Master/tlpkg/tlpsrc/collection-latex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latex.tlpsrc
@@ -20,13 +20,13 @@ depend latex-fonts
 depend latexconfig
 depend ltxmisc
 depend mfnfss
+depend mptopdf
 depend natbib
 depend oberdiek
 depend pdftex-def
 depend pslatex
 depend psnfss
 depend pspicture
-depend supp-pdf
 depend tools
 #
 depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/context.tlpsrc b/Master/tlpkg/tlpsrc/context.tlpsrc
index 2b599907feb..e8a540ffe92 100644
--- a/Master/tlpkg/tlpsrc/context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context.tlpsrc
@@ -25,10 +25,6 @@ execute AddFormat name=cont-nl mode=disabled engine=pdftex \
 execute AddFormat name=cont-ro mode=disabled engine=pdftex \
         patterns=cont-usr.tex options="-8bit *cont-ro.ini"
 #
-# No mptopdf for TL'10.
-#execute AddFormat name=mptopdf engine=pdftex \
-#        options="-translate-file=cp227.tcx mptopdf.tex"
-#
 execute AddFormat name=metafun engine=mpost options="metafun.mp"
 #
 runpattern +f texmf/web2c/texmfcnf.lua
@@ -36,9 +32,14 @@ runpattern +d texmf-dist/context/data
 runpattern +d texmf-dist/fonts/cid/fontforge
 runpattern +f texmf-dist/tex/mptopdf/config/mptopdf.ini
 #
-# See comments in supp-pdf.tlpsrc.
-runpattern +!f texmf-dist/tex/context/base/supp-pdf.*
-depend supp-pdf
+# See longdesc in mptopdf.tlpsrc.
+runpattern +!f texmf-dist/tex/context/base/supp-mis.mkii
+runpattern +!f texmf-dist/tex/context/base/supp-mpe.mkii
+runpattern +!f texmf-dist/tex/context/base/supp-pdf.mkii
+runpattern +!f texmf-dist/tex/context/base/syst-tex.mkii
+runpattern +!f texmf-dist/scripts/context/perl/mptopdf.pl
+runpattern +!f texmf-dist/tex/generic/context/mptopdf.pl
+depend mptopdf
 #
 # these have their own TL packages, and are not part of core context.
 runpattern +!d texmf-dist/tex/context/third
diff --git a/Master/tlpkg/tlpsrc/mptopdf.tlpsrc b/Master/tlpkg/tlpsrc/mptopdf.tlpsrc
new file mode 100644
index 00000000000..04f4b0921b7
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/mptopdf.tlpsrc
@@ -0,0 +1,35 @@
+shortdesc mpost to PDF, native MetaPost graphics inclusion
+
+longdesc The mptopdf script does standalone conversion from mpost to
+longdesc PDF, using the supp-* and syst-* files.  They also native
+longdesc MetaPost graphics inclusion in LaTeX (via pdftex.def) and
+longdesc ConTeXt.  They can be used independently of the rest of
+longdesc ConTeXt, yet are maintained as part of it.  So in TeX Live we
+longdesc pull them out to this separate package for the benefit of LaTeX
+longdesc users who do not install the rest of ConTeXt.
+longdesc 
+longdesc This can be found on CTAN in macros/pdftex/graphics.
+
+execute AddFormat name=mptopdf engine=pdftex \
+        options="-translate-file=cp227.tcx mptopdf.tex"
+
+runpattern f texmf-dist/tex/context/base/supp-mis.mkii
+runpattern f texmf-dist/tex/context/base/supp-mpe.mkii
+runpattern f texmf-dist/tex/context/base/supp-pdf.mkii
+runpattern f texmf-dist/tex/context/base/syst-tex.mkii
+runpattern f texmf-dist/scripts/context/perl/mptopdf.pl
+runpattern f texmf-dist/tex/generic/context/mptopdf.pl
+#
+binpattern f bin/${ARCH}/mptopdf
+
+# more info:
+# 
+# supp-pdf is the main thing.
+# 
+# supp-mpe is for ConTeXt extensions (i.e., certain MetaPost specials),
+# according to pdftex.def (it is loaded by
+# \LoadMetaPostSpecialExtensions) and it may require supp-mis.
+# 
+# mptopdf is for turning MetaPost files into stand-alone PDF.
+# mptopdf.pl relies on a format created from mptopdf.tex, which in turn
+# reads all the above supp-* files.
diff --git a/Master/tlpkg/tlpsrc/supp-pdf.tlpsrc b/Master/tlpkg/tlpsrc/supp-pdf.tlpsrc
deleted file mode 100644
index 9a663441b61..00000000000
--- a/Master/tlpkg/tlpsrc/supp-pdf.tlpsrc
+++ /dev/null
@@ -1,32 +0,0 @@
-shortdesc native MetaPost graphics inclusion
-longdesc The supp-pdf.* files support native MetaPost graphics inclusion
-longdesc in LaTeX (via pdftex.def) and ConTeXt.  They can be used
-longdesc independently of the rest of the ConTeXt, yet are maintained as
-longdesc part of it.  So in TeX Live we pull them out to this separate
-longdesc package for the benefit of LaTeX users who do not install the
-longdesc rest of ConTeXt.  They can be found on CTAN in
-longdesc macros/pdftex/graphics.
-#
-runpattern f texmf-dist/tex/context/base/supp-pdf.*
-
-# more info ...
-# 
-# Date: Mon, 14 Sep 2009 12:15:26
-# From: Daniel Luecking
-# 
-# A simple inclusion via "pdftex mpsproof ..." (that's my mpsproof.tex
-# from the metapost distribution) loads only supp-pdf.tex if I use the
-# files from CTAN/macros/pdftx/graphics, otherwise it loads supp-pdf.tex
-# from tex/context/base/, which then loads supp-pdf.mkii.
-# 
-# The supp-mpe.* are for context extensions (i.e., certain metapost
-# specials), according to pdftex.def (it is loaded by
-# \LoadMetaPostSpecialExtensions) and it may require supp-mis.*.
-# 
-# mptopdf.* are only for turning metapost files into stand-alone PDF.
-# The perl component is in texmf-dist/scripts/context/ but maybe it ought
-# to be separate from context. It relies on a format created from mptopdf.tex.
-# 
-# I really have no idea about syst-tex.*, but I suspect it's only needed by
-# supp-mpe.*
-