From a7f3f25904531d7f61901735bf82b2b081432c09 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 31 Mar 2012 23:11:11 +0000 Subject: mf2pt1 (24mar12) git-svn-id: svn://tug.org/texlive/trunk@25811 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/mf2pt1/mf2pt1.pl | 8 +-- Master/texmf-dist/doc/support/mf2pt1/ChangeLog | 20 +++++-- Master/texmf-dist/doc/support/mf2pt1/README | 2 +- Master/texmf-dist/doc/support/mf2pt1/mf2pt1.pdf | Bin 201811 -> 201816 bytes Master/texmf-dist/doc/support/mf2pt1/mf2pt1.texi | 14 ++--- Master/texmf-dist/metapost/mf2pt1/mf2pt1.mp | 2 +- Master/texmf-dist/scripts/mf2pt1/mf2pt1.pl | 8 +-- Master/texmf/doc/info/mf2pt1.info | 10 ++-- Master/tlpkg/libexec/ctan2tds | 62 ++++++++++++++++----- 9 files changed, 85 insertions(+), 41 deletions(-) diff --git a/Build/source/texk/texlive/linked_scripts/mf2pt1/mf2pt1.pl b/Build/source/texk/texlive/linked_scripts/mf2pt1/mf2pt1.pl index 2119e7b6ab6..e18d7a7ae57 100755 --- a/Build/source/texk/texlive/linked_scripts/mf2pt1/mf2pt1.pl +++ b/Build/source/texk/texlive/linked_scripts/mf2pt1/mf2pt1.pl @@ -7,7 +7,7 @@ ######################################################################## # mf2pt1 # -# Copyright (C) 2011 Scott Pakin # +# Copyright (C) 2012 Scott Pakin # # # # This program may be distributed and/or modified under the conditions # # of the LaTeX Project Public License, either version 1.3c of this # @@ -21,7 +21,7 @@ # version 2006/05/20 or later. # ######################################################################## -our $VERSION = "2.4.5"; # mf2pt1 version number +our $VERSION = "2.4.6"; # mf2pt1 version number require 5.6.1; # I haven't tested mf2pt1 with older Perl versions use File::Basename; @@ -160,7 +160,7 @@ my $filedir; my $filenoext; my $versionmsg = "mf2pt1 version $VERSION -Copyright (C) 2011 Scott Pakin +Copyright (C) 2012 Scott Pakin This program may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this @@ -427,7 +427,7 @@ ENDHEADER sub get_bboxes ($) { execute_command 1, ("mpost", "-mem=mf2pt1", "-progname=mpost", - "\\mode:=localfont; mag:=$mag; bpppix $bpppix; input $mffile"); + "\\mode:=localfont; mag:=$mag; bpppix $bpppix; nonstopmode; input $mffile"); opendir (CURDIR, ".") || die "${progname}: $! ($filedir)\n"; @charfiles = sort { ($a=~ /\.(\d+)$/)[0] <=> ($b=~ /\.(\d+)$/)[0] } diff --git a/Master/texmf-dist/doc/support/mf2pt1/ChangeLog b/Master/texmf-dist/doc/support/mf2pt1/ChangeLog index bce490a05ed..f2148d43bce 100644 --- a/Master/texmf-dist/doc/support/mf2pt1/ChangeLog +++ b/Master/texmf-dist/doc/support/mf2pt1/ChangeLog @@ -1,4 +1,16 @@ -2011-08-02 Scott Pakin +2012-03-24 Scott Pakin + + * README, mf2pt1.pl, mf2pt1.texi, mf2pt1.mp: + Updated the copyright date from 2011 to 2012 and increased the + version number from 2.4.5 to 2.4.6. + +2012-03-24 Werner Lemberg + + * mf2pt1.pl: + Modified the code to pass "nonstopmode" to the Metafont + invocation. + +2011-08-02 Scott Pakin * README, mf2pt1.pl, mf2pt1.texi: Updated the copyright date from 2008 to 2011 and increased the version @@ -8,12 +20,12 @@ * mf2pt1.pl: Prevented non-integer arguments from being passed to hsbw in the - definition of ".notdef". + definition of ".notdef". 2008-01-27 Scott Pakin - * mf2pt1.pl, mf2pt1.texi: Increased the version number from 2.4.3 - to 2.4.4 + * mf2pt1.pl, mf2pt1.texi: + Increased the version number from 2.4.3 to 2.4.4 2008-01-27 Werner Lemberg diff --git a/Master/texmf-dist/doc/support/mf2pt1/README b/Master/texmf-dist/doc/support/mf2pt1/README index 3ecb8161889..14c82be17ae 100644 --- a/Master/texmf-dist/doc/support/mf2pt1/README +++ b/Master/texmf-dist/doc/support/mf2pt1/README @@ -27,7 +27,7 @@ For installation instructions, see the mf2pt1 manual (mf2pt1.pdf). Copyright and license --------------------- -Copyright (C) 2011 Scott Pakin, scott+mf@pakin.org +Copyright (C) 2012 Scott Pakin, scott+mf@pakin.org This package may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this diff --git a/Master/texmf-dist/doc/support/mf2pt1/mf2pt1.pdf b/Master/texmf-dist/doc/support/mf2pt1/mf2pt1.pdf index 41078470327..f6d9c1c7c93 100644 Binary files a/Master/texmf-dist/doc/support/mf2pt1/mf2pt1.pdf and b/Master/texmf-dist/doc/support/mf2pt1/mf2pt1.pdf differ diff --git a/Master/texmf-dist/doc/support/mf2pt1/mf2pt1.texi b/Master/texmf-dist/doc/support/mf2pt1/mf2pt1.texi index 8cd448abf6e..15d7239748b 100644 --- a/Master/texmf-dist/doc/support/mf2pt1/mf2pt1.texi +++ b/Master/texmf-dist/doc/support/mf2pt1/mf2pt1.texi @@ -10,8 +10,8 @@ @finalout @c %**end of header -@set VERSION 2.4.5 -@set DATE 2 August 2011 +@set VERSION 2.4.6 +@set DATE 24 March 2012 @c Format the document with a ragged bottom instead of the default @c flush bottom. @@ -80,7 +80,7 @@ Metafont @ifnottex @strong{mf2pt1}: Produce PostScript @w{Type 1} fonts from Metafont source -Copyright 2011 Scott Pakin. +Copyright 2012 Scott Pakin. @end ifnottex @titlepage @@ -96,7 +96,7 @@ This file documents @command{mf2pt1} version @value{VERSION}, dated @vskip 0pt plus 1filll -Copyright @copyright{} 2011 Scott Pakin. +Copyright @copyright{} 2012 Scott Pakin. @sp 2 @@ -689,9 +689,9 @@ parameters that @command{mf2pt1} accepts: @noindent @b{if} known @i{ps_output}: -@multitable {@b{if}} {@b{font_underline_thickness}} {@t{"Copyright (C) 2011 Scott Pakin.";}} +@multitable {@b{if}} {@b{font_underline_thickness}} {@t{"Copyright (C) 2012 Scott Pakin.";}} @item @tab @b{font_coding_scheme} @tab @t{"ot1"}; -@item @tab @b{font_comment} @tab @t{"Copyright (C) 2011 Scott Pakin."}; +@item @tab @b{font_comment} @tab @t{"Copyright (C) 2012 Scott Pakin."}; @item @tab @b{font_family} @tab @t{"Kerplotz"}; @item @tab @b{font_fixed_pitch} @tab @b{false}; @item @tab @b{font_identifier} @tab @t{"Kerplotz Light Oblique"}; @@ -718,7 +718,7 @@ The same parameters can also be specified on the command line as follows: @example -mf2pt1 --encoding=ot1 --comment="Copyright (C) 2011 Scott Pakin." +mf2pt1 --encoding=ot1 --comment="Copyright (C) 2012 Scott Pakin." --family=Kerplotz --nofixedpitch --fullname="Kerplotz Light Oblique" --name=Kerplotz-LightOblique --designsize=10 --italicangle=-9.5 --underpos=-100 --underthick=50 --uniqueid=4112233 --version=002.005 diff --git a/Master/texmf-dist/metapost/mf2pt1/mf2pt1.mp b/Master/texmf-dist/metapost/mf2pt1/mf2pt1.mp index a8b45aad07c..3d3490fa2d1 100644 --- a/Master/texmf-dist/metapost/mf2pt1/mf2pt1.mp +++ b/Master/texmf-dist/metapost/mf2pt1/mf2pt1.mp @@ -10,7 +10,7 @@ %%%% ==================================================================== %%%% %%%% mf2pt1 %%%% -%%%% Copyright (C) 2008 Scott Pakin %%%% +%%%% Copyright (C) 2012 Scott Pakin %%%% %%%% %%%% %%%% This program may be distributed and/or modified under the conditions %%%% %%%% of the LaTeX Project Public License, either version 1.3c of this %%%% diff --git a/Master/texmf-dist/scripts/mf2pt1/mf2pt1.pl b/Master/texmf-dist/scripts/mf2pt1/mf2pt1.pl index 2119e7b6ab6..e18d7a7ae57 100755 --- a/Master/texmf-dist/scripts/mf2pt1/mf2pt1.pl +++ b/Master/texmf-dist/scripts/mf2pt1/mf2pt1.pl @@ -7,7 +7,7 @@ ######################################################################## # mf2pt1 # -# Copyright (C) 2011 Scott Pakin # +# Copyright (C) 2012 Scott Pakin # # # # This program may be distributed and/or modified under the conditions # # of the LaTeX Project Public License, either version 1.3c of this # @@ -21,7 +21,7 @@ # version 2006/05/20 or later. # ######################################################################## -our $VERSION = "2.4.5"; # mf2pt1 version number +our $VERSION = "2.4.6"; # mf2pt1 version number require 5.6.1; # I haven't tested mf2pt1 with older Perl versions use File::Basename; @@ -160,7 +160,7 @@ my $filedir; my $filenoext; my $versionmsg = "mf2pt1 version $VERSION -Copyright (C) 2011 Scott Pakin +Copyright (C) 2012 Scott Pakin This program may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this @@ -427,7 +427,7 @@ ENDHEADER sub get_bboxes ($) { execute_command 1, ("mpost", "-mem=mf2pt1", "-progname=mpost", - "\\mode:=localfont; mag:=$mag; bpppix $bpppix; input $mffile"); + "\\mode:=localfont; mag:=$mag; bpppix $bpppix; nonstopmode; input $mffile"); opendir (CURDIR, ".") || die "${progname}: $! ($filedir)\n"; @charfiles = sort { ($a=~ /\.(\d+)$/)[0] <=> ($b=~ /\.(\d+)$/)[0] } diff --git a/Master/texmf/doc/info/mf2pt1.info b/Master/texmf/doc/info/mf2pt1.info index 13abf208687..0497e42a03d 100644 --- a/Master/texmf/doc/info/mf2pt1.info +++ b/Master/texmf/doc/info/mf2pt1.info @@ -7,7 +7,7 @@ END-INFO-DIR-ENTRY *mf2pt1*: Produce PostScript Type 1 fonts from Metafont source - Copyright 2011 Scott Pakin. + Copyright 2012 Scott Pakin.  File: mf2pt1.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir) @@ -153,8 +153,8 @@ N.B. The `install-info' command is a convenient way to install man page is embedded within the `mf2pt1' Perl script and can be extracted with `pod2man': - pod2man --center="User Commands" --date="2 August 2011" \ - --release="v2.4.5" mf2pt1 > mf2pt1.1 + pod2man --center="User Commands" --date="24 March 2012" \ + --release="v2.4.6" mf2pt1 > mf2pt1.1 You can then move `mf2pt1.1' into `/usr/man/man1' or any other man page directory. Note that the `mf2pt1' man page is fairly rudimentary. It @@ -444,7 +444,7 @@ of the parameters that `mf2pt1' accepts: if known ps_output: font_coding_scheme "ot1"; - font_comment "Copyright (C) 2011 Scott Pakin."; + font_comment "Copyright (C) 2012 Scott Pakin."; font_family "Kerplotz"; font_fixed_pitch false; font_identifier "Kerplotz Light Oblique"; @@ -468,7 +468,7 @@ Adobe, it's generally better not to assign *font_unique_id*; let The same parameters can also be specified on the command line as follows: - mf2pt1 --encoding=ot1 --comment="Copyright (C) 2011 Scott Pakin." + mf2pt1 --encoding=ot1 --comment="Copyright (C) 2012 Scott Pakin." --family=Kerplotz --nofixedpitch --fullname="Kerplotz Light Oblique" --name=Kerplotz-LightOblique --designsize=10 --italicangle=-9.5 --underpos=-100 --underthick=50 --uniqueid=4112233 --version=002.005 diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index f5c14d86b38..79e304c32f8 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -30,6 +30,7 @@ use vars qw($opt_ctan_dir); $MV = "mv"; $CP = "cp -p"; $RM = "rm -vf"; # just to get feedback from GNU rm on removals +$MAKEINFO = "makeinfo"; $INSTALL = "install -D -m 664"; $| = 1; @@ -2142,6 +2143,11 @@ $standardxmt='\.xmt'; 'latex2man' => '\.info', ); +# packages which have info files to build and then install. +%specialtexinfos = ( + 'mf2pt1' => '.*\.texi', +); + # packages which have man pages to install. %specialmans = ( 'bundledoc' => '\.1$', @@ -2565,6 +2571,7 @@ sub donormal { &dosource; &dotype1; &doscripts; + &dotexinfos; &doinfos; &domans; @@ -2823,25 +2830,31 @@ sub doinfos { &install ("$TOPDEST/texmf/doc/info/", $infopatt); } -# xmltex files -sub doxmt { - my $xmtpatt = $specialxmt{$package} || $standardxmt; - &install ("$DEST/tex/xmltex/$package", $xmtpatt); -} + +# generate info files from .texi. +# +sub dotexinfos { + my $texipatt = $specialtexinfos{$package}; + return unless $texipatt; + + local *DOT; + opendir (DOT, ".") || die "opendir(.) failed: $! in " . `pwd`; + my @files = readdir (DOT); + my @texi_files = grep (/$texipatt/, @files); + die ("dotexinfos: no texi files match $texipatt (@files) in " . `pwd`) + if ! @texi_files; -# build the font files -sub domf { - $mfpatt = $specialmf{$package} || $standardmf; - &runmf ($mfpatt); + closedir (DOT) || die "closedir(.) failed: $! in " . `pwd`; - my $mfdir = "$DEST/fonts/source/$Foundry/$package"; - # - # don't use $mfpatt since that's only the tfm-able mf files; just - # install all the .mf files. - my $mf_inst_patt = $specialmfinstall{$package} || $standardmfinstall; - &install ($mfdir, $mf_inst_patt); + print "tl_texi_to_info for: @texi_files\n"; + &SYSTEM ("$MAKEINFO --no-split @texi_files"); + + # install() uses the @filenames global, ugh. + local @filenames = <*.info>; + &install ("$TOPDEST/texmf/doc/info/", '.info'); } + # man pages. We put these in texmf/doc/man/man1, a la info (see above). # sub domans { @@ -2886,6 +2899,25 @@ sub tl_man_to_pdf { } +# xmltex files +sub doxmt { + my $xmtpatt = $specialxmt{$package} || $standardxmt; + &install ("$DEST/tex/xmltex/$package", $xmtpatt); +} + +# build the font files +sub domf { + $mfpatt = $specialmf{$package} || $standardmf; + &runmf ($mfpatt); + + my $mfdir = "$DEST/fonts/source/$Foundry/$package"; + # + # don't use $mfpatt since that's only the tfm-able mf files; just + # install all the .mf files. + my $mf_inst_patt = $specialmfinstall{$package} || $standardmfinstall; + &install ($mfdir, $mf_inst_patt); +} + sub rundvi { local($thispatt) = @_; $TEX = $specialTEX{$package}; -- cgit v1.2.3