diff options
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-x | Master/tlpkg/bin/tlpkg-ctan-check | 2 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tlpkginfo | 2 | ||||
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 31 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/context.tlpsrc | 51 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/mptopdf.tlpsrc | 15 |
5 files changed, 79 insertions, 22 deletions
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. |