diff options
5 files changed, 61 insertions, 24 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/thumbpdf/thumbpdf.pl b/Build/source/texk/texlive/linked_scripts/thumbpdf/thumbpdf.pl index 3b52e5dd62c..8bf4e0958aa 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-2012 Heiko Oberdiek. +# Copyright (C) 1999-2014 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.15"; -my $date = "2012/04/18"; +my $version = "3.16"; +my $date = "2014/07/15"; my $author = "Heiko Oberdiek"; -my $copyright = "Copyright (c) 1999-2012 by $author."; +my $copyright = "Copyright (c) 1999-2014 by $author."; # # Reqirements: Perl5, Ghostscript # History: @@ -153,6 +153,9 @@ my $copyright = "Copyright (c) 1999-2012 by $author."; # 2012/04/09 v3.14 # 2012/04/18 v3.15 # * Option --version added. +# 2014/07/15 v3.16 +# * Patch for "thumbpdf.pl" by Norbert Preining because of +# pdfTeX 1.40.15 (TeX Live 2014). # ### program identification @@ -937,6 +940,16 @@ if ($::opt_makedata) $objno[$count] = $1; $getobjindex[$1] = $count; $objdict[$count] = ($2); # boolean (if $2 exists) + if (!$objdict[$count]) { + # check for << on thext line, new PDF-X/2014 + $_ = <PDF>; + if (/^<<$/) { + $objdict[$count] = 1; + $lineno++; + $_ = <PDF>; + $lineno++; + } + } my $stream = 0; print "* obj $objno[$count]" . (($objdict[$count]) ? " (dict)" : "") . @@ -944,18 +957,18 @@ if ($::opt_makedata) # get obj $objtext[$count] = ""; - while (<PDF>) + while ($_) { - $lineno++; - if ($objdict[$count]) { if (/^>>/) { last if /^>>\s+endobj$/; # obj without stream - # get stream $_ = <PDF>; $lineno++; + last if /^endobj$/; # obj without stream, new PDF-X/2014 + + # get stream /^stream$/ or die "$Error `stream' expected on line $lineno!\n"; print "* stream\n" if $::opt_debug; @@ -982,6 +995,9 @@ if ($::opt_makedata) last if /^endobj$/; } $objtext[$count] .= $_; + + $_ = <PDF>; + $lineno++; } $count++; } diff --git a/Master/texmf-dist/doc/generic/thumbpdf/README b/Master/texmf-dist/doc/generic/thumbpdf/README index 79fd7eba855..78f0e51d077 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 2012/04/18 v3.15 +README for project thumbpdf 2014/07/15 v3.16 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-2012 Heiko Oberdiek. +Copyright (C) 1999-2014 Heiko Oberdiek. This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 @@ -610,3 +610,6 @@ J. HISTORY 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). diff --git a/Master/texmf-dist/scripts/thumbpdf/thumbpdf.pl b/Master/texmf-dist/scripts/thumbpdf/thumbpdf.pl index 3b52e5dd62c..8bf4e0958aa 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-2012 Heiko Oberdiek. +# Copyright (C) 1999-2014 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.15"; -my $date = "2012/04/18"; +my $version = "3.16"; +my $date = "2014/07/15"; my $author = "Heiko Oberdiek"; -my $copyright = "Copyright (c) 1999-2012 by $author."; +my $copyright = "Copyright (c) 1999-2014 by $author."; # # Reqirements: Perl5, Ghostscript # History: @@ -153,6 +153,9 @@ my $copyright = "Copyright (c) 1999-2012 by $author."; # 2012/04/09 v3.14 # 2012/04/18 v3.15 # * Option --version added. +# 2014/07/15 v3.16 +# * Patch for "thumbpdf.pl" by Norbert Preining because of +# pdfTeX 1.40.15 (TeX Live 2014). # ### program identification @@ -937,6 +940,16 @@ if ($::opt_makedata) $objno[$count] = $1; $getobjindex[$1] = $count; $objdict[$count] = ($2); # boolean (if $2 exists) + if (!$objdict[$count]) { + # check for << on thext line, new PDF-X/2014 + $_ = <PDF>; + if (/^<<$/) { + $objdict[$count] = 1; + $lineno++; + $_ = <PDF>; + $lineno++; + } + } my $stream = 0; print "* obj $objno[$count]" . (($objdict[$count]) ? " (dict)" : "") . @@ -944,18 +957,18 @@ if ($::opt_makedata) # get obj $objtext[$count] = ""; - while (<PDF>) + while ($_) { - $lineno++; - if ($objdict[$count]) { if (/^>>/) { last if /^>>\s+endobj$/; # obj without stream - # get stream $_ = <PDF>; $lineno++; + last if /^endobj$/; # obj without stream, new PDF-X/2014 + + # get stream /^stream$/ or die "$Error `stream' expected on line $lineno!\n"; print "* stream\n" if $::opt_debug; @@ -982,6 +995,9 @@ if ($::opt_makedata) last if /^endobj$/; } $objtext[$count] .= $_; + + $_ = <PDF>; + $lineno++; } $count++; } diff --git a/Master/texmf-dist/tex/generic/thumbpdf/thumbpdf.sty b/Master/texmf-dist/tex/generic/thumbpdf/thumbpdf.sty index 0bc646b1548..5809aa84d7a 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: 2012/04/18 v3.15 +% Version: 2014/07/15 v3.16 % Author: Heiko Oberdiek % % Function: Inclusion of thumbnails % -% Copyright: Copyright (C) 1999-2012 Heiko Oberdiek. +% Copyright: Copyright (C) 1999-2014 Heiko Oberdiek. % % This work may be distributed and/or modified under % the conditions of the LaTeX Project Public License, @@ -101,6 +101,7 @@ % 2012/04/09 v3.14: Fix for plain TeX compatibility % (offending \RequirePackage). % 2012/04/18 v3.15 +% 2014/07/15 v3.16 % % \THB@ is the prefix for internal command names. % @@ -121,7 +122,7 @@ \def\x{\endgroup\ProvidesPackage{thumbpdf}}% \fi \fi -\x[2012/04/18 v3.15 Inclusion of thumbnails (HO)]% +\x[2014/07/15 v3.16 Inclusion of thumbnails (HO)]% % Dummy for \thisthumb and \DeclareThumbs. It is overwritten, % if the checks succeed and the whole package is loaded. diff --git a/Master/texmf-dist/tex/generic/thumbpdf/thumbpdf.tex b/Master/texmf-dist/tex/generic/thumbpdf/thumbpdf.tex index 8b375ee04ab..a9b6239d3ce 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: 2012/04/18 v3.15 +% Version: 2014/07/15 v3.16 % Author: Heiko Oberdiek % -% Copyright: Copyright (C) 1999-2012 Heiko Oberdiek. +% Copyright: Copyright (C) 1999-2014 Heiko Oberdiek. % % This work may be distributed and/or modified under % the conditions of the LaTeX Project Public License, @@ -94,9 +94,10 @@ % 2011/08/10 v3.13 % 2012/04/09 v3.14 % 2012/04/18 v3.15 +% 2014/07/15 v3.16 \immediate\write16{% - File: thumbpdf.tex 2012/04/18 v3.15 % + File: thumbpdf.tex 2014/07/15 v3.16 % Including thumbnails as images (HO)% } \immediate\write16{% |