From 50b580f0458334eb21a6441d314893e79dc206ea Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 13 Jul 2012 23:16:34 +0000 Subject: mf2pt1 2.5 (3jul12) git-svn-id: svn://tug.org/texlive/trunk@27032 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/support/mf2pt1/ChangeLog | 17 ++++++++++++ Master/texmf-dist/doc/support/mf2pt1/mf2pt1.pdf | Bin 201816 -> 205723 bytes Master/texmf-dist/doc/support/mf2pt1/mf2pt1.texi | 10 ++++--- Master/texmf-dist/metapost/mf2pt1/mf2pt1.mp | 2 +- Master/texmf-dist/scripts/mf2pt1/mf2pt1.pl | 4 +-- Master/texmf/doc/info/mf2pt1.info | 33 ++++++++++++----------- Master/tlpkg/libexec/ctan2tds | 1 + 7 files changed, 44 insertions(+), 23 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/support/mf2pt1/ChangeLog b/Master/texmf-dist/doc/support/mf2pt1/ChangeLog index f2148d43bce..48ddcc20083 100644 --- a/Master/texmf-dist/doc/support/mf2pt1/ChangeLog +++ b/Master/texmf-dist/doc/support/mf2pt1/ChangeLog @@ -1,3 +1,20 @@ +2012-06-29 Scott Pakin + + * mf2pt1.texi, mf2pt1.pl + Increased the version number from 2.4.6 to 2.5. Updated the + Acknowledgments section. + +2012-06-29 Michael Ummels + + * mf2pt1.mp: + Made the to_bp function round to nearest rather than round up. + +2012-06-29 Michael Ummels + + * mf2pt1.pl: + Changed the computation of character widths to use TeX points + instead of PostScript points. + 2012-03-24 Scott Pakin * README, mf2pt1.pl, mf2pt1.texi, mf2pt1.mp: diff --git a/Master/texmf-dist/doc/support/mf2pt1/mf2pt1.pdf b/Master/texmf-dist/doc/support/mf2pt1/mf2pt1.pdf index f6d9c1c7c93..41dbe28d1c3 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 15d7239748b..0c1276920c0 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.6 -@set DATE 24 March 2012 +@set VERSION 2.5 +@set DATE 29 June 2012 @c Format the document with a ragged bottom instead of the default @c flush bottom. @@ -977,8 +977,10 @@ Jackowski for updating the @strong{is_clockwise} function in @file{mf2pt1.mp} to work around a bug in MetaPost which relates to the @strong{turningnumber} command. Finally, thanks go to Ralf Stubner for providing the T1 encoding vector and for pointing out a typo in -the generated font programs; and, to Michael Zedler for alerting me to +the generated font programs; to Michael Zedler for alerting me to problems with @copt{encoding} and suggesting I modify that option to -accept PostScript @file{.enc} files. +accept PostScript @file{.enc} files; and to Michael Ummels for fixing +a couple of bugs that made character widths in the generated fonts +slightly too large. @bye diff --git a/Master/texmf-dist/metapost/mf2pt1/mf2pt1.mp b/Master/texmf-dist/metapost/mf2pt1/mf2pt1.mp index 3d3490fa2d1..bb6ceda5dc3 100644 --- a/Master/texmf-dist/metapost/mf2pt1/mf2pt1.mp +++ b/Master/texmf-dist/metapost/mf2pt1/mf2pt1.mp @@ -58,7 +58,7 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) = w:=charwd*pt; h:=charht*pt; d:=chardp*pt; charic:=0; clearxy; clearit; clearpen; scantokens extra_beginchar; - def to_bp (expr num) = decimal (ceiling (num*bp_per_pixel)) enddef; + def to_bp (expr num) = decimal (round (num*bp_per_pixel)) enddef; special "% MF2PT1: glyph_dimensions 0 " & to_bp (-d) & " " & to_bp(w) & " " & to_bp(h); special "% MF2PT1: font_size " & decimal designsize; special "% MF2PT1: font_slant " & decimal font_slant_; diff --git a/Master/texmf-dist/scripts/mf2pt1/mf2pt1.pl b/Master/texmf-dist/scripts/mf2pt1/mf2pt1.pl index e18d7a7ae57..ad3df2cdf84 100755 --- a/Master/texmf-dist/scripts/mf2pt1/mf2pt1.pl +++ b/Master/texmf-dist/scripts/mf2pt1/mf2pt1.pl @@ -21,7 +21,7 @@ # version 2006/05/20 or later. # ######################################################################## -our $VERSION = "2.4.6"; # mf2pt1 version number +our $VERSION = "2.5"; # mf2pt1 version number require 5.6.1; # I haven't tested mf2pt1 with older Perl versions use File::Basename; @@ -588,7 +588,7 @@ sub output_font_programs () my @fontprog; push @fontprog, ("/$gname {", frac_string (frac_approx ($charbbox[$charnum]->[0]), - frac_approx ($charwd[$charnum] * $mag)) + frac_approx ($charbbox[$charnum]->[2])) . "hsbw"); my ($cpx, $cpy) = ($charbbox[$charnum]->[0], 0); # Current point (PostScript) diff --git a/Master/texmf/doc/info/mf2pt1.info b/Master/texmf/doc/info/mf2pt1.info index 0497e42a03d..796a095453d 100644 --- a/Master/texmf/doc/info/mf2pt1.info +++ b/Master/texmf/doc/info/mf2pt1.info @@ -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="24 March 2012" \ - --release="v2.4.6" mf2pt1 > mf2pt1.1 + pod2man --center="User Commands" --date="29 June 2012" \ + --release="v2.5" 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 @@ -686,9 +686,10 @@ Jackowski for updating the *is_clockwise* function in `mf2pt1.mp' to work around a bug in MetaPost which relates to the *turningnumber* command. Finally, thanks go to Ralf Stubner for providing the T1 encoding vector and for pointing out a typo in the generated font -programs; and, to Michael Zedler for alerting me to problems with +programs; to Michael Zedler for alerting me to problems with `--encoding' and suggesting I modify that option to accept PostScript -`.enc' files. +`.enc' files; and to Michael Ummels for fixing a couple of bugs that +made character widths in the generated fonts slightly too large.  @@ -697,17 +698,17 @@ Node: Top301 Node: Introduction840 Node: Requirements2677 Node: Installation4426 -Node: Usage6240 -Node: Restrictions7956 -Node: Font information10346 -Node: Parameters11706 -Node: Command-line equivalents15081 -Node: Default values16205 -Node: Parameter example17883 -Node: Additional command-line options19902 -Node: Custom font encodings22241 -Node: Restoring mfplain defaults25692 -Node: Future Work26551 -Node: Acknowledgments28418 +Node: Usage6237 +Node: Restrictions7953 +Node: Font information10343 +Node: Parameters11703 +Node: Command-line equivalents15078 +Node: Default values16202 +Node: Parameter example17880 +Node: Additional command-line options19899 +Node: Custom font encodings22238 +Node: Restoring mfplain defaults25689 +Node: Future Work26548 +Node: Acknowledgments28415  End Tag Table diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index d8341bc48cf..a88f8e3db1c 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -369,6 +369,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'feynmf', "&MAKEfeynmf", 'findhyph', "&MAKEflatten", 'firststeps', "die 'skipping, noinfo license, 1999 book examples'", + 'fitr', "die 'skipping, per author (dpstory) request'", 'fldigigal', "die 'skipping, per author request'", 'fltpage', "die 'skipping, unclear license'", 'fnlineno', "die 'skipping, use lineno'", -- cgit v1.2.3