summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-08 00:29:37 +0000
committerKarl Berry <karl@freefriends.org>2013-04-08 00:29:37 +0000
commit689aefb0727676ed3cddf331337b4be226495e72 (patch)
tree9af26b9aef6a1e923ed7b3e0de08e94b0365a8e8 /Master
parent177b0faee50c9834c47fb0122d0a8b3646613c44 (diff)
mptopdf update, precursor and coming from new context
git-svn-id: svn://tug.org/texlive/trunk@29730 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/bin/win32/mptopdf.exebin1536 -> 6144 bytes
-rw-r--r--Master/texmf-dist/doc/context/scripts/mkii/mptopdf.man33
-rw-r--r--Master/texmf-dist/doc/man/man1/mptopdf.1137
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rwxr-xr-xMaster/tlpkg/bin/tlpkginfo2
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds31
-rw-r--r--Master/tlpkg/tlpsrc/context.tlpsrc51
-rw-r--r--Master/tlpkg/tlpsrc/mptopdf.tlpsrc15
8 files changed, 145 insertions, 126 deletions
diff --git a/Master/bin/win32/mptopdf.exe b/Master/bin/win32/mptopdf.exe
index 5777d90a17a..2d45f27494d 100755
--- a/Master/bin/win32/mptopdf.exe
+++ b/Master/bin/win32/mptopdf.exe
Binary files differ
diff --git a/Master/texmf-dist/doc/context/scripts/mkii/mptopdf.man b/Master/texmf-dist/doc/context/scripts/mkii/mptopdf.man
new file mode 100644
index 00000000000..06feece6693
--- /dev/null
+++ b/Master/texmf-dist/doc/context/scripts/mkii/mptopdf.man
@@ -0,0 +1,33 @@
+.TH "mptopdf" "1" "01-01-2013" "version 1.4.1" "convert MetaPost to PDF"
+.SH NAME
+.B mptopdf
+.SH SYNOPSIS
+.B mptopdf [
+.I OPTIONS ...
+.B ] [
+.I FILENAMES
+.B ]
+.SH DESCRIPTION
+.B convert MetaPost to PDF
+.SH OPTIONS
+.TP
+.B --metafun
+use the metafun format to process the file (default is mpost)
+.TP
+.B --texexec
+use texexec (context) to process text snippets
+.TP
+.B --latex
+use latex to process text snippets
+.SH AUTHOR
+More information about ConTeXt and the tools that come with it can be found at:
+
+
+.B "maillist:"
+ntg-context@ntg.nl / http://www.ntg.nl/mailman/listinfo/ntg-context
+
+.B "webpage:"
+http://www.pragma-ade.nl / http://tex.aanhet.net
+
+.B "wiki:"
+http://contextgarden.net
diff --git a/Master/texmf-dist/doc/man/man1/mptopdf.1 b/Master/texmf-dist/doc/man/man1/mptopdf.1
index 3c547f06aa8..06feece6693 100644
--- a/Master/texmf-dist/doc/man/man1/mptopdf.1
+++ b/Master/texmf-dist/doc/man/man1/mptopdf.1
@@ -1,104 +1,33 @@
-.TH "MPTOPDF" "1" "January 2007" "mptopdf 1.3.2" "ConTeXt"
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.de EX
-.in +3
-.nf
-.ft CW
-..
-.de EE
-.in -3
-.ft R
-.fi
-..
-
-.SH "NAME"
-mptopdf \- convert MetaPost to PDF
-
-.SH "SYNOPSIS"
-\fBmptopdf\fP \fIFILE\fP [ ... ]
-
-.SH "DESCRIPTION"
-
-\fBmptopdf\fP can convert MetaPost-generated EPS files to PDF, or it
-can process a MetaPost source file directly (see
-.BR mpost (1))
-and convert the generated EPS files to PDF.
-
-.SH "OPTIONS"
-All switches are specified in full here but can be abbreviated to the
-shortest unique prefix. Thus, \fB--metaf\fP works the same as
-\fB--metafun\fP.
-.IP \fB--help\fP
-Print a terse help message.
-.IP "\fB--metafun\fP"
-Use the metafun pre-compiled format to process the MetaPost source
-file. You usually don't need this option, since metafun input is
-usually produced and processed as part of a
-.BR texexec (1)
-run. Needs the \fB--rawmp\fP switch to take effect.
-.IP \fB--rawmp\fP
-Process the source file with
-.BR mpost (1)
-directly, rather than with
-.BR texexec (1).
-This option is needed if you want to specify \fB--metafun\fP.
-.IP \fB--latex\fP
-Typeseting labels using
-.BR latex (1)
-rather than plain
-.BR tex (1).
-
-.SH "USAGE"
-
-To convert \fImanfig.20\fP to \fImanfig-20.pdf\fI:
-.EX
-mptopdf manfig.20
-.EE
-
-You can convert more than one EPS file at once:
-.EX
-mptopdf manfig.20 otherfig.17 finalfig.8
-.EE
-
-Or you can give
-.BR mptopdf (1)
-a pattern that it will expand:
-.EX
-mptopdf 'manfig.*'
-.EE
-Note the single quotes to protect the * from the shell. Of course,
-usually you can let the shell do the wildcard expansion and therefore
-leave off the quotes.
-
-To convert
-.I figs.mp
-to \fIfigs-1.pdf\fP, \fIfigs-2.pdf\fP, ...
-.EX
-mptopdf figs.mp
-.EE
-
-If the labels are typeset with
-.BR latex (1):
-.EX
-mptopdf --latex figs.mp
-.EE
-
-.SH "SEE ALSO"
-.PP
-.BR tex (1),
-.BR latex (1),
-.BR mpost (1),
-.BR pdftex (1),
-.BR texexec (1).
-.PP
-.URL "http://www.contextgarden.net" "ConTeXt wiki" .
-
-.SH "AUTHOR"
-.BR mptopdf (1)
-is part of the ConTeXt system by Hans Hagen et al, which is available from
-.URL "http://www.pragma-ade.com/" "PRAGMA ADE" .
-This manpage was written by Sanjoy Mahajan <sanjoy@mit.edu> and is in
-the public domain.
+.TH "mptopdf" "1" "01-01-2013" "version 1.4.1" "convert MetaPost to PDF"
+.SH NAME
+.B mptopdf
+.SH SYNOPSIS
+.B mptopdf [
+.I OPTIONS ...
+.B ] [
+.I FILENAMES
+.B ]
+.SH DESCRIPTION
+.B convert MetaPost to PDF
+.SH OPTIONS
+.TP
+.B --metafun
+use the metafun format to process the file (default is mpost)
+.TP
+.B --texexec
+use texexec (context) to process text snippets
+.TP
+.B --latex
+use latex to process text snippets
+.SH AUTHOR
+More information about ConTeXt and the tools that come with it can be found at:
+
+
+.B "maillist:"
+ntg-context@ntg.nl / http://www.ntg.nl/mailman/listinfo/ntg-context
+
+.B "webpage:"
+http://www.pragma-ade.nl / http://tex.aanhet.net
+
+.B "wiki:"
+http://contextgarden.net
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index e0658ba6c1e..cd3661a4bb8 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -291,7 +291,7 @@ my @TLP_working = qw(
monofill montex
moreenum morefloats morehype moresize
moreverb morewrites movie15 mp3d mparhack mpattern mpcolornames mpgraphics
- mpman-ru ms msc msg mslapa msu-thesis mtgreek
+ mpman-ru mptopdf ms msc msg mslapa msu-thesis mtgreek
multenum multibbl multibib multicap multienv multiexpand multirow
multido multiobjective munich musixguit
musixtex musixtex-fonts musuos muthesis
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index 8ecc58648ae..10c5ce0df08 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -123,7 +123,7 @@ sub find_ctan_dir {
"info/$me", # Type1fonts
"help/$me", # es-tex-faq
"graphics/$me", # sparklines
- "graphics/metapost/contrib/tools/$me", # mptopdf
+ "macros/pdftex/$me", # mptopdf
"graphics/metapost/contrib/macros/$me", # mpattern
"graphics/pictex/addon/$me", # autoarea
"graphics/pstricks/contrib/pedigree/$me", # pst-pdgr
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index d103a7d1113..7bb103f23e4 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -657,7 +657,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'mp3d', "&MAKEflatten",
'mpcolornames',"&MAKEcopy",
'mpdinbrief', "die 'skipping, nosell license'",
- 'mptopdf', "die 'skipping, not ready, sorry'", #"&MAKEflatten",
+ 'mptopdf', "&MAKEcopy",
'msuthesis', "die 'skipping, use msu-thesis'",
'mtp2lite', "die 'skipping, nonfree'",
'mtx', "die 'skipping, pascal musixtex binaries'",
@@ -1131,6 +1131,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'luatexja' => '&POSTluatexja',
'm-tx' => '&POST_do_man',
'montex' => '&POSTmontex',
+ 'mptopdf' => '&POSTmptopdf',
'musixtex' => '&POSTmusixtex',
'niceframe' => '&POST_rmsymlink',
'pedigree-perl' => '&POSTpedigreeperl',
@@ -2529,7 +2530,7 @@ for (@ARGV) {
my $COOKED_PKG = "$COOKED_TOP/$package"; # output directory
if ($specialscripts_bin{$package}
- || $package =~ /^(biber|context)$/) { # special POSTcases
+ || $package =~ /^(biber|context|mptopdf)$/) { # special POSTcases
$BUILDDEST = "$COOKED_PKG/Build/source";
$TOPDEST = "$COOKED_PKG/Master";
} else {
@@ -4984,6 +4985,7 @@ sub bindirs_symlink {
$linktarget .= "/$exec";
#
(my $linkname = $exec) =~ s,.*/,,; # just the basename
+ $linkname =~ s,\.[^./]+$,,; # rm extension too
chomp (my @platforms = `cd $Master/bin && ls`);
for my $p (@platforms) {
@@ -5003,7 +5005,7 @@ sub bindirs_symlink {
sub build_scripts_copy {
my ($exec,$intermediate_dirs) = @_;
- # prepend / to INTERMEDIATE_DIRS if fiven.
+ # prepend / to INTERMEDIATE_DIRS if given.
$intermediate_dirs = ($intermediate_dirs ? "/$intermediate_dirs" : "");
my $build_tldir = "texk/texlive";
@@ -5024,6 +5026,29 @@ sub build_scripts_copy {
}
}
+sub POSTmptopdf {
+ # mptopdf needs a cut-down version of the context post routine.
+ # But there are enough differences that trying to factor out the
+ # commonalities doesn't make sense. Sigh.
+ print "POST$package - user-level executables\n";
+ my $w32_bindir = "$TOPDEST/bin/win32";
+ &xmkdir ($w32_bindir);
+ #
+ my $pkg_subdir = "perl"; # where hans keeps it
+ &xchdir ("$DEST/scripts/context/$pkg_subdir");
+ my $exec = "mptopdf.pl";
+ &bindirs_symlink ($exec);
+ &build_scripts_copy ($exec, $pkg_subdir);
+ &SYSTEM ("$CP ../stubs/mswin/mptopdf.exe $w32_bindir/");
+ #
+ print "still POST$package - man page\n";
+ &xchdir ("$DEST/doc/context/scripts/mkii");
+ my $mandest = "$TOPDEST/texmf-dist/doc/man/man1";
+ &xmkdir ($mandest);
+ &SYSTEM ("$CP mptopdf.man $mandest/mptopdf.1");
+ &tl_man_to_pdf ();
+}
+
sub POSTcontext_games {
print "POST$package - remove duplicated fonts\n";
diff --git a/Master/tlpkg/tlpsrc/context.tlpsrc b/Master/tlpkg/tlpsrc/context.tlpsrc
index f913f88705a..57a9c82b648 100644
--- a/Master/tlpkg/tlpsrc/context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context.tlpsrc
@@ -14,28 +14,27 @@ depend stmaryrd
depend amsfonts
#
execute AddFormat name=cont-en engine=pdftex \
- patterns=cont-usr.tex options="-8bit *cont-en.ini"
+ patterns=cont-usr.tex options="-8bit *cont-en.mkii"
execute AddFormat name=cont-en engine=xetex \
- patterns=cont-usr.tex options="-8bit *cont-en.ini"
+ patterns=cont-usr.tex options="-8bit *cont-en.mkii"
#
# disabled context formats:
execute AddFormat name=cont-de mode=disabled engine=pdftex \
- patterns=cont-usr.tex options="-8bit *cont-de.ini"
+ patterns=cont-usr.tex options="-8bit *cont-de.mkii"
execute AddFormat name=cont-fr mode=disabled engine=pdftex \
- patterns=cont-usr.tex options="-8bit *cont-fr.ini"
+ patterns=cont-usr.tex options="-8bit *cont-fr.mkii"
execute AddFormat name=cont-it mode=disabled engine=pdftex \
- patterns=cont-usr.tex options="-8bit *cont-it.ini"
+ patterns=cont-usr.tex options="-8bit *cont-it.mkii"
execute AddFormat name=cont-nl mode=disabled engine=pdftex \
- patterns=cont-usr.tex options="-8bit *cont-nl.ini"
+ patterns=cont-usr.tex options="-8bit *cont-nl.mkii"
execute AddFormat name=cont-ro mode=disabled engine=pdftex \
- patterns=cont-usr.tex options="-8bit *cont-ro.ini"
+ patterns=cont-usr.tex options="-8bit *cont-ro.mkii"
#
# contnav, hans, hans-sh fonts.
execute addMap original-context-symbol.map
#
runpattern +d texmf-dist/context/data
runpattern +d texmf-dist/fonts/cid/fontforge
-runpattern +f texmf-dist/tex/mptopdf/config/mptopdf.ini
#
# See longdesc in mptopdf.tlpsrc.
runpattern +!f texmf-dist/tex/context/base/supp-mis.mkii
@@ -43,7 +42,9 @@ 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/scripts/context/stubs/mswin/mptopdf.exe
runpattern +!f texmf-dist/tex/generic/context/mptopdf/mptopdf.tex
+docpattern +!f texmf-dist/doc/context/scripts/mkii/mptopdf.man
depend mptopdf
#
# these have their own TL packages, and are not part of core context.
@@ -55,12 +56,43 @@ runpattern +!d texmf-dist/tex/xetex/zhspacing/context
#
srcpattern +!d texmf-dist/source/context/third
#
-docpattern +!d texmf-dist/doc/context/third
docpattern +!d texmf-dist/doc/generic/tex-virtual-academy-pl/context
+docpattern +!d texmf-dist/doc/context/third
docpattern +f texmf-dist/doc/man/man1/ctxtools.*
+docpattern +f texmf-dist/doc/man/man1/luatools.*
docpattern +f texmf-dist/doc/man/man1/pstopdf.*
docpattern +f texmf-dist/doc/man/man1/texexec.*
docpattern +f texmf-dist/doc/man/man1/texmfstart.*
+docpattern +f texmf-dist/doc/man/man1/mtx-babel.*
+docpattern +f texmf-dist/doc/man/man1/mtx-base.*
+docpattern +f texmf-dist/doc/man/man1/mtx-cache.*
+docpattern +f texmf-dist/doc/man/man1/mtx-chars.*
+docpattern +f texmf-dist/doc/man/man1/mtx-check.*
+docpattern +f texmf-dist/doc/man/man1/mtx-colors.*
+docpattern +f texmf-dist/doc/man/man1/mtx-context.*
+docpattern +f texmf-dist/doc/man/man1/mtx-epub.*
+docpattern +f texmf-dist/doc/man/man1/mtx-fcd.*
+docpattern +f texmf-dist/doc/man/man1/mtx-flac.*
+docpattern +f texmf-dist/doc/man/man1/mtx-fonts.*
+docpattern +f texmf-dist/doc/man/man1/mtx-grep.*
+docpattern +f texmf-dist/doc/man/man1/mtx-interface.*
+docpattern +f texmf-dist/doc/man/man1/mtx-metapost.*
+docpattern +f texmf-dist/doc/man/man1/mtx-metatex.*
+docpattern +f texmf-dist/doc/man/man1/mtx-modules.*
+docpattern +f texmf-dist/doc/man/man1/mtx-package.*
+docpattern +f texmf-dist/doc/man/man1/mtx-patterns.*
+docpattern +f texmf-dist/doc/man/man1/mtx-pdf.*
+docpattern +f texmf-dist/doc/man/man1/mtx-profile.*
+docpattern +f texmf-dist/doc/man/man1/mtx-rsync.*
+docpattern +f texmf-dist/doc/man/man1/mtx-scite.*
+docpattern +f texmf-dist/doc/man/man1/mtx-server.*
+docpattern +f texmf-dist/doc/man/man1/mtx-texworks.*
+docpattern +f texmf-dist/doc/man/man1/mtx-timing.*
+docpattern +f texmf-dist/doc/man/man1/mtx-tools.*
+docpattern +f texmf-dist/doc/man/man1/mtx-unzip.*
+docpattern +f texmf-dist/doc/man/man1/mtx-update.*
+docpattern +f texmf-dist/doc/man/man1/mtx-watch.*
+docpattern +f texmf-dist/doc/man/man1/mtxrun.*
#
binpattern f bin/${ARCH}/context
binpattern f bin/${ARCH}/ctxtools
@@ -69,5 +101,4 @@ binpattern f bin/${ARCH}/mtxrun
binpattern f bin/${ARCH}/pstopdf
binpattern f bin/${ARCH}/texexec
binpattern f bin/${ARCH}/texmfstart
-#
binpattern f/win32 bin/win32/mtxrun.lua
diff --git a/Master/tlpkg/tlpsrc/mptopdf.tlpsrc b/Master/tlpkg/tlpsrc/mptopdf.tlpsrc
index 5827d0c9973..0a2adca27e8 100644
--- a/Master/tlpkg/tlpsrc/mptopdf.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mptopdf.tlpsrc
@@ -18,20 +18,21 @@ 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/scripts/context/stubs/mswin/mptopdf.exe
runpattern f texmf-dist/tex/generic/context/mptopdf/mptopdf.tex
#
binpattern f bin/${ARCH}/mptopdf
#
docpattern +f texmf-dist/doc/man/man1/mptopdf.*
+docpattern +f texmf-dist/doc/context/scripts/mkii/mptopdf.man
# more info:
+# - supp-pdf is the main thing; it needs supp-mis for helper macros.
#
-# supp-pdf is the main thing; it needs supp-mis for helper macros.
-#
-# supp-mpe is for ConTeXt extensions (i.e., certain MetaPost specials),
-# according to pdftex.def (it is loaded by
+# - supp-mpe is for ConTeXt extensions (i.e., certain MetaPost
+# specials), according to pdftex.def (it is loaded by
# \LoadMetaPostSpecialExtensions).
#
-# 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 *.mkii files.
+# - mptopdf (the script) 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 *.mkii files.