epstopdf (24jan15)

git-svn-id: svn://tug.org/texlive/trunk@36139 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 26 insertions, 15 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl b/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl
index b83e4bef60b..f263df00933 100755
--- a/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl
+++ b/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: epstopdf.pl 34293 2014-06-18 18:16:38Z karl $
+# $Id: epstopdf.pl 36129 2015-01-24 00:30:11Z karl $
 # (Copyright lines below.)
 #
 # Redistribution and use in source and binary forms, with or without
@@ -30,13 +30,16 @@
 # Level 2 PS interpreter should work, although in practice using
 # Ghostscript is near-universal.  Many more details below.
 # 
-# One thing not allowed for: the case of
+# One thing not supported is the case of
 # "%%BoundingBox: (atend)" when input is not seekable (e.g., from a pipe),
 #
 # emacs-page
-my $ver = "2.22";
+my $ver = "2.23";
 
 # History
+#  2015/01/22 v2.23 (Karl Berry)
+#    * use # instead of = to placate msys; report from KUROKI Yusuke,
+#      tex-k mail 20 Jan 2015 12:40:16.
 #  2014/06/18 v2.22 (Karl Berry)
 #    * escape % in $outputfilename; report from William Fischer,
 #      tex-k mail 16 Jun 2014 18:45:12.
@@ -168,7 +171,7 @@ my $ver = "2.22";
 ### emacs-page
 ### program identification
 my $program = "epstopdf";
-my $ident = '($Id: epstopdf.pl 34293 2014-06-18 18:16:38Z karl $)' . " $ver";
+my $ident = '($Id: epstopdf.pl 36129 2015-01-24 00:30:11Z karl $)' . " $ver";
 my $copyright = <<END_COPYRIGHT ;
 Copyright 2009-2014 Karl Berry et al.
 Copyright 2002-2009 Gerben Wierda et al.
@@ -179,7 +182,7 @@ There is NO WARRANTY, to the extent permitted by law.
 END_COPYRIGHT
 my $title = "$program $ident\n";
 
-my $on_windows = $^O =~ /^MSWin/;
+my $on_windows = $^O =~ /^(MSWin|msys$)/;
 my $on_windows_or_cygwin = $on_windows || $^O eq "cygwin";
 
 ### ghostscript command name
@@ -570,7 +573,8 @@ if ($::opt_pdfsettings
   warnerr "Invalid value for --pdfsettings: $::opt_pdfsettings";
   $::opt_pdfsettings = '';
 }
-push @GS, "-dPDFSETTINGS=/$::opt_pdfsettings" if $::opt_pdfsettings;
+# use # instead of = to avoid mingw path munging.
+push (@GS, "-dPDFSETTINGS#/$::opt_pdfsettings") if $::opt_pdfsettings;
 
 push @GS, qw[
   -dMaxSubsetPct=100
@@ -596,7 +600,8 @@ if ($::opt_autorotate and
         . "(use 'All', 'None' or 'PageByPage'";
   $::opt_autorotate = '';
 }
-push @GS, "-dAutoRotatePages=/$::opt_autorotate" if $::opt_autorotate;
+# use # instead of = to avoid mingw path munging.
+push (@GS, "-dAutoRotatePages#/$::opt_autorotate") if $::opt_autorotate;
 $rotmsg = $::opt_autorotate ? $::opt_autorotate : "[use gs default]";
 
 foreach my $gsopt (@::opt_gsopt) {
diff --git a/Master/texmf-dist/doc/man/man1/epstopdf.man1.pdf b/Master/texmf-dist/doc/man/man1/epstopdf.man1.pdf
index b3eea9e7b27..094498b2fe0 100644
--- a/Master/texmf-dist/doc/man/man1/epstopdf.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/epstopdf.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man1/repstopdf.man1.pdf b/Master/texmf-dist/doc/man/man1/repstopdf.man1.pdf
index f214b1b719a..2ae67655e63 100644
--- a/Master/texmf-dist/doc/man/man1/repstopdf.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/repstopdf.man1.pdf
diff --git a/Master/texmf-dist/scripts/epstopdf/epstopdf.pl b/Master/texmf-dist/scripts/epstopdf/epstopdf.pl
index b83e4bef60b..f263df00933 100755
--- a/Master/texmf-dist/scripts/epstopdf/epstopdf.pl
+++ b/Master/texmf-dist/scripts/epstopdf/epstopdf.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: epstopdf.pl 34293 2014-06-18 18:16:38Z karl $
+# $Id: epstopdf.pl 36129 2015-01-24 00:30:11Z karl $
 # (Copyright lines below.)
 #
 # Redistribution and use in source and binary forms, with or without
@@ -30,13 +30,16 @@
 # Level 2 PS interpreter should work, although in practice using
 # Ghostscript is near-universal.  Many more details below.
 # 
-# One thing not allowed for: the case of
+# One thing not supported is the case of
 # "%%BoundingBox: (atend)" when input is not seekable (e.g., from a pipe),
 #
 # emacs-page
-my $ver = "2.22";
+my $ver = "2.23";
 
 # History
+#  2015/01/22 v2.23 (Karl Berry)
+#    * use # instead of = to placate msys; report from KUROKI Yusuke,
+#      tex-k mail 20 Jan 2015 12:40:16.
 #  2014/06/18 v2.22 (Karl Berry)
 #    * escape % in $outputfilename; report from William Fischer,
 #      tex-k mail 16 Jun 2014 18:45:12.
@@ -168,7 +171,7 @@ my $ver = "2.22";
 ### emacs-page
 ### program identification
 my $program = "epstopdf";
-my $ident = '($Id: epstopdf.pl 34293 2014-06-18 18:16:38Z karl $)' . " $ver";
+my $ident = '($Id: epstopdf.pl 36129 2015-01-24 00:30:11Z karl $)' . " $ver";
 my $copyright = <<END_COPYRIGHT ;
 Copyright 2009-2014 Karl Berry et al.
 Copyright 2002-2009 Gerben Wierda et al.
@@ -179,7 +182,7 @@ There is NO WARRANTY, to the extent permitted by law.
 END_COPYRIGHT
 my $title = "$program $ident\n";
 
-my $on_windows = $^O =~ /^MSWin/;
+my $on_windows = $^O =~ /^(MSWin|msys$)/;
 my $on_windows_or_cygwin = $on_windows || $^O eq "cygwin";
 
 ### ghostscript command name
@@ -570,7 +573,8 @@ if ($::opt_pdfsettings
   warnerr "Invalid value for --pdfsettings: $::opt_pdfsettings";
   $::opt_pdfsettings = '';
 }
-push @GS, "-dPDFSETTINGS=/$::opt_pdfsettings" if $::opt_pdfsettings;
+# use # instead of = to avoid mingw path munging.
+push (@GS, "-dPDFSETTINGS#/$::opt_pdfsettings") if $::opt_pdfsettings;
 
 push @GS, qw[
   -dMaxSubsetPct=100
@@ -596,7 +600,8 @@ if ($::opt_autorotate and
         . "(use 'All', 'None' or 'PageByPage'";
   $::opt_autorotate = '';
 }
-push @GS, "-dAutoRotatePages=/$::opt_autorotate" if $::opt_autorotate;
+# use # instead of = to avoid mingw path munging.
+push (@GS, "-dAutoRotatePages#/$::opt_autorotate") if $::opt_autorotate;
 $rotmsg = $::opt_autorotate ? $::opt_autorotate : "[use gs default]";
 
 foreach my $gsopt (@::opt_gsopt) {
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index db7107a47e6..319056608cc 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2235,7 +2235,8 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
  'ecclesiastic' => 'latex',  # requires interaction
  'etextools'    => 'etex -translate-file=empty.tcx',    # no 8-bit
  'extpfeil'     => 'latex -translate-file=empty.tcx',   # no 8-bit
- 'fancytooltips' => 'latex', # requires interaction
+ 'facture'	=> 'latex', # requires interaction
+ 'fancytooltips'=> 'latex', # requires interaction
  'fancyvrb'     => 'latex -translate-file=empty.tcx',   # no 8-bit
  'fbithesis'    => 'latex',  # requires interaction
  'fge'          => 'latex',  # requires interaction