summaryrefslogtreecommitdiff
path: root/support/mf2pt1
diff options
context:
space:
mode:
Diffstat (limited to 'support/mf2pt1')
-rw-r--r--support/mf2pt1/ChangeLog12
-rw-r--r--support/mf2pt1/README2
-rw-r--r--support/mf2pt1/mf2pt1.mp2
-rw-r--r--support/mf2pt1/mf2pt1.pdfbin229650 -> 181030 bytes
-rwxr-xr-xsupport/mf2pt1/mf2pt1.pl17
-rw-r--r--support/mf2pt1/mf2pt1.texi41
6 files changed, 44 insertions, 30 deletions
diff --git a/support/mf2pt1/ChangeLog b/support/mf2pt1/ChangeLog
index 57b9ec2b0d..fb3386307e 100644
--- a/support/mf2pt1/ChangeLog
+++ b/support/mf2pt1/ChangeLog
@@ -1,3 +1,15 @@
+2020-11-27 Scott Pakin <scott+mf@pakin.org>
+
+ * mf2pt1.pl
+ Do not write a UniqueID unless explicitly requested by the user.
+
+ * mf2pt1.texi
+ Update all URLs in the documentation to the latest version.
+ Mention that Adobe no longer recommends the use of unique IDs.
+
+ * mf2pt1.texi, mf2pt1.pl, README, mf2pt1.mp
+ Updated the version number to 2.6 and the copyright year to 2020.
+
2014-04-30 Scott Pakin <scott+mf@pakin.org>
* mf2pt1.texi
diff --git a/support/mf2pt1/README b/support/mf2pt1/README
index 4ba418f279..500b12ffa9 100644
--- a/support/mf2pt1/README
+++ b/support/mf2pt1/README
@@ -27,7 +27,7 @@ For installation instructions, see the mf2pt1 manual (mf2pt1.pdf).
Copyright and license
---------------------
-Copyright (C) 2014 Scott Pakin, scott+mf@pakin.org
+Copyright (C) 2005-2020 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/support/mf2pt1/mf2pt1.mp b/support/mf2pt1/mf2pt1.mp
index 588bc57cbb..3ef56f9ab9 100644
--- a/support/mf2pt1/mf2pt1.mp
+++ b/support/mf2pt1/mf2pt1.mp
@@ -10,7 +10,7 @@
%%%% ==================================================================== %%%%
%%%% mf2pt1 %%%%
-%%%% Copyright (C) 2014 Scott Pakin %%%%
+%%%% Copyright (C) 2005-2020 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/support/mf2pt1/mf2pt1.pdf b/support/mf2pt1/mf2pt1.pdf
index 94b586a4d2..5478597a47 100644
--- a/support/mf2pt1/mf2pt1.pdf
+++ b/support/mf2pt1/mf2pt1.pdf
Binary files differ
diff --git a/support/mf2pt1/mf2pt1.pl b/support/mf2pt1/mf2pt1.pl
index abfd02c2f8..3546aee393 100755
--- a/support/mf2pt1/mf2pt1.pl
+++ b/support/mf2pt1/mf2pt1.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
##################################################
# Convert stylized Metafont to PostScript Type 1 #
@@ -7,7 +7,7 @@
########################################################################
# mf2pt1 #
-# Copyright (C) 2014 Scott Pakin #
+# Copyright (C) 2005-2020 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.5a"; # mf2pt1 version number
+our $VERSION = "2.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) 2012 Scott Pakin
+Copyright (C) 2005-2020 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
@@ -404,11 +404,11 @@ ENDHEADER
}
# Show the final boilerplate.
+ print OUTFILE "/UniqueID $uniqueID def\n" if defined $uniqueID;
print OUTFILE <<"ENDHEADER";
/PaintType 0 def
/FontType 1 def
/FontMatrix [0.001 0 0 0.001 0 0] readonly def
-/UniqueID $uniqueID def
/FontBBox{@fontbbox}readonly def
currentdict end
currentfile eexec
@@ -794,13 +794,14 @@ if ($rounding<=0.0 || $rounding>1.0) {
die sprintf "%s: Invalid rounding amount \"%g\"; value must be a positive number no greater than 1.0\n", $progname, $rounding;
}
-# Ensure that every user-definable parameter is assigned a value.
+# Ensure that every user-definable parameter is assigned a value. The only
+# exception is the unique ID, as Adobe no longer recommends specifying one.
assign_default $fontversion, $opthash{fontversion}, "001.000";
assign_default $creationdate, scalar localtime;
assign_default $comment, $opthash{comment}, "Font converted to Type 1 by mf2pt1, written by Scott Pakin.";
assign_default $weight, $opthash{weight}, "Medium";
assign_default $fixedpitch, $opthash{fixedpitch}, 0;
-assign_default $uniqueID, $opthash{uniqueid}, int(rand(1000000)) + 4000000;
+assign_default $uniqueID, $opthash{uniqueid};
assign_default $designsize, $opthash{designsize};
die "${progname}: a design size must be specified in $mffile or on the command line\n" if !defined $designsize;
die "${progname}: the design size must be a positive number\n" if $designsize<=0.0;
@@ -858,11 +859,11 @@ mf2pt1 is using the following font parameters:
font_underline_position: $underlinepos
font_underline_thickness: $underlinethick
font_name: $fontname
- font_unique_id: $uniqueID
font_size: $designsize (bp)
font_coding_scheme: $encoding_name
PARAMVALUES
;
+print " font_unique_id: $uniqueID\n" if defined $uniqueID;
print "\n";
# Scale by a factor of 1000/design size.
diff --git a/support/mf2pt1/mf2pt1.texi b/support/mf2pt1/mf2pt1.texi
index 45fe6e309d..5b55575453 100644
--- a/support/mf2pt1/mf2pt1.texi
+++ b/support/mf2pt1/mf2pt1.texi
@@ -11,7 +11,7 @@
@c %**end of header
@copying
-Copyright @copyright{} 2014 Scott Pakin
+Copyright @copyright{} 2005--2020 Scott Pakin
@sp 2
@@ -23,15 +23,15 @@ license or (at your option) any later version.
The latest version of this license is in:
@sp 1
-@center @uref{http://www.latex-project.org/lppl.txt}
+@center @uref{https://www.latex-project.org/lppl.txt}
@sp 1
and version 1.3c or later is part of all distributions of @LaTeX{}
version 2006/05/20 or later.
@end copying
-@set VERSION 2.5a
-@set DATE 30 April 2014
+@set VERSION 2.6
+@set DATE 27 November 2020
@c Define some fonts we intend to use.
@iftex
@@ -186,14 +186,13 @@ FontForge when available to autohint the generated @w{Type 1} font,
thereby making it look better especially at lower resolutions.
@end table
-Perl is available from @uref{http://www.cpan.org, the Comprehensive
+Perl is available from @uref{https://www.cpan.org, the Comprehensive
Perl Archive Network}; MetaPost and the @w{Type 1} utilities are
-available from @uref{http://www.ctan.org, the Comprehensive @TeX{}
-Archive Network}; and, FontForge is available from
-@uref{http://fontforge.sourceforge.net/}. In addition, MetaPost's
-home page is @uref{http://cm.bell-labs.com/who/hobby/MetaPost.html},
-and the @w{Type 1} utilities' home page is
-@uref{http://www.lcdf.org/type/}.
+available from @uref{https://www.ctan.org, the Comprehensive @TeX{}
+Archive Network}; and FontForge is available from
+@uref{https://fontforge.sourceforge.net/}. In addition, MetaPost's
+home page is @uref{https://tug.org/metapost.html}, and the @w{Type 1}
+utilities' home page is @uref{https://www.lcdf.org/type/}.
Besides being useful for autohinting fonts, FontForge enables a font
designer to hint fonts manually for additional fine-tuning and to
@@ -360,7 +359,7 @@ paths with nonoverlapping paths.
@item
Remove overlaps using @MF{} code within the font program itself. A
@file{.zip} file attachment to
-@uref{http://tug.org/mailman/htdig/metapost/2005-January/000080.html,
+@uref{https://tug.org/pipermail/metapost/2005-January/000080.html,
a @w{6 January} 2005 article} by
@iftex
@tex
@@ -502,10 +501,12 @@ The thickness of an underline, specified in ``sharped'' units within
@item font_unique_id
The unique ID for this font. The ID should be between 0 and
-16,777,215. If not specified, @command{mf2pt1} will choose an ID at
-random from the ``open'' range, 4,000,000-4,999,999. All IDs not in
-that range are allocated by contacting Adobe's UniqueID Coordinator.
-(I don't believe a fee is involved, but I don't know for sure.)
+16,777,215, with the ``open'' range being 4,000,000-4,999,999. All
+IDs not in that range are allocated by contacting Adobe's UniqueID
+Coordinator. (I don't believe a fee is involved, but I don't know for
+sure.) If a unique ID is not specified, @command{mf2pt1} will not
+write a unique ID to the file. Note that Adobe no longer recommends
+including unique IDs in fonts.
@item font_version
The version number of the font. This should be of the form
@@ -675,9 +676,9 @@ parameters that @command{mf2pt1} accepts:
@noindent
@b{if} known @i{ps_output}:
-@multitable {@b{if}} {@b{font_underline_thickness}} {@t{"Copyright (C) 2014 Scott Pakin.";}}
+@multitable {@b{if}} {@b{font_underline_thickness}} {@t{"Copyright (C) 2020 Scott Pakin.";}}
@item @tab @b{font_coding_scheme} @tab @t{"ot1"};
-@item @tab @b{font_comment} @tab @t{"Copyright (C) 2014 Scott Pakin."};
+@item @tab @b{font_comment} @tab @t{"Copyright (C) 2020 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"};
@@ -704,7 +705,7 @@ The same parameters can also be specified on the command line as
follows:
@example
-mf2pt1 --encoding=ot1 --comment="Copyright (C) 2014 Scott Pakin."
+mf2pt1 --encoding=ot1 --comment="Copyright (C) 2020 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
@@ -953,7 +954,7 @@ more robust way to dump @file{mf2pt1.mem}; for directing me to the
overlap-removal code mentioned in @ref{Restrictions}; for supplying
the @emph{crossproduct}, @emph{makeline}, and @emph{is_clockwise}
functions used by @file{mf2pt1.mp}; for proposing the @copt{bpppix}
-command-line option; and, for suggesting various features and
+command-line option; and for suggesting various features and
improvements to @command{mf2pt1}. Thanks also go to Werner Lemberg
and
@iftex