diff options
| -rw-r--r-- | Master/texmf-dist/doc/support/epspdf/Changelog | 7 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/support/epspdf/README | 18 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/support/epspdf/epspdf.install | 279 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/support/epspdf/epspdf.pdf | bin | 251061 -> 251976 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/support/epspdf/epspdf.texi | 29 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/support/epspdf/index.html | 175 | ||||
| -rw-r--r-- | Master/texmf-dist/scripts/epspdf/epspdf.help | 30 | ||||
| -rwxr-xr-x | Master/texmf-dist/scripts/epspdf/epspdf.rb | 49 | ||||
| -rwxr-xr-x | Master/texmf-dist/scripts/epspdf/epspdfrc.rb | 43 | ||||
| -rwxr-xr-x | Master/texmf-dist/scripts/epspdf/epspdftk.rb | 2 | ||||
| -rw-r--r-- | Master/texmf/doc/info/epspdf.info | bin | 22452 -> 22385 bytes |
11 files changed, 363 insertions, 269 deletions
diff --git a/Master/texmf-dist/doc/support/epspdf/Changelog b/Master/texmf-dist/doc/support/epspdf/Changelog index 26183d55553..c9ba0f85def 100644 --- a/Master/texmf-dist/doc/support/epspdf/Changelog +++ b/Master/texmf-dist/doc/support/epspdf/Changelog @@ -1,3 +1,10 @@ +2009-09-11 0.4.3 + + Patch for Ruby 1.9 compatibility (Ruben Stein). Patch for + compatibility with newer Ghostscript under Windows. Fix for option + gRAY with ps => pdf. `epspdf --version' now prints + version. Documentation updates. + 2009-09-11 0.4.2 More liberal documentation license. Slight documentation updates. diff --git a/Master/texmf-dist/doc/support/epspdf/README b/Master/texmf-dist/doc/support/epspdf/README index bed4e7ec655..6dbbdc82130 100644 --- a/Master/texmf-dist/doc/support/epspdf/README +++ b/Master/texmf-dist/doc/support/epspdf/README @@ -6,14 +6,12 @@ Full documentation is available in the doc subdirectory. Windows users: you may prefer the Windows setup program available from http://tex.aanhet.net/epspdf/ or on CTAN as part of epspdf-extra. This setup program includes a minimal subset of Ruby/Tk, -whereas this version requires separate installation of Ruby, and for -the GUI also Tcl/Tk. +whereas this version requires separate installation of Ruby, and +of Tcl/Tk if you want a GUI. -Mac users: you may want to have a look at epspdf_app, a very simple -AppleScript applet for starting epspdftk.rb by double-clicking. Also -available from http://tex.aanhet.net/epspdf/ or on CTAN as part of -epspdf-extra. - -The files in the texlive subdirectory are NOT useful for a -standalone installation. They are wrapper scripts for -embedding epspdf and epspdftk into TeX Live. +Mac OS X Leopard users: you may want to have a look at epspdftk.app, +which wraps epspdftk into a Mac OS X double-clickable "app" with the +help of a bit of AppleScript. Available from +http://tex.aanhet.net/epspdf/ or on CTAN as part of +epspdf-extra. WARNING: the GUI interface will not work on Snow +Leopard with the built-in Ruby. diff --git a/Master/texmf-dist/doc/support/epspdf/epspdf.install b/Master/texmf-dist/doc/support/epspdf/epspdf.install index 4e20e2f4152..fec78698435 100644 --- a/Master/texmf-dist/doc/support/epspdf/epspdf.install +++ b/Master/texmf-dist/doc/support/epspdf/epspdf.install @@ -11,11 +11,12 @@ Table of Contents * [2]Features * [3]Prerequisites - * [4]Installation - * [5]Preview programs - * [6]Files - * [7]Releases - * [8]User Manual + * [4]Ruby/Tk + * [5]Installation + * [6]Preview programs + * [7]Files + * [8]Releases + * [9]User Manual Features @@ -54,8 +55,8 @@ Features companion, in Ruby/Tk. Starting with the 2008 edition, epspdf is included in TeX Live as an - optional package, complete with wrapper scripts epspdf and epspdftk which - can be called from the command-line without further ado. + optional package, complete with wrappers epspdf and epspdftk which can be + called from the command-line without further ado. Prerequisites @@ -65,9 +66,9 @@ Prerequisites * Ghostscript * pdftops from the xpdf suite, strongly recommended for better pdf to PostScript conversions - * Ruby 1.8.x - * Tcl/Tk is only required for the GUI interface. Only version 8.4 has - been tested. + * Ruby 1.8.x or 1.9.x + * Tcl/Tk is only required for the GUI interface. The version (8.4 or + 8.5) must be supported by your Ruby. * Optional: viewers for PostScript and pdf You may not have to install all of these yourself. @@ -75,25 +76,36 @@ Prerequisites Linux On a current Linux distribution you can almost certainly install - everything from your distribution's package repositories. You may have to - install Ruby's Tk bindings, in addition to Ruby and Tcl/Tk themselves. The - name of such a package might be e.g. libtcltk-ruby. As to PostScript- and - pdf viewers: epspdf tests for several popular viewers, but the - configuration screen also lets you specify viewers manually. + everything from your distribution's package repositories. Ruby's Tk + bindings may be in a separate package, with a name such as libtcltk-ruby. + As to PostScript- and pdf viewers: epspdf tests for several popular + viewers, but the configuration screen also lets you specify viewers + manually. - Mac OS X (Tiger and later) + Mac OS X (Tiger and Leopard) - Warning! Epspdf has not yet been tested with Snow Leopard. There is a - report that epspdftk fails under Snow Leopard. + Ruby, Tcl/Tk and Ruby/Tk are already part of Tiger and Leopard. - Ruby and Tcl/Tk are already part of the operating system. Ghostscript is - included in MacTeX, but is also available via e.g. MacPorts. You can get - pdftops from MacPorts as part of either Poppler or xpdf. Another source is - [9]http://users.phg-online.de/tk/MOSXS/. + Ghostscript is included in MacTeX, but is also available via e.g. + MacPorts. - If you want to compile xpdf it yourself, which is not hard, you can ignore - warnings about X, Motif or FreeType not being found since these missing - libraries won't affect the compilation of pdftops. + You can get pdftops from MacPorts as part of either Poppler or xpdf. + Another source is [10]http://users.phg-online.de/tk/MOSXS/. If you want to + compile xpdf it yourself, which is not hard, you can ignore warnings about + X, Motif or FreeType not being found since these missing libraries won't + affect the compilation of pdftops. + + Mac OS X Snow Leopard + + For Ghostscript and pdftops, see above. + + Unfortunately, in Snow Leopard Ruby's Tk bindings went missing, so the GUI + interface won't work with the built-in Ruby; see [11]below. If you compile + Ruby yourself from [12]source you get the Tk interface automatically. Call + configure with a --enable-pthread option. + + Snow Leopard's built-in Ruby is fine for command-line use and on-the-fly + conversions. Windows (Windows 2000 and later) @@ -101,99 +113,112 @@ Prerequisites TeX installation may fill some of the gaps, and there is a special Windows installer which includes a partial Ruby installation. See the table below: - TeX distribution Installer Zipfile - (1) MikTeX and TeX Live 2008 include a hidden Ghostscript which is always - installed, and which epspdf knows how to find. Caveat: although older - versions of TeX Live include a Ghostscript installer, it is not impossible - to install an older TeX Live without Ghostscript, in which case you have - to provide a Ghostscript yourself. - (2) With TeX Live ≥ 2008, you are better off installing the TeX Live - package, which also gives you wrapper batchfiles epspdf.bat and - epspdftk.bat. You still need to install Ruby and Tcl/Tk. - TeX Live[10](1) No additional Ruby, Tcl/Tk[11](2) - requirements - MiKTeX Pdftops (optional) Pdftops (optional); Ruby, - Tcl/Tk(optional) - Ghostscript, pdftops Ghostscript; - Other/None (optional) pdftops(optional), Ruby, - Tcl/Tk (optional) + TeX distribution Installer Zipfile + (1) MikTeX and TeX Live ≥ 2008 include a hidden Ghostscript which is + always installed, and which epspdf knows how to find. Caveat: although + older versions of TeX Live include a Ghostscript installer, it is not + impossible to install an older TeX Live without Ghostscript, in which case + you have to provide a Ghostscript yourself. + (2) With TeX Live ≥ 2008, you are better off installing the TeX Live + package, which also gives you wrappers for epspdf and epspdftk for use on + the command-line and for on-the-fly conversions. You still need to install + Ruby 1.8 and Tcl/Tk. + TeX Live[13](1) No additional Ruby, Tcl/Tk[14](2) + requirements + MiKTeX Pdftops (optional) Pdftops (optional); Ruby 1.8, + Tcl/Tk(optional) + Other/None Ghostscript, pdftops Ghostscript; pdftops(optional), + (optional) Ruby 1.8, Tcl/Tk (optional) URLs for the prerequisites - Ghostscript and GSview ([12]http://pages.cs.wisc.edu/~ghost/) + Ghostscript and GSview ([15]http://pages.cs.wisc.edu/~ghost/) Contains sources and Windows binaries. The Windows binaries come with standard GUI Windows setup programs. - XPDF ([13]http://www.foolabs.com/xpdf/) + XPDF ([16]http://www.foolabs.com/xpdf/) Sources and Windows binaries. The Windows binaries are packaged into a zipfile, which has to be manually unpacked. The Configure screen of epspdftk lets you browse for the chosen location. You have to do this only once. - XPDF, Mac OS X binaries ([14]http://users.phg-online.de/tk/MOSXS/) + XPDF, Mac OS X binaries ([17]http://users.phg-online.de/tk/MOSXS/) These are universal binaries. - TeX Live ([15]http://www.tug.org/texlive/) - TeX Live 2008 includes epspdf as an optional install. For Windows, - this version doesn't require external copies of pdftops or - Ghostscript but does not include Ruby or Tcl/Tk. + TeX Live ([18]http://www.tug.org/texlive/) + TeX Live ≥ 2008 includes pdftops, Ghostscript and optionally + epspdf. - MacTeX ([16]http://www.tug.org/mactex/) + MacTeX ([19]http://www.tug.org/mactex/) MacTeX is based on TeX Live. Its set of add-ons includes Ghostscript, and can be downloaded separately. - The MacPorts Project ([17]http://www.macports.org/) + The MacPorts Project ([20]http://www.macports.org/) MacTeX has Poppler- and xpdf packages either of which include pdftops. Ruby one-click installer for Windows ( - [18]http://rubyforge.org/projects/rubyinstaller/) + [21]http://rubyforge.org/projects/rubyinstaller/) Current versions (1.8.4 and later) require Tcl/Tk to be separately installed. Old releases of Ruby one-click installer ( - [19]http://rubyforge.org/frs/?group_id=167) + [22]http://rubyforge.org/frs/?group_id=167) Versions prior to 1.8.4 include Tcl/Tk. - Ruby source code ([20]http://www.ruby-lang.org/en/downloads/) + Ruby source code ([23]http://www.ruby-lang.org/en/downloads/) For those people who prefer to roll their own... ActiveTcl from ActiveState ( - [21]http://activestate.com/Products/ActiveTcl/ - Get version 8.4, not 8.5. + [24]http://activestate.com/Products/ActiveTcl/ + Version 8.4 is the safer bet. + + Ruby's Tk interface library + + At the moment, the Ruby Tk interface is not as readily available as it has + been: at some time during the 8.4 cycle, the Windows Ruby one-click + installer dropped Tcl/Tk, and aimed instead to hook up to any + already-installed Tcl/Tk. As to Ruby 1.9: at the moment I know of no + easy-to-use installer on Windows which includes a Tk interface library. On + Mac OS X 10.6 (Snow Leopard) the Ruby Tk interface library also went + missing, although both Ruby and Tcl/Tk are still included. + + I am working on a pure Tcl/Tk interface, i.e.a Tcl/Tk script which calls + epspdf as a program, not as a library, but I can give no ETA. This will + eliminate dependence on a Ruby/Tk interface library. Installation First make sure that the prerequisites are met. Then: - TeX Live 2008 + TeX Live ≥ 2008 Use TeX Live's package manager tlmgr for installation. Windows setup program - Download the [22]epspdftk setup program. You can run it in the usual way, + Download the [25]epspdftk setup program. You can run it in the usual way, by double-clicking. The setup program will create entries in your start menu for epspdftk and for the user manual. Windows zipfile - Download the [23]epspdf zip file, unpack it somewhere and create a + Download the [26]epspdf zip file, unpack it somewhere and create a shortcut for epspdftk.rbw. If you plan to use the command-line version, put a batchfile in a directory on your path with the line "<path_to_ruby.exe>" "<path_to_epspdf.rb>" %* - With such a batchfile, the caller has to take care of quoting: + Similarly for epspdftk. With such a batchfile, the caller has to take care + of quoting: epspdf "my file.eps" "my file.pdf" - Epspdf[tk] has been tested with Windows 2000, Windows XP and Windows - Vista. + Epspdf[tk] has been tested with Windows 2000, Windows XP and Windows 7. Unix/Linux - Download the [24]tar.gz archive and unpack it in some directory. All files + Download the [27]tar.gz archive and unpack it in some directory. All files should be in the same directory; that is how they find each other. If you plan to use epspdf.rb from the command-line, then create a shell script epspdf such as @@ -213,7 +238,10 @@ Installation There is also a compressed disk image epspdf.x.x.x.dmg.gz which wraps epspdftk into a Max OS X "app". Double-click once to expand, a second time - to mount, then drag epspdftk.app to the Applications folder. + to mount, then drag epspdftk.app to the Applications folder. The current + version has been created and tested with Leopard. As pointed out + [28]above, under Snow Leopard the GUI program epspdftk will not work + without a third-party Ruby/Tk. Epspdf mostly duplicates functionality of Preview. But having an alternate conversion engine means that you can have another shot at problem files. @@ -233,7 +261,7 @@ Preview programs Supported PostScript viewers include evince, gv, gsview and okular. These are also listed as pdf viewers. Additional pdf viewers are xpdf, gpdf, epdfview and acroread/Adobe Reader. You can also specify a previewer - manually in the configuration screen; see the [25]user manual.. + manually in the configuration screen; see the [29]user manual.. Mac OS X @@ -242,33 +270,34 @@ Preview programs Files - * [26]epspdf.0.4.2.tgz preferred for Unix and Mac OS X - * [27]epspdf.0.4.2.zip preferred for Windows - * [28]epspdf.0.4.2.exe Windows setup program, including Ruby/Tk subset - * [29]epspdftk.0.4.2.dmg.gz compressed disk image with epspdftk wrapped - into a Mac OS X "app" + * [30]epspdf.0.4.3.tgz preferred for Unix and Mac OS X; GUI fails under + OS X Snow Leopard with built-in Ruby + * [31]epspdf.0.4.3.zip preferred for Windows + * [32]epspdf.0.4.3.exe Windows setup program, including Ruby/Tk subset + * [33]epspdftk.0.4.3.dmg.gz; built and tested on Leopard Older releases - * [30]epspdf.0.3.0.tgz for Unix and Mac OS X - * [31]epspdf.0.3.0.zip for Windows - * [32]epspdf.0.3.0.exe Windows setup program - * [33]epspdf.0.2.12.tgz for Unix and Mac OS X - * [34]epspdf.0.2.12.zip for Windows - * [35]epspdf.0.2.12.exe Windows setup program - * [36]epspdf.0.2.11.tgz for Unix and Mac OS X - * [37]epspdf.0.2.11.zip for Windows - * [38]epspdf.0.2.11.exe Windows setup program - * [39]epspdf.0.2.01.tgz for Unix and Mac OS X - * [40]epspdf.0.2.01.zip for Windows - * [41]epspdf.0.2.exe, Windows setup program - * [42]epspdf_app.0.2.01.zip Mac OS X applet for starting epspdftk.rb + * [34]epspdftk.0.4.2.dmg.gz; tested on Tiger and Leopard + * [35]epspdf.0.3.0.tgz for Unix and Mac OS X + * [36]epspdf.0.3.0.zip for Windows + * [37]epspdf.0.3.0.exe Windows setup program + * [38]epspdf.0.2.12.tgz for Unix, including Mac OS X + * [39]epspdf.0.2.12.zip for Windows + * [40]epspdf.0.2.12.exe Windows setup program + * [41]epspdf.0.2.01.tgz for Unix and Mac OS X + * [42]epspdf.0.2.01.zip for Windows + * [43]epspdf.0.2.exe, Windows setup program + * [44]epspdf_app.0.2.01.zip Mac OS X applet for starting epspdftk.rb Releases + 0.4.3 + Current version. Fixes for compatibility with Ruby 1.9 and, under + Windows, for newer Ghostscript versions. Documentation updates. + 0.4.2 - Current version. More liberal documentation license. Slight - documentation updates. + More liberal documentation license. Slight documentation updates. 0.4.1 Documentation: added section on bitmaps. Windows setup program: @@ -323,7 +352,7 @@ Releases -------------------------------------------------------------------------- - Last revised: September 11, 2009 + Last revised: Januari 27, 2010 References @@ -331,42 +360,44 @@ References 1. http://tex.aanhet.net/epspdf/ 2. http://tex.aanhet.net/epspdf/index.html#features 3. http://tex.aanhet.net/epspdf/index.html#prerequisites - 4. http://tex.aanhet.net/epspdf/index.html#install - 5. http://tex.aanhet.net/epspdf/index.html#preview - 6. http://tex.aanhet.net/epspdf/index.html#files - 7. http://tex.aanhet.net/epspdf/index.html#releases - 8. http://tex.aanhet.net/epspdf/epspdf.pdf - 9. http://users.phg-online.de/tk/MOSXS/ - 10. http://tex.aanhet.net/epspdf/index.html#tlnote - 11. http://tex.aanhet.net/epspdf/index.html#tlzipnote - 12. http://pages.cs.wisc.edu/~ghost/ - 13. http://www.foolabs.com/xpdf/ - 14. http://users.phg-online.de/tk/MOSXS/ - 15. http://www.tug.org/texlive/ - 16. http://www.tug.org/mactex/ - 17. http://www.macports.org/ - 18. http://rubyforge.org/projects/rubyinstaller/ - 19. http://rubyforge.org/frs/?group_id=167 - 20. http://www.ruby-lang.org/en/downloads/ - 21. http://activestate.com/Products/ActiveTcl/ - 22. http://tex.aanhet.net/epspdf/epspdf.0.4.2.exe - 23. http://tex.aanhet.net/epspdf/epspdf.0.4.2.zip - 24. http://tex.aanhet.net/epspdf/epspdf.0.4.2.tgz - 25. http://tex.aanhet.net/epspdf/epspdf.pdf - 26. http://tex.aanhet.net/epspdf/epspdf.0.4.2.tgz - 27. http://tex.aanhet.net/epspdf/epspdf.0.4.2.zip - 28. http://tex.aanhet.net/epspdf/epspdf.0.4.2.exe - 29. http://tex.aanhet.net/epspdf/epspdftk.0.4.2.dmg.gz - 30. http://tex.aanhet.net/epspdf/epspdf.0.3.0.tgz - 31. http://tex.aanhet.net/epspdf/epspdf.0.3.0.zip - 32. http://tex.aanhet.net/epspdf/epspdf.0.3.0.exe - 33. http://tex.aanhet.net/epspdf/epspdf.0.2.12.tgz - 34. http://tex.aanhet.net/epspdf/epspdf.0.2.12.zip - 35. http://tex.aanhet.net/epspdf/epspdf.0.2.12.exe - 36. http://tex.aanhet.net/epspdf/epspdf.0.2.11.tgz - 37. http://tex.aanhet.net/epspdf/epspdf.0.2.11.zip - 38. http://tex.aanhet.net/epspdf/epspdf.0.2.11.exe - 39. http://tex.aanhet.net/epspdf/epspdf.0.2.01.tgz - 40. http://tex.aanhet.net/epspdf/epspdf.0.2.01.zip - 41. http://tex.aanhet.net/epspdf/epspdf.0.2.exe - 42. http://tex.aanhet.net/epspdf/epspdf_app.0.2.01.zip + 4. http://tex.aanhet.net/epspdf/index.html#rubytk + 5. http://tex.aanhet.net/epspdf/index.html#install + 6. http://tex.aanhet.net/epspdf/index.html#preview + 7. http://tex.aanhet.net/epspdf/index.html#files + 8. http://tex.aanhet.net/epspdf/index.html#releases + 9. http://tex.aanhet.net/epspdf/epspdf.pdf + 10. http://users.phg-online.de/tk/MOSXS/ + 11. http://tex.aanhet.net/epspdf/index.html#rubytk + 12. http://www.ruby-lang.org/en/downloads/ + 13. http://tex.aanhet.net/epspdf/index.html#tlnote + 14. http://tex.aanhet.net/epspdf/index.html#tlzipnote + 15. http://pages.cs.wisc.edu/~ghost/ + 16. http://www.foolabs.com/xpdf/ + 17. http://users.phg-online.de/tk/MOSXS/ + 18. http://www.tug.org/texlive/ + 19. http://www.tug.org/mactex/ + 20. http://www.macports.org/ + 21. http://rubyforge.org/projects/rubyinstaller/ + 22. http://rubyforge.org/frs/?group_id=167 + 23. http://www.ruby-lang.org/en/downloads/ + 24. http://activestate.com/Products/ActiveTcl/ + 25. http://tex.aanhet.net/epspdf/epspdf.0.4.3.exe + 26. http://tex.aanhet.net/epspdf/epspdf.0.4.3.zip + 27. http://tex.aanhet.net/epspdf/epspdf.0.4.3.tgz + 28. http://tex.aanhet.net/epspdf/index.html#rubytk + 29. http://tex.aanhet.net/epspdf/epspdf.pdf + 30. http://tex.aanhet.net/epspdf/epspdf.0.4.3.tgz + 31. http://tex.aanhet.net/epspdf/epspdf.0.4.3.zip + 32. http://tex.aanhet.net/epspdf/epspdf.0.4.3.exe + 33. http://tex.aanhet.net/epspdf/epspdftk.0.4.3.dmg.gz + 34. http://tex.aanhet.net/epspdf/epspdftk.0.4.2.dmg.gz + 35. http://tex.aanhet.net/epspdf/epspdf.0.3.0.tgz + 36. http://tex.aanhet.net/epspdf/epspdf.0.3.0.zip + 37. http://tex.aanhet.net/epspdf/epspdf.0.3.0.exe + 38. http://tex.aanhet.net/epspdf/epspdf.0.2.12.tgz + 39. http://tex.aanhet.net/epspdf/epspdf.0.2.12.zip + 40. http://tex.aanhet.net/epspdf/epspdf.0.2.12.exe + 41. http://tex.aanhet.net/epspdf/epspdf.0.2.01.tgz + 42. http://tex.aanhet.net/epspdf/epspdf.0.2.01.zip + 43. http://tex.aanhet.net/epspdf/epspdf.0.2.exe + 44. http://tex.aanhet.net/epspdf/epspdf_app.0.2.01.zip diff --git a/Master/texmf-dist/doc/support/epspdf/epspdf.pdf b/Master/texmf-dist/doc/support/epspdf/epspdf.pdf Binary files differindex 06bc2df4dd5..f438a668c0b 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 816e89e5fb6..36d69d53327 100644 --- a/Master/texmf-dist/doc/support/epspdf/epspdf.texi +++ b/Master/texmf-dist/doc/support/epspdf/epspdf.texi @@ -21,7 +21,7 @@ @raggedbottom @end iftex -@set version 0.4.2 +@set version 0.4.3 @set homepage http://tex.aanhet.net/epspdf/ @setchapternewpage off @@ -30,7 +30,7 @@ @copying This manual is for epspdf, version @value{version}. -Copyright @copyright{} 2006, 2007, 2008, 2009 Siep Kroonenberg. +Copyright @copyright{} 2006, 2008, 2009, 2010 Siep Kroonenberg. @quotation Copying and distribution of this file, with or without modification, @@ -164,8 +164,9 @@ previewer for the current file. @anchor{gray}@i{Grayscaling:} Simple color figures can be converted to grayscale. Bitmapped data won't be converted. If grayscaling doesn't -work on non-bitmapped data, select the ``Try harder to -grayscale'' option. This may cause an extra pdf-PostScript roundtrip. +work even on non-bitmapped data, select the ``Try harder to +grayscale'' option. This may cause an extra pdf-PostScript roundtrip, +but grayscaling may still fail. @i{Compute tight boundingbox:} This option is only available if a single page is converted. @@ -201,7 +202,7 @@ preserved between sessions. @subsection Configuring viewers -Under Linux, the preferred PostScript- and pdf viewers can be configured +Under Unix, the preferred PostScript- and pdf viewers can be configured 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. @@ -257,7 +258,7 @@ It is strongly recommended to invoke epspdf.rb via a wrapper script epspdf or epspdf.bat on the search path, e.g. @example #!/bin/sh -@var{path_to_epspdf}/epspdf.rb "@@" +@var{path_to_epspdf}/epspdf.rb "$@@" @end example for Unix/Linux/OS X, or @example @@ -281,17 +282,17 @@ epspdf [@var{options}] @var{infile} @var{outfile} @node Option summary @section Option summary -The summary below is the output of a command @kbd{epspdf --help} -for help. +Typing @kbd{epspdf --help} gives you the following summary: @example $ epspdf --help -Epspdf version 0.4.2 -Copyright (C) 2006, 2008, 2009 Siep Kroonenberg -Epspdf 0.4.2 +Epspdf version 0.4.3 +Copyright (C) 2006, 2008, 2009, 2010 Siep Kroonenberg Convert between [e]ps and pdf formats Usage: epspdf.rb [options] infile [outfile] + Default for outfile is file.pdf if infile is file.eps or file.ps Default for outfile is file.eps if infile is file.pdf + -g, --gray, --grey Convert to grayscale; success not guaranteed -G, --GRAY, --GREY Try harder to convert to grayscale @@ -316,6 +317,7 @@ Default for outfile is file.eps if infile is file.pdf -i, --info Info: display detected filetype -s Save (some) settings -d Debug: don't remove temp files + -v Prints version info -h, --help Show this message @end example @@ -343,8 +345,7 @@ screenshots, but less so for diagrams and spreadsheet-generated graphics. A file in PostScript- or pdf format can contain both types of graphic -data, e.g. a text in vector format agains a photographic background in -bitmapped format. +data. Vector graphics can be freely scaled without losing sharpness or becoming pixellated. If bitmapped graphics are enlarged too much, @@ -587,7 +588,7 @@ dmensions of the pdf file. Other conversions preserve or generate a hires boundingbox. Under Windows, the new version looks for an installed @TeX{} and will -use its private Ghostscript if it cannot find separately installed +use its private Ghostscript if it cannot find a separately installed Ghostscript. @TeX{} Live's pdftops, being on the searchpath, will be used unless epspdf finds another copy first. diff --git a/Master/texmf-dist/doc/support/epspdf/index.html b/Master/texmf-dist/doc/support/epspdf/index.html index 28ce2c9cae2..6630ff3fd80 100644 --- a/Master/texmf-dist/doc/support/epspdf/index.html +++ b/Master/texmf-dist/doc/support/epspdf/index.html @@ -28,6 +28,7 @@ this page</a></p> <ul> <li><a href="#features">Features</a></li> <li><a href="#prerequisites">Prerequisites</a></li> +<li><a href="#rubytk">Ruby/Tk</a></li> <li><a href="#install">Installation</a></li> <li><a href="#preview">Preview programs</a></li> <li><a href="#files">Files</a></li> @@ -77,7 +78,7 @@ conversions are necessary.</p> its GUI companion, in Ruby/Tk.</p> <p>Starting with the 2008 edition, epspdf is included in TeX Live as -an optional package, complete with wrapper scripts epspdf and +an optional package, complete with wrappers epspdf and epspdftk which can be called from the command-line without further ado.</p> @@ -89,9 +90,9 @@ checked for when epspdf starts:</p> <li>Ghostscript</li> <li>pdftops from the xpdf suite, strongly recommended for better pdf to PostScript conversions</li> -<li>Ruby 1.8.<i>x</i></li> -<li>Tcl/Tk is only required for the GUI interface. Only version 8.4 - has been tested.</li> +<li>Ruby 1.8.<i>x</i> or 1.9.<i>x</i></li> +<li>Tcl/Tk is only required for the GUI interface. The version (8.4 + or 8.5) must be supported by your Ruby.</li> <li>Optional: viewers for PostScript and pdf</li> </ul> @@ -100,29 +101,41 @@ checked for when epspdf starts:</p> <h3>Linux</h3> <p>On a current Linux distribution you can almost certainly install -everything from your distribution's package repositories. You may -have to install Ruby's Tk bindings, in addition to Ruby and Tcl/Tk -themselves. The name of such a package might be -e.g. libtcltk-ruby. As to PostScript- and pdf viewers: epspdf tests -for several popular viewers, but the configuration screen also lets -you specify viewers manually.</p> +everything from your distribution's package repositories. Ruby's Tk +bindings may be in a separate package, with a name such as +libtcltk-ruby. As to PostScript- and pdf viewers: epspdf tests for +several popular viewers, but the configuration screen also lets you +specify viewers manually.</p> -<h3>Mac OS X (Tiger and later)</h3> +<h3>Mac OS X (Tiger and Leopard)</h3> -<p><b>Warning!</b> Epspdf has not yet been tested with Snow - Leopard. There is a report that epspdftk fails under Snow +<p>Ruby, Tcl/Tk and Ruby/Tk are already part of Tiger and Leopard.</p> -<p>Ruby and Tcl/Tk are already part of the operating -system. Ghostscript is included in MacTeX, but is also available via -e.g. MacPorts. You can get pdftops from MacPorts as part of either -Poppler or xpdf. Another source is <a -href="http://users.phg-online.de/tk/MOSXS/">http://users.phg-online.de/tk/MOSXS/</a>.</p> +<p>Ghostscript is included in MacTeX, but is also available via +e.g. MacPorts.</p> -<p>If you want to compile xpdf it yourself, which is not hard, you -can ignore warnings about X, Motif or FreeType not being found since +<p>You can get pdftops from MacPorts as part of either Poppler or +xpdf. Another source +is <a href="http://users.phg-online.de/tk/MOSXS/">http://users.phg-online.de/tk/MOSXS/</a>. If +you want to compile xpdf it yourself, which is not hard, you can +ignore warnings about X, Motif or FreeType not being found since these missing libraries won't affect the compilation of pdftops.</p> +<h3>Mac OS X Snow Leopard</h3> + +<p>For Ghostscript and pdftops, see above.</p> + +<p>Unfortunately, in Snow Leopard Ruby's Tk bindings went missing, + so the GUI interface won't work with the built-in Ruby; + see <a href="#rubytk">below</a>. If you compile Ruby yourself + from <a href="http://www.ruby-lang.org/en/downloads/">source</a> + you get the Tk interface automatically. Call <tt>configure</tt> + with a <tt>--enable-pthread</tt> option.</p> + +<p>Snow Leopard's built-in Ruby is fine for command-line use and + on-the-fly conversions.</p> + <h3>Windows (Windows 2000 and later)</h3> <p>By itself, Windows lacks any of the prerequisites of @@ -137,7 +150,7 @@ installation. See the table below:</p> <tfoot> <tr><td colspan="3"><b><a name="tlnote" - class="fineprint"> (1)</a></b> MikTeX and TeX Live 2008 include a + class="fineprint"> (1)</a></b> MikTeX and TeX Live ≥ 2008 include a hidden Ghostscript which is always installed, and which epspdf knows how to find. Caveat: although older versions of TeX Live include a Ghostscript installer, it is not impossible to install an @@ -147,21 +160,21 @@ installation. See the table below:</p> <tr><td colspan="3"><b><a name="tlzipnote" class="fineprint"> (2)</a></b> With TeX Live ≥ 2008, you are better off installing the TeX Live package, which also gives you - wrapper batchfiles epspdf.bat and epspdftk.bat. You still need to - install Ruby and Tcl/Tk.</td></tr> + wrappers for epspdf and epspdftk for use on the command-line and + for on-the-fly conversions. You still need to + install Ruby 1.8 and Tcl/Tk.</td></tr> </tfoot> <tr><th class="fcol">TeX Live<a href="#tlnote">(1)</a></th><td>No additional requirements</td> <td>Ruby, Tcl/Tk<a href="#tlzipnote">(2)</a></td></tr> <tr><th class="fcol">MiKTeX</th><td>Pdftops (optional)</td> <td>Pdftops - (optional); Ruby, Tcl/Tk(optional)</td></tr> + (optional); Ruby 1.8, Tcl/Tk(optional)</td></tr> <tr><th class="fcol">Other/None</th><td>Ghostscript, pdftops (optional)</td> - <td>Ghostscript; pdftops(optional), Ruby, Tcl/Tk + <td>Ghostscript; pdftops(optional), Ruby 1.8, Tcl/Tk (optional)</td></tr> - </table> <h3>URLs for the prerequisites</h3> @@ -186,9 +199,8 @@ installation. See the table below:</p> <dt>TeX Live (<a href="http://www.tug.org/texlive/">http://www.tug.org/texlive/</a>)</dt> - <dd>TeX Live 2008 includes epspdf as an optional install. For - Windows, this version doesn't require external copies of pdftops - or Ghostscript but does not include Ruby or Tcl/Tk.</dd> + <dd>TeX Live ≥ 2008 includes pdftops, Ghostscript and + optionally epspdf.</dd> <dt>MacTeX (<a href="http://www.tug.org/mactex/">http://www.tug.org/mactex/</a>)</dt> @@ -217,30 +229,43 @@ installation. See the table below:</p> <dt>ActiveTcl from ActiveState (<a href="http://activestate.com/Products/ActiveTcl/"> - http://activestate.com/Products/ActiveTcl/</a></dt> <dd> Get - version 8.4, not 8.5.</dd> - + http://activestate.com/Products/ActiveTcl/</a></dt> <dd> + Version 8.4 is the safer bet.</dd> </dl> +<h3><a name="rubytk">Ruby's Tk interface library</a></h3> + +<p>At the moment, the Ruby Tk interface is not as readily available + as it has been: at some time during the 8.4 cycle, the Windows + Ruby one-click installer dropped Tcl/Tk, and aimed instead to hook + up to any already-installed Tcl/Tk. As to Ruby 1.9: at the moment + I know of no easy-to-use installer on Windows which includes a Tk + interface library. On Mac OS X 10.6 (Snow Leopard) the Ruby Tk + interface library also went missing, although both Ruby and Tcl/Tk + are still included.</p> +<p>I am working on a pure Tcl/Tk interface, <i>i.e.</i>a Tcl/Tk + script which calls epspdf as a program, not as a library, but I + can give no ETA. This will eliminate dependence on a Ruby/Tk + interface library.</p> <h2><a name="install"/>Installation</h2> <p>First make sure that the prerequisites are met. Then:</p> -<h3>TeX Live 2008</h3> +<h3>TeX Live ≥ 2008</h3> <p>Use TeX Live's package manager tlmgr for installation.</p> <h3>Windows setup program</h3> -<p>Download the <a href="epspdf.0.4.2.exe">epspdftk setup +<p>Download the <a href="epspdf.0.4.3.exe">epspdftk setup program.</a> You can run it in the usual way, by double-clicking. The setup program will create entries in your start menu for epspdftk and for the user manual.</p> <h3>Windows zipfile</h3> -<p>Download the <a href="epspdf.0.4.2.zip">epspdf zip file</a>, +<p>Download the <a href="epspdf.0.4.3.zip">epspdf zip file</a>, unpack it somewhere and create a shortcut for epspdftk.rbw. If you plan to use the command-line version, put a batchfile in a directory on your path with the line</p> @@ -249,17 +274,18 @@ on your path with the line</p> "<path_to_ruby.exe>" "<path_to_epspdf.rb>" %* </pre> -<p>With such a batchfile, the caller has to take care of quoting:</p> +<p>Similarly for epspdftk. With such a batchfile, the caller has to +take care of quoting:</p> <pre> epspdf "my file.eps" "my file.pdf" </pre> <p>Epspdf[tk] has been tested with Windows 2000, Windows XP and -Windows Vista.</p> +Windows 7.</p> <h3>Unix/Linux</h3> -<p>Download the <a href="epspdf.0.4.2.tgz">tar.gz archive</a> and +<p>Download the <a href="epspdf.0.4.3.tgz">tar.gz archive</a> and unpack it in some directory. All files should be in the same directory; that is how they find each other. If you plan to use epspdf.rb from the command-line, then create a shell script @@ -284,7 +310,10 @@ in the same directory.</p> <p>There is also a compressed disk image epspdf.x.x.x.dmg.gz which wraps epspdftk into a Max OS X <q>app</q>. Double-click once to expand, a second time to mount, then drag epspdftk.app to the -Applications folder.</p> +Applications folder. The current version has been created and tested +with Leopard. As pointed out <a href="#rubytk">above</a>, under Snow +Leopard the GUI program epspdftk will not work without a third-party +Ruby/Tk.</p> <p>Epspdf mostly duplicates functionality of Preview. But having an alternate conversion engine means that you can have another shot at @@ -316,53 +345,53 @@ usually Preview or Adobe Reader.</p> <h2><a name="files"/>Files</h2> <ul> -<li><a href="epspdf.0.4.2.tgz">epspdf.0.4.2.tgz</a> preferred for Unix -and Mac OS X</li> +<li><a href="epspdf.0.4.3.tgz">epspdf.0.4.3.tgz</a> preferred for Unix +and Mac OS X; GUI fails under OS X Snow Leopard with built-in Ruby</li> -<li><a href="epspdf.0.4.2.zip">epspdf.0.4.2.zip</a> preferred for +<li><a href="epspdf.0.4.3.zip">epspdf.0.4.3.zip</a> preferred for Windows</li> -<li><a href="epspdf.0.4.2.exe">epspdf.0.4.2.exe</a> Windows setup +<li><a href="epspdf.0.4.3.exe">epspdf.0.4.3.exe</a> Windows setup program, including Ruby/Tk subset</li> -<li><a href="epspdftk.0.4.2.dmg.gz">epspdftk.0.4.2.dmg.gz</a> - compressed disk image with epspdftk wrapped into a Mac OS X <q>app</q></li> +<li><a href="epspdftk.0.4.3.dmg.gz">epspdftk.0.4.3.dmg.gz</a>; + built and tested on Leopard</li> </ul> <h3>Older releases</h3> <ul> -<li><a href="epspdf.0.3.0.tgz">epspdf.0.3.0.tgz</a> for Unix -and Mac OS X</li> -<li><a href="epspdf.0.3.0.zip">epspdf.0.3.0.zip</a> for -Windows</li> -<li><a href="epspdf.0.3.0.exe">epspdf.0.3.0.exe</a> Windows setup - program</li> -<li><a href="epspdf.0.2.12.tgz">epspdf.0.2.12.tgz</a> for Unix -and Mac OS X</li> -<li><a href="epspdf.0.2.12.zip">epspdf.0.2.12.zip</a> for -Windows</li> -<li><a href="epspdf.0.2.12.exe">epspdf.0.2.12.exe</a> Windows setup - program</li> -<li><a href="epspdf.0.2.11.tgz">epspdf.0.2.11.tgz</a> for Unix -and Mac OS X</li> -<li><a href="epspdf.0.2.11.zip">epspdf.0.2.11.zip</a> for -Windows</li> -<li><a href="epspdf.0.2.11.exe">epspdf.0.2.11.exe</a> Windows setup - program</li> -<li><a href="epspdf.0.2.01.tgz">epspdf.0.2.01.tgz</a> for Unix +<li><a href="http:/tex.aanhet.net/epspdf/epspdftk.0.4.2.dmg.gz">epspdftk.0.4.2.dmg.gz</a>; + tested on Tiger and Leopard</li> +<li><a href="http:/tex.aanhet.net/epspdf/epspdf.0.3.0.tgz">epspdf.0.3.0.tgz</a> +for Unix and Mac OS X</li> +<li><a href="http:/tex.aanhet.net/epspdf/epspdf.0.3.0.zip">epspdf.0.3.0.zip</a> +for Windows</li> +<li><a href="http:/tex.aanhet.net/epspdf/epspdf.0.3.0.exe">epspdf.0.3.0.exe</a> +Windows setup program</li> +<li><a href="http:/tex.aanhet.net/epspdf/epspdf.0.2.12.tgz">epspdf.0.2.12.tgz</a> +for Unix, including Mac OS X</li> +<li><a href="http:/tex.aanhet.net/epspdf/epspdf.0.2.12.zip">epspdf.0.2.12.zip</a> +for Windows</li> +<li><a href="http:/tex.aanhet.net/epspdf/epspdf.0.2.12.exe">epspdf.0.2.12.exe</a> +Windows setup program</li> +<li><a href="http:/tex.aanhet.net/epspdf/epspdf.0.2.01.tgz">epspdf.0.2.01.tgz</a> +for Unix and Mac OS X</li> -<li><a href="epspdf.0.2.01.zip">epspdf.0.2.01.zip</a> for - Windows</li> -<li><a href="epspdf.0.2.exe">epspdf.0.2.exe</a>, Windows setup - program</li> - -<li><a href="epspdf_app.0.2.01.zip">epspdf_app.0.2.01.zip</a> Mac OS X -applet for starting epspdftk.rb</li> +<li><a href="http:/tex.aanhet.net/epspdf/epspdf.0.2.01.zip">epspdf.0.2.01.zip</a> +for Windows</li> +<li><a href="http:/tex.aanhet.net/epspdf/epspdf.0.2.exe">epspdf.0.2.exe</a>, +Windows setup program</li> +<li><a href="http:/tex.aanhet.net/epspdf/epspdf_app.0.2.01.zip">epspdf_app.0.2.01.zip</a> +Mac OS X applet for starting epspdftk.rb</li> </ul> <h2><a name="releases"/>Releases</h2> -<dl><dt>0.4.2</dt><dd>Current version. More liberal documentation +<dl><dt>0.4.3</dt><dd>Current version. Fixes for compatibility with + Ruby 1.9 and, under Windows, for newer Ghostscript + versions. Documentation updates.</dd> + +<dt>0.4.2</dt><dd>More liberal documentation license. Slight documentation updates.</dd> <dt>0.4.1</dt><dd>Documentation: added section on @@ -414,5 +443,5 @@ applet for starting epspdftk.rb</li> <hr/> -<p class="fineprint">Last revised: September 11, 2009</p> +<p class="fineprint">Last revised: Januari 27, 2010</p> </body></html> diff --git a/Master/texmf-dist/scripts/epspdf/epspdf.help b/Master/texmf-dist/scripts/epspdf/epspdf.help index 1fac2734fa8..6a5687aed69 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.4.2. +This manual is for epspdf, version 0.4.3. -Copyright (C) 2006, 2007, 2008, 2009 Siep Kroonenberg. +Copyright (C) 2006, 2008, 2009, 2010 Siep Kroonenberg. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided @@ -49,9 +49,10 @@ for the current file. ====================== Grayscaling: Simple color figures can be converted to grayscale. -Bitmapped data won't be converted. If grayscaling doesn't work on +Bitmapped data won't be converted. If grayscaling doesn't work even on non-bitmapped data, select the "Try harder to grayscale" option. This -may cause an extra pdf-PostScript roundtrip. +may cause an extra pdf-PostScript roundtrip, but grayscaling may still +fail. Compute tight boundingbox: This option is only available if a single page is converted. @@ -85,7 +86,7 @@ preserved between sessions. 1.5.1 Configuring viewers ------------------------- -Under Linux, the preferred PostScript- and pdf viewers can be configured +Under Unix, the preferred PostScript- and pdf viewers can be configured 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. @@ -142,7 +143,7 @@ epspdftk.rb. It is strongly recommended to invoke epspdf.rb via a wrapper script epspdf or epspdf.bat on the search path, e.g. #!/bin/sh - PATH_TO_EPSPDF/epspdf.rb "@" + PATH_TO_EPSPDF/epspdf.rb "$@" for Unix/Linux/OS X, or "PATH_TO_RUBY.EXE" "PATH_TO_EPSPDF.RB" %* for Windows. It is the responsibility of the caller to provide double @@ -157,15 +158,16 @@ Basic usage: 2.1 Option summary ================== -The summary below is the output of a command `epspdf --help' for help. +Typing `epspdf --help' gives you the following summary: $ epspdf --help - Epspdf version 0.4.2 - Copyright (C) 2006, 2008, 2009 Siep Kroonenberg - Epspdf 0.4.2 + Epspdf version 0.4.3 + Copyright (C) 2006, 2008, 2009, 2010 Siep Kroonenberg Convert between [e]ps and pdf formats Usage: epspdf.rb [options] infile [outfile] + Default for outfile is file.pdf if infile is file.eps or file.ps Default for outfile is file.eps if infile is file.pdf + -g, --gray, --grey Convert to grayscale; success not guaranteed -G, --GRAY, --GREY Try harder to convert to grayscale @@ -190,6 +192,7 @@ The summary below is the output of a command `epspdf --help' for help. -i, --info Info: display detected filetype -s Save (some) settings -d Debug: don't remove temp files + -v Prints version info -h, --help Show this message @@ -207,8 +210,7 @@ screenshots, but less so for diagrams and spreadsheet-generated graphics. A file in PostScript- or pdf format can contain both types of graphic -data, e.g. a text in vector format agains a photographic background in -bitmapped format. +data. Vector graphics can be freely scaled without losing sharpness or becoming pixellated. If bitmapped graphics are enlarged too much, @@ -339,10 +341,8 @@ grayscale image. It produces larger files than sam2p. -------------------------------- Create a batchfile `bitmap2eps.bat' with contents - sam2p "%~1" "%~dpn1.eps" (TeX Live) or - bmeps -c "%~1" "%~dpn1.eps" (MikTeX) and place it _e.g._ on your desktop. Now if you drop a bitmapped graphic on this batchfile then you will get an eps file with @@ -420,7 +420,7 @@ dmensions of the pdf file. Other conversions preserve or generate a hires boundingbox. Under Windows, the new version looks for an installed TeX and will use -its private Ghostscript if it cannot find separately installed +its private Ghostscript if it cannot find a separately installed Ghostscript. TeX Live's pdftops, being on the searchpath, will be used unless epspdf finds another copy first. diff --git a/Master/texmf-dist/scripts/epspdf/epspdf.rb b/Master/texmf-dist/scripts/epspdf/epspdf.rb index 0b47db2c505..6c67f7eae3f 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 Siep Kroonenberg +# Copyright (C) 2006, 2008, 2009, 2010 Siep Kroonenberg # n dot s dot kroonenberg at rug dot nl # # This program is free software, licensed under the GNU GPL, >=2.0. @@ -987,6 +987,8 @@ class PsPdf def any_to_any( params={} ) + # $stderr.puts( hash_prn( params ) ) + type = params[ 'type' ] page = params[ 'page' ] bbox = params[ 'bbox' ] @@ -1090,13 +1092,11 @@ class PsPdf when 'pdf' if bbox - pp = pp.ps_to_pdf( 'sep' => gray ) - pp = pp.pdf_to_eps( 'page' => page ) + pp = pp.ps_to_pdf.pdf_to_eps( 'sep' => gray, 'page' => page ) pp = pp.fix_bb return pp = pp.eps_to_pdf( 'gray' => gray ) elsif page - pp = pp.ps_to_pdf( 'sep' => gray ) - pp = pp.pdf_to_ps( 'page' => page ) + pp = pp.ps_to_pdf.pdf_to_ps( 'sep' => gray, 'page' => page ) return pp = pp.ps_to_pdf( 'gray' => gray ) else pp = pp.ps_to_pdf.pdf_to_ps( 'sep' => 1 ) if gRAY @@ -1145,8 +1145,7 @@ save_settings = false opts = OptionParser.new do |opts| # for help output - opts.banner = "Epspdf 0.4.2" - opts.separator "Convert between [e]ps and pdf formats" + opts.banner = "Convert between [e]ps and pdf formats" opts.separator "Usage: epspdf.rb [options] infile [outfile]" opts.separator "" opts.separator "Default for outfile is file.pdf" + @@ -1202,9 +1201,18 @@ opts = OptionParser.new do |opts| opts.on( "-V PDFVERSION", "--version=PDFVERSION", PDF_VERSIONS, "Deprecated; use `-N' or `--pdfversion'." ) do |opt| + if opt == "" + puts EPVERSION + exit + end $settings.pdf_version = opt end + #opts.on( "--version" ) do |opt| + # puts EPVERSION + # exit + #end + opts.on( "-I", "Ignore pdftops even if available", "(default: use if available)" ) do |opt| @@ -1260,21 +1268,34 @@ opts = OptionParser.new do |opts| end end # opts +# hack alert! we support `--version' for version info although +# --version is still interpreted as desired pdf output version + +if ARGV.length == 1 and ARGV[0] == '--version' + puts EPVERSION + exit +end + # parse options destructively -opts.parse!( ARGV ) +begin + opts.parse!( ARGV ) +rescue OptionParser::ParseError => e + STDERR.puts e.message, "\n", opts + exit( -1 ) +end $options.page = 1 if $options.bbox and not $options.page $settings.write_settings if save_settings if ARGV.length < 1 - puts opts if not save_settings # help output - # puts "Settings:" - # $settings.each_key do |k| - # puts "key #{k} value #{$settings[k].val}" - # end - abort + if not save_settings # help output + puts opts + abort + else + exit + end elsif $options.info puts "File type of #{ARGV[0]} is #{PsPdf.new( 'file' => ARGV[0] ).type}" exit diff --git a/Master/texmf-dist/scripts/epspdf/epspdfrc.rb b/Master/texmf-dist/scripts/epspdf/epspdfrc.rb index d9751ff970f..08bcfdb991a 100755 --- a/Master/texmf-dist/scripts/epspdf/epspdfrc.rb +++ b/Master/texmf-dist/scripts/epspdf/epspdfrc.rb @@ -1,10 +1,10 @@ -EPVERSION = '0.4.2' -COPYRIGHT = '2006, 2008, 2009' +EPVERSION = '0.4.3' +COPYRIGHT = '2006, 2008, 2009, 2010' # epspdf conversion utility, configuration module ##### -# Copyright (C) 2006, 2008, 2009 Siep Kroonenberg +# Copyright (C) 2006, 2008, 2009, 2010 Siep Kroonenberg # n dot s dot kroonenberg at rug dot nl # # This program is free software, licensed under the GNU GPL, >=2.0. @@ -88,33 +88,33 @@ def shell_error_string ( e ) returl nil else return case e - when 0: "Out of memory or resources" + when 0 then "Out of memory or resources" #define ERROR_FILE_NOT_FOUND 2L #define SE_ERR_FNF 2 - when 2: "File not found" + when 2 then "File not found" #define ERROR_PATH_NOT_FOUND 3L #define SE_ERR_PNF 3 - when 3: "Path not found" + when 3 then "Path not found" #define SE_ERR_ACCESSDENIED 5 - when 5: "Access denied" + when 5 then "Access denied" #define SE_ERR_OOM 8 - when 8: "Not enough memory" + when 8 then "Not enough memory" #define ERROR_BAD_FORMAT 11L - when 11: "Invalid exe" + when 11 then "Invalid exe" #define SE_ERR_SHARE 26 - when 26: "Sharing violation" + when 26 then "Sharing violation" #define SE_ERR_ASSOCINCOMPLETE 27 - when 27: "Invalid file association" + when 27 then "Invalid file association" #define SE_ERR_DDETIMEOUT 28 - when 28: "DDE timeout" + when 28 then "DDE timeout" #define SE_ERR_DDEFAIL 29 - when 29: "DDE fail" + when 29 then "DDE fail" #define SE_ERR_DDEBUSY 30 - when 30: "DDE busy" + when 30 then "DDE busy" #define SE_ERR_NOASSOC 31 - when 31: "No file association" + when 31 then "No file association" #define SE_ERR_DLLNOTFOUND 32 - when 32: "DLL not found" + when 32 then "DLL not found" else "Unspecified error" end # case end # else @@ -393,6 +393,10 @@ class << $settings # ghostscript. TeX may also come with pdftops.exe, but pdftops # would then be on the searchpath and not require special treatment. + # Later versions of Ghostscript come with several libraries built-in. + # Hopefully, there is no harm in including too many directories + # in GS_LIB. Better test this. + texbindir = ( ARCH == 'w32' ) ? find_on_path( 'tex' ) : nil texbindir = short_name( File.dirname( texbindir ) ) if texbindir @@ -448,8 +452,11 @@ class << $settings gsroot = texroot + '/tlpkg/tlgs' this_gs_prog = gsroot + '/bin/gswin32c.exe' if test( ?f, this_gs_prog ) - self.gs_prog = this_gs_prog - ENV['GS_LIB'] = "#{gsroot}/lib;#{gsroot}/fonts;#{gsroot}/Resource" + self.gs_prog = this_gs_prog + ENV['GS_LIB'] = "#{gsroot}/lib;#{gsroot}/fonts" + if test( ?d, "#{gsroot}/Resource" ) + ENV['GS_LIB'] += ";#{gsroot}/Resource" + end else # test for MikTeX hidden ghostscript # http://blog.miktex.org/post/2005/04/ # Starting-mgsexe-at-the-DOS-Prompt.aspx diff --git a/Master/texmf-dist/scripts/epspdf/epspdftk.rb b/Master/texmf-dist/scripts/epspdf/epspdftk.rb index 79dbdd5d325..44ad3a2c063 100755 --- a/Master/texmf-dist/scripts/epspdf/epspdftk.rb +++ b/Master/texmf-dist/scripts/epspdf/epspdftk.rb @@ -3,7 +3,7 @@ # epspdf conversion utility, GUI frontend ##### -# Copyright (C) 2006, 2008, 2009 Siep Kroonenberg +# Copyright (C) 2006, 2008, 2009, 2010 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/doc/info/epspdf.info b/Master/texmf/doc/info/epspdf.info Binary files differindex addad14c6d0..998409b1985 100644 --- a/Master/texmf/doc/info/epspdf.info +++ b/Master/texmf/doc/info/epspdf.info |