summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-04-18 23:22:58 +0000
committerKarl Berry <karl@freefriends.org>2012-04-18 23:22:58 +0000
commit525c63401b06425f0f3e3b2d72361fa68d75c47d (patch)
tree38fc2c973942ce2eed6cb750a5d5e8226f4adcb7 /Master
parent2d1f9c73370c360ee47be0e569a4fd05d234663f (diff)
pkfix 1.7 (18apr12)
git-svn-id: svn://tug.org/texlive/trunk@26032 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/support/pkfix/README6
-rwxr-xr-xMaster/texmf-dist/scripts/pkfix/pkfix.pl17
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds2
3 files changed, 19 insertions, 6 deletions
diff --git a/Master/texmf-dist/doc/support/pkfix/README b/Master/texmf-dist/doc/support/pkfix/README
index 6dcf4a2b80c..037616ac3b5 100644
--- a/Master/texmf-dist/doc/support/pkfix/README
+++ b/Master/texmf-dist/doc/support/pkfix/README
@@ -1,4 +1,4 @@
-README for project pkfix 2011/04/22 v1.6
+README for project pkfix 2012/04/18 v1.7
TABLE OF CONTENTS
=================
@@ -42,7 +42,7 @@ NOTICE:
B. COPYRIGHT, DISCLAIMER, LICENSE
=================================
-Copyright (C) 2001, 2005, 2007, 2009, 2011 Heiko Oberdiek.
+Copyright (C) 2001, 2005, 2007, 2009, 2011, 2012 Heiko Oberdiek.
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -261,3 +261,5 @@ J. HISTORY
2011/04/22 v1.6:
* Bug fix: input and output files are read and written in
binary mode (thanks M.S. Dousti for bug report).
+2012/04/18 v1.7:
+ * Option --version added.
diff --git a/Master/texmf-dist/scripts/pkfix/pkfix.pl b/Master/texmf-dist/scripts/pkfix/pkfix.pl
index 9a983f0a272..83f8721cb7a 100755
--- a/Master/texmf-dist/scripts/pkfix/pkfix.pl
+++ b/Master/texmf-dist/scripts/pkfix/pkfix.pl
@@ -5,7 +5,7 @@ $^W=1; # turn warning on
#
# pkfix.pl
#
-# Copyright (C) 2001, 2005, 2007, 2009, 2011 Heiko Oberdiek.
+# Copyright (C) 2001, 2005, 2007, 2009, 2011, 2012 Heiko Oberdiek.
#
# This work may be distributed and/or modified under the
# conditions of the LaTeX Project Public License, either version 1.3
@@ -25,10 +25,10 @@ $^W=1; # turn warning on
my $file = "pkfix.pl";
my $program = uc($&) if $file =~ /^\w+/;
my $project = lc($program);
-my $version = "1.6";
-my $date = "2011/04/22";
+my $version = "1.7";
+my $date = "2012/04/18";
my $author = "Heiko Oberdiek";
-my $copyright = "Copyright (c) 2001, 2005, 2007, 2009, 2011 by $author.";
+my $copyright = "Copyright (c) 2001, 2005, 2007, 2009, 2011, 2012 by $author.";
#
# Reqirements: Perl5, dvips
# History:
@@ -80,6 +80,8 @@ my $copyright = "Copyright (c) 2001, 2005, 2007, 2009, 2011 by $author.";
# 2011/04/22 v1.6:
# * Bug fix: input and output files are read and written in
# binary mode (thanks M.S. Dousti for bug report).
+# 2012/04/18 v1.7:
+# * Option --version added.
#
### program identification
my $title = "$program $version, $date - $copyright\n";
@@ -130,6 +132,7 @@ $::opt_quiet = 0;
$::opt_debug = 0;
$::opt_verbose = 0;
$::opt_clean = 1;
+$::opt_version = 0;
my $usage = <<"END_OF_USAGE";
${title}Syntax: \L$program\E [options] <inputfile.ps> <outputfile.ps>
@@ -137,6 +140,7 @@ Function: This program tries to replace pk fonts in <inputfile.ps>
by the type 1 versions. The result is written in <outputfile.ps>.
Options: (defaults:)
--help print usage
+ --version print version number
--(no)quiet suppress messages ($bool[$::opt_quiet])
--(no)verbose verbose printing ($bool[$::opt_verbose])
--(no)debug debug informations ($bool[$::opt_debug])
@@ -157,6 +161,7 @@ my @OrgArgv = @ARGV;
use Getopt::Long;
GetOptions(
"help!",
+ "version!",
"quiet!",
"debug!",
"verbose!",
@@ -166,6 +171,10 @@ GetOptions(
"dvips=s",
"options=s"
) or die $usage;
+if ($::opt_version) {
+ print "$project $date v$version\n";
+ exit(0);
+}
!$::opt_help or die $usage;
@ARGV < 3 or die "$usage$Error Too many files!\n";
@ARGV == 2 or die "$usage$Error Missing file names!\n";
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 37403e8f0f4..137dab81c96 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -376,6 +376,8 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'fundus-la', "die 'skipping, noinfo license of fonts'",
'fundus-pvscript', "die 'skipping, noinfo license of fonts'",
'fundus-startrek', "die 'skipping, noinfo license of fonts'",
+ 'fundus-twcal', "die 'skipping, nocommercial? license of fonts'",
+ 'fundus-va', "die 'skipping, noinfo license of fonts'",
'futhark', "die 'skipping, nonfree license'",
'futurans', "die 'skipping, requires nonfree font'",
'galley', "die 'skipping, will be included in xpackages later'",