epspdf from ctan again

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

10 files changed, 265 insertions, 135 deletions

diff --git a/Master/texmf-dist/doc/info/epspdf.info b/Master/texmf-dist/doc/info/epspdf.info
index c75e35f75cd..0a6bd784f20 100644
--- a/Master/texmf-dist/doc/info/epspdf.info
+++ b/Master/texmf-dist/doc/info/epspdf.info
@@ -1,8 +1,8 @@
 This is epspdf.info, produced by makeinfo version 6.7 from epspdf.texi.
 
-This manual is for epspdf and epspdftk, version 0.6.4.
+This manual is for epspdf and epspdftk, version 0.6.5.
 
-Copyright (C) 2006-2019 Siep Kroonenberg.
+Copyright (C) 2006-2020 Siep Kroonenberg.
 
      Copying and distribution of this file, with or without
      modification, are permitted in any medium without royalty provided
@@ -19,9 +19,9 @@ File: epspdf.info,  Node: Top,  Next: Usage,  Prev: (dir),  Up: (dir)
 Epspdf and epspdftk
 *******************
 
-This manual is for epspdf and epspdftk, version 0.6.4.
+This manual is for epspdf and epspdftk, version 0.6.5.
 
-Copyright (C) 2006-2019 Siep Kroonenberg.
+Copyright (C) 2006-2020 Siep Kroonenberg.
 
      Copying and distribution of this file, with or without
      modification, are permitted in any medium without royalty provided
@@ -71,6 +71,8 @@ Troubleshooting
 
 * No options for output format visible::
 * Ghostscript stackunderflow error::
+* Error message ``pdf_crop failed''::
+* Wrong boundingbox (.eps or .ps output)::
 * Part of the graphic gets cut off::
 * Fonts look ugly::
 * The page has been converted to a bitmap::
@@ -79,7 +81,8 @@ Troubleshooting
 
 Change history
 
-* Version 6.4::
+* Version 0.6.5::
+* Version 0.6.4::
 * Version 0.6::
 * Version 0.5::
 * Version 0.4::
@@ -180,6 +183,9 @@ in this screen.  Epspdf looks for a number of PostScript- and pdf
 viewers, from which you can select one, but you can also enter one
 manually.
 
+Some viewers require a plugin for eps and PostScript.  The GUI does not
+check whether such a plugin is actually installed.
+
 For Windows and Mac OS there is no such configuration option.  Epspdf
 will use the program associated with the file type, which can be
 configured outside epspdf.
@@ -230,7 +236,7 @@ elaborate command-line interface.
 
 Below, we assume that there is a suitable wrapper or symlink for epspdf
 on your searchpath.  This is the case if you installed epspdf as a TeX
-Live package.
+Live- or MiKTeX package.
 
 Basic usage of epspdf itself:
 
@@ -453,7 +459,7 @@ Windows Explorer and "open" with _bitmap2eps_, which uses sam2p or bmeps
 in the background.
 
 
-File: epspdf.info,  Node: Troubleshooting,  Next: Change history,  Prev: Bitmapped graphics for LaTeX and pdflatex,  Up: Top
+File: epspdf.info,  Node: Troubleshooting,  Next: Requirements,  Prev: Bitmapped graphics for LaTeX and pdflatex,  Up: Top
 
 5 Troubleshooting
 *****************
@@ -462,6 +468,8 @@ File: epspdf.info,  Node: Troubleshooting,  Next: Change history,  Prev: Bitmapp
 
 * No options for output format visible::
 * Ghostscript stackunderflow error::
+* Error message ``pdf_crop failed''::
+* Wrong boundingbox (.eps or .ps output)::
 * Part of the graphic gets cut off::
 * Fonts look ugly::
 * The page has been converted to a bitmap::
@@ -477,7 +485,7 @@ File: epspdf.info,  Node: No options for output format visible,  Next: Ghostscri
 Widen the window, to make the output format radio buttons visible.
 
 
-File: epspdf.info,  Node: Ghostscript stackunderflow error,  Next: Part of the graphic gets cut off,  Prev: No options for output format visible,  Up: Troubleshooting
+File: epspdf.info,  Node: Ghostscript stackunderflow error,  Next: Error message ``pdf_crop failed'',  Prev: No options for output format visible,  Up: Troubleshooting
 
 5.2 Ghostscript stackunderflow error
 ====================================
@@ -488,19 +496,37 @@ error 'stackunderflow in .setdistillerparams'.  If you run into this,
 use the "default" or "prepress" target instead.
 
 
-File: epspdf.info,  Node: Part of the graphic gets cut off,  Next: Fonts look ugly,  Prev: Ghostscript stackunderflow error,  Up: Troubleshooting
+File: epspdf.info,  Node: Error message ``pdf_crop failed'',  Next: Wrong boundingbox (.eps or .ps output),  Prev: Ghostscript stackunderflow error,  Up: Troubleshooting
+
+5.3 Error message mentioning failure of pdf_crop
+================================================
+
+Problably, the luatex format has not been generated.  Fix this with TeX
+Live Manager or with the MiKTeX Console.
+
+
+File: epspdf.info,  Node: Wrong boundingbox (.eps or .ps output),  Next: Part of the graphic gets cut off,  Prev: Error message ``pdf_crop failed'',  Up: Troubleshooting
+
+5.4 Wrong boundingbox (.eps or .ps output)
+==========================================
+
+This may be a bug in pdftops.  Do not use pdftops (epspdftk: see
+configuration screen; command-line epspdf: use the "-I" option)
+
+
+File: epspdf.info,  Node: Part of the graphic gets cut off,  Next: Fonts look ugly,  Prev: Wrong boundingbox (.eps or .ps output),  Up: Troubleshooting
 
-5.3 Part of the graphic gets cut off
+5.5 Part of the graphic gets cut off
 ====================================
 
-If the PostScript file was generated with the Windows PostScript driver,
-experiment with the PostScript Output option.  Don't choose Optimize for
-Speed.
+If the PostScript file was generated with the old Windows PostScript
+driver, experiment with the PostScript Output option.  Don't choose
+Optimize for Speed.
 
 
 File: epspdf.info,  Node: Fonts look ugly,  Next: The page has been converted to a bitmap,  Prev: Part of the graphic gets cut off,  Up: Troubleshooting
 
-5.4 Fonts look ugly
+5.6 Fonts look ugly
 ===================
 
 If Ghostscript has to do the conversion from pdf to ps then text may not
@@ -512,7 +538,7 @@ the xpdf suite and of the Poppler utilities.
 
 File: epspdf.info,  Node: The page has been converted to a bitmap,  Next: Temporary files are not removed,  Prev: Fonts look ugly,  Up: Troubleshooting
 
-5.5 The page has been converted to a bitmap
+5.7 The page has been converted to a bitmap
 ===========================================
 
 The usual cause is that the page contains features such as transparency
@@ -524,7 +550,7 @@ avoid unnecessary conversions: '-T default -N default'
 
 File: epspdf.info,  Node: Temporary files are not removed,  Next: Resources for troubleshooting,  Prev: The page has been converted to a bitmap,  Up: Troubleshooting
 
-5.6 Temporary files are not removed
+5.8 Temporary files are not removed
 ===================================
 
    * Command-line: make sure that you did not specify the option '-d'.
@@ -538,7 +564,7 @@ File: epspdf.info,  Node: Temporary files are not removed,  Next: Resources for
 
 File: epspdf.info,  Node: Resources for troubleshooting,  Prev: Temporary files are not removed,  Up: Troubleshooting
 
-5.7 Resources for troubleshooting
+5.9 Resources for troubleshooting
 =================================
 
 Logfile.  The GUI has a button for viewing log output.  This same output
@@ -586,23 +612,37 @@ embedded Tcl/Tk runtime and a regular Windows installer, which also
 creates a menu shortcut and an uninstaller.
 
 
-File: epspdf.info,  Node: Change history,  Prev: Troubleshooting,  Up: Top
+File: epspdf.info,  Node: Change history,  Prev: Requirements,  Up: Top
 
 Appendix B Change history
 *************************
 
 * Menu:
 
-* Version 6.4::
+* Version 0.6.5::
+* Version 0.6.4::
 * Version 0.6::
 * Version 0.5::
 * Version 0.4::
 
 
-File: epspdf.info,  Node: Version 6.4,  Next: Version 0.6,  Up: Change history
+File: epspdf.info,  Node: Version 0.6.5,  Next: Version 0.6.4,  Prev: Change history,  Up: Change history
 
-B.1 Version 6.4
-===============
+B.1 Version 0.6.5
+=================
+
+Epspdf: Compatibility change for ghostscript 9.50 and later.
+
+Epspdftk: improvements to viewer selection; does not impact Windows or
+MacOS.
+
+A few updates to the manual, mostly for the troubleshooting section.
+
+
+File: epspdf.info,  Node: Version 0.6.4,  Next: Version 0.6,  Prev: Version 0.6.5,  Up: Change history
+
+B.2 Version 0.6.4
+=================
 
 Compatibility changes for luatex 1.9 and later.
 
@@ -616,9 +656,9 @@ epspdf.tlu is now invoked via a batchfile.  This should prevent black
 console windows popping up.
 
 
-File: epspdf.info,  Node: Version 0.6,  Next: Version 0.5,  Prev: Change history,  Up: Change history
+File: epspdf.info,  Node: Version 0.6,  Next: Version 0.5,  Prev: Version 0.6.4,  Up: Change history
 
-B.2 Version 0.6
+B.3 Version 0.6
 ===============
 
 The command-line backend component has been rewritten in texlua and
@@ -640,7 +680,7 @@ have no effect.
 
 File: epspdf.info,  Node: Version 0.5,  Next: Version 0.4,  Prev: Version 0.6,  Up: Change history
 
-B.3 Version 0.5
+B.4 Version 0.5
 ===============
 
 The GUI has been rewritten in Tcl/Tk, removing the dependence on the
@@ -677,7 +717,7 @@ The "-info" option now also prints the number of pages for pdf files.
 
 File: epspdf.info,  Node: Version 0.4,  Prev: Version 0.5,  Up: Change history
 
-B.4 Version 0.4
+B.5 Version 0.4
 ===============
 
 Hi-res boundingboxes are now supported.  By default, conversion from eps
@@ -696,41 +736,44 @@ There is now a "-v" (lowercase) option to print the version string.
 
 Tag Table:
 Node: Top552
-Node: Usage1986
-Node: Overview2189
-Node: Viewing2574
-Node: Conversion options3035
-Ref: gray3182
-Node: Converting3833
-Node: The configuration screen4226
-Node: Command-line usage6313
-Node: Option summary7018
-Node: Notes on PostScript and pdf8325
-Node: Bitmapped and vector8708
-Node: Font embedding9938
-Node: Eps preview headers10393
-Node: Bounding- and other boxes10840
-Node: Orientation11462
-Node: Exporting PostScript or pdf from Windows programs11895
-Node: Bitmapped graphics for LaTeX and pdflatex12848
-Node: Linux13317
-Node: Mac OS14070
-Node: Windows14380
-Node: Troubleshooting15131
-Node: No options for output format visible15555
-Node: Ghostscript stackunderflow error15859
-Node: Part of the graphic gets cut off16365
-Node: Fonts look ugly16743
-Node: The page has been converted to a bitmap17275
-Node: Temporary files are not removed17764
-Node: Resources for troubleshooting18429
-Ref: Documentation19376
-Node: Requirements19694
-Node: Change history20591
-Node: Version 6.420796
-Node: Version 0.621274
-Node: Version 0.522057
-Node: Version 0.423536
+Node: Usage2087
+Node: Overview2290
+Node: Viewing2675
+Node: Conversion options3136
+Ref: gray3283
+Node: Converting3934
+Node: The configuration screen4327
+Node: Command-line usage6538
+Node: Option summary7254
+Node: Notes on PostScript and pdf8561
+Node: Bitmapped and vector8944
+Node: Font embedding10174
+Node: Eps preview headers10629
+Node: Bounding- and other boxes11076
+Node: Orientation11698
+Node: Exporting PostScript or pdf from Windows programs12131
+Node: Bitmapped graphics for LaTeX and pdflatex13084
+Node: Linux13553
+Node: Mac OS14306
+Node: Windows14616
+Node: Troubleshooting15367
+Node: No options for output format visible15870
+Node: Ghostscript stackunderflow error16174
+Node: Error message ``pdf_crop failed''16681
+Node: Wrong boundingbox (.eps or .ps output)17067
+Node: Part of the graphic gets cut off17457
+Node: Fonts look ugly17845
+Node: The page has been converted to a bitmap18377
+Node: Temporary files are not removed18866
+Node: Resources for troubleshooting19531
+Ref: Documentation20478
+Node: Requirements20796
+Node: Change history21693
+Node: Version 0.6.521915
+Node: Version 0.6.422272
+Node: Version 0.622778
+Node: Version 0.523560
+Node: Version 0.425039
 
 End Tag Table
 
diff --git a/Master/texmf-dist/doc/support/epspdf/Changelog b/Master/texmf-dist/doc/support/epspdf/Changelog
index cf31923aec1..07aa313649e 100644
--- a/Master/texmf-dist/doc/support/epspdf/Changelog
+++ b/Master/texmf-dist/doc/support/epspdf/Changelog
@@ -1,3 +1,13 @@
+2020-01-09 0.6.5
+
+	Ghostscript invocations: no more .setpdfwrite, which is now
+	deprecated
+
+	epspdftk: improved handling of selection of Unix pdf- and
+	Postscript viewers
+
+	Updates to the manual
+
 2019-02-01 0.6.4
 
 	pdf_crop: epdf replaced by pdfe if available (LuaTeX >= 1.9)
diff --git a/Master/texmf-dist/doc/support/epspdf/epspdf.pdf b/Master/texmf-dist/doc/support/epspdf/epspdf.pdf
index 92ff2e1311f..637a4fd89f8 100644
--- a/Master/texmf-dist/doc/support/epspdf/epspdf.pdf
+++ b/Master/texmf-dist/doc/support/epspdf/epspdf.pdf
diff --git a/Master/texmf-dist/doc/support/epspdf/epspdf.texi b/Master/texmf-dist/doc/support/epspdf/epspdf.texi
index 1c87952cae8..6d5c254ac41 100644
--- a/Master/texmf-dist/doc/support/epspdf/epspdf.texi
+++ b/Master/texmf-dist/doc/support/epspdf/epspdf.texi
@@ -29,7 +29,7 @@
 @hyphenation{epspdf-tk epspdf}
 @end iftex
 
-@set version 0.6.4
+@set version 0.6.5
 
 @setchapternewpage off
 @paragraphindent none
@@ -37,7 +37,7 @@
 @copying
 This manual is for epspdf and epspdftk, version @value{version}.
 
-Copyright @copyright{} 2006-2019 Siep Kroonenberg.
+Copyright @copyright{} 2006-2020 Siep Kroonenberg.
 
 @quotation
 Copying and distribution of this file, with or without modification,
@@ -114,6 +114,8 @@ Troubleshooting
 
 * No options for output format visible::
 * Ghostscript stackunderflow error::
+* Error message ``pdf_crop failed''::
+* Wrong boundingbox (.eps or .ps output)::
 * Part of the graphic gets cut off::
 * Fonts look ugly::
 * The page has been converted to a bitmap::
@@ -122,7 +124,8 @@ Troubleshooting
 
 Change history
 
-* Version 6.4::
+* Version 0.6.5::
+* Version 0.6.4::
 * Version 0.6::
 * Version 0.5::
 * Version 0.4::
@@ -225,6 +228,9 @@ in this screen. Epspdf looks for a number of PostScript- and pdf
 viewers, from which you can select one, but you can also enter one
 manually.
 
+Some viewers require a plugin for eps and PostScript. The GUI
+does not check whether such a plugin is actually installed.
+
 For Windows and Mac OS there is no such configuration option. Epspdf
 will use the program associated with the file type, which can be
 configured outside epspdf.
@@ -268,7 +274,7 @@ elaborate command-line interface.
 
 Below, we assume that there is a suitable wrapper or symlink for epspdf
 on your searchpath. This is the case if you installed epspdf as a TeX
-Live package.
+Live- or MiKTeX package.
 
 Basic usage of epspdf itself:
 
@@ -465,12 +471,14 @@ With TeX Live, you can convert to eps by right-clicking an image in
 Windows Explorer and ``open'' with @emph{bitmap2eps}, which uses sam2p
 or bmeps in the background.
 
-@node Troubleshooting, Change history, Bitmapped graphics for @LaTeX{} and pdflatex, Top
+@node Troubleshooting, Requirements, Bitmapped graphics for @LaTeX{} and pdflatex, Top
 @chapter Troubleshooting
 
 @menu
 * No options for output format visible::
 * Ghostscript stackunderflow error::
+* Error message ``pdf_crop failed''::
+* Wrong boundingbox (.eps or .ps output)::
 * Part of the graphic gets cut off::
 * Fonts look ugly::
 * The page has been converted to a bitmap::
@@ -483,7 +491,7 @@ or bmeps in the background.
 
 Widen the window, to make the output format radio buttons visible.
 
-@node Ghostscript stackunderflow error, Part of the graphic gets cut off, No options for output format visible, Troubleshooting
+@node Ghostscript stackunderflow error, Error message ``pdf_crop failed'', No options for output format visible, Troubleshooting
 @section Ghostscript stackunderflow error
 
 Some Ghostscript versions, @emph{e.g.} 9.10, have an error in color
@@ -491,12 +499,24 @@ handling when converting to pdf: selecting ``printer'' as target may
 lead to an error @code{stackunderflow in .setdistillerparams}. If you
 run into this, use the ``default'' or ``prepress'' target instead.
 
-@node Part of the graphic gets cut off, Fonts look ugly, Ghostscript stackunderflow error, Troubleshooting
+@node Error message ``pdf_crop failed'', Wrong boundingbox (.eps or .ps output), Ghostscript stackunderflow error, Troubleshooting
+@section Error message mentioning failure of pdf_crop
+
+Problably, the luatex format has not been generated. Fix this with
+TeX Live Manager or with the MiKTeX Console.
+
+@node Wrong boundingbox (.eps or .ps output), Part of the graphic gets cut off, Error message ``pdf_crop failed'', Troubleshooting
+@section Wrong boundingbox (.eps or .ps output)
+
+This may be a bug in pdftops. Do not use pdftops (epspdftk: see
+configuration screen; command-line epspdf: use the ``-I'' option)
+
+@node Part of the graphic gets cut off, Fonts look ugly, Wrong boundingbox (.eps or .ps output), Troubleshooting
 @section Part of the graphic gets cut off
 
-If the PostScript file was generated with the Windows PostScript driver,
-experiment with the PostScript Output option. Don't choose Optimize for
-Speed.
+If the PostScript file was generated with the old Windows PostScript
+driver, experiment with the PostScript Output option. Don't choose
+Optimize for Speed.
 
 @node Fonts look ugly, The page has been converted to a bitmap, Part of the graphic gets cut off, Troubleshooting
 @section Fonts look ugly
@@ -560,7 +580,7 @@ pdftops, type @kbd{pdftops -h}. For Unix, there is also a man page, and
 for Windows there is a file pdftops.txt in the distribution zip. TeX
 Live includes the man page in pdf format: pdftops.pdf.
 
-@node Requirements
+@node Requirements, Change history, Troubleshooting, Top
 @appendix Requirements
 
 Epspdftk consists of a GUI front end and a command-line back end.
@@ -579,18 +599,29 @@ For Windows there is an alternate epspdf-setup package on CTAN with an
 embedded Tcl/Tk runtime and a regular Windows installer, which also
 creates a menu shortcut and an uninstaller.
 
-@node Change history,  , Troubleshooting, Top
+@node Change history,  , Requirements, Top
 @appendix Change history
 
 @menu
-* Version 6.4::
+* Version 0.6.5::
+* Version 0.6.4::
 * Version 0.6::
 * Version 0.5::
 * Version 0.4::
 @end menu
 
-@node Version 6.4
-@section Version 6.4
+@node Version 0.6.5, Version 0.6.4, Change history, Change history
+@section Version 0.6.5
+
+Epspdf: Compatibility change for ghostscript 9.50 and later.
+
+Epspdftk: improvements to viewer selection; does not impact Windows or
+MacOS.
+
+A few updates to the manual, mostly for the troubleshooting section.
+
+@node Version 0.6.4, Version 0.6, Version 0.6.5, Change history
+@section Version 0.6.4
 
 Compatibility changes for luatex 1.9 and later.
 
@@ -603,7 +634,7 @@ The GUI now requires Tcl/Tk version 8.5 or higher. On Windows,
 epspdf.tlu is now invoked via a batchfile. This should prevent black
 console windows popping up.
 
-@node Version 0.6, Version 0.5, Change history, Change history
+@node Version 0.6, Version 0.5, Version 0.6.4, Change history
 @section Version 0.6
 
 The command-line backend component has been rewritten in texlua and
diff --git a/Master/texmf-dist/doc/support/epspdf/logo.pdf b/Master/texmf-dist/doc/support/epspdf/images/logo.pdf
index 153b771fb26..153b771fb26 100644
--- a/Master/texmf-dist/doc/support/epspdf/logo.pdf
+++ b/Master/texmf-dist/doc/support/epspdf/images/logo.pdf
diff --git a/Master/texmf-dist/doc/support/epspdf/logo.svg b/Master/texmf-dist/doc/support/epspdf/images/logo.svg
index fa54577adc1..fa54577adc1 100644
--- a/Master/texmf-dist/doc/support/epspdf/logo.svg
+++ b/Master/texmf-dist/doc/support/epspdf/images/logo.svg
diff --git a/Master/texmf-dist/scripts/epspdf/epspdf.help b/Master/texmf-dist/scripts/epspdf/epspdf.help
index c200849f0a5..8ee499c019b 100644
--- a/Master/texmf-dist/scripts/epspdf/epspdf.help
+++ b/Master/texmf-dist/scripts/epspdf/epspdf.help
@@ -24,23 +24,26 @@ Epspdf and epspdftk
 5 Troubleshooting
   5.1 No options for output format visible
   5.2 Ghostscript stackunderflow error
-  5.3 Part of the graphic gets cut off
-  5.4 Fonts look ugly
-  5.5 The page has been converted to a bitmap
-  5.6 Temporary files are not removed
-  5.7 Resources for troubleshooting
+  5.3 Error message mentioning failure of pdf_crop
+  5.4 Wrong boundingbox (.eps or .ps output)
+  5.5 Part of the graphic gets cut off
+  5.6 Fonts look ugly
+  5.7 The page has been converted to a bitmap
+  5.8 Temporary files are not removed
+  5.9 Resources for troubleshooting
 Appendix A Requirements
 Appendix B Change history
-  B.1 Version 6.4
-  B.2 Version 0.6
-  B.3 Version 0.5
-  B.4 Version 0.4
+  B.1 Version 0.6.5
+  B.2 Version 0.6.4
+  B.3 Version 0.6
+  B.4 Version 0.5
+  B.5 Version 0.4
 Epspdf and epspdftk
 *******************
 
-This manual is for epspdf and epspdftk, version 0.6.4.
+This manual is for epspdf and epspdftk, version 0.6.5.
 
-Copyright (C) 2006-2019 Siep Kroonenberg.
+Copyright (C) 2006-2020 Siep Kroonenberg.
 
      Copying and distribution of this file, with or without
      modification, are permitted in any medium without royalty provided
@@ -116,6 +119,9 @@ in this screen.  Epspdf looks for a number of PostScript- and pdf
 viewers, from which you can select one, but you can also enter one
 manually.
 
+Some viewers require a plugin for eps and PostScript.  The GUI does not
+check whether such a plugin is actually installed.
+
 For Windows and Mac OS there is no such configuration option.  Epspdf
 will use the program associated with the file type, which can be
 configured outside epspdf.
@@ -163,7 +169,7 @@ elaborate command-line interface.
 
 Below, we assume that there is a suitable wrapper or symlink for epspdf
 on your searchpath.  This is the case if you installed epspdf as a TeX
-Live package.
+Live- or MiKTeX package.
 
 Basic usage of epspdf itself:
 
@@ -346,14 +352,26 @@ when converting to pdf: selecting "printer" as target may lead to an
 error 'stackunderflow in .setdistillerparams'.  If you run into this,
 use the "default" or "prepress" target instead.
 
-5.3 Part of the graphic gets cut off
+5.3 Error message mentioning failure of pdf_crop
+================================================
+
+Problably, the luatex format has not been generated.  Fix this with TeX
+Live Manager or with the MiKTeX Console.
+
+5.4 Wrong boundingbox (.eps or .ps output)
+==========================================
+
+This may be a bug in pdftops.  Do not use pdftops (epspdftk: see
+configuration screen; command-line epspdf: use the "-I" option)
+
+5.5 Part of the graphic gets cut off
 ====================================
 
-If the PostScript file was generated with the Windows PostScript driver,
-experiment with the PostScript Output option.  Don't choose Optimize for
-Speed.
+If the PostScript file was generated with the old Windows PostScript
+driver, experiment with the PostScript Output option.  Don't choose
+Optimize for Speed.
 
-5.4 Fonts look ugly
+5.6 Fonts look ugly
 ===================
 
 If Ghostscript has to do the conversion from pdf to ps then text may not
@@ -362,7 +380,7 @@ tend to do better in this respect than older ones, but as to preserving
 fonts, the pdftops utility may still handle more cases.  It is part of
 the xpdf suite and of the Poppler utilities.
 
-5.5 The page has been converted to a bitmap
+5.7 The page has been converted to a bitmap
 ===========================================
 
 The usual cause is that the page contains features such as transparency
@@ -371,7 +389,7 @@ which are not supported by the target format.
 Otherwise, set pdf target use and target version both to "default" to
 avoid unnecessary conversions: '-T default -N default'
 
-5.6 Temporary files are not removed
+5.8 Temporary files are not removed
 ===================================
 
    * Command-line: make sure that you did not specify the option '-d'.
@@ -382,7 +400,7 @@ avoid unnecessary conversions: '-T default -N default'
      However, you should have no trouble removing temporary files
      manually.
 
-5.7 Resources for troubleshooting
+5.9 Resources for troubleshooting
 =================================
 
 Logfile.  The GUI has a button for viewing log output.  This same output
@@ -429,8 +447,18 @@ creates a menu shortcut and an uninstaller.
 Appendix B Change history
 *************************
 
-B.1 Version 6.4
-===============
+B.1 Version 0.6.5
+=================
+
+Epspdf: Compatibility change for ghostscript 9.50 and later.
+
+Epspdftk: improvements to viewer selection; does not impact Windows or
+MacOS.
+
+A few updates to the manual, mostly for the troubleshooting section.
+
+B.2 Version 0.6.4
+=================
 
 Compatibility changes for luatex 1.9 and later.
 
@@ -443,7 +471,7 @@ The GUI now requires Tcl/Tk version 8.5 or higher.  On Windows,
 epspdf.tlu is now invoked via a batchfile.  This should prevent black
 console windows popping up.
 
-B.2 Version 0.6
+B.3 Version 0.6
 ===============
 
 The command-line backend component has been rewritten in texlua and
@@ -462,7 +490,7 @@ The current version has no provisions for custom Ghostscript- or pdftops
 parameters.  The corresponding command-line options are accepted but
 have no effect.
 
-B.3 Version 0.5
+B.4 Version 0.5
 ===============
 
 The GUI has been rewritten in Tcl/Tk, removing the dependence on the
@@ -496,7 +524,7 @@ the desired pdf version.
 
 The "-info" option now also prints the number of pages for pdf files.
 
-B.4 Version 0.4
+B.5 Version 0.4
 ===============
 
 Hi-res boundingboxes are now supported.  By default, conversion from eps
diff --git a/Master/texmf-dist/scripts/epspdf/epspdf.tlu b/Master/texmf-dist/scripts/epspdf/epspdf.tlu
index 0007ade0742..1dba171bf18 100755
--- a/Master/texmf-dist/scripts/epspdf/epspdf.tlu
+++ b/Master/texmf-dist/scripts/epspdf/epspdf.tlu
@@ -11,8 +11,10 @@ epspdf conversion utility
 0.6.3: compatibility fixes for luatex 0.9x
 0.6.4: adaptations for newer versions of LuaTeX and ghostscript;
        some refactoring; better handling of some corner cases
+0.6.5: eliminate .setpdfwrite from ghostscript commandlines,
+       since this is now considered obsolete
 
-Copyright (C) 2006-2019 Siep Kroonenberg
+Copyright (C) 2006-2020 Siep Kroonenberg
 
 siepo at bitmuis nl
 
@@ -1895,17 +1897,13 @@ function any_to_any()
 
   -- `distiller' settings
   -- these depend on whether final output is pdf
-  -- '.setpdfwrite' is just some optimization option for ghostscript
   if options.type=='pdf' then
     if settings.pdf_target and (settings.pdf_target~='default') then
       table.insert(pdf_options, '-dPDFSETTINGS#/'..settings.pdf_target)
     end
-    if settings.pdf_target=='screen' or settings.pdf_target=='ebook' then
-      pdf_tail_options = {'-c', '.setpdfwrite', '-f'}
-      -- -f ensures that the input filename is not added to the -c string
-    else
+    if settings.pdf_target~='screen' and settings.pdf_target~='ebook' then
       pdf_tail_options = {
-        '-c', '.setpdfwrite <</NeverEmbed [ ] >> setdistillerparams', '-f'}
+        '-c', '<</NeverEmbed [ ] >> setdistillerparams', '-f'}
     end
   end
 
@@ -2228,7 +2226,7 @@ descriptions.use_pdftops = 'Use pdftops if available'
 
 settings.ps_viewer = false
 descriptions.ps_viewer =
-  'Epspdftk: viewer for PostScript files; not used on Windows or OS X'
+  'Epspdftk: viewer for PostScript files; not used on Windows or Mac OS'
 
 settings.pdf_viewer = false
 descriptions.pdf_viewer =
@@ -2271,7 +2269,8 @@ gs_options = {'-q', '-dNOPAUSE', '-dBATCH', '-P-', '-dSAFER'}
 pdf_options = {'-sDEVICE#pdfwrite'} -- '-dUseCIEColor' causes serious slowdown
 -- options for final conversion to pdf;
 -- will be completed after reading settings and options
-pdf_tail_options = {'-c', '.setpdfwrite', '-f'}
+-- -f ensures that the input filename is not added to a -c string
+pdf_tail_options = {'-f'}
 gray_options = {'-dProcessColorModel#/DeviceGray',
   '-sColorConversionStrategy#Gray'}
 
diff --git a/Master/texmf-dist/scripts/epspdf/epspdftk.tcl b/Master/texmf-dist/scripts/epspdf/epspdftk.tcl
index 26ed17efcfd..5ea94b6f037 100755
--- a/Master/texmf-dist/scripts/epspdf/epspdftk.tcl
+++ b/Master/texmf-dist/scripts/epspdf/epspdftk.tcl
@@ -3,7 +3,7 @@
 # epspdf conversion utility, GUI frontend
 
 #####
-# Copyright (C) 2006-2019 Siep Kroonenberg
+# Copyright (C) 2006-2020 Siep Kroonenberg
 # siepo at bitmuis dot nl
 #
 # This program is free software, licensed under the GNU GPL, >=2.0.
@@ -130,34 +130,38 @@ proc getsettings {} {
   }
 
   # unix: viewer settings
+  # It may depend on installed plugins whether a pdf viewer
+  # can render postscript.
+  # AFAIK, no such plugins exist for xpdf or mupdf.
+  # chrome and firefox also only render pdf and not postscript.
   # configured viewer, if valid, heads the list
   if {$::classic_unix} {
 
-    set ::ps_viewers {}
-    if {$::settings(ps_viewer) ne "" && [is_prog $::settings(ps_viewer)]} {
-      lappend ::ps_viewers $::settings(ps_viewer)
-    }
-    foreach v {evince okular gv qpdfview} {
-      if {$v ne $::settings(ps_viewer) && [is_prog $v]} {
-        lappend ::ps_viewers $v
-      }
-    }
-    # puts [join $::ps_viewers " "]
-
     set ::pdf_viewers {}
     if {$::settings(pdf_viewer) ne "" && [is_prog $::settings(pdf_viewer)]} {
       lappend ::pdf_viewers $::settings(pdf_viewer)
     }
-    foreach v {evince okular mupdf qpdfview texworks xpdf zathura} {
+    foreach v {
+      atril evince okular qpdfview mupdf xpdf zathura gv firefox chrome \
+          chromium chromium-browser} {
       if {$v ne $::settings(pdf_viewer) && [is_prog $v]} {
         lappend ::pdf_viewers $v
       }
     }
     # puts [join $::pdf_viewers " "]
 
-    if {[llength ::pdf_viewers] == 0 && [llength ::ps_viewers] != 0} {
-      lappend ::pdf_viewers [lindex $::ps_viewers 0]
+    set ::ps_viewers {}
+    if {$::settings(ps_viewer) ne "" && [is_prog $::settings(ps_viewer)]} {
+      lappend ::ps_viewers $::settings(ps_viewer)
+    }
+    foreach v $::pdf_viewers {
+      if {$v ne $::settings(ps_viewer) && \
+          $v ni {xpdf mupdf firefox chrome chromium chromium-browser}} {
+        lappend ::ps_viewers $v
+      }
     }
+    # puts [join $::ps_viewers " "]
+
     if {[llength ::pdf_viewers] == 0} {
       tk_messageBox -message "No viewers found"
     } elseif {[llength ::ps_viewers] == 0} {
@@ -227,19 +231,30 @@ proc ppack {b args} {pack $b {*}$args -padx 3 -pady 3}
 font create bfont {*}[font configure TkDefaultFont]
 font configure bfont -weight bold
 
-proc update_combo {w vls} {
-  upvar $vls vs
+proc update_combo w {
+  # check that a manually supplied entry is actually a program
+  # proc used for postscript- and pdf viewers
+  set vls [$w cget -values]
   set new [$w get]
-  if {$new ni $vs} {
+  if {$new ni $vls} {
     if {[is_prog $new]} {
-      set vs [linsert $vs 0 $new]
-      $w configure -values $vs
+      set vls [linsert $vls 0 $new]
+      $w configure -values $vls
     } else {
-      tk_messageBox -title Error -icon error -message "$vl Not a program"
+      tk_messageBox -title Error -icon error -message "$new not a program"
+      raise .config_t
+      focus $w
     }
   }
 }
 
+proc revert_combo w {
+  # aborts entry of new value
+  if {[$w current] < 0} {
+    $w current 0
+  }
+}
+
 ### and now the actual GUI ###################################
 
 wm title . "PostScript- and pdf conversions"
@@ -319,11 +334,15 @@ if {$::classic_unix} {
   grid [ttk::combobox .config_t.viewf.pdf] -row 1 -column 1 -sticky e
   .config_t.viewf.pdf configure -values $::pdf_viewers
   .config_t.viewf.pdf configure -textvariable ::settings(pdf_viewer)
-  bind .config_t.viewf.pdf <Return> {update_combo %W $::pdf_viewers}
+  bind .config_t.viewf.pdf <Escape> {revert_combo %W}
+  bind .config_t.viewf.pdf <Return> {update_combo %W}
+  bind .config_t.viewf.pdf <FocusOut> {update_combo %W}
   grid [ttk::combobox .config_t.viewf.ps] -row 2 -column 1 -sticky e
   .config_t.viewf.ps configure -values $::ps_viewers
   .config_t.viewf.ps configure -textvariable ::settings(ps_viewer)
-  bind .config_t.viewf.ps <Return> {update_combo %W $::ps_viewers}
+  bind .config_t.viewf.ps <Escape> {revert_combo %W}
+  bind .config_t.viewf.ps <Return> {update_combo %W}
+  bind .config_t.viewf.ps <FocusOut> {update_combo %W}
   grid columnconfigure .config_t.viewf 1 -weight 1 -pad 2
 }
 
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 98bb619aeba..eca5e32945b 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -6206,7 +6206,7 @@ sub POSTeplain {
 sub POSTepspdf {
   print "POST$package - construct images subdir\n";
   &xmkdir ("images");
-  &SYSTEM ("$MV *.png images/");
+  &SYSTEM ("$MV *.png logo.* images/");
   &SYSTEM ("$MV *.bat epspdf.texlua /tmp/");
   print "YOU-MUST-DO! update /tmp/$package* into bin/win32, etc.\n";
 }