thumbpdf 3.13c (10aug11)

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

4 files changed, 119 insertions, 23 deletions

diff --git a/Master/texmf-dist/doc/generic/thumbpdf/readme.txt b/Master/texmf-dist/doc/generic/thumbpdf/readme.txt
index 48acbcd02c3..a81967dd2fa 100644
--- a/Master/texmf-dist/doc/generic/thumbpdf/readme.txt
+++ b/Master/texmf-dist/doc/generic/thumbpdf/readme.txt
@@ -1,4 +1,4 @@
-readme.txt for project thumbpdf 2010/07/07 v3.11
+readme.txt for project thumbpdf 2011/08/10 v3.13
 
 TABLE OF CONTENTS
 =================
@@ -50,7 +50,7 @@ In the following the user TeX file is called `<jobname>.tex'.
 
 B. COPYRIGHT, DISCLAIMER, LICENSE
 =================================
-Copyright (C) 1999-2010 Heiko Oberdiek.
+Copyright (C) 1999-2011 Heiko Oberdiek.
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
@@ -221,6 +221,7 @@ F. USER INTERFACE
   Configuration options for --makepng:
   --useps:      Use the PostScript file `<jobname>.ps' instead of the
                 pdf file `<jobname>.pdf' for generating the thumbnails.
+  --gscmd <name>: Name of the ghostscript command.
   --device|png [png]<dev>:     (dev = mono, gray, 16, 256, 16m)
                 Ghostscript device for producing the thumbnails, e.g.:
                 --device=mono, --device=pnggray, --png=256
@@ -409,14 +410,6 @@ If you have questions, problems with `thumbpdf', error reports,
 if you have improvements or want to have additional features,
 please send them to the author.
 
-My environment for developing and testing:
-* linux, SuSE 7.3
-* perl v5.6.0
-* pdfTeX 3.14159-1.00a-pretest-20010806
-* Ghostscript 5.50, 6.51, 7.x
-* dvips 5.86
-* VTeX 7.53
-
 Other ps->pdf routes:
 * pstill: I did not succeed. It seems that the used pdfmark specials
   are not supported.
@@ -607,3 +600,8 @@ J. HISTORY
   * \pdfcompresslevel=0 and \pdfminorversion=4 added for thumbpdf.tex.
   * \input is used with file name extension for "thumbpdf.tex".
   * Warning if \pdfobjcompresslevel>0.
+2011/08/09 v3.12:
+  * Support for LuaTeX added.
+2011/08/10 v3.13:
+  * Use gswin64c in Windows with 64 bits.
+  * Fix of version date of thumbpdf.sty.
diff --git a/Master/texmf-dist/scripts/thumbpdf/thumbpdf.pl b/Master/texmf-dist/scripts/thumbpdf/thumbpdf.pl
index 9dc544b77e8..c18e50262ba 100755
--- a/Master/texmf-dist/scripts/thumbpdf/thumbpdf.pl
+++ b/Master/texmf-dist/scripts/thumbpdf/thumbpdf.pl
@@ -5,7 +5,7 @@ $^W=1; # turn warning on
 #
 # thumbpdf.pl
 #
-# Copyright (C) 1999-2008 Heiko Oberdiek.
+# Copyright (C) 1999-2011 Heiko Oberdiek.
 #
 # This work may be distributed and/or modified under the
 # conditions of the LaTeX Project Public License, either version 1.3
@@ -26,10 +26,10 @@ $^W=1; # turn warning on
 #
 my $file        = "thumbpdf.pl";
 my $program     = uc($&) if $file =~ /^\w+/;
-my $version     = "3.11";
-my $date        = "2010/07/07";
+my $version     = "3.13";
+my $date        = "2011/08/10";
 my $author      = "Heiko Oberdiek";
-my $copyright   = "Copyright (c) 1999-2010 by $author.";
+my $copyright   = "Copyright (c) 1999-2011 by $author.";
 #
 # Reqirements: Perl5, Ghostscript
 # History:
@@ -147,6 +147,8 @@ my $copyright   = "Copyright (c) 1999-2010 by $author.";
 #   2008/04/16 v3.10
 #   2010/07/07 v3.11
 #    * \input is used with file name extension for "thumbpdf.tex".
+#   2011/08/10 v3.13
+#    * Use gswin64c in Windows with 64 bits.
 #
 
 ### program identification
@@ -160,7 +162,12 @@ my $Error = "!!! Error:"; # error prefix
 my $GS = "gs";
 $GS = "gs386"    if $^O =~ /dos/i;
 $GS = "gsos2"    if $^O =~ /os2/i;
-$GS = "gswin32c" if $^O =~ /mswin32/i;
+if ($^O =~ /mswin32c/i) {
+    # http://perldoc.perl.org/perlport.html#DOS-and-Derivatives
+    use Config;
+    $GS = "gswin32c";
+    $GS = "gswin64c" if $Config{'archname'} =~ /mswin32-x64/i;
+}
 
 # Windows detection (no SIGHUP)
 my $Win = 0;
@@ -236,6 +243,7 @@ Options:                                                         (defaults:)
   --(no)useps     `makepng' uses `.ps' instead of `.pdf' file    ($bool[$::opt_useps])
   --(no)level2    `<jobname>.tpm' with ps level 2 features       ($bool[$::opt_level2])
   --(no)greek     text in greek style (experimental)             ($bool[$::opt_greek])
+  --gscmd <name>  call of ghostscript                            ($GS)
   --antialias <num1>[num2] anti-aliasing, 0 = disable, 4 = max   ($::opt_antialias)
   --device|png [png]<dev>  Ghostscript device for thumbnails,
                            dev = mono, gray, 16, 256, 16m        ($::opt_device)
@@ -243,7 +251,7 @@ Options:                                                         (defaults:)
   --compress <n>           thumbnail compress level, n = 0..10   ($::opt_compress)
   --modes <mode>[,mode]    mode=pdftex|pdfmark|dvips|ps2pdf|
                                 vtexpdfmark|all                  ($::opt_modes)
-  --password apassword     for an encrypted pdf file             ($::opt_password)
+  --password <password>    for an encrypted pdf file             ($::opt_password)
 END_OF_USAGE
 
 ### environment variable THUMBPDF
@@ -378,7 +386,7 @@ my $MaxThumb = 0;
 if ($::opt_makepng)
 {
   print "*** make png files / run Ghostscript ***\n"
-    unless $::opt_quiet or $::opt_printgscmd;
+      unless $::opt_quiet or $::opt_printgscmd;
   if ($::opt_useps)
   {
     print "* ps file: $jobfile\n" if $::opt_verbose;
diff --git a/Master/texmf-dist/tex/generic/thumbpdf/thumbpdf.sty b/Master/texmf-dist/tex/generic/thumbpdf/thumbpdf.sty
index 2c925afbd7e..c97bf33b238 100644
--- a/Master/texmf-dist/tex/generic/thumbpdf/thumbpdf.sty
+++ b/Master/texmf-dist/tex/generic/thumbpdf/thumbpdf.sty
@@ -1,11 +1,11 @@
 % File:        thumbpdf.sty
 % Project:     thumbpdf
-% Version:     2010/07/07 v3.11
+% Version:     2011/08/10 v3.13
 % Author:      Heiko Oberdiek
 %
 % Function:    Inclusion of thumbnails
 %
-% Copyright:   Copyright (C) 1999-2010 Heiko Oberdiek.
+% Copyright:   Copyright (C) 1999-2011 Heiko Oberdiek.
 %
 %              This work may be distributed and/or modified under
 %              the conditions of the LaTeX Project Public License,
@@ -96,6 +96,8 @@
 %              2007/11/07 v3.9
 %              2008/04/16 v3.10
 %              2010/07/07 v3.11: Warning if \pdfobjcompresslevel>0.
+%              2011/08/09 v3.12: Support for LuaTeX added.
+%              2011/08/10 v3.13: Version date fixed.
 %
 % \THB@ is the prefix for internal command names.
 %
@@ -116,7 +118,7 @@
       \def\x{\endgroup\ProvidesPackage{thumbpdf}}%
     \fi
   \fi
-\x[2010/07/07 v3.11 Inclusion of thumbnails (HO)]%
+\x[2011/08/10 v3.13 Inclusion of thumbnails (HO)]%
 
 % Dummy for \thisthumb and \DeclareThumbs. It is overwritten,
 % if the checks succeed and the whole package is loaded.
@@ -481,6 +483,70 @@
   \fi
 }
 
+\RequirePackage{ifluatex}[2010/03/01]
+\ifluatex
+  \def\THB@InitLua{%
+    \catcode39=12 % '
+    \catcode40=12 % (
+    \catcode41=12 % )
+    \catcode43=12 % +
+    \catcode45=12 % -
+    \catcode46=12 % .
+    \catcode60=12 % <
+    \catcode95=12 % _
+    \escapechar=-1 %
+    \edef\\{\string\\}%
+    \edef\%{\string\%}%
+    \escapechar=92 %
+    \newlinechar=13 %
+    \catcode13=12 %
+    \endlinechar=13 %
+  }%
+  \ifnum\luatexversion<36 %
+    \def\THB@directlua#{\directlua0}%
+  \else
+    \let\THB@directlua\directlua
+  \fi
+  \begingroup
+    \THB@InitLua %
+    \THB@directlua{%
+      thumbpdf = {}
+      thumbpdf.callback = callback.find('process_input_buffer')
+%     if thumbpdf.callback then
+%       texio.write_nl('log', 'Package thumbpdf Info: Callback saved.')
+%       texio.write_nl('log', '')
+%     end
+      function thumbpdf.process_input_buffer(buffer)
+        return string.gsub(buffer, '[\\100-\\255]',
+            function (s)
+              local num = string.byte(s)
+              if num < 128 then
+                return s
+              else
+                return unicode.utf8.char(num + 1114112)
+              end
+            end
+        )
+      end
+      thumbpdf.id, thumbpdf.error =
+          callback.register('process_input_buffer',
+              thumbpdf.process_input_buffer)
+      if thumbpdf.id == nil then
+        tex.print(string.format(
+            '\\\\endgroup\\\\begingroup%
+            \\\\PackageError{thumbpdf}%
+            {\%s:\\\\MessageBreak \%s}\\\\@ehc',
+            'Setting process_input_buffer failed',
+            string.gsub(thumbpdf.error, '\\.$', '')))
+%     else
+%       texio.write_nl('log',
+%           'Package thumbpdf Info: Setting process_input_buffer.')
+%       texio.write_nl('log', '')
+      end
+    }%
+  \endgroup%
+\fi
+
 % Many commands and catcode changes are only necessary to read
 % the data file, so we do this in a group.
 \begingroup
@@ -551,6 +617,28 @@
     \input{\THB@datafile}%
   \fi
 \endgroup
+
+\ifluatex
+  \begingroup
+    \THB@InitLua %
+    \THB@directlua{%
+      thumbpdf.id, thumbpdf.error =
+          callback.register('process_input_buffer', thumbpdf.callback)
+      if thumbpdf.id == nil then
+        tex.print(string.format(
+            '\\\\endgroup\\\\begingroup%
+            \\\\PackageError{thumbpdf}%
+            {\%s:\\\\MessageBreak \%s}\\\\@ehc',
+            'Restoring process_input_buffer failed',
+            string.gsub(thumbpdf.error, '\\.$', '')))
+%     else
+%       texio.write_nl('log', 'Package thumbpdf Info: Callback restored.')
+%       texio.write_nl('log', '')
+      end
+    }%
+  \endgroup
+\fi
+
 % restore catcode of `@'.
 \catcode`\@=\THB@AtCode\relax
 \endinput
diff --git a/Master/texmf-dist/tex/generic/thumbpdf/thumbpdf.tex b/Master/texmf-dist/tex/generic/thumbpdf/thumbpdf.tex
index 148edbed8e2..14ffd6203ca 100644
--- a/Master/texmf-dist/tex/generic/thumbpdf/thumbpdf.tex
+++ b/Master/texmf-dist/tex/generic/thumbpdf/thumbpdf.tex
@@ -1,9 +1,9 @@
 % File:        thumbpdf.tex
 % Project:     thumbpdf
-% Version:     2010/07/07 v3.11
+% Version:     2011/08/10 v3.13
 % Author:      Heiko Oberdiek
 %
-% Copyright:   Copyright (C) 1999-2010 Heiko Oberdiek.
+% Copyright:   Copyright (C) 1999-2011 Heiko Oberdiek.
 %
 %              This work may be distributed and/or modified under
 %              the conditions of the LaTeX Project Public License,
@@ -90,9 +90,11 @@
 %              2008/04/16 v3.10
 %              2010/07/07 v3.11: \pdfcompresslevel=0 and
 %                \pdfminorversion=4 added.
+%              2011/08/09 v3.12
+%              2011/08/10 v3.13
 
 \immediate\write16{%
-  File: thumbpdf.tex 2010/07/07 v3.11 %
+  File: thumbpdf.tex 2011/08/10 v3.13 %
   Including thumbnails as images (HO)%
 }
 \immediate\write16{%