From 5938ab5ff71d6733b41a9f8a91bc9abb8901d0a3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 13 Apr 2013 23:41:53 +0000 Subject: sync with build git-svn-id: svn://tug.org/texlive/trunk@29908 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/scripts/texlive/tlmgr.pl | 2 +- Master/texmf-dist/scripts/texlive/updmap.pl | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl index 4f38959c4a1..05017552c36 100755 --- a/Master/texmf-dist/scripts/texlive/tlmgr.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl @@ -4740,7 +4740,7 @@ sub check_runfiles { |libertine\.sty |m-tex4ht\.tex |metatex\.tex - |noEmbed\.map + |.*-noEmbed\.map |ps2mfbas\.mf |pstricks\.con |sample\.bib diff --git a/Master/texmf-dist/scripts/texlive/updmap.pl b/Master/texmf-dist/scripts/texlive/updmap.pl index 36f5181008a..3853e25b25d 100755 --- a/Master/texmf-dist/scripts/texlive/updmap.pl +++ b/Master/texmf-dist/scripts/texlive/updmap.pl @@ -1,8 +1,8 @@ #!/usr/bin/env perl # mupdmap: utility to maintain map files for outline fonts. -# $Id: updmap.pl 28922 2013-01-24 01:12:02Z karl $ +# $Id: updmap.pl 29907 2013-04-13 23:41:19Z karl $ # -# Copyright 2011, 2012 Norbert Preining +# Copyright 2011, 2012, 2013 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # @@ -33,7 +33,7 @@ BEGIN { } -my $version = '$Id: updmap.pl 28922 2013-01-24 01:12:02Z karl $'; +my $version = '$Id: updmap.pl 29907 2013-04-13 23:41:19Z karl $'; use Getopt::Long qw(:config no_autoabbrev ignore_case_always); use strict; @@ -905,7 +905,7 @@ sub cidx2dvips { if ($italicmax > 0) { # we have already a definition of SlantFont via ,Italic or ,BoldItalic # warn the user that larger one is kept - print STDERR "cidx2dvips: warning: Double slant specified via Italic and -s:\n==> $l\n==> Using only the biggest slant value.\n"; + print STDERR "cidx2dvips warning: Double slant specified via Italic and -s:\n==> $l\n==> Using only the biggest slant value.\n"; } $italicmax = $1 if ($1 > $italicmax); $opts =~ s/-s ([.0-9-][.0-9-]*)//; @@ -1236,7 +1236,7 @@ sub mkMaps { print_and_log ("\n"); } } else { - print STDERR "Warning: File $d/$f doesn't exist.\n"; + print STDERR "$prg: Warning: File $d/$f doesn't exist.\n"; print LOG "Warning: File $d/$f doesn't exist.\n" unless $opts{'dry-run'}; } @@ -1437,7 +1437,7 @@ sub disable_map { } else { # disable a Map type that might be activated in a lower ranked updmap.cfg if (!defined($alldata->{'maps'}{$map})) { - warning("Map is not present anywhere, why should I disable it?\n"); + warning("$prg: map file not present, nothing to disable: $map\n"); return; } my $orig = $alldata->{'maps'}{$map}{'origin'}; @@ -1529,7 +1529,7 @@ sub save_updmap { my $p = ($upd{'maps'}{$m}{'status'} eq "disabled" ? "#! " : ""); print FN "$p$t $m\n"; } - close(FN) || warn("Cannot close file handle for $fn: $!"); + close(FN) || warn("$prg: Cannot close file handle for $fn: $!"); delete $alldata->{'updmap'}{$fn}{'changed'}; return 1; } @@ -1839,7 +1839,7 @@ sub read_updmap_file { my @lines = ; chomp(@lines); $data{'lines'} = [ @lines ]; - close(FN) || warn("Cannot close $fn: $!"); + close(FN) || warn("$prg: Cannot close $fn: $!"); for (@lines) { $i++; chomp; @@ -2001,7 +2001,7 @@ sub read_map_file { my $fn = shift; my @lines; if (!open(MF,"<$fn")) { - warn("cannot open $fn: $!"); + warn("$prg: open($fn) failed: $!"); return; } @lines = ; -- cgit v1.2.3