epspdf version 0.6.1

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

7 files changed, 232 insertions, 341 deletions

diff --git a/Master/texmf-dist/doc/info/epspdf.info b/Master/texmf-dist/doc/info/epspdf.info
index 0ede27f4058..5bf78595d5d 100644
--- a/Master/texmf-dist/doc/info/epspdf.info
+++ b/Master/texmf-dist/doc/info/epspdf.info
diff --git a/Master/texmf-dist/doc/support/epspdf/Changelog b/Master/texmf-dist/doc/support/epspdf/Changelog
index 144f82caff9..98de407e3e1 100644
--- a/Master/texmf-dist/doc/support/epspdf/Changelog
+++ b/Master/texmf-dist/doc/support/epspdf/Changelog
@@ -1,3 +1,29 @@
+2014-12-6 0.6.1
+
+	Epspdf now invokes luatex, ghostscript and pdftops by their
+	basenames, modifying the process searchpath, in order to sidestep
+	problems with spaces in path names, especially on Windows.
+
+	Ghostscript >= 9.15: check for epswrite/eps2write ghostscript
+	output devices.
+
+	Removed use of cmd /c, which was a bug workaround for some old
+	version of LuaTeX.
+
+	Some code reorganization: fewer globals, all non-trivial
+	initialization in one block following the function definitions.
+
+	Temporary files: the temporary directory has been placed under
+	%TEMP% under Windows, and under either $TEMPDIR or /tmp on other
+	systems. To give Windows >= Vista a better chance to remove
+	temporary files, epspdf first waits one second.
+
+	epspdftk.tcl: updated list of Unix PostScript- and pdf viewers.
+
+	Windows starpack ececutable: based on a newer tclkit, from the
+	KitCreator project (http://kitcreator.rkeene.org/fossil/index).
+	epspdf.help is now inside the starpack.
+
 2013-02-07 0.6.0
 
 	Command-line component rewritten in TeXLua
@@ -16,6 +42,9 @@
 
 	ATM custom options for GhostScript and pdftops are no-ops.
 
+	AppData is once more read from the environment, because texlua
+	does not provide access to the registry.
+
 	AppleScript wrapper dropped since I no longer own a Mac.
 
 2011-02-27 0.5.3
diff --git a/Master/texmf-dist/doc/support/epspdf/README b/Master/texmf-dist/doc/support/epspdf/README
index 6cc6e40c5d7..ef20085fb4b 100644
--- a/Master/texmf-dist/doc/support/epspdf/README
+++ b/Master/texmf-dist/doc/support/epspdf/README
@@ -1,9 +1,12 @@
-Epspdf is an ps/eps/pdf converter which can be used both from the
-command-line and as a GUI application.
+Epspdftk.tcl is a GUI ps/eps/pdf converter. Epspdf.tlu, its
+command-line backend, can be used by itself.
+
+Both are scripts: epspdf.tlu is written in texlua and uses the
+texlua script interpreter from TeX Live or MiKTeX. Epspdftk.tcl
+requires Tcl/Tk, either a full installation or a tclkit runtime.
 
 Full documentation is available in the doc subdirectory.
 
-Windows users: you may prefer the Windows setup program instead. It
-is available from http://tex.aanhet.net/epspdf/ and on CTAN as
-epspdf-extra. The setup program already provides the necessary
-pieces of Tcl/Tk.
+Windows users: you may prefer the epspdf-setup package, which
+installs a version of epspdftk which requires no additional software
+beyond MiKTeX or TeX Live.
diff --git a/Master/texmf-dist/doc/support/epspdf/epspdf.install b/Master/texmf-dist/doc/support/epspdf/epspdf.install
deleted file mode 100644
index 020a79d6483..00000000000
--- a/Master/texmf-dist/doc/support/epspdf/epspdf.install
+++ /dev/null
@@ -1,169 +0,0 @@
-                              Epspdf and epspdftk
-
-   A multiplatform GUI- and command-line converter for [e]ps and pdf.
-
-   Siep Kroonenberg,
-   siepo at cybercomm dot nl
-
-   [1]Current online version of this page
-
-   [2]Legacy Ruby-based versions
-
-Table of Contents
-
-     * [3]Features
-     * [4]Prerequisites
-     * [5]Installation
-     * [6]Files
-     * [7]Releases
-
-Features
-
-     * Distiller
-     * Works both for documents and for graphics
-     * Single-page selection
-     * Also converts from pdf back to PostScript and eps
-     * Removal of preview headers from eps files
-     * Cropping extra whitespace
-     * Grayscaling
-     * GUI- and command-line version
-     * GUI-configurable preferences
-     * Multiplatform: works unchanged on Windows and Unix/Linux
-     * Support for TeX Live and MiKTeX
-
-   Epspdf has been created with TeX in mind. For TeX and its derivatives, eps
-   and pdf are the preferred graphics formats.
-
-   Ghostscript can convert PostScript to pdf. However, few people are
-   prepared to deal with the ghostscript command-line. Several command-line
-   utilities try to help out, e.g. epstopdf, a2ping, and the convert utility
-   from ImageMagick. But many users simply want a GUI.
-
-   Epspdftk adds a GUI, with buttons to select options and with dialogs for
-   opening and saving files.
-
-   A lot more can be done with multistep conversions: grayscaling, page
-   selection, computing a tight boundingbox. People who depend on PSTricks
-   will appreciate the option to go from pdf to PostScript.
-
-   Where it makes sense, epspdf uses additional software for a better
-   outcome.
-
-   The command-line program epspdf is written in texlua, which is already
-   part of recent versions of MikTeX and TeX Live. Versions [8]prior to 0.6
-   were written in Ruby. Epspdftk, its GUI companion, is written in in
-   Tcl/Tk.
-
-   Starting with the 2008 edition, TeX Live includes epspdf in some form as
-   an optional package, complete with wrapper scripts epspdf and epspdftk
-   which can be called from the command-line without further ado.
-
-   There is also a third-party LaTeX package epspdfconversion which uses
-   epspdf for on-the-fly conversion of eps graphics to pdf, with options to
-   control grayscaling and boundingbox generation. See CTAN or your TeX
-   distribution.
-
-Prerequisites
-
-   These are the required and optional prerequisites, which will be checked
-   for when epspdf starts:
-
-     * A recent TeX installation, either [9]TeX Live or [10]MikTeX. If this
-       is not an option, get a [11]legacy version of epspdf instead.
-     * [12]Ghostscript
-     * Optional: pdftops from the [13]xpdf suite or from the [14]Poppler
-       utilities. Pdftops may do a better job of preserving scalable fonts
-       when converting from pdf to ps.
-     * [15]Tcl/Tk for the GUI interface. Versions 8.4 and 8.5 have been
-       tested. A single-file [16]TclKit runtime is sufficient. Recent
-       [17]Windows precompiled tclkit binaries are available.
-     * Optional: viewers for PostScript and pdf
-
-   On Windows, both MikTeX and TeX Live already include a copy of
-   Ghostscript. TeX Live for Windows also includes pdftops.
-
-   If you have MiKTeX and a copy of pdftops.exe, then you can point epspdf to
-   this file from within the GUI. You need to do this only once.
-
-Installation
-
-   If you have a sufficiently recent standalone TeX Live, just install the
-   package. Otherwise:
-
-  Unix/Linux
-
-   Unpack the archive somewhere and create symlinks to epspdf.tlu and
-   epspdftk.tcl in a directory on your searchpath.
-
-  Windows setup program
-
-   This is a conventional Windows installer. If it does not find texlua.exe
-   on the searchpath then it gives a warning and a chance to abort. It
-   creates a shortcut to the epspdftk GUI and it also creates an uninstaller.
-
-   It installs epspdftk in the form of a so-called starpack, which consists
-   of the epspdftk script and a Tcl/Tk runtime, wrapped into a single file.
-   The command-line script epspdf.tlu remains a separate file.
-
-   This installer has been created with [18]NSIS.
-
-  Windows zipfile
-
-   Download the epspdf zip file, unpack it somewhere and create a batchfile
-   epspdf.bat such as
-
- texlua "<path_to_epspdf.tlu>" %*
-
-   for epspdf.tlu, and a batchfile epspdftk.bat
-
- wish85 "<path_to_epspdftk.tcl>" %1
-
-   for epspdftk.tcl. The wish executable might also be named wish[.exe] or
-   wish84[.exe]. The first command-line parameter will be interpreted as
-   startup directory for the file browser. Make sure that wish85 and these
-   batchfiles are on your searchpath.
-
-   Epspdf[tk] has been tested with Windows XP, Windows 7 and Windows 8.
-
-Files
-
-     * [19]epspdf.0.6.0.tgz preferred for Unix and Mac OS X
-     * [20]epspdf.0.6.0.zip preferred for Windows if you don't want to use
-       the installer below
-     * [21]epspdf.0.6.0.exe Windows setup program which installs epspdf with
-       a buit-in Tcl/Tk runtime.
-
-Releases
-
-     * 0.6.0 Current version. Command-line component rewritten in texlua.
-     * [22]Legacy Ruby-based versions
-
-   --------------------------------------------------------------------------
-
-   Last revised: February 7, 2013
-
-References
-
-   Visible links
-   1. http://tex.aanhet.net/epspdf/
-   2. http://tex.aanhet.net/epspdf/legacy.html
-   3. http://tex.aanhet.net/epspdf/index.html#features
-   4. http://tex.aanhet.net/epspdf/index.html#prerequisites
-   5. http://tex.aanhet.net/epspdf/index.html#install
-   6. http://tex.aanhet.net/epspdf/index.html#files
-   7. http://tex.aanhet.net/epspdf/index.html#releases
-   8. http://tex.aanhet.net/epspdf/legacy.html
-   9. http://www.tug.org/texlive/
-  10. http://miktex.org/
-  11. http://tex.aanhet.net/epspdf/legacy.html
-  12. http://ghostscript.com/
-  13. http://www.foolabs.com/xpdf/
-  14. http://poppler.freedesktop.org/
-  15. http://www.tcl.tk/
-  16. http://wiki.tcl.tk/52
-  17. http://www.patthoyts.tk/tclkit/win32-ix86/
-  18. http://nsis.sourceforge.net/
-  19. http://tex.aanhet.net/epspdf/epspdf.0.6.03.tgz
-  20. http://tex.aanhet.net/epspdf/epspdf.0.6.0.zip
-  21. http://tex.aanhet.net/epspdf/epspdf.0.6.0.exe
-  22. http://tex.aanhet.net/epspdf/legacy.html
diff --git a/Master/texmf-dist/doc/support/epspdf/epspdf.pdf b/Master/texmf-dist/doc/support/epspdf/epspdf.pdf
index 0fcf41d73e1..e23bd75f213 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 d1150537efc..ae7a8265d3e 100644
--- a/Master/texmf-dist/doc/support/epspdf/epspdf.texi
+++ b/Master/texmf-dist/doc/support/epspdf/epspdf.texi
@@ -11,6 +11,7 @@
 @afourpaper
 @c %**end of header
 
+@c Actually, we do not produce html anymore
 @ifhtml
 @alias chapter = unnumbered
 @alias section = unnumberedsec
@@ -28,7 +29,7 @@
 @hyphenation{epspdf-tk epspdf}
 @end iftex
 
-@set version 0.6.0
+@set version 0.6.1
 @set homepage http://tex.aanhet.net/epspdf/
 
 @setchapternewpage off
@@ -37,7 +38,7 @@
 @copying
 This manual is for epspdf, version @value{version}.
 
-Copyright @copyright{} 2006, 2008, 2009, 2010, 2011, 2013 Siep Kroonenberg.
+Copyright @copyright{} 2006, 2008, 2009, 2010, 2011, 2013, 2014 Siep Kroonenberg.
 
 @quotation
 Copying and distribution of this file, with or without modification,
@@ -49,7 +50,9 @@ without any warranty.
 
 @titlepage
 @sp 1
+@ifnotinfo
 @center @image{images/logo,,.4in}
+@end ifnotinfo
 @sp 2
 @center @titlefont {Epspdf and epspdftk User Manual}
 @sp 1
@@ -63,96 +66,78 @@ without any warranty.
 @contents
 
 @ifnottex
-@node Top, What has changed?, (dir), (dir)
+@node Top, Usage, (dir), (dir)
 @top Epspdf and epsdftk
 
 @insertcopying
 @end ifnottex
 
 @menu
-* What has changed?::           
-* Usage::                       
-* Command-line usage::          
-* Notes on PostScript and pdf::  
-* Bitmapped graphics for @LaTeX{} and pdflatex::  
-* Troubleshooting::             
-* Change history::              
+* Usage::
+* Command-line usage::
+* Notes on PostScript and pdf::
+* Bitmapped graphics for @LaTeX{} and pdflatex::
+* Troubleshooting::
+* Change history::
 
 @detailmenu
  --- The Detailed Node Listing ---
 
 Usage
 
-* Overview::                    
-* Viewing::                     
-* Conversion options::          
-* Converting::                  
-* The configuration screen::    
+* Overview::
+* Viewing::
+* Conversion options::
+* Converting::
+* The configuration screen::
 
 Command-line usage
 
-* Option summary::              
+* Option summary::
 
 Notes on PostScript and pdf
 
-* Bitmapped and vector::        
-* Font embedding::              
-* Eps preview headers::         
-* Bounding- and other boxes::   
-* Orientation::                 
-* Exporting PostScript or pdf from Windows programs::  
+* Bitmapped and vector::
+* Font embedding::
+* Eps preview headers::
+* Bounding- and other boxes::
+* Orientation::
+* Exporting PostScript or pdf from Windows programs::
 
 Bitmapped graphics for @LaTeX{} and pdflatex
 
-* Linux::                       
-* Mac OS X::                    
-* Windows::                     
+* Linux::
+* Mac OS X::
+* Windows::
 
 Troubleshooting
 
-* Part of the graphic gets cut off::  
-* Fonts look ugly::             
-* The page has been converted to a bitmap::  
-* Resources for troubleshooting::  
+* No options for output format visible::
+* Ghostscript stackunderflow error::
+* Part of the graphic gets cut off::
+* Fonts look ugly::
+* The page has been converted to a bitmap::
+* Temporary files are not removed::
+* Resources for troubleshooting::
 
 Change history
 
-* Version 0.6::                 
-* Version 0.5::                 
-* Version 0.4::                 
+* Version 0.6::
+* Version 0.5::
+* Version 0.4::
 
 @end detailmenu
 @end menu
 
-@node What has changed?, Usage, Top, Top
-@unnumbered What has changed?
-
-Improvements:
-@itemize @bullet
-@item
-Grayscaling should now also work on bitmapped images.
-@item
-Revised multistep conversions, with less risk of losing high-level
-structure
-@item
-Rewritten in TeXLua, which is a component of both TeX Live and of
-MikTeX. Command-line use no longer requires an external scripting
-language.
-@end itemize
-
-I have been testing with Ghostscript version 9.05 and 9.06.
-
-For more details, see @ref{Version 0.6}.
-
-@node Usage, Command-line usage, What has changed?, Top
+@node Usage, Command-line usage, Top, Top
 @chapter Usage
 
 @menu
-* Overview::                    
-* Viewing::                     
-* Conversion options::          
-* Converting::                  
-* The configuration screen::    
+* Overview::
+* Viewing::
+* Conversion options::
+* Converting::
+* The configuration screen::
 @end menu
 
 @node Overview, Viewing, Usage, Usage
@@ -166,11 +151,13 @@ When opening a file, epspdf tries to find out file type and, in
 the case of a pdf file, the number of pages. This information is
 displayed in the box in the upper part of the screen.
 
+@ifnotinfo
 @noindent @image{images/main_w8,,3in}
 @iftex
 @hfill
 @end iftex
 @image{images/cnv_linux,,3in}
+@end ifnotinfo
 
 @node Viewing, Conversion options, Overview, Usage
 @section Viewing
@@ -218,7 +205,9 @@ can judge the result by pressing the View button again.
 @node The configuration screen,  , Converting, Usage
 @section The configuration screen
 
+@ifnotinfo
 @image{images/config_lnx,3in}
+@end ifnotinfo
 
 Epspdftk also has a configuration screen. The settings here are
 preserved between sessions.
@@ -240,7 +229,8 @@ pdf''. ``prepress'' is for pdfs which are going to be printed
 commercially. The options prepress, printer and default will try to
 embed all fonts. Often, printshops insist on this. With luck,
 Ghostscript fonts and system fonts will be used for fonts which were not
-originally embedded.
+originally embedded. Note that ``printer'' may not work with some
+versions of Ghostscript, due to a bug in the handling of color.
 
 On the other hand, you may prefer ``screen'' if file size is a
 concern. See also the Ghostscript documentation, in particular Use.htm
@@ -259,10 +249,12 @@ low version number but otherwise leave this at ``default''.
 @subsection Options for converting to PostScript
 For conversion the other way you may opt @i{not} to use pdftops even if
 it is available. In this case, the conversion will be done by
-Ghostscript. Characters may be converted to drawn shapes or little
-bitmaps so this is not recommended if the file uses fonts.
+Ghostscript. With older Ghostscript versions, characters may be
+converted to drawn shapes or little bitmaps, so use pdftops if
+available. With newer Ghostscript versions, with an eps2write rather
+than an epswrite output device, Ghostscript does a much better job.
 
-Under Windows and MikTeX, this is also the place to point the program to
+Under MikTeX, this is also the place to point the program to
 the location of pdftops.exe.
 
 @node Command-line usage, Notes on PostScript and pdf, Usage, Top
@@ -271,21 +263,22 @@ the location of pdftops.exe.
 epspdf.tlu is the backend of epspdftk, but it can also be used
 standalone. It shares configuration settings with epspdftk.tcl.
 
+The first parameter of the epspdftk GUI program is interpreted as
+startup directory for the file browser. Epspdf itself has a more
+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.
 
-The first parameter of epspdftk is interpreted as startup directory for
-the file browser.
-
-Basic usage:
+Basic usage of epspdf itself:
 
 @example
-epspdf [@var{options}] @var{infile} @var{outfile}
+epspdf [@var{options}] @var{infile} [@var{outfile}]
 @end example
 
 @menu
-* Option summary::              
+* Option summary::
 @end menu
 
 @node Option summary,  , Command-line usage, Command-line usage
@@ -294,8 +287,8 @@ epspdf [@var{options}] @var{infile} @var{outfile}
 Typing  @kbd{epspdf --help} gives you the following summary:
 @example
 $ epspdf --help
-Epspdf version 0.6.0
-Copyright (c) 2006, 2008, 2009, 2010, 2011, 2013 Siep Kroonenberg
+Epspdf version 0.6.1
+Copyright (c) 2006, 2008, 2009, 2010, 2011, 2013, 2014 Siep Kroonenberg
 
 Convert between [e]ps and pdf formats
 Usage: epspdf[.tlu] [options] infile [outfile]
@@ -315,6 +308,7 @@ Default for outfile is file.eps if infile is file.pdf
 -U          Use pdftops if available
 -I          Reverses the above
 -s, --save  Save some settings to configuration file
+-i, --info  Info: display detected filetype and exit
 -d          Debug: do not remove temp files
 -v, --version
             Display version info and exit
@@ -325,12 +319,12 @@ Default for outfile is file.eps if infile is file.pdf
 @chapter Notes on PostScript and pdf
 
 @menu
-* Bitmapped and vector::        
-* Font embedding::              
-* Eps preview headers::         
-* Bounding- and other boxes::   
-* Orientation::                 
-* Exporting PostScript or pdf from Windows programs::  
+* Bitmapped and vector::
+* Font embedding::
+* Eps preview headers::
+* Bounding- and other boxes::
+* Orientation::
+* Exporting PostScript or pdf from Windows programs::
 @end menu
 
 @node Bitmapped and vector, Font embedding, Notes on PostScript and pdf, Notes on PostScript and pdf
@@ -410,7 +404,7 @@ or a selection. This removes a major headache for Windows users.
 
 As a last resort, you can ``print'' to a PostScript file. From some
 programs, you can print a selection. A suitable driver which comes with
-Windows is Generic / MS Publisher Imagesetter. Pay attention to the
+Windows is Generic / MS Publisher Color Printer. Pay attention to the
 printer properties: choose ``Outline'' for font downloading and avoid
 the ``Optimize for speed'' setting for PostScript Output Option. In my
 tests, ``Encapsulated PostScript'' did not look very promising
@@ -425,9 +419,9 @@ format (best for photographs) directly. However, for @LaTeX{} you are
 stuck with .eps format. Tips for converting to .eps:
 
 @menu
-* Linux::                       
-* Mac OS X::                    
-* Windows::                     
+* Linux::
+* Mac OS X::
+* Windows::
 @end menu
 
 @node Linux, Mac OS X, Bitmapped graphics for @LaTeX{} and pdflatex, Bitmapped graphics for @LaTeX{} and pdflatex
@@ -458,7 +452,7 @@ excellent alternative to epspdf.
 @node Windows,  , Mac OS X, Bitmapped graphics for @LaTeX{} and pdflatex
 @section Windows
 
-Windows is not a particularly friendly environment for PostScript and
+Windows is not a particularly friendly environment for PostScript or
 pdf. A couple of command-line utilities try to fill the gap, @emph{e.g.}
 @example
 sam2p image.png image.eps
@@ -479,13 +473,29 @@ or bmeps in the background.
 @chapter Troubleshooting
 
 @menu
-* Part of the graphic gets cut off::  
-* Fonts look ugly::             
-* The page has been converted to a bitmap::  
-* Resources for troubleshooting::  
+* No options for output format visible::
+* Ghostscript stackunderflow error::
+* Part of the graphic gets cut off::
+* Fonts look ugly::
+* The page has been converted to a bitmap::
+* Temporary files are not removed::
+* Resources for troubleshooting::
 @end menu
 
-@node Part of the graphic gets cut off, Fonts look ugly, Troubleshooting, Troubleshooting
+@node No options for output format visible, Ghostscript stackunderflow error, Troubleshooting, Troubleshooting
+@section No options for output format visible
+
+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
+@section Ghostscript stackunderflow error
+
+Due to an error in Ghostscript color handling when converting to pdf,
+selecting ``printer'' as target may lead to an error @code{stackunderflow
+in .setdistillerparams}. Use the ``default'' or ``prepress'' target
+instead.
+
+@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 Windows PostScript driver,
@@ -496,11 +506,12 @@ Speed.
 @section Fonts look ugly
 
 If Ghostscript has to do the conversion from pdf to ps then text may not
-remain text, but may be replaced by bitmaps. Try to get hold of a more
-recent Ghostscript and of either the xpdf suite or the Poppler
-utilities, both of which include pdftops.
+remain text, but may be replaced by bitmaps. Newer Ghostscript versions
+tend to do better in this respect than older ones, but as to preserving
+fonts, the pdftops utility still handles more cases. It is part of the
+xpdf suite and of the Poppler utilities.
 
-@node The page has been converted to a bitmap, Resources for troubleshooting, Fonts look ugly, Troubleshooting
+@node The page has been converted to a bitmap, Temporary files are not removed, Fonts look ugly, Troubleshooting
 @section The page has been converted to a bitmap
 
 This may happen if the page contains features such as transparency which
@@ -509,7 +520,22 @@ are not supported by intermediate formats.
 Set pdf target use and target version both to ``default'' to avoid
 unnecessary conversions: @code{-T default -N default}
 
-@node Resources for troubleshooting,  , The page has been converted to a bitmap, Troubleshooting
+@node Temporary files are not removed, Resources for troubleshooting, The page has been converted to a bitmap, Troubleshooting
+@section Temporary files are not removed
+
+@itemize
+@item
+Command-line: make sure that you did not specify the option @code{-d}.
+@item
+Epspdftk GUI: make sure that `Remove temp files' is checked.
+@item
+Windows: this platform is notorious for excessive file locking. I
+already inserted a Windows-specific delay before attempting to delete
+the temporary files, but this is not always enough. However, you should
+have no trouble removing temporary files manually.
+@end itemize
+
+@node Resources for troubleshooting,  , Temporary files are not removed, Troubleshooting
 @section Resources for troubleshooting
 
 @i{Logfile.} The GUI has a button for viewing log output. This same
@@ -519,7 +545,7 @@ Windows it is in a subdirectory epspdf of @file{%APPDATA%}. This APPDATA
 directory may be @file{c:\Documents and Settings\@var{your user
 name}\Application Data} or @file{c:\Users\@var{your user
 name}\AppData\Roaming}. Otherwise, open a command prompt and type
-@kbd{echo %APPDATA%}, which will produce this information.
+@kbd{echo %APPDATA%} to display this information.
 
 The logfile lists all epspdf calls and all Ghostscript- and pdftops
 calls plus error information.
@@ -539,9 +565,9 @@ for Windows there is a file pdftops.txt in the distribution zip.
 @chapter Change history
 
 @menu
-* Version 0.6::                 
-* Version 0.5::                 
-* Version 0.4::                 
+* Version 0.6::
+* Version 0.5::
+* Version 0.4::
 @end menu
 
 @node Version 0.6, Version 0.5, Change history, Change history
diff --git a/Master/texmf-dist/doc/support/epspdf/index.html b/Master/texmf-dist/doc/support/epspdf/index.html
index 7c6d18d0d15..4208e73b328 100644
--- a/Master/texmf-dist/doc/support/epspdf/index.html
+++ b/Master/texmf-dist/doc/support/epspdf/index.html
@@ -1,14 +1,10 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<!doctype html>
 
-<!DOCTYPE html
-   PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" >
-
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
 
 <head>
 
-<link rel="stylesheet" href="default.css" type="text/css"/>
+<link rel="stylesheet" href="default.css" type="text/css" />
 
 <title>Epspdf and epspdftk</title>
 
@@ -18,15 +14,15 @@
 
 <h1>Epspdf and epspdftk</h1>
 
-<p>A multiplatform GUI- and command-line converter
+<p>A cross-platform GUI- and command-line converter
 for [e]ps and pdf.</p>
 
-<p><i>Siep Kroonenberg,<br/><tt>siepo at cybercomm
+<p><i>Siep Kroonenberg,<br /><tt>siepo at cybercomm
 dot nl</tt></i></p>
 
 </div>
 
-<p id="logo"><img src="images/epspdf.png" alt=""/></p>
+<p id="logo"><img src="images/epspdf.png" alt="" /></p>
 
 <p><a href="http://tex.aanhet.net/epspdf/">Current online version of
 this page</a></p>
@@ -38,13 +34,14 @@ Ruby-based versions</a></p>
 
 <ul>
 <li><a href="#features">Features</a></li>
+<li><a href="#introduction">Introduction</a></li>
 <li><a href="#prerequisites">Prerequisites</a></li>
 <li><a href="#install">Installation</a></li>
 <li><a href="#files">Files</a></li>
 <li><a href="#releases">Releases</a></li>
 </ul>
 
-<h2><a name="features"/>Features</h2>
+<h2><a name="features" />Features</h2>
 
 <ul>
 <li>Distiller</li>
@@ -54,90 +51,89 @@ Ruby-based versions</a></p>
 <li>Removal of preview headers from eps files</li>
 <li>Cropping extra whitespace</li>
 <li>Grayscaling</li>
-<li>GUI- and command-line version</li>
+<li>GUI- and command-line use</li>
 <li>GUI-configurable preferences</li>
 <li>Multiplatform: works unchanged on Windows and Unix/Linux</li>
 <li>Support for TeX Live and MiKTeX</li>
 </ul>
 
-<p>Epspdf has been created with TeX in mind. For TeX and its
-derivatives, eps and pdf are the preferred graphics formats.</p>
+<h2><a name="introduction" />Introduction</h2>
+
+<p>For TeX and its derivatives, eps and pdf are the preferred
+graphics formats. Epspdf and epspdftk can convert between these,
+with various conversion options, and can also handle PostScript
+files which aren't eps files. PSTricks users may appreciate the
+capability to go from pdf back to PostScript.</p>
 
-<p>Ghostscript can convert PostScript to pdf. However, few people
-are prepared to deal with the ghostscript command-line. Several
-command-line utilities try to help out, e.g. epstopdf, a2ping, and
-the convert utility from ImageMagick. But many users simply want a
-GUI.</p>
+<p>Epspdftk is the GUI component, with buttons to select options and
+with file dialogs for opening and saving files.</p>
 
-<p>Epspdftk adds a GUI, with buttons to select options and with
-dialogs for opening and saving files.</p>
+<p>Epspdf is the command-line component, which is used by epspdftk
+but can also be used on its own. It uses Ghostscript, luatex and
+optionally pdftops to do the real work. Multistep conversions extend
+the possibilities.</p>
 
-<p>A lot more can be done with multistep conversions: grayscaling,
-page selection, computing a tight boundingbox. People who depend on
-PSTricks will appreciate the option to go from pdf to
-PostScript.</p>
+<p>Conversion options include grayscaling, page selection, computing
+a tight boundingbox and some pdf options.</p>
 
-<p>Where it makes sense, epspdf uses additional software for a
-better outcome.</p>
+<p>The third-party LaTeX package epspdfconversion uses epspdf for
+  on-the-fly conversion of eps graphics to pdf, with options to
+  control grayscaling and boundingbox generation. See CTAN or your
+  TeX distribution.</p>
 
 <p>The command-line program epspdf is written in texlua, which is
-already part of recent versions of MikTeX and TeX Live. Versions <a
+part of recent versions of MikTeX and TeX Live. Versions <a
 href="http://tex.aanhet.net/epspdf/legacy.html">prior to 0.6</a>
 were written in Ruby. Epspdftk, its GUI companion, is written in in
 Tcl/Tk.</p>
 
 <p>Starting with the 2008 edition, TeX Live includes epspdf in some
-form as an optional package, complete with wrapper scripts epspdf
-and epspdftk which can be called from the command-line without
-further ado.</p>
-
-<p>There is also a third-party LaTeX package epspdfconversion which
-  uses epspdf for on-the-fly conversion of eps graphics to pdf, with
-  options to control grayscaling and boundingbox generation. See
-  CTAN or your TeX distribution.</p>
+form as an optional package.</p>
 
-<h2><a name="prerequisites"/>Prerequisites</h2>
+<h2><a name="prerequisites" />Prerequisites</h2>
 
 <p>These are the required and optional prerequisites, which will be
 checked for when epspdf starts:</p>
 <ul>
 
-<li>A recent TeX installation, either <a
+<li>A somewhat recent TeX installation, either <a
   href="http://www.tug.org/texlive/">TeX Live</a> or <a
-  href="http://miktex.org/">MikTeX</a>. If this is not an option,
+  href="http://miktex.org/">MiKTeX</a>. If this is not an option,
   get a <a href="http://tex.aanhet.net/epspdf/legacy.html">legacy
   version</a> of epspdf instead.</li>
 
-<li><a href="http://ghostscript.com">Ghostscript</a></li>
+<li><a href="http://ghostscript.com">Ghostscript</a>. This is
+  already part of MiKTeX and of TeX Live for Windows, and packaged
+  for most Linux distributions.</li>
 
 <li>Optional: pdftops from the <a
  href="http://www.foolabs.com/xpdf/">xpdf suite</a> or from the <a
- href="http://poppler.freedesktop.org/">Poppler
- utilities</a>. Pdftops may do a better job of preserving scalable
- fonts when converting from pdf to ps.</li>
+ href="http://poppler.freedesktop.org/">Poppler utilities</a>, or as
+ a package from your Linux distribution. Pdftops may do a better job
+ of preserving scalable fonts when converting from pdf to
+ ps. Included in TeX Live for Windows.</li>
 
 <li><a href="http://www.tcl.tk/">Tcl/Tk</a> for the GUI
-  interface. Versions 8.4 and 8.5 have been tested. A single-file <a
-  href="http://wiki.tcl.tk/52">TclKit</a> runtime is
-  sufficient. Recent <a
-  href="http://www.patthoyts.tk/tclkit/win32-ix86/">Windows
-  precompiled tclkit binaries</a> are available.</li>
+  interface. Versions 8.4 through 8.6 have been tested. Packaged for
+  many or most Linux distributions, and also available from <a
+  href="http://www.activestate.com/activetcl">ActiveState</a>. Alternatively,
+  a single-file TclKit runtime will do. The <a
+  href="http://wiki.tcl.tk/52">TclKit</a> page contains various
+  links for precompiled binaries.</li>
 
 <li>Optional: viewers for PostScript and pdf</li>
 
 </ul>
 
-<p>On Windows, both MikTeX and TeX Live already include a copy of
-Ghostscript. TeX Live for Windows also includes pdftops.</p>
-
 <p>If you have MiKTeX and a copy of pdftops.exe, then you can point
 epspdf to this file from within the GUI. You need to do this only
 once.</p>
 
-<h2><a name="install"/>Installation</h2>
+<h2><a name="install" />Installation</h2>
 
-<p>If you have a sufficiently recent standalone TeX Live, just
-   install the package. Otherwise:</p>
+<p>If you have a sufficiently recent standalone TeX Live and have a
+   Tcl/Tk installation or runtime, just
+   install the TeX Live package. Otherwise:</p>
 
 <h3>Unix/Linux</h3>
 
@@ -147,14 +143,16 @@ once.</p>
 <h3>Windows setup program</h3>
 
 <p>This is a conventional Windows installer. If it does not find
-texlua.exe on the searchpath then it gives a warning and a chance to
+texlua.exe on the searchpath then it gives a warning and a opportunity to
 abort. It creates a shortcut to the epspdftk GUI and it also creates
 an uninstaller.</p>
 
 <p>It installs epspdftk in the form of a so-called
-<em>starpack</em>, which
-consists of the epspdftk script and a Tcl/Tk runtime, wrapped into
-a single file. The command-line script epspdf.tlu remains a separate
+<em>starpack</em>, which consists of the epspdftk script and a
+Tcl/Tk runtime, combined into a single executable. For version 0.6.1,
+the Tcl/Tk 8.5 runtime is from the <a
+href="http://tclkits.rkeene.org/fossil/wiki/Downloads"> KitCreator
+project</a>. The command-line script epspdf.tlu remains a separate
 file.</p>
 
 <p>This installer has been created with <a
@@ -172,45 +170,49 @@ texlua "&lt;path_to_epspdf.tlu&gt;" %*
 <p>for epspdf.tlu, and a batchfile epspdftk.bat</p>
 
 <pre>
-wish85 "&lt;path_to_epspdftk.tcl&gt;" %1
+wish "&lt;path_to_epspdftk.tcl&gt;" %1
 </pre>
 
 <p>for epspdftk.tcl. The wish executable might also be named
-  wish[.exe] or wish84[.exe]. The first command-line parameter will
+  wish85[.exe] or wish86[.exe], or tclkit[.exe] if it is a
+  single-file Tcl/Tk runtime. The first command-line parameter will
   be interpreted as startup directory for the file browser. Make
-  sure that wish85 and these batchfiles are on your searchpath.</p>
+  sure that wish and these batchfiles are on your searchpath.</p>
 
 <p>Epspdf[tk] has been tested with Windows XP, Windows 7 and
 Windows 8.</p>
 
-<h2><a name="files"/>Files</h2>
+<h2><a name="files" />Files</h2>
 
 <ul>
 
-  <li><a href="epspdf.0.6.03.tgz">epspdf.0.6.0.tgz</a> preferred for Unix
+  <li><a href="epspdf.0.6.1.tgz">epspdf.0.6.1.tgz</a> preferred for Unix
 and Mac OS X</li>
 
-<li><a href="epspdf.0.6.0.zip">epspdf.0.6.0.zip</a> preferred for
+<li><a href="epspdf.0.6.1.zip">epspdf.0.6.1.zip</a> preferred for
 Windows if you don't want to use the installer below</li>
 
-<li><a href="epspdf.0.6.0.exe">epspdf.0.6.0.exe</a> Windows setup
-  program which installs epspdf with a buit-in Tcl/Tk runtime.</li>
+<li><a href="epspdf.0.6.1.exe">epspdf.0.6.1.exe</a> Windows setup
+  program which installs epspdf with a built-in Tcl/Tk runtime: no
+  dependencies beyond a TeX Live- or MiKTeX installation.</li>
 
 </ul>
 
-<h2><a name="releases"/>Releases</h2>
+<h2><a name="releases" />Releases</h2>
 
 <ul>
 
-<li>0.6.0 Current version. Command-line component
-rewritten in texlua.</li>
+<li>0.6.1 Current version. Bug fixes, see Changelog; support for later
+  Ghostscript versions.</li>
+
+<li>0.6.0 First release of luatex version.</li>
 
 <li><a href="http://tex.aanhet.net/epspdf/legacy.html">Legacy
 Ruby-based versions</a></li>
 
 </ul>
 
-<hr/>
+<hr />
 
-<p class="fineprint">Last revised: February 7, 2013</p>
+<p class="fineprint">Last revised: December 5, 2014</p>
 </body></html>