epspdf: Minor initialization fix for Windows

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

4 files changed, 19 insertions, 29 deletions

diff --git a/Master/texmf-dist/scripts/epspdf/epspdf.help b/Master/texmf-dist/scripts/epspdf/epspdf.help
index dbd1cd3b93f..a1f71180989 100644
--- a/Master/texmf-dist/scripts/epspdf/epspdf.help
+++ b/Master/texmf-dist/scripts/epspdf/epspdf.help
@@ -1,9 +1,9 @@
 Epspdf and epsdftk
 ******************
 
-This manual is for epspdf, version 0.5.2.
+This manual is for epspdf, version 0.5.3.
 
-Copyright (C) 2006, 2008, 2009, 2010 Siep Kroonenberg.
+Copyright (C) 2006, 2008, 2009, 2010, 2011 Siep Kroonenberg.
 
      Copying and distribution of this file, with or without
      modification, are permitted in any medium without royalty provided
@@ -154,8 +154,8 @@ Basic usage:
 
 Typing  `epspdf --help' gives you the following summary:
      $ epspdf --help
-     Epspdf version 0.5.2
-     Copyright (C) 2006, 2008, 2009, 2010 Siep Kroonenberg
+     Epspdf version 0.5.3
+     Copyright (C) 2006, 2008, 2009, 2010, 2011 Siep Kroonenberg
      Convert between [e]ps and pdf formats
      Usage: epspdf.rb [options] infile [outfile]
 
@@ -286,7 +286,7 @@ options can be found under the Advanced button.
 options to write clipboard contents to an emf file. Wmf2eps uses a
 printer driver in the background. For faithful conversion, pick
 wmf2eps; for subsequent editing, choose TpX. Both programs are
-available from `http://www.tug.org/ctan.html'.
+available from `http://mirror.ctan.org/'.
 
 4 Bitmapped graphics for LaTeX and pdflatex
 *******************************************
@@ -342,11 +342,6 @@ bmeps -c "%~1" "%~dpn1.eps"
 bitmapped graphic on this batchfile then you will get an eps file with
 the same name as the original, but with extension `.eps'.
 
-You can also right-click on a bitmap, choose _Open With..._ and browse
-to this file bitmap2eps.bat, resulting in conversion to .eps. The next
-time you do this with a file of the same type, bitmap2eps.bat will
-already be in the list of possible programs for opening the file.
-
 5 Troubleshooting
 *****************
 
@@ -380,17 +375,7 @@ If Ghostscript has to do the conversion from pdf to ps then text will
 not remain text, but will be replaced by drawn shapes or bitmaps. Try
 to get hold of the xpdf suite, which includes pdftops.
 
-5.4 Epspdftk quit unexpectedly (Mac OS X applet)
-================================================
-
-This sometimes happens to me when I start epspdftk from the AppleScript
-applet. Unfortunately, I have no idea where this comes from.
-
-Try the "Reopen" button in the popup dialog. If this repeatedly fails,
-install the regular Unix edition instead and run it from the
-command-line.
-
-5.5 Resources for troubleshooting
+5.4 Resources for troubleshooting
 =================================
 
 Logfile. The GUI has a button for viewing log output. This same output
diff --git a/Master/texmf-dist/scripts/epspdf/epspdf.rb b/Master/texmf-dist/scripts/epspdf/epspdf.rb
index 94da56c4c99..47a0c1f65b9 100755
--- a/Master/texmf-dist/scripts/epspdf/epspdf.rb
+++ b/Master/texmf-dist/scripts/epspdf/epspdf.rb
@@ -3,7 +3,7 @@
 # epspdf conversion utility, main source
 
 #####
-# Copyright (C) 2006, 2008, 2009, 2010 Siep Kroonenberg
+# Copyright (C) 2006, 2008, 2009, 2010, 2011 Siep Kroonenberg
 # n dot s dot kroonenberg at rug dot nl
 #
 # This program is free software, licensed under the GNU GPL, >=2.0.
diff --git a/Master/texmf-dist/scripts/epspdf/epspdfrc.rb b/Master/texmf-dist/scripts/epspdf/epspdfrc.rb
index 66ecdb8c1d6..a6ea573cf11 100755
--- a/Master/texmf-dist/scripts/epspdf/epspdfrc.rb
+++ b/Master/texmf-dist/scripts/epspdf/epspdfrc.rb
@@ -1,10 +1,10 @@
-EPVERSION = '0.5.2'
-COPYRIGHT = '2006, 2008, 2009, 2010'
+EPVERSION = '0.5.3'
+COPYRIGHT = '2006, 2008, 2009, 2010, 2011'
 
 # epspdf conversion utility, configuration module
 
 #####
-# Copyright (C) 2006, 2008, 2009, 2010 Siep Kroonenberg
+# Copyright (C) 2006, 2008, 2009, 2010, 2011 Siep Kroonenberg
 # n dot s dot kroonenberg at rug dot nl
 #
 # This program is free software, licensed under the GNU GPL, >=2.0.
@@ -119,11 +119,16 @@ end # def
 
 # system-dependent location of logfile
 
-epsdir = case ARCH
+epsdir = ''
+case ARCH
   when 'w32'
-    "#{ENV['APPDATA'].gsub( /\\/, '/' )}/epspdf"
+    Registry::HKEY_CURRENT_USER.open( 'Software\Microsoft\Windows' +
+        '\CurrentVersion\Explorer\User Shell Folders' ) do |r|
+      epsdir = r.read_s_expand( 'AppData' )
+    end
+    epsdir = "#{epsdir.gsub( /\\/, '/' )}/epspdf"
   else
-    "#{ENV['HOME']}/.epspdf"
+    epsdir = "#{ENV['HOME']}/.epspdf"
 end
 Dir.mkdir( epsdir ) unless test( ?e, epsdir )
 # epsdir may be a regular file, or creation above may have failed
diff --git a/Master/texmf-dist/scripts/epspdf/epspdftk.tcl b/Master/texmf-dist/scripts/epspdf/epspdftk.tcl
index ff29eff893d..361ac83d6b1 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, 2008, 2009, 2010 Siep Kroonenberg
+# Copyright (C) 2006, 2008, 2009, 2010, 2011 Siep Kroonenberg
 # n dot s dot kroonenberg at rug dot nl
 #
 # This program is free software, licensed under the GNU GPL, >=2.0.