From 887bfffd417c5b4c794b80801fbce4538c049e0c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 27 Nov 2020 21:38:14 +0000 Subject: mf2pt1 (27nov20) git-svn-id: svn://tug.org/texlive/trunk@57018 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/mf2pt1/mf2pt1.pl | 17 ++++---- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 51 +++++++++++++--------- 2 files changed, 39 insertions(+), 29 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/texlive/linked_scripts/mf2pt1/mf2pt1.pl b/Build/source/texk/texlive/linked_scripts/mf2pt1/mf2pt1.pl index abfd02c2f8d..3546aee3931 100755 --- a/Build/source/texk/texlive/linked_scripts/mf2pt1/mf2pt1.pl +++ b/Build/source/texk/texlive/linked_scripts/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/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index d17509cddb3..3f60d52a75e 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,12 +1,12 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 56566 2020-10-06 03:40:54Z preining $ +# $Id: tlmgr.pl 56993 2020-11-24 18:35:36Z karl $ # # Copyright 2008-2020 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 56566 $'; -my $datrev = '$Date: 2020-10-06 05:40:54 +0200 (Tue, 06 Oct 2020) $'; +my $svnrev = '$Revision: 56993 $'; +my $datrev = '$Date: 2020-11-24 19:35:36 +0100 (Tue, 24 Nov 2020) $'; my $tlmgrrevision; my $tlmgrversion; my $prg; @@ -8352,26 +8352,35 @@ C<--only-installed> and C<--only-remote> cannot both be specified. =item B<--data C> If the option C<--data> is given, its argument must be a comma separated -list of field names from: C, C, C, C, -C, C, C, C, C, C, -C, C, or C, and various C -fields. For the C fields, there are two more variants with prefix C -and C, that is C and C etc, which indicate -the local and remote information, respectively. The variants without C and -C show the most current one, that is normally the remote one. - -The requested packages' information is listed in CSV format one package per -line, and the column information is given by the C. The C -column contains the name of all dependencies separated by C<:>. +list of field names from: C, C, C, +C, C, C, C, C, +C, C, C, C, C, +plus various C fields (see below). + +The C fields all come from the TeX Catalogue +(L). For each, there are two more +variants with prefix C and C, e.g., C and +C, which indicate the local and remote information, +respectively. The variants without C and C show the most current +one, which is normally the remote value. + +The requested packages' information is listed in CSV format, one package +per line, and the column information is given by the C. The +C column contains the names of all the dependencies separated +by C<:> characters. + +At this writing, the C fields include: C, +C, C, C, C, C. Each +may be empty or a url value. A brief description is on the CTAN upload +page for new packages: L. =item B<--json> -In case C<--json> is specified, the output is a -JSON encoded array where each array element is the JSON representation of -a single C but with additional information. For details see -C, format definition: C. -If both C<--json> and C<--data> are given, C<--json> takes precedence. - +In case C<--json> is specified, the output is a JSON encoded array where +each array element is the JSON representation of a single C but +with additional information. For details see +C, format definition: C. If both +C<--json> and C<--data> are given, C<--json> takes precedence. =back @@ -10092,7 +10101,7 @@ This script and its documentation were written for the TeX Live distribution (L) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 56566 2020-10-06 03:40:54Z preining $ +$Id: tlmgr.pl 56993 2020-11-24 18:35:36Z karl $ =cut # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html -- cgit v1.2.3