epspdf

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

11 files changed, 366 insertions, 268 deletions

diff --git a/Master/texmf-dist/doc/info/epspdf.info b/Master/texmf-dist/doc/info/epspdf.info
index 94885b31130..c75e35f75cd 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.5 from epspdf.texi.
+This is epspdf.info, produced by makeinfo version 6.7 from epspdf.texi.
 
-This manual is for epspdf and epspdftk, version 0.6.5.
+This manual is for epspdf and epspdftk, version 0.6.4.
 
-Copyright (C) 2006-2020 Siep Kroonenberg.
+Copyright (C) 2006-2019 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.5.
+This manual is for epspdf and epspdftk, version 0.6.4.
 
-Copyright (C) 2006-2020 Siep Kroonenberg.
+Copyright (C) 2006-2019 Siep Kroonenberg.
 
      Copying and distribution of this file, with or without
      modification, are permitted in any medium without royalty provided
@@ -71,8 +71,6 @@ 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::
@@ -81,8 +79,7 @@ Troubleshooting
 
 Change history
 
-* Version 0.6.5::
-* Version 0.6.4::
+* Version 6.4::
 * Version 0.6::
 * Version 0.5::
 * Version 0.4::
@@ -183,9 +180,6 @@ 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.
@@ -236,7 +230,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- or MiKTeX package.
+Live package.
 
 Basic usage of epspdf itself:
 
@@ -459,7 +453,7 @@ Windows Explorer and "open" with _bitmap2eps_, which uses sam2p or bmeps
 in the background.
 
 
-File: epspdf.info,  Node: Troubleshooting,  Next: Requirements,  Prev: Bitmapped graphics for LaTeX and pdflatex,  Up: Top
+File: epspdf.info,  Node: Troubleshooting,  Next: Change history,  Prev: Bitmapped graphics for LaTeX and pdflatex,  Up: Top
 
 5 Troubleshooting
 *****************
@@ -468,8 +462,6 @@ File: epspdf.info,  Node: Troubleshooting,  Next: Requirements,  Prev: Bitmapped
 
 * 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::
@@ -485,7 +477,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: Error message ``pdf_crop failed'',  Prev: No options for output format visible,  Up: Troubleshooting
+File: epspdf.info,  Node: Ghostscript stackunderflow error,  Next: Part of the graphic gets cut off,  Prev: No options for output format visible,  Up: Troubleshooting
 
 5.2 Ghostscript stackunderflow error
 ====================================
@@ -496,37 +488,19 @@ error 'stackunderflow in .setdistillerparams'.  If you run into this,
 use the "default" or "prepress" target instead.
 
 
-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
+File: epspdf.info,  Node: Part of the graphic gets cut off,  Next: Fonts look ugly,  Prev: Ghostscript stackunderflow error,  Up: Troubleshooting
 
-5.5 Part of the graphic gets cut off
+5.3 Part of the graphic gets cut off
 ====================================
 
-If the PostScript file was generated with the old Windows PostScript
-driver, experiment with the PostScript Output option.  Don't choose
-Optimize for Speed.
+If the PostScript file was generated with the 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.6 Fonts look ugly
+5.4 Fonts look ugly
 ===================
 
 If Ghostscript has to do the conversion from pdf to ps then text may not
@@ -538,7 +512,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.7 The page has been converted to a bitmap
+5.5 The page has been converted to a bitmap
 ===========================================
 
 The usual cause is that the page contains features such as transparency
@@ -550,7 +524,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.8 Temporary files are not removed
+5.6 Temporary files are not removed
 ===================================
 
    * Command-line: make sure that you did not specify the option '-d'.
@@ -564,7 +538,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.9 Resources for troubleshooting
+5.7 Resources for troubleshooting
 =================================
 
 Logfile.  The GUI has a button for viewing log output.  This same output
@@ -612,37 +586,23 @@ 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: Requirements,  Up: Top
+File: epspdf.info,  Node: Change history,  Prev: Troubleshooting,  Up: Top
 
 Appendix B Change history
 *************************
 
 * Menu:
 
-* Version 0.6.5::
-* Version 0.6.4::
+* Version 6.4::
 * Version 0.6::
 * Version 0.5::
 * Version 0.4::
 
 
-File: epspdf.info,  Node: Version 0.6.5,  Next: Version 0.6.4,  Prev: Change history,  Up: Change history
+File: epspdf.info,  Node: Version 6.4,  Next: Version 0.6,  Up: Change history
 
-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
-=================
+B.1 Version 6.4
+===============
 
 Compatibility changes for luatex 1.9 and later.
 
@@ -656,9 +616,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: Version 0.6.4,  Up: Change history
+File: epspdf.info,  Node: Version 0.6,  Next: Version 0.5,  Prev: Change history,  Up: Change history
 
-B.3 Version 0.6
+B.2 Version 0.6
 ===============
 
 The command-line backend component has been rewritten in texlua and
@@ -680,7 +640,7 @@ have no effect.
 
 File: epspdf.info,  Node: Version 0.5,  Next: Version 0.4,  Prev: Version 0.6,  Up: Change history
 
-B.4 Version 0.5
+B.3 Version 0.5
 ===============
 
 The GUI has been rewritten in Tcl/Tk, removing the dependence on the
@@ -717,7 +677,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.5 Version 0.4
+B.4 Version 0.4
 ===============
 
 Hi-res boundingboxes are now supported.  By default, conversion from eps
@@ -736,43 +696,45 @@ There is now a "-v" (lowercase) option to print the version string.
 
 Tag Table:
 Node: Top552
-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
+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
 
 End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/Master/texmf-dist/doc/support/epspdf/Changelog b/Master/texmf-dist/doc/support/epspdf/Changelog
index 07aa313649e..cf31923aec1 100644
--- a/Master/texmf-dist/doc/support/epspdf/Changelog
+++ b/Master/texmf-dist/doc/support/epspdf/Changelog
@@ -1,13 +1,3 @@
-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 637a4fd89f8..92ff2e1311f 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 6d5c254ac41..1c87952cae8 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.5
+@set version 0.6.4
 
 @setchapternewpage off
 @paragraphindent none
@@ -37,7 +37,7 @@
 @copying
 This manual is for epspdf and epspdftk, version @value{version}.
 
-Copyright @copyright{} 2006-2020 Siep Kroonenberg.
+Copyright @copyright{} 2006-2019 Siep Kroonenberg.
 
 @quotation
 Copying and distribution of this file, with or without modification,
@@ -114,8 +114,6 @@ 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::
@@ -124,8 +122,7 @@ Troubleshooting
 
 Change history
 
-* Version 0.6.5::
-* Version 0.6.4::
+* Version 6.4::
 * Version 0.6::
 * Version 0.5::
 * Version 0.4::
@@ -228,9 +225,6 @@ 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.
@@ -274,7 +268,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- or MiKTeX package.
+Live package.
 
 Basic usage of epspdf itself:
 
@@ -471,14 +465,12 @@ 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, Requirements, Bitmapped graphics for @LaTeX{} and pdflatex, Top
+@node Troubleshooting, Change history, 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::
@@ -491,7 +483,7 @@ or bmeps in the background.
 
 Widen the window, to make the output format radio buttons visible.
 
-@node Ghostscript stackunderflow error, Error message ``pdf_crop failed'', No options for output format visible, Troubleshooting
+@node Ghostscript stackunderflow error, Part of the graphic gets cut off, No options for output format visible, Troubleshooting
 @section Ghostscript stackunderflow error
 
 Some Ghostscript versions, @emph{e.g.} 9.10, have an error in color
@@ -499,24 +491,12 @@ 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 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
+@node Part of the graphic gets cut off, Fonts look ugly, Ghostscript stackunderflow error, Troubleshooting
 @section Part of the graphic gets cut off
 
-If the PostScript file was generated with the old Windows PostScript
-driver, experiment with the PostScript Output option. Don't choose
-Optimize for Speed.
+If the PostScript file was generated with the 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
@@ -580,7 +560,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, Change history, Troubleshooting, Top
+@node Requirements
 @appendix Requirements
 
 Epspdftk consists of a GUI front end and a command-line back end.
@@ -599,29 +579,18 @@ 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,  , Requirements, Top
+@node Change history,  , Troubleshooting, Top
 @appendix Change history
 
 @menu
-* Version 0.6.5::
-* Version 0.6.4::
+* Version 6.4::
 * Version 0.6::
 * Version 0.5::
 * Version 0.4::
 @end menu
 
-@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
+@node Version 6.4
+@section Version 6.4
 
 Compatibility changes for luatex 1.9 and later.
 
@@ -634,7 +603,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, Version 0.6.4, Change history
+@node Version 0.6, Version 0.5, Change history, 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/images/main_wx.png b/Master/texmf-dist/doc/support/epspdf/images/main_wx.png
new file mode 100644
index 00000000000..068dd2d8fa0
--- /dev/null
+++ b/Master/texmf-dist/doc/support/epspdf/images/main_wx.png
diff --git a/Master/texmf-dist/doc/support/epspdf/images/logo.pdf b/Master/texmf-dist/doc/support/epspdf/logo.pdf
index 153b771fb26..153b771fb26 100644
--- a/Master/texmf-dist/doc/support/epspdf/images/logo.pdf
+++ b/Master/texmf-dist/doc/support/epspdf/logo.pdf
diff --git a/Master/texmf-dist/doc/support/epspdf/logo.svg b/Master/texmf-dist/doc/support/epspdf/logo.svg
new file mode 100644
index 00000000000..fa54577adc1
--- /dev/null
+++ b/Master/texmf-dist/doc/support/epspdf/logo.svg
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1052.3622"
+   height="744.09448"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="epspdf.svg"
+   style="display:inline">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective2921"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2984"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3898"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath2886">
+      <path
+         id="path2888"
+         style="fill:none;stroke:#000000;stroke-width:1.15759587;display:inline"
+         d="m 662.69592,363.42152 c 0,148.23849 -120.17108,268.40953 -268.40958,268.40953 -148.2385,0 -268.40954,-120.17104 -268.40954,-268.40953 0,-148.23851 120.17104,-268.40955 268.40954,-268.40955 148.2385,0 268.40958,120.17104 268.40958,268.40955 z m -123.7647,-10e-6 c 0,-79.88516 -64.75972,-144.64488 -144.64488,-144.64488 -79.88517,0 -144.64489,64.75972 -144.64489,144.64488 0,79.88517 64.75972,144.64489 144.64489,144.64489 79.88516,0 144.64488,-64.75972 144.64488,-144.64489 z" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.1295785"
+     inkscape:cx="404.62267"
+     inkscape:cy="380.57534"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer2"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1272"
+     inkscape:window-height="911"
+     inkscape:window-x="402"
+     inkscape:window-y="117"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="false"
+     inkscape:snap-page="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer"
+     style="display:inline">
+    <g
+       id="g3853"
+       clip-path="url(#clipPath2886)">
+      <path
+         id="path3822"
+         d="m 423.25,469.15625 c -10.09348,1.24175 -20.18906,2.46673 -30.28125,3.71875 -18.4916,31.25922 -36.9755,62.52301 -55.46875,93.78125 18.55393,33.75824 37.05144,67.54777 55.59375,101.3125 27.78142,-3.72777 55.55723,-7.49833 83.34375,-11.1875 -26.58572,-27.90445 -53.14375,-55.83532 -79.71875,-83.75 9.84306,-34.73978 19.69161,-69.478 29.53125,-104.21875 -1,0.11458 -2,0.22917 -3,0.34375 z"
+         style="fill:#0b2817;stroke:none" />
+      <path
+         style="fill:#d40000;stroke:none"
+         d="m 316.05617,71.823338 78.15822,81.661702 -28.70783,102.88966 -27.3834,11.06187 1.51539,-106.43282 -96.3054,-58.82396 72.72302,-30.356452 z"
+         id="path3830"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path3832"
+         d="m 472.3726,655.52027 -78.15822,-81.66169 28.70783,-102.88968 27.3834,-11.06187 -1.51539,106.43283 96.3054,58.82396 -72.72302,30.35645 z"
+         style="fill:#0b2817;stroke:none" />
+      <path
+         id="path3836"
+         d="m 241.96875,100.40625 c -21.83042,16.85792 -43.68483,33.68489 -65.5,50.5625 36.97454,10.86566 73.93656,21.77405 110.90625,32.65625 8.85895,34.99878 17.67974,70.00731 26.5625,105 8.90627,-6.74614 17.84062,-13.45586 26.78125,-20.15625 0.3408,-36.31262 0.75616,-72.62486 1.09375,-108.9375 -32.91375,-19.9839 -65.82147,-39.97811 -98.75,-59.9375 l -0.80274,0.59632 -0.29101,0.21618 z"
+         style="fill:#800000;stroke:none" />
+      <path
+         id="path3838"
+         d="m 472.125,440.53125 c -8.13836,6.11062 -16.25394,12.25194 -24.40625,18.34375 -0.3408,36.31262 -0.75616,72.62486 -1.09375,108.9375 32.90907,20.00202 65.8493,39.95316 98.75,59.96875 22.18542,-17.1381 44.39191,-34.24901 66.5625,-51.40625 -36.97454,-10.86566 -73.93656,-21.77405 -110.90625,-32.65625 -8.84881,-34.99871 -17.65722,-70.00773 -26.53125,-105 -0.79167,0.60417 -1.58333,1.20833 -2.375,1.8125 z"
+         style="fill:none;stroke:none" />
+      <path
+         style="fill:#800000;stroke:none"
+         d="m 180.60315,150.00273 108.51786,31.642 26.58312,103.45898 -18.18379,23.27156 -51.90404,-92.93123 -112.8149,-2.79034 47.80175,-62.65097 z"
+         id="path3842"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path3844"
+         d="m 607.82562,577.34089 -108.51785,-31.642 -26.58313,-103.45898 18.18379,-23.27156 51.90405,92.93123 112.8149,2.79034 -47.80176,62.65097 z"
+         style="fill:#0055d4;stroke:none" />
+      <path
+         id="path3848"
+         d="m 130.75,211.8125 c -10.49227,25.50931 -20.9624,51.02775 -31.46875,76.53125 37.45067,-9.08351 74.91791,-18.09905 112.375,-27.15625 25.1662,25.88587 50.33612,51.76813 75.5,77.65625 4.37516,-10.28715 8.74305,-20.57753 13.09375,-30.875 -17.81224,-31.63098 -35.64932,-63.24804 -53.46875,-94.875 -38.49971,-0.86603 -77.00012,-1.70338 -115.5,-2.5625 l -0.38302,0.92374 -0.14823,0.35751 z"
+         style="fill:#550000;stroke:none" />
+      <path
+         id="path3850"
+         d="m 500.09375,391.28125 c -3.97605,9.36589 -7.97624,18.72165 -11.9375,28.09375 17.82214,31.63127 35.67073,63.24772 53.5,94.875 38.49971,0.86603 77.00012,1.70338 115.5,2.5625 10.6772,-25.93315 21.31525,-51.88246 32,-77.8125 -37.45067,9.08351 -74.91791,18.09905 -112.375,27.15625 -25.1662,-25.88587 -50.33612,-51.76813 -75.5,-77.65625 -0.39583,0.92708 -0.79167,1.85417 -1.1875,2.78125 z"
+         style="fill:#0044aa;stroke:none" />
+      <path
+         style="fill:#550000;stroke:none"
+         d="m 102.38709,285.43458 109.80022,-26.85616 74.75114,76.30654 -4.11184,29.24566 -91.41583,-54.52878 -99.095738,53.99095 10.072048,-78.15821 z"
+         id="path3854"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path3856"
+         d="m 686.04168,441.90904 -109.80022,26.85616 -74.75115,-76.30655 4.11184,-29.24566 91.41584,54.52879 99.09574,-53.99094 -10.07205,78.1582 z"
+         style="fill:#0044aa;stroke:none" />
+      <path
+         id="path3860"
+         d="m 190.21875,307.53125 c -33.42637,18.33463 -66.85842,36.65894 -100.28125,55 3.727767,27.78142 7.498332,55.55723 11.1875,83.34375 27.89398,-26.57536 55.8145,-53.12291 83.71875,-79.6875 34.75009,9.833 69.49943,19.66867 104.25,29.5 -1.30917,-11.09907 -2.70355,-22.18816 -4.0625,-33.28125 -31.26916,-18.482 -62.54438,-36.95375 -93.8125,-55.4375 l -0.87158,0.49026 -0.12842,0.0722 z"
+         style="fill:none;stroke:none" />
+      <path
+         id="path3862"
+         d="M 684.46875,284.1875 C 657.5,309.84375 630.53125,335.5 603.5625,361.15625 c -34.7397,-9.83292 -69.47847,-19.66913 -104.21875,-29.5 1.30917,11.09907 2.70355,22.18816 4.0625,33.28125 31.26916,18.482 62.54438,36.95375 93.8125,55.4375 33.74768,-18.54378 67.5271,-37.03031 101.28125,-55.5625 -3.72777,-27.78142 -7.49833,-55.55723 -11.1875,-83.34375 -0.94792,0.90625 -1.89583,1.8125 -2.84375,2.71875 z"
+         style="fill:#003380;stroke:none" />
+      <path
+         style="fill:#2ca05a;stroke:none"
+         d="m 102.36592,441.83003 81.6617,-78.15822 102.88966,28.70783 11.06187,27.3834 -106.43282,-1.51539 -58.82396,96.3054 -30.35645,-72.72302 z"
+         id="path3866"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path3868"
+         d="m 686.06285,285.5136 -81.66169,78.15822 -102.88968,-28.70783 -11.06187,-27.3834 106.43283,1.51539 58.82396,-96.3054 30.35645,72.72302 z"
+         style="fill:#003380;stroke:none" />
+      <path
+         id="path3872"
+         d="m 189.46875,417.03125 c -19.77769,32.59589 -39.58367,65.17478 -59.34375,97.78125 17.08893,22.22516 34.23322,44.40895 51.375,66.59375 10.86566,-36.97454 21.77405,-73.93656 32.65625,-110.90625 35.00918,-8.85901 70.02824,-17.67932 105.03125,-26.5625 -6.7258,-8.9192 -13.45366,-17.83687 -20.1875,-26.75 -36.31263,-0.35053 -72.62485,-0.77776 -108.9375,-1.125 l -0.52256,0.8526 -0.0712,0.11615 z"
+         style="fill:#217844;stroke:none" />
+      <path
+         id="path3874"
+         d="m 605.84375,149.6875 c -10.53125,35.71875 -21.0625,71.4375 -31.59375,107.15625 -34.99878,8.85895 -70.00731,17.67974 -105,26.5625 6.7258,8.9192 13.45366,17.83687 20.1875,26.75 36.31263,0.35053 72.62485,0.77776 108.9375,1.125 19.97403,-32.91341 39.95665,-65.82184 59.90625,-98.75 -17.07951,-22.22439 -34.21034,-44.41053 -51.34375,-66.59375 -0.36458,1.25 -0.72917,2.5 -1.09375,3.75 z"
+         style="fill:#002255;stroke:none" />
+      <path
+         style="fill:#217844;stroke:none"
+         d="m 180.54531,577.28305 31.642,-108.51786 103.45898,-26.58312 23.27156,18.18379 -92.93123,51.90404 -2.79034,112.8149 -62.65097,-47.80175 z"
+         id="path3878"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path3880"
+         d="m 607.88347,150.06058 -31.642,108.51785 -103.45898,26.58313 -23.27156,-18.18379 92.93123,-51.90405 2.79034,-112.8149 62.65097,47.80176 z"
+         style="fill:#002255;stroke:none" />
+      <path
+         id="path3884"
+         d="m 337.6875,458.09375 c -31.3543,17.66642 -62.70751,35.3348 -94.0625,53 -0.85617,38.52053 -1.68305,77.04177 -2.53125,115.5625 25.94402,10.60347 51.85869,21.28092 77.78125,31.9375 -9.08351,-37.45067 -18.09905,-74.91791 -27.15625,-112.375 25.89614,-25.16635 51.78983,-50.33522 77.6875,-75.5 -10.28715,-4.37516 -20.57753,-8.74305 -30.875,-13.09375 l -0.84375,0.46875 z"
+         style="fill:#16502d;stroke:none" />
+      <path
+         id="path3886"
+         d="m 470.5,72.5625 c 8.73958,36.1875 17.47917,72.375 26.21875,108.5625 -25.89614,25.16635 -51.78983,50.33522 -77.6875,75.5 10.28715,4.37516 20.57753,8.74305 30.875,13.09375 31.64123,-17.81253 63.26906,-35.64899 94.90625,-53.46875 0.85617,-38.52053 1.68305,-77.04177 2.53125,-115.5625 C 521.39973,90.084032 495.48506,79.406582 469.5625,68.75 c 0.3125,1.270833 0.625,2.541667 0.9375,3.8125 z"
+         style="fill:none;stroke:none" />
+      <path
+         style="fill:#16502d;stroke:none"
+         d="M 315.97716,655.49911 289.121,545.69889 l 76.30654,-74.75115 29.24566,4.11184 -54.52878,91.41583 53.99095,99.09574 -78.15821,-10.07204 z"
+         id="path3890"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path3892"
+         d="m 472.45162,71.844518 26.85616,109.800212 -76.30655,74.75116 -29.24566,-4.11184 54.52879,-91.41584 -53.99094,-99.095741 78.1582,10.072049 z"
+         style="fill:#ff0000;stroke:none" />
+      <path
+         id="path3820"
+         d="m 393.96875,59.5625 c -27.32378,3.660109 -54.64045,7.374185 -81.96875,11 26.57646,27.903358 53.12273,55.8355 79.6875,83.75 -9.83292,34.7397 -19.66913,69.47847 -29.5,104.21875 11.09907,-1.30917 22.18816,-2.70355 33.28125,-4.0625 18.4916,-31.25922 36.9755,-62.52301 55.46875,-93.78125 C 432.38357,126.92926 413.88606,93.139727 395.34375,59.375 l -0.99083,0.135113 -0.38417,0.05239 z"
+         style="fill:#d40000;stroke:none" />
+    </g>
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:none"
+       id="path2985"
+       sodipodi:cx="408.40744"
+       sodipodi:cy="364.15735"
+       sodipodi:rx="205.37555"
+       sodipodi:ry="205.37555"
+       d="m 613.78299,364.15735 a 205.37555,205.37555 0 1 1 -410.7511,0 205.37555,205.37555 0 1 1 410.7511,0 z"
+       transform="matrix(1.0258634,0,0,1.0258634,-23.842106,-8.5330716)" />
+  </g>
+</svg>
diff --git a/Master/texmf-dist/scripts/epspdf/epspdf.help b/Master/texmf-dist/scripts/epspdf/epspdf.help
index 8ee499c019b..c200849f0a5 100644
--- a/Master/texmf-dist/scripts/epspdf/epspdf.help
+++ b/Master/texmf-dist/scripts/epspdf/epspdf.help
@@ -24,26 +24,23 @@ Epspdf and epspdftk
 5 Troubleshooting
   5.1 No options for output format visible
   5.2 Ghostscript stackunderflow error
-  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
+  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
 Appendix A Requirements
 Appendix B Change history
-  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
+  B.1 Version 6.4
+  B.2 Version 0.6
+  B.3 Version 0.5
+  B.4 Version 0.4
 Epspdf and epspdftk
 *******************
 
-This manual is for epspdf and epspdftk, version 0.6.5.
+This manual is for epspdf and epspdftk, version 0.6.4.
 
-Copyright (C) 2006-2020 Siep Kroonenberg.
+Copyright (C) 2006-2019 Siep Kroonenberg.
 
      Copying and distribution of this file, with or without
      modification, are permitted in any medium without royalty provided
@@ -119,9 +116,6 @@ 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.
@@ -169,7 +163,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- or MiKTeX package.
+Live package.
 
 Basic usage of epspdf itself:
 
@@ -352,26 +346,14 @@ 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 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
+5.3 Part of the graphic gets cut off
 ====================================
 
-If the PostScript file was generated with the old Windows PostScript
-driver, experiment with the PostScript Output option.  Don't choose
-Optimize for Speed.
+If the PostScript file was generated with the Windows PostScript driver,
+experiment with the PostScript Output option.  Don't choose Optimize for
+Speed.
 
-5.6 Fonts look ugly
+5.4 Fonts look ugly
 ===================
 
 If Ghostscript has to do the conversion from pdf to ps then text may not
@@ -380,7 +362,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.7 The page has been converted to a bitmap
+5.5 The page has been converted to a bitmap
 ===========================================
 
 The usual cause is that the page contains features such as transparency
@@ -389,7 +371,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.8 Temporary files are not removed
+5.6 Temporary files are not removed
 ===================================
 
    * Command-line: make sure that you did not specify the option '-d'.
@@ -400,7 +382,7 @@ avoid unnecessary conversions: '-T default -N default'
      However, you should have no trouble removing temporary files
      manually.
 
-5.9 Resources for troubleshooting
+5.7 Resources for troubleshooting
 =================================
 
 Logfile.  The GUI has a button for viewing log output.  This same output
@@ -447,18 +429,8 @@ creates a menu shortcut and an uninstaller.
 Appendix B Change history
 *************************
 
-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
-=================
+B.1 Version 6.4
+===============
 
 Compatibility changes for luatex 1.9 and later.
 
@@ -471,7 +443,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.3 Version 0.6
+B.2 Version 0.6
 ===============
 
 The command-line backend component has been rewritten in texlua and
@@ -490,7 +462,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.4 Version 0.5
+B.3 Version 0.5
 ===============
 
 The GUI has been rewritten in Tcl/Tk, removing the dependence on the
@@ -524,7 +496,7 @@ the desired pdf version.
 
 The "-info" option now also prints the number of pages for pdf files.
 
-B.5 Version 0.4
+B.4 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 1dba171bf18..0007ade0742 100755
--- a/Master/texmf-dist/scripts/epspdf/epspdf.tlu
+++ b/Master/texmf-dist/scripts/epspdf/epspdf.tlu
@@ -11,10 +11,8 @@ 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-2020 Siep Kroonenberg
+Copyright (C) 2006-2019 Siep Kroonenberg
 
 siepo at bitmuis nl
 
@@ -1897,13 +1895,17 @@ 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' and settings.pdf_target~='ebook' then
+    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
       pdf_tail_options = {
-        '-c', '<</NeverEmbed [ ] >> setdistillerparams', '-f'}
+        '-c', '.setpdfwrite <</NeverEmbed [ ] >> setdistillerparams', '-f'}
     end
   end
 
@@ -2226,7 +2228,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 Mac OS'
+  'Epspdftk: viewer for PostScript files; not used on Windows or OS X'
 
 settings.pdf_viewer = false
 descriptions.pdf_viewer =
@@ -2269,8 +2271,7 @@ 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
--- -f ensures that the input filename is not added to a -c string
-pdf_tail_options = {'-f'}
+pdf_tail_options = {'-c', '.setpdfwrite', '-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 5ea94b6f037..26ed17efcfd 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-2020 Siep Kroonenberg
+# Copyright (C) 2006-2019 Siep Kroonenberg
 # siepo at bitmuis dot nl
 #
 # This program is free software, licensed under the GNU GPL, >=2.0.
@@ -130,38 +130,34 @@ 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 {
-      atril evince okular qpdfview mupdf xpdf zathura gv firefox chrome \
-          chromium chromium-browser} {
+    foreach v {evince okular mupdf qpdfview texworks xpdf zathura} {
       if {$v ne $::settings(pdf_viewer) && [is_prog $v]} {
         lappend ::pdf_viewers $v
       }
     }
     # puts [join $::pdf_viewers " "]
 
-    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
-      }
+    if {[llength ::pdf_viewers] == 0 && [llength ::ps_viewers] != 0} {
+      lappend ::pdf_viewers [lindex $::ps_viewers 0]
     }
-    # puts [join $::ps_viewers " "]
-
     if {[llength ::pdf_viewers] == 0} {
       tk_messageBox -message "No viewers found"
     } elseif {[llength ::ps_viewers] == 0} {
@@ -231,30 +227,19 @@ 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 {
-  # check that a manually supplied entry is actually a program
-  # proc used for postscript- and pdf viewers
-  set vls [$w cget -values]
+proc update_combo {w vls} {
+  upvar $vls vs
   set new [$w get]
-  if {$new ni $vls} {
+  if {$new ni $vs} {
     if {[is_prog $new]} {
-      set vls [linsert $vls 0 $new]
-      $w configure -values $vls
+      set vs [linsert $vs 0 $new]
+      $w configure -values $vs
     } else {
-      tk_messageBox -title Error -icon error -message "$new not a program"
-      raise .config_t
-      focus $w
+      tk_messageBox -title Error -icon error -message "$vl Not a program"
     }
   }
 }
 
-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"
@@ -334,15 +319,11 @@ 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 <Escape> {revert_combo %W}
-  bind .config_t.viewf.pdf <Return> {update_combo %W}
-  bind .config_t.viewf.pdf <FocusOut> {update_combo %W}
+  bind .config_t.viewf.pdf <Return> {update_combo %W $::pdf_viewers}
   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 <Escape> {revert_combo %W}
-  bind .config_t.viewf.ps <Return> {update_combo %W}
-  bind .config_t.viewf.ps <FocusOut> {update_combo %W}
+  bind .config_t.viewf.ps <Return> {update_combo %W $::ps_viewers}
   grid columnconfigure .config_t.viewf 1 -weight 1 -pad 2
 }
 
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index c668ad4d7fa..7947a69965c 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -429,7 +429,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
  'epigrafica',  "&MAKEflatten",
  'epiolmec',    "&MAKEflatten",
  'epix',        "die 'skipping, needs C++'",
- 'epspdf',      "die 'skipping, siep does it by hand'", #"&MAKEflatten",
+ 'epspdf',      "&MAKEflatten",
  'epspdf-setup',"die 'skipping, siep does it by hand'",
  'epyt',	"die 'renamed to beamertheme-epyt'",
  'eq-save',	"die 'skipping, requires acrotex'",
@@ -2691,7 +2691,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
  'cleveref'     => 'latex',  # requires interaction
  'clrstrip'	=> 'tex',
  'ctable'       => 'latex',  # requires interaction
- 'curve2e'      => 'tex',
+ 'curve2e'      => 'tex -translate-file=empty.tcx',   # no 8-bit
  'dateiliste'   => 'latex',  # requires interaction
  'dccpaper'	=> 'etex',   # 8bit
  'denisbdoc' 	=> 'tex',
@@ -3050,7 +3050,7 @@ $standardttf = '\.ttf|\.TTC';
  'bib2gls'		=> '\.jar$',
  'changes'		=> '\.py$',
  'cloze'		=> '\.lua$',
- 'epspdf'               => '(epspdf(|\.help|boot|tk)|\.rb|makegray\.pro)$',
+ 'epspdf'               => '(epspdf(|\.help|\.tlu|.*tk.*)|\.rb|makegray\.pro)$',
  'latex2nemeth'         => '\.jar$',
  'latex-make'           => '\.py$',
  'latexindent'          => 'LatexIndent|\.yaml$',
@@ -3208,6 +3208,7 @@ $standardttf = '\.ttf|\.TTC';
 
 # packages which have info files to build and then install.
 %specialtexinfos = (
+ 'epspdf'                       => '.*\.texi',
  'mf2pt1'                       => '.*\.texi',
  'texdraw'                      => '.*\.texi',
 );