summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/pdfcrop/pdfcrop.pl12
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/tetex/updmap.pl134
-rw-r--r--Master/texmf-dist/doc/support/pdfcrop/README4
-rwxr-xr-xMaster/texmf-dist/scripts/pdfcrop/pdfcrop.pl12
4 files changed, 155 insertions, 7 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/pdfcrop/pdfcrop.pl b/Build/source/texk/texlive/linked_scripts/pdfcrop/pdfcrop.pl
index 723433c67b6..b7662c15f26 100755
--- a/Build/source/texk/texlive/linked_scripts/pdfcrop/pdfcrop.pl
+++ b/Build/source/texk/texlive/linked_scripts/pdfcrop/pdfcrop.pl
@@ -22,8 +22,8 @@ $^W=1; # turn warning on
my $prj = 'pdfcrop';
my $file = "$prj.pl";
my $program = uc($&) if $file =~ /^\w+/;
-my $version = "1.37";
-my $date = "2012/10/16";
+my $version = "1.38";
+my $date = "2012/11/02";
my $author = "Heiko Oberdiek";
my $copyright = "Copyright (c) 2002-2012 by $author.";
#
@@ -105,6 +105,8 @@ my $copyright = "Copyright (c) 2002-2012 by $author.";
# 2012/10/16 v1.36: * More error codes added.
# 2012/10/16 v1.37: * Extended error messages if available.
# * Fix for broken v1.36.
+# 2012/11/02 v1.38: * Fix for unsufficient cleanup, if function `cleanup' is
+# prematurely called in `eval' for `symlink' checking.
### program identification
my $title = "$program $version, $date - $copyright\n";
@@ -688,7 +690,11 @@ if ($inputfile eq '-') {
elsif (not $inputfile =~ /^[\w\d\.\-\:\/@]+$/) { # /[\s\$~'"#{}%]/
$inputfilesafe = "$tmp-img.pdf";
push @unlink_files, $inputfilesafe;
- my $symlink_exists = eval { symlink("", ""); 1 };
+ my $symlink_exists = eval {
+ local $SIG{'__DIE__'};
+ symlink("", "");
+ 1;
+ };
print "* Input file name `$inputfile' contains special characters.\n"
. "* " . ($symlink_exists ? "Link" : "Copy")
. " input file to temporary file `$inputfilesafe'.\n"
diff --git a/Build/source/texk/texlive/linked_scripts/tetex/updmap.pl b/Build/source/texk/texlive/linked_scripts/tetex/updmap.pl
index 78830d5a83b..2acc4af1019 100755
--- a/Build/source/texk/texlive/linked_scripts/tetex/updmap.pl
+++ b/Build/source/texk/texlive/linked_scripts/tetex/updmap.pl
@@ -792,8 +792,142 @@ sub transLW35 {
# cidx2dvips()
# reads from stdin, writes to stdout. It transforms "cid-x"-like syntax into
# "dvips"-like syntax.
+#
+# Specifying the PS Name:
+# dvips needs the PSname instead of the file name. Thus we allow specifying
+# the PSname in the comment:
+# The PS Name can be specified in the font definition line
+# by including the following sequence somewhere after the
+# other components:
+#
+# %!PS<SPACE-TAB><PSNAME><NON-WORD-CHAR-OR-EOL>
+#
+# where
+# <SPACE-TAB> is either a space or a tab character
+# <PSNAME> is *one* word, defined by \w\w* perl re
+# <NON-WORD-CHAR-OR-EOL> is a non-\w char or the end of line
+#
+# That means we could have
+# ... %here the PS font name: %!PS fontname some other comment
+# ... %!PS fontname %other comments
+# ... %!PS fontname
+#
###############################################################################
+
+# reimplementation of the cryptic code that was there before
sub cidx2dvips {
+ my ($s) = @_;
+ my %fname_psname = (
+ # Morisawa
+ 'A-OTF-FutoGoB101Pr6N-Bold' => 'FutoGoB101Pr6N-Bold',
+ 'A-OTF-FutoGoB101Pro-Bold' => 'FutoGoB101Pro-Bold',
+ 'A-OTF-FutoMinA101Pr6N-Bold' => 'FutoMinA101Pr6N-Bold',
+ 'A-OTF-FutoMinA101Pro-Bold' => 'FutoMinA101Pro-Bold',
+ 'A-OTF-GothicBBBPr6N-Medium' => 'GothicBBBPr6N-Medium',
+ 'A-OTF-GothicBBBPro-Medium' => 'GothicBBBPro-Medium',
+ 'A-OTF-Jun101Pr6N-Light' => 'Jun101Pr6N-Light',
+ 'A-OTF-Jun101Pro-Light' => 'Jun101Pro-Light',
+ 'A-OTF-MidashiGoPr6N-MB31' => 'MidashiGoPr6N-MB31',
+ 'A-OTF-MidashiGoPro-MB31' => 'MidashiGoPro-MB31',
+ 'A-OTF-RyuminPr6N-Light' => 'RyuminPr6N-Light',
+ 'A-OTF-RyuminPro-Light' => 'RyuminPro-Light',
+ # Hiragino font file names and PS names are the same
+ #
+ # IPA
+ 'ipaexg' => 'IPAexGothic',
+ 'ipaexm' => 'IPAexMincho',
+ 'ipag' => 'IPAGothic',
+ 'ipam' => 'IPAMincho',
+ #
+ # Kozuka font names and PS names are the same
+ );
+ my @d;
+ foreach (@$s) {
+ # ship empty lines and comment lines out as is
+ if (m/^\s*(%.*)?$/) {
+ push(@d, $_);
+ next;
+ }
+ # get rid of new lines for now
+ chomp;
+ # save the line for warnings
+ my $l = $_;
+ # first check whether a PSname is given
+ my $psname;
+ #
+ # the matching on \w* is greedy, so will take all the word chars available
+ # that means we do not need to test for end of word
+ if ($_ =~ m/%!PS\s\s*([0-9A-Za-z-_][0-9A-Za-z-_]*)/) {
+ $psname = $1;
+ }
+ # remove comments
+ s/[^0-9A-Za-z-_]*%.*$//;
+ # replace supported ",SOMETHING" constructs
+ my $italicmax = 0;
+ if (m/,BoldItalic/) {
+ $italicmax = .3;
+ s/,BoldItalic//;
+ }
+ s/,Bold//;
+ if (m/,Italic/) {
+ $italicmax = .3;
+ s/,Italic//;
+ }
+ # break out if unsupported constructs are found: @ / ,
+ next if (m![\@/,]!);
+ # make everything single spaced
+ s/\s\s*/ /g;
+ # unicode encoded fonts are not supported
+ next if (m!^\w\w* unicode !);
+ # now we have the following format
+ # <word> <word> <word> some options like -e or -s
+ if ($_ !~ m/([^ ][^ ]*) ([^ ][^ ]*) ([^ ][^ ]*)( (.*))?$/) {
+ print STDERR "cidx2dvips warning: Cannot translate font line:\n==> $l\n";
+ print STDERR "Current translation status: ==>$_==\n";
+ next;
+ }
+ my $tfmname = $1;
+ my $cid = $2;
+ my $fname = $3;
+ my $opts = (defined($5) ? " $5" : "");
+ # remove extensions from $fname
+ $fname =~ s/\.[Oo][Tt][Ff]//;
+ $fname =~ s/\.[Tt][Tt][FfCc]//;
+ # remove leading ! from $fname
+ $fname =~ s/^!//;
+ # remove leading :<number>: from $fname
+ $fname =~ s/:[0-9]+://;
+ # remove leading space from $opt
+ $opts =~ s/^\s+//;
+ # replace -e and -s in the options
+ $opts =~ s/-e ([.0-9-][.0-9-]*)/ "$1 ExtendFont"/;
+ if (m/-s ([.0-9-][.0-9-]*)/) {
+ 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";
+ }
+ $italicmax = $1 if ($1 > $italicmax);
+ $opts =~ s/-s ([.0-9-][.0-9-]*)//;
+ }
+ if ($italicmax != 0) {
+ $opts .= " \"$italicmax SlantFont\"";
+ }
+ # print out the result
+ if (defined($psname)) {
+ push @d, "$tfmname $psname-$cid$opts\n";
+ } else {
+ if (defined($fname_psname{$fname})) {
+ push @d, "$tfmname $fname_psname{$fname}-$cid$opts\n";
+ } else {
+ push @d, "$tfmname $fname-$cid$opts\n";
+ }
+ }
+ }
+ return @d;
+}
+
+sub cidx2dvips_old {
my ($s) = @_;
my @d;
foreach (@$s) {
diff --git a/Master/texmf-dist/doc/support/pdfcrop/README b/Master/texmf-dist/doc/support/pdfcrop/README
index 635a325d0f2..4ea8503d799 100644
--- a/Master/texmf-dist/doc/support/pdfcrop/README
+++ b/Master/texmf-dist/doc/support/pdfcrop/README
@@ -1,4 +1,4 @@
-README for pdfcrop 2012/10/16 v1.37
+README for pdfcrop 2012/11/02 v1.38
TABLE OF CONTENTS
=================
@@ -247,6 +247,8 @@ L. HISTORY
2012/10/16 v1.36: * More error codes added.
2012/10/16 v1.37: * Extended error messages if available.
* Fix for broken v1.36.
+2012/11/02 v1.38: * Fix for unsufficient cleanup, if function `cleanup' is
+ prematurely called in `eval' for `symlink' checking.
M. TODO
diff --git a/Master/texmf-dist/scripts/pdfcrop/pdfcrop.pl b/Master/texmf-dist/scripts/pdfcrop/pdfcrop.pl
index 723433c67b6..b7662c15f26 100755
--- a/Master/texmf-dist/scripts/pdfcrop/pdfcrop.pl
+++ b/Master/texmf-dist/scripts/pdfcrop/pdfcrop.pl
@@ -22,8 +22,8 @@ $^W=1; # turn warning on
my $prj = 'pdfcrop';
my $file = "$prj.pl";
my $program = uc($&) if $file =~ /^\w+/;
-my $version = "1.37";
-my $date = "2012/10/16";
+my $version = "1.38";
+my $date = "2012/11/02";
my $author = "Heiko Oberdiek";
my $copyright = "Copyright (c) 2002-2012 by $author.";
#
@@ -105,6 +105,8 @@ my $copyright = "Copyright (c) 2002-2012 by $author.";
# 2012/10/16 v1.36: * More error codes added.
# 2012/10/16 v1.37: * Extended error messages if available.
# * Fix for broken v1.36.
+# 2012/11/02 v1.38: * Fix for unsufficient cleanup, if function `cleanup' is
+# prematurely called in `eval' for `symlink' checking.
### program identification
my $title = "$program $version, $date - $copyright\n";
@@ -688,7 +690,11 @@ if ($inputfile eq '-') {
elsif (not $inputfile =~ /^[\w\d\.\-\:\/@]+$/) { # /[\s\$~'"#{}%]/
$inputfilesafe = "$tmp-img.pdf";
push @unlink_files, $inputfilesafe;
- my $symlink_exists = eval { symlink("", ""); 1 };
+ my $symlink_exists = eval {
+ local $SIG{'__DIE__'};
+ symlink("", "");
+ 1;
+ };
print "* Input file name `$inputfile' contains special characters.\n"
. "* " . ($symlink_exists ? "Link" : "Copy")
. " input file to temporary file `$inputfilesafe'.\n"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 19:59:00 +0000