Small compatibility fix for luatex >=0.81

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

8 files changed, 136 insertions, 110 deletions

diff --git a/Master/texmf-dist/doc/info/epspdf.info b/Master/texmf-dist/doc/info/epspdf.info
index 5bf78595d5d..fc7b673fe85 100644
--- a/Master/texmf-dist/doc/info/epspdf.info
+++ b/Master/texmf-dist/doc/info/epspdf.info
@@ -1,8 +1,9 @@
 This is epspdf.info, produced by makeinfo version 5.2 from epspdf.texi.
 
-This manual is for epspdf, version 0.6.1.
+This manual is for epspdf, version 0.6.2.
 
-Copyright (C) 2006, 2008, 2009, 2010, 2011, 2013, 2014 Siep Kroonenberg.
+Copyright (C) 2006, 2008, 2009, 2010, 2011, 2013, 2014, 2015 Siep
+Kroonenberg.
 
      Copying and distribution of this file, with or without
      modification, are permitted in any medium without royalty provided
@@ -19,9 +20,10 @@ File: epspdf.info,  Node: Top,  Next: Usage,  Prev: (dir),  Up: (dir)
 Epspdf and epsdftk
 ******************
 
-This manual is for epspdf, version 0.6.1.
+This manual is for epspdf, version 0.6.2.
 
-Copyright (C) 2006, 2008, 2009, 2010, 2011, 2013, 2014 Siep Kroonenberg.
+Copyright (C) 2006, 2008, 2009, 2010, 2011, 2013, 2014, 2015 Siep
+Kroonenberg.
 
      Copying and distribution of this file, with or without
      modification, are permitted in any medium without royalty provided
@@ -252,8 +254,8 @@ File: epspdf.info,  Node: Option summary,  Prev: Command-line usage,  Up: Comman
 
 Typing 'epspdf --help' gives you the following summary:
      $ epspdf --help
-     Epspdf version 0.6.1
-     Copyright (c) 2006, 2008, 2009, 2010, 2011, 2013, 2014 Siep Kroonenberg
+     Epspdf version 0.6.2
+     Copyright (c) 2006, 2008, 2009, 2010, 2011, 2013, 2014, 2015 Siep Kroonenberg
 
      Convert between [e]ps and pdf formats
      Usage: epspdf[.tlu] [options] infile [outfile]
@@ -489,9 +491,10 @@ File: epspdf.info,  Node: Ghostscript stackunderflow error,  Next: Part of the g
 5.2 Ghostscript stackunderflow error
 ====================================
 
-Due to an error in Ghostscript color handling when converting to pdf,
-selecting "printer" as target may lead to an error 'stackunderflow in
-.setdistillerparams'.  Use the "default" or "prepress" target instead.
+Some Ghostscript versions, _e.g._  9.10, have an error in color handling
+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.
 
 
 File: epspdf.info,  Node: Part of the graphic gets cut off,  Next: Fonts look ugly,  Prev: Ghostscript stackunderflow error,  Up: Troubleshooting
@@ -512,8 +515,8 @@ File: epspdf.info,  Node: Fonts look ugly,  Next: The page has been converted to
 If Ghostscript has to do the conversion from pdf to ps then text may not
 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.
+fonts, the pdftops utility may still handle more cases.  It is part of
+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
@@ -552,8 +555,8 @@ is also written to a file 'epspdf.log'.  For Linux/Unix/Mac OS X this is
 in a subdirectory .epspdf of your home directory; for Windows it is in a
 subdirectory epspdf of '%APPDATA%'.  This APPDATA directory may be
 'c:\Documents and Settings\YOUR USER NAME\Application Data' or
-'c:\Users\YOUR USER NAME\AppData\Roaming'.  Otherwise, open a command
-prompt and type 'echo %APPDATA%' to display this information.
+'c:\Users\YOUR USER NAME\AppData\Roaming'.  Type 'echo %APPDATA%' to
+find out which.
 
 The logfile lists all epspdf calls and all Ghostscript- and pdftops
 calls plus error information.
@@ -601,8 +604,8 @@ I no longer own a Mac, and therefore no longer try to provide an
 AppleScript wrapper.
 
 The current version has no provisions for custom Ghostscript- or pdftops
-parameters.  I may of may not re-add those in a future update.  The
-corresponding command-line options are accepted but have no effect.
+parameters.  The corresponding command-line options are accepted but
+have no effect.
 
 
 File: epspdf.info,  Node: Version 0.5,  Next: Version 0.4,  Prev: Version 0.6,  Up: Change history
@@ -662,39 +665,39 @@ There is now a "-v" (lowercase) option to print the version string.
 
 
 Tag Table:
-Node: Top570
-Node: Usage1989
-Node: Overview2192
-Node: Viewing2631
-Node: Conversion options3088
-Ref: gray3230
-Node: Converting3918
-Node: The configuration screen4259
-Node: Command-line usage6712
-Node: Option summary7417
-Node: Notes on PostScript and pdf8740
-Node: Bitmapped and vector9123
-Node: Font embedding10354
-Node: Eps preview headers10884
-Node: Bounding- and other boxes11341
-Node: Orientation12121
-Node: Exporting PostScript or pdf from Windows programs12544
-Node: Bitmapped graphics for LaTeX and pdflatex13428
-Node: Linux13899
-Node: Mac OS X14654
-Node: Windows14972
-Node: Troubleshooting15657
-Node: No options for output format visible16081
-Node: Ghostscript stackunderflow error16385
-Node: Part of the graphic gets cut off16842
-Node: Fonts look ugly17220
-Node: The page has been converted to a bitmap17749
-Node: Temporary files are not removed18225
-Node: Resources for troubleshooting18890
-Ref: Documentation19915
-Node: Change history20166
-Node: Version 0.620337
-Node: Version 0.521237
-Node: Version 0.422719
+Node: Top576
+Node: Usage2001
+Node: Overview2204
+Node: Viewing2643
+Node: Conversion options3100
+Ref: gray3242
+Node: Converting3930
+Node: The configuration screen4271
+Node: Command-line usage6724
+Node: Option summary7429
+Node: Notes on PostScript and pdf8758
+Node: Bitmapped and vector9141
+Node: Font embedding10372
+Node: Eps preview headers10902
+Node: Bounding- and other boxes11359
+Node: Orientation12139
+Node: Exporting PostScript or pdf from Windows programs12562
+Node: Bitmapped graphics for LaTeX and pdflatex13446
+Node: Linux13917
+Node: Mac OS X14672
+Node: Windows14990
+Node: Troubleshooting15675
+Node: No options for output format visible16099
+Node: Ghostscript stackunderflow error16403
+Node: Part of the graphic gets cut off16909
+Node: Fonts look ugly17287
+Node: The page has been converted to a bitmap17819
+Node: Temporary files are not removed18295
+Node: Resources for troubleshooting18960
+Ref: Documentation19939
+Node: Change history20190
+Node: Version 0.620361
+Node: Version 0.521210
+Node: Version 0.422692
 
 End Tag Table
diff --git a/Master/texmf-dist/doc/support/epspdf/Changelog b/Master/texmf-dist/doc/support/epspdf/Changelog
index 98de407e3e1..18713161cbe 100644
--- a/Master/texmf-dist/doc/support/epspdf/Changelog
+++ b/Master/texmf-dist/doc/support/epspdf/Changelog
@@ -1,28 +1,37 @@
-2014-12-6 0.6.1
+2015-10-28 0.6.2
 
-	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.
+	Replace obsolete luatex primitives \pdfpagewidth and
+	\pdfpageheight with \pagewidth and \pageheight respectively
 
-	Ghostscript >= 9.15: check for epswrite/eps2write ghostscript
-	output devices.
+	Minor tweaks to the manual
+
+2014-11-30 0.6.1
+
+	Windows ececutable based on a newer tclkit, from the KitCreator
+	project (http://kitcreator.rkeene.org/fossil/index). This
+	necessitated a new test for being a starpack, viz. by checking the
+	name of the executable, instead of the previous test for
+	tclkitpath.
+
+	Epspdf now modifies the process searchpath and calls luatex,
+	ghostscript and pdftops by basename to sidestep problems with
+	spaces in path names, especially on Windows.
 
 	Removed use of cmd /c, which was a bug workaround for some old
 	version of LuaTeX.
 
-	Some code reorganization: fewer globals, all non-trivial
+	Some code cleanup(?): 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.
+	The temporary directory has been placed under %TEMP% under
+	Windows, and under either $TEMPDIR or /tmp on other systems.
 
-	epspdftk.tcl: updated list of Unix PostScript- and pdf viewers.
+	To give Windows >= Vista a better chance to remove temporary
+	files, epspdf first waits one second.
+
+	Check for epswrite/eps2write ghostscript output devices.
 
-	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.
+	epspdftk.tcl: updated list of Unix PostScript- and pdf viewers.
 
 2013-02-07 0.6.0
 
diff --git a/Master/texmf-dist/doc/support/epspdf/epspdf.pdf b/Master/texmf-dist/doc/support/epspdf/epspdf.pdf
index e23bd75f213..454d1e03d7c 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 ae7a8265d3e..456544837ed 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.1
+@set version 0.6.2
 @set homepage http://tex.aanhet.net/epspdf/
 
 @setchapternewpage off
@@ -38,7 +38,7 @@
 @copying
 This manual is for epspdf, version @value{version}.
 
-Copyright @copyright{} 2006, 2008, 2009, 2010, 2011, 2013, 2014 Siep Kroonenberg.
+Copyright @copyright{} 2006, 2008, 2009, 2010, 2011, 2013, 2014, 2015 Siep Kroonenberg.
 
 @quotation
 Copying and distribution of this file, with or without modification,
@@ -287,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.1
-Copyright (c) 2006, 2008, 2009, 2010, 2011, 2013, 2014 Siep Kroonenberg
+Epspdf version 0.6.2
+Copyright (c) 2006, 2008, 2009, 2010, 2011, 2013, 2014, 2015 Siep Kroonenberg
 
 Convert between [e]ps and pdf formats
 Usage: epspdf[.tlu] [options] infile [outfile]
@@ -490,10 +490,10 @@ 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.
+Some Ghostscript versions, @emph{e.g.} 9.10, have an error in color
+handling when converting to pdf: selecting ``printer'' as target may
+lead to an error @code{stackunderflow in .setdistillerparams}. If you
+run into this, use the ``default'' or ``prepress'' target instead.
 
 @node Part of the graphic gets cut off, Fonts look ugly, Ghostscript stackunderflow error, Troubleshooting
 @section Part of the graphic gets cut off
@@ -508,7 +508,7 @@ Speed.
 If Ghostscript has to do the conversion from pdf to ps then text may not
 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
+fonts, the pdftops utility may still handle more cases. It is part of the
 xpdf suite and of the Poppler utilities.
 
 @node The page has been converted to a bitmap, Temporary files are not removed, Fonts look ugly, Troubleshooting
@@ -544,8 +544,8 @@ OS X this is in a subdirectory .epspdf of your home directory; for
 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%} to display this information.
+name}\AppData\Roaming}. Type
+@kbd{echo %APPDATA%} to find out which.
 
 The logfile lists all epspdf calls and all Ghostscript- and pdftops
 calls plus error information.
@@ -588,8 +588,8 @@ I no longer own a Mac, and therefore no longer try to provide an
 AppleScript wrapper.
 
 The current version has no provisions for custom Ghostscript- or pdftops
-parameters. I may of may not re-add those in a future update. The
-corresponding command-line options are accepted but have no effect.
+parameters. The corresponding command-line options are accepted but have
+no effect.
 
 @node Version 0.5, Version 0.4, Version 0.6, Change history
 @section Version 0.5
diff --git a/Master/texmf-dist/doc/support/epspdf/index.html b/Master/texmf-dist/doc/support/epspdf/index.html
index 4208e73b328..d1d15d24dea 100644
--- a/Master/texmf-dist/doc/support/epspdf/index.html
+++ b/Master/texmf-dist/doc/support/epspdf/index.html
@@ -110,8 +110,9 @@ checked for when epspdf starts:</p>
  href="http://www.foolabs.com/xpdf/">xpdf suite</a> or from the <a
  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>
+ than Ghostscript of preserving scalable fonts when converting from
+ pdf to ps, although Ghostscript is steadily improving in this
+ respect. Included in TeX Live for Windows.</li>
 
 <li><a href="http://www.tcl.tk/">Tcl/Tk</a> for the GUI
   interface. Versions 8.4 through 8.6 have been tested. Packaged for
@@ -186,13 +187,13 @@ Windows 8.</p>
 
 <ul>
 
-  <li><a href="epspdf.0.6.1.tgz">epspdf.0.6.1.tgz</a> preferred for Unix
+  <li><a href="epspdf.0.6.2.tgz">epspdf.0.6.2.tgz</a> preferred for Unix
 and Mac OS X</li>
 
-<li><a href="epspdf.0.6.1.zip">epspdf.0.6.1.zip</a> preferred for
+<li><a href="epspdf.0.6.2.zip">epspdf.0.6.2.zip</a> preferred for
 Windows if you don't want to use the installer below</li>
 
-<li><a href="epspdf.0.6.1.exe">epspdf.0.6.1.exe</a> Windows setup
+<li><a href="epspdf.0.6.2.exe">epspdf.0.6.2.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>
 
@@ -202,8 +203,11 @@ Windows if you don't want to use the installer below</li>
 
 <ul>
 
-<li>0.6.1 Current version. Bug fixes, see Changelog; support for later
-  Ghostscript versions.</li>
+<li>0.6.2 Current version. Small compatibility fix for luatex &ge;
+0.81.</li>
+
+<li>0.6.1 Bug fixes, see Changelog; support for later Ghostscript
+  versions.</li>
 
 <li>0.6.0 First release of luatex version.</li>
 
@@ -214,5 +218,5 @@ Ruby-based versions</a></li>
 
 <hr />
 
-<p class="fineprint">Last revised: December 5, 2014</p>
+<p class="fineprint">Last revised: November 1, 2015</p>
 </body></html>
diff --git a/Master/texmf-dist/scripts/epspdf/epspdf.help b/Master/texmf-dist/scripts/epspdf/epspdf.help
index 269e4148471..d7653c13576 100644
--- a/Master/texmf-dist/scripts/epspdf/epspdf.help
+++ b/Master/texmf-dist/scripts/epspdf/epspdf.help
@@ -36,9 +36,10 @@ Epspdf and epsdftk
 Epspdf and epsdftk
 ******************
 
-This manual is for epspdf, version 0.6.1.
+This manual is for epspdf, version 0.6.2.
 
-Copyright (C) 2006, 2008, 2009, 2010, 2011, 2013, 2014 Siep Kroonenberg.
+Copyright (C) 2006, 2008, 2009, 2010, 2011, 2013, 2014, 2015 Siep
+Kroonenberg.
 
      Copying and distribution of this file, with or without
      modification, are permitted in any medium without royalty provided
@@ -178,8 +179,8 @@ Basic usage of epspdf itself:
 
 Typing 'epspdf --help' gives you the following summary:
      $ epspdf --help
-     Epspdf version 0.6.1
-     Copyright (c) 2006, 2008, 2009, 2010, 2011, 2013, 2014 Siep Kroonenberg
+     Epspdf version 0.6.2
+     Copyright (c) 2006, 2008, 2009, 2010, 2011, 2013, 2014, 2015 Siep Kroonenberg
 
      Convert between [e]ps and pdf formats
      Usage: epspdf[.tlu] [options] infile [outfile]
@@ -348,9 +349,10 @@ Widen the window, to make the output format radio buttons visible.
 5.2 Ghostscript stackunderflow error
 ====================================
 
-Due to an error in Ghostscript color handling when converting to pdf,
-selecting "printer" as target may lead to an error 'stackunderflow in
-.setdistillerparams'.  Use the "default" or "prepress" target instead.
+Some Ghostscript versions, _e.g._  9.10, have an error in color handling
+when converting to pdf: selecting "printer" as target may lead to an
+error 'stackunderflow in .setdistillerparams'.  If you run into this,
+use the "default" or "prepress" target instead.
 
 5.3 Part of the graphic gets cut off
 ====================================
@@ -365,8 +367,8 @@ Speed.
 If Ghostscript has to do the conversion from pdf to ps then text may not
 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.
+fonts, the pdftops utility may still handle more cases.  It is part of
+the xpdf suite and of the Poppler utilities.
 
 5.5 The page has been converted to a bitmap
 ===========================================
@@ -396,8 +398,8 @@ is also written to a file 'epspdf.log'.  For Linux/Unix/Mac OS X this is
 in a subdirectory .epspdf of your home directory; for Windows it is in a
 subdirectory epspdf of '%APPDATA%'.  This APPDATA directory may be
 'c:\Documents and Settings\YOUR USER NAME\Application Data' or
-'c:\Users\YOUR USER NAME\AppData\Roaming'.  Otherwise, open a command
-prompt and type 'echo %APPDATA%' to display this information.
+'c:\Users\YOUR USER NAME\AppData\Roaming'.  Type 'echo %APPDATA%' to
+find out which.
 
 The logfile lists all epspdf calls and all Ghostscript- and pdftops
 calls plus error information.
@@ -433,8 +435,8 @@ I no longer own a Mac, and therefore no longer try to provide an
 AppleScript wrapper.
 
 The current version has no provisions for custom Ghostscript- or pdftops
-parameters.  I may of may not re-add those in a future update.  The
-corresponding command-line options are accepted but have no effect.
+parameters.  The corresponding command-line options are accepted but
+have no effect.
 
 6.2 Version 0.5
 ===============
diff --git a/Master/texmf-dist/scripts/epspdf/epspdf.tlu b/Master/texmf-dist/scripts/epspdf/epspdf.tlu
index 463fb22f35a..7a7c2d78a97 100755
--- a/Master/texmf-dist/scripts/epspdf/epspdf.tlu
+++ b/Master/texmf-dist/scripts/epspdf/epspdf.tlu
@@ -6,9 +6,10 @@ kpse.set_program_name('texlua')
 
 -- 0.6.0: first texlua version
 -- 0.6.1: allow TeX installation on path with spaces
+-- 0.6.2: compatibility fix for luatex 0.81
 
-ep_version = '0.6.1'
-ep_copyright = '2006, 2008, 2009, 2010, 2011, 2013, 2014'
+ep_version = '0.6.2'
+ep_copyright = '2006, 2008, 2009, 2010, 2011, 2013, 2014, 2015'
 
 --[[
 
@@ -1528,6 +1529,13 @@ function PsPdf:pdf_crop()
     #3%
   \fi
 }
+
+% future modification: \pdfoutput => \outputmode
+\begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname pdfoutput\endcsname\relax
+  \let\pdfoutput \outputmode
+\fi
+
 \begingroup
   \newlinechar=10 %
   \endlinechar=\newlinechar %
@@ -1540,8 +1548,8 @@ function PsPdf:pdf_crop()
             'pdfcompresslevel',
             'pdfhorigin',
             'pdfvorigin',
-            'pdfpagewidth',
-            'pdfpageheight',
+            'pagewidth',
+            'pageheight',
             'pdfmapfile',
             'pdfximage',
             'pdflastximage',
@@ -1559,8 +1567,8 @@ function PsPdf:pdf_crop()
     \global\let\pdfcompresslevel\TESTpdfcompresslevel %
     \global\let\pdfhorigin\TESTpdfhorigin %
     \global\let\pdfvorigin\TESTpdfvorigin %
-    \global\let\pdfpagewidth\TESTpdfpagewidth %
-    \global\let\pdfpageheight\TESTpdfpageheight %
+    \global\let\pagewidth\TESTpagewidth %
+    \global\let\pageheight\TESTpageheight %
     \global\let\pdfmapfile\TESTpdfmapfile %
     \global\let\pdfximage\TESTpdfximage %
     \global\let\pdflastximage\TESTpdflastximage %
@@ -1602,11 +1610,11 @@ function PsPdf:pdf_crop()
   }%
   \pdfhorigin=-#2bp\relax
   \pdfvorigin=#3bp\relax
-  \pdfpagewidth=#4bp\relax
-  \advance\pdfpagewidth by -#2bp\relax
-  \pdfpageheight=#5bp\relax
-  \advance\pdfpageheight by -#3bp\relax
-  \ht0=\pdfpageheight
+  \pagewidth=#4bp\relax
+  \advance\pagewidth by -#2bp\relax
+  \pageheight=#5bp\relax
+  \advance\pageheight by -#3bp\relax
+  \ht0=\pageheight
   \shipout\box0\relax
 }
 ]]
diff --git a/Master/texmf-dist/scripts/epspdf/epspdftk.tcl b/Master/texmf-dist/scripts/epspdf/epspdftk.tcl
index b55db2c979f..e28118853f3 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, 2011, 2013, 2014 Siep Kroonenberg
+# Copyright (C) 2006, 2008, 2009, 2010, 2011, 2013, 2014, 2015 Siep Kroonenberg
 # n dot s dot kroonenberg at rug dot nl
 #
 # This program is free software, licensed under the GNU GPL, >=2.0.