Imported Upstream version 2.16.0

[lilypond.git] / scripts / build / mf2pt1.pl

diff --git a/scripts/build/mf2pt1.pl b/scripts/build/mf2pt1.pl
index 95df0f82069a4da0d186cbed3fdd4d15286a6f3c..746fb829f60cde99dc65f221494d02dc2e330fa6 100644 (file)
--- a/scripts/build/mf2pt1.pl
+++ b/scripts/build/mf2pt1.pl
@@ -7,7 +7,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     #
@@ -21,7 +21,7 @@
 # version 2006/05/20 or later.                                         #
 ########################################################################
 
-our $VERSION = "2.4.4";   # 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;
@@ -160,7 +160,7 @@ my $filedir;
 my $filenoext;
 my $versionmsg = "mf2pt1 version $VERSION
 
-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
@@ -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] }
@@ -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)
@@ -726,7 +726,7 @@ sub output_trailer ()
 {
     print OUTFILE <<"ENDTRAILER";
 /.notdef {
-        0 @{[$fontbbox[2]-$fontbbox[0]]} hsbw
+        0 @{[frac_string (frac_approx ($fontbbox[2] - $fontbbox[0]))]} hsbw
         endchar
         } ND
 end