summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-09-08 21:41:40 +0000
committerKarl Berry <karl@freefriends.org>2018-09-08 21:41:40 +0000
commit80b28c052dd903d1c5c60a1faafd530bec8f5e45 (patch)
treeabfbd5f51a0c77909ccb703f62dfbbeed6f05654
parent3c44afcf87fb8597bb6da350f1777c8bf5b14517 (diff)
thumbpdf (8sep18)
git-svn-id: svn://tug.org/texlive/trunk@48625 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/thumbpdf/thumbpdf.pl12
-rw-r--r--Master/texmf-dist/doc/generic/thumbpdf/README75
-rwxr-xr-xMaster/texmf-dist/scripts/thumbpdf/thumbpdf.pl12
-rw-r--r--Master/texmf-dist/tex/generic/thumbpdf/thumbpdf.sty14
-rw-r--r--Master/texmf-dist/tex/generic/thumbpdf/thumbpdf.tex7
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds13
6 files changed, 102 insertions, 31 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/thumbpdf/thumbpdf.pl b/Build/source/texk/texlive/linked_scripts/thumbpdf/thumbpdf.pl
index 8bf4e0958aa..a5f0b54eafe 100755
--- a/Build/source/texk/texlive/linked_scripts/thumbpdf/thumbpdf.pl
+++ b/Build/source/texk/texlive/linked_scripts/thumbpdf/thumbpdf.pl
@@ -5,7 +5,7 @@ $^W=1; # turn warning on
#
# thumbpdf.pl
#
-# Copyright (C) 1999-2014 Heiko Oberdiek.
+# Copyright (C) 1999-2018 Heiko Oberdiek.
#
# This work may be distributed and/or modified under the
# conditions of the LaTeX Project Public License, either version 1.3
@@ -27,10 +27,10 @@ $^W=1; # turn warning on
my $file = "thumbpdf.pl";
my $program = uc($&) if $file =~ /^\w+/;
my $prj = 'thumbpdf';
-my $version = "3.16";
-my $date = "2014/07/15";
+my $version = "3.17";
+my $date = "2018/09/07";
my $author = "Heiko Oberdiek";
-my $copyright = "Copyright (c) 1999-2014 by $author.";
+my $copyright = "Copyright (c) 1999-2018 by $author.";
#
# Reqirements: Perl5, Ghostscript
# History:
@@ -156,6 +156,8 @@ my $copyright = "Copyright (c) 1999-2014 by $author.";
# 2014/07/15 v3.16
# * Patch for "thumbpdf.pl" by Norbert Preining because of
# pdfTeX 1.40.15 (TeX Live 2014).
+# 2018/09/07 v3.17
+# * { } quoted as \{ \} in regex for "new" stricter perl syntax.
#
### program identification
@@ -1454,7 +1456,7 @@ END_DTA
my $length = $thumblength[$i];
my $dict = $objtext[$thumbobj[$i]];
$dict =~ s/\\the\\pdflastobj\\\s*\d+\s*R/{RGB_$i}/;
- $dict =~ s/\\UseRGB{(\d+)}\\\s*\d+\s*R/{RGB_$1}/;
+ $dict =~ s/\\UseRGB\{(\d+)\}\\\s*\d+\s*R/{RGB_$1}/;
$dict =~ s/\/Length\s+\d+\s*//;
$dict =~ s/^\s+//;
$dict =~ s/\s+$//;
diff --git a/Master/texmf-dist/doc/generic/thumbpdf/README b/Master/texmf-dist/doc/generic/thumbpdf/README
index 78f0e51d077..8cfa320058d 100644
--- a/Master/texmf-dist/doc/generic/thumbpdf/README
+++ b/Master/texmf-dist/doc/generic/thumbpdf/README
@@ -1,4 +1,4 @@
-README for project thumbpdf 2014/07/15 v3.16
+README for project thumbpdf 2018/09/07 v3.17
TABLE OF CONTENTS
=================
@@ -345,25 +345,37 @@ F. USER INTERFACE
* Additional thumbnails: `<jobname>.tno'
If `<jobname>.tno' is found, the thumbnails are automatically
included by the program `thumbpdf.tex'.
- Format of this file:
+ Format of this file:#
+
+```
\thumb{filename without `.png' extension}% or
\thumb[name]{filename with/without extension}
+```
+
Examples:
+
+```
\thumb{one}% --> \thisthumb{one}, recommended
\thumb{one.png}% --> \thisthumb{one.png}
\thumb[two]{one}% --> \thisthumb{two}
\thumb[one]{./extrathumb/one.png}% --> thisthumb{one}
- The first example shows that the `.png' extension
+```
+
+The first example shows that the `.png' extension
is supported and recommended. But `.jpg' or `.tif'
files also work.
This data can be included in the main tex file that
includes `thumbpdf.sty' with the \DeclareThumbs feature:
- \usepackage{thumbpdf}% or \input thumbpdf.sty
+
+```
+\usepackage{thumbpdf}% or \input thumbpdf.sty
\DeclareThumbs{
\thumb{one}
\thumb[two]{./extra/two.jpg}
}
- Then the file `\jobname.tno' is written with the thumbnail
+```
+
+Then the file `\jobname.tno' is written with the thumbnail
declarations. (LaTeX's \nofiles is respected.)
* Program `thumbpdf.tex'
Execept for debugging there is no reason for an user to call it
@@ -403,12 +415,15 @@ G. AUTHOR
=========
Heiko Oberdiek
Email: heiko.oberdiek at googlemail.com
+ ho-tex at tug.org
H. QUESTIONS, SUGGESTED IMPROVEMENTS
====================================
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.
+please send them via github issues:
+https://github.com/ho-tex/thumbpdf/issues
+
Other ps->pdf routes:
* pstill: I did not succeed. It seems that the used pdfmark specials
@@ -458,54 +473,68 @@ I. KNOWN PROBLEMS
J. HISTORY
==========
+
1999/02/14 v1.0 first release
+
1999/02/23 v1.1
* Bug in thumbpdf.sty removed (#2->#1).
* New option in thumbpdf.pl: --resolution.
* Automatic calculation of the resolution for Ghostscript
(max. size 106x106).
+
1999/03/01 v1.2
* Optimizition: indirect objects for length values removed.
+
1999/03/12 v1.3
* Copyright: LPPL
+
1999/05/05 v1.4
* Detecting of cygwin-perl.
* Save memory by sharing `RGB' objects (devices: png16, png256).
+
1999/06/13 v1.5
* Gs detection extended (thumbpdf.pl).
* Installation part of readme.txt rewritten and table of contents
added.
+
1999/07/27 v1.6
* Bug in thumbpdf.sty fixed (handling of \pdfpageattr).
* Warning if there are missing thumbs (thumbpdf.sty).
* Added section `Known Problems' in `readme.txt'.
+
1999/08/08 v1.7
* Bug in thumbpdf.sty fixed. This bug was introduced in
version 1.6, therefore this version should not be used.
* Adaptation for pdfTeX version 0.14a.
* LPPL 1.1
+
1999/09/09 v1.8
* Bug in thumbpdf.sty fixed. \PackageWarning cannot be used
in \shipout, because \protect has been set to \noexpand
(mysterious LaTeX behaviour?).
+
1999/09/16 v1.9
* The perl script now detects direct /Length objects,
that pdfTeX uses including JPEG images.
+
2000/01/11 v1.10
* Bug in /Length detection removed.
* Direct /Length in RGB objects supported.
* \immediate before \pdfximage removed.
* thumbpdf.sty revised.
+
2000/01/19 v1.11
* Small fix for perl versions that cannot handle "my"
in "for" loops.
* LPPL 1.2
+
2000/02/11 v1.12 (not released)
* Option `clean' added.
* `<jobname>.tnd' replaces `thumbpdf.tex', if thumbpdf is called:
thumbpdf [options] <jobname>[.pdf]
* `<jobname>.tno' can be used instead of `thumbopt.tex'.
* \DeclareThumbs added.
+
2000/02/22 v2.0
* Support for the dvips/ps2pdf route by pdfmark specials.
* Temporary files are removed.
@@ -514,32 +543,40 @@ J. HISTORY
thumbdta.tex ==> <jobname>.tpt, <jobname>.tpm added
thumbopt.tex ==> <jobname>.tno
* Syntax change: <jobname> is now required.
+
2000/02/28 v2.1
* Environment variable `THUMBPDF' supported.
* `thumbpdf.cfg' supported.
* TDS place for readme.txt: texmf/doc/generic/thumbpdf/readme.txt
* Errors in `readme.txt' corrected.
+
2000/03/07 v2.2
* Support for Distiller 3 and 4, the streams are uncompressed.
* Call of gs is changed in order to show the currently processed
page number of the pdf file.
* Option --printgscmd creates the command line file `thumbpdf.gs'
for the Ghostscript call.
+
2000/03/22 v2.3
* Bug fix: --useps now works.
+
2000/04/10 v2.4
* Fix for ActiveState Perl 5.6.0: uc line changed, fork removed.
(Thanks to Andreas Buehmann <andreas.buehmann@gmx.de>.)
* Test of `thumbpdf.tex' version.
+
2000/07/29 v2.5
* Save trick in call of ghostscript.
* Undocumented option --gspages added.
* Problem with ActiveState perl 5.6.0 (win32) added
to section "Known Problems".
+
2000/09/27 v2.6
* Information about ActiveState perl 5.6.0 updated.
+
2000/10/27 v2.7
* -dFIXEDMEDIA=0 added in gs call.
+
2001/01/12 v2.8:
* Bug fix in dvips mode and active option `level2':
pack parameter corrected for little-endian machines.
@@ -550,19 +587,24 @@ J. HISTORY
* Ghostscript uses the MediaBox for calculating the
page size. For version 6.50 a patch is added to use
the /CropBox instead.
+
2001/03/29 v2.9:
* Option --password added.
+
2001/04/02 v2.10:
* Small corrections in readme.txt, contributed by Michael Wiedmann.
+
2001/04/26 v2.11:
* Option --antialias added (suggestion of Juergen Bausa).
* This version is not released.
+
2002/01/11 v3.0:
* Syntax of option --antialias changed. The option is enabled
as default, so that the ghostscript step is now slower.
* Support for VTeX's PS mode added.
* Greek mode added (experimental).
* Signal handlers added for cleanup.
+
2002/05/26 v3.1:
* SIG_HUP unkown in Windows.
* Bug fix: The signal function for __DIE__ "cleanup" aborts
@@ -572,44 +614,65 @@ J. HISTORY
removed from list. "vtexpdfmark" was detected,
"vtex" did not work and perhaps it will be used
later for VTeX in PDF mode.
+
2002/05/26 v3.2:
* Fix: "MacOS/X: darwin" is now not interpreted as
Windows.
+
2003/03/19 v3.3:
* Fix for gs 8.00 in mode dvips:
THB_DistillerPatch also applied to ghostscript >= 8.00.
+
2003/06/06 v3.4:
* Bug fix, two forgotten "pop"s added for Distiller case.
+
2004/10/24 v3.5:
* Revert Cygwin detection: is unix (request by Jan Nieuwenhuizen).
* LPPL 1.3.
+
2004/11/19 v3.6:
* Bug fix for dvips mode and gs < 8.00 (/stackunderflow in pop).
+
2004/11/19 v3.7:
* For easier debugging, the special thumbpdf objects are now
valid PDF objects that are referenced in the Catalog.
* Remove of extra '\n' before "endstream" that is added
by pdfTeX 1.20a.
+
2005/07/06 v3.8:
* Fix because of pdfTeX 1.30.
+
2007/11/07 v3.9:
* Deprecation warning of perl 5.8.8 fixed.
+
2008/04/16 v3.10:
* TDS archive `thumbpdf.tds.zip' provided.
+
2010/07/07 v3.11:
* \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.
+
2012/04/09 v3.14:
* Fix for plain TeX compatibility (offending \RequirePackage).
+
2012/04/18 v3.15:
* Option --version added.
* File `readme.txt' renamed to `README'.
+
2014/07/15 v3.16
* Patch for `thumbpdf.pl' by Norbert Preining because of
pdfTeX 1.40.15 (TeX Live 2014).
+
+2018/09/07 v3.17
+ * Move to ho-tex github organisation
+ https://github.com/ho-tex/thumbpdf
+ * Patch for `thumbpdf.pl' by David Carlisle for new perl { regex handling
+ * Update warning messages for Oberdiek bundle issue 46 from Karl Berry
diff --git a/Master/texmf-dist/scripts/thumbpdf/thumbpdf.pl b/Master/texmf-dist/scripts/thumbpdf/thumbpdf.pl
index 8bf4e0958aa..a5f0b54eafe 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-2014 Heiko Oberdiek.
+# Copyright (C) 1999-2018 Heiko Oberdiek.
#
# This work may be distributed and/or modified under the
# conditions of the LaTeX Project Public License, either version 1.3
@@ -27,10 +27,10 @@ $^W=1; # turn warning on
my $file = "thumbpdf.pl";
my $program = uc($&) if $file =~ /^\w+/;
my $prj = 'thumbpdf';
-my $version = "3.16";
-my $date = "2014/07/15";
+my $version = "3.17";
+my $date = "2018/09/07";
my $author = "Heiko Oberdiek";
-my $copyright = "Copyright (c) 1999-2014 by $author.";
+my $copyright = "Copyright (c) 1999-2018 by $author.";
#
# Reqirements: Perl5, Ghostscript
# History:
@@ -156,6 +156,8 @@ my $copyright = "Copyright (c) 1999-2014 by $author.";
# 2014/07/15 v3.16
# * Patch for "thumbpdf.pl" by Norbert Preining because of
# pdfTeX 1.40.15 (TeX Live 2014).
+# 2018/09/07 v3.17
+# * { } quoted as \{ \} in regex for "new" stricter perl syntax.
#
### program identification
@@ -1454,7 +1456,7 @@ END_DTA
my $length = $thumblength[$i];
my $dict = $objtext[$thumbobj[$i]];
$dict =~ s/\\the\\pdflastobj\\\s*\d+\s*R/{RGB_$i}/;
- $dict =~ s/\\UseRGB{(\d+)}\\\s*\d+\s*R/{RGB_$1}/;
+ $dict =~ s/\\UseRGB\{(\d+)\}\\\s*\d+\s*R/{RGB_$1}/;
$dict =~ s/\/Length\s+\d+\s*//;
$dict =~ s/^\s+//;
$dict =~ s/\s+$//;
diff --git a/Master/texmf-dist/tex/generic/thumbpdf/thumbpdf.sty b/Master/texmf-dist/tex/generic/thumbpdf/thumbpdf.sty
index 5809aa84d7a..d95c8b95d2d 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: 2014/07/15 v3.16
+% Version: 2018/09/07 v3.17
% Author: Heiko Oberdiek
%
% Function: Inclusion of thumbnails
%
-% Copyright: Copyright (C) 1999-2014 Heiko Oberdiek.
+% Copyright: Copyright (C) 1999-2018 Heiko Oberdiek.
%
% This work may be distributed and/or modified under
% the conditions of the LaTeX Project Public License,
@@ -102,6 +102,9 @@
% (offending \RequirePackage).
% 2012/04/18 v3.15
% 2014/07/15 v3.16
+% 2018/09/07 v3.17 Abort not just warn on terminal if pdfcompression is enabled.
+% (David Carlisle as suggested by Karl Berry)
+% https://github.com/ho-tex/thumbpdf
%
% \THB@ is the prefix for internal command names.
%
@@ -122,7 +125,7 @@
\def\x{\endgroup\ProvidesPackage{thumbpdf}}%
\fi
\fi
-\x[2014/07/15 v3.16 Inclusion of thumbnails (HO)]%
+\x[2018/09/07 v3.17 Inclusion of thumbnails (HO)]%
% Dummy for \thisthumb and \DeclareThumbs. It is overwritten,
% if the checks succeed and the whole package is loaded.
@@ -280,9 +283,8 @@
\expandafter\ifx\csname pdfobjcompresslevel\endcsname\relax
\else
\ifnum\pdfobjcompresslevel>0 %
- \PackageWarningNoLine{\THB@name}{%
- Compressed PDF objects of PDF 1.5 are not supported%
- }%
+ \wlog{THUMBPDF: Compressed PDF objects of PDF 1.5 are not supported}%
+ \endgroup\expandafter\expandafter\expandafter\endinput
\fi
\fi
diff --git a/Master/texmf-dist/tex/generic/thumbpdf/thumbpdf.tex b/Master/texmf-dist/tex/generic/thumbpdf/thumbpdf.tex
index a9b6239d3ce..68e18391b68 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: 2014/07/15 v3.16
+% Version: 2018/09/07 v3.17
% Author: Heiko Oberdiek
%
-% Copyright: Copyright (C) 1999-2014 Heiko Oberdiek.
+% Copyright: Copyright (C) 1999-2018 Heiko Oberdiek.
%
% This work may be distributed and/or modified under
% the conditions of the LaTeX Project Public License,
@@ -95,9 +95,10 @@
% 2012/04/09 v3.14
% 2012/04/18 v3.15
% 2014/07/15 v3.16
+% 2018/09/07 v3.17 https://github.com/ho-tex/thumbpdf
\immediate\write16{%
- File: thumbpdf.tex 2014/07/15 v3.16 %
+ File: thumbpdf.tex 2018/09/07 v3.17 %
Including thumbnails as images (HO)%
}
\immediate\write16{%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 9735d405a2d..85476c468ea 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1412,7 +1412,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'pgfornament' => '&POSTpgfornament',
'pgfplots' => '&POSTpgfplots',
'pict2e' => '&POSTpict2e',
- 'platex' => '&POSTplatex',
+ 'platex' => '&POST_preserve_man',
'pmx' => '&POSTpmx',
'pmxchords' => '&POST_do_man',
'prerex' => '&POSTprerex',
@@ -1431,6 +1431,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'texdoc' => '&POSTtexdoc',
'texdraw' => '&POSTtexdraw',
'tex-ps' => '&POSTtex_ps',
+ 'thumbpdf' => '&POST_preserve_man',
'tikz-cd' => '&POSTtikz_cd',
'tipa-de' => '&POST_rmsymlink',
'tudscr' => '&POSTtudscr',
@@ -6334,11 +6335,6 @@ sub POSTpict2e {
&SYSTEM ("$MV $texdir/pict2e-example.cfg $texdir/pict2e.cfg");
}
-sub POSTplatex {
- print "POST$package - preserve man pages\n";
- &preserve_man_pages ($package);
-}
-
sub POSTpmx {
print "POST$package - preserve binaries\n";
&POST_preserve_bin ("scor2prt", "pmxab");
@@ -6514,6 +6510,11 @@ sub POST_otherformat {
&SYSTEM ("$MV $DEST/tex/$package/$package/* $DEST/tex/$package/");
}
+sub POST_preserve_man {
+ print "POST$package - preserve man pages\n";
+ &preserve_man_pages ($package);
+}
+
# Move .1 and .5 files from source dir to man dir (if needed), and make
# our pdfs from them.
#