summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-08-25 21:57:34 +0000
committerKarl Berry <karl@freefriends.org>2013-08-25 21:57:34 +0000
commiteb1fd272c1f4ed50c8dd02145f12f08ae99e8600 (patch)
tree878e2240e0460e18bcf20b2376c33f9f199677de /Master
parent6e1716959dcbead4226252da5ee6590ef79c67dc (diff)
pdfpages (25aug13)
git-svn-id: svn://tug.org/texlive/trunk@31518 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdfbin286756 -> 287115 bytes
-rw-r--r--Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx34
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty4
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def4
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppdvips.def4
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppnull.def4
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pppdftex.def14
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppvtex.def4
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppxetex.def4
9 files changed, 52 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
index 0e61698cd51..f882ac6e863 100644
--- a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
+++ b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
index 09728fa108f..9f71b1b6464 100644
--- a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
+++ b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
@@ -27,10 +27,10 @@
%<*dtx>
\makeatletter
%</dtx>
-\def\AM@fileversion{v0.4u}
+\def\AM@fileversion{v0.4v}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
+\AM@SVN@Date$Date: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $
%</!(example1,example2,example3,installer)>
%
%
@@ -80,7 +80,7 @@
%
% \GetFileInfo{pdfpages.dtx}
%
-% \CheckSum{4642}
+% \CheckSum{4663}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -3175,11 +3175,28 @@
% Get last page number.
%
% \noindent
-% Note: Do not use |\pdfximage| directly. This clashes with packages which
+% Note: Do not use |\pdfximage| directly. This compromises packages which
% manipulate the input path of graphicx.sty.
+%
+% Unfortunately, |\pdflastximagepages| is not updated if |\includegraphics|
+% is used repeatedly on the same file. Heiko is aware of this and will provide
+% a solution in pdftex.def. Until then we will use the original graphicx's filename
+% from |\Gread@@pdftex|.
+% \begin{macrocode}
+%% \def\AM@getpagecount{%
+%% \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
+%% \edef\AM@pagecount{\the\pdflastximagepages}%
+%% }
+% \end{macrocode}
% \begin{macrocode}
+\let\AM@Gread@@pdftex\Gread@@pdftex
+\renewcommand*{\Gread@@pdftex}[1]{%
+ \xdef\AM@currentdocname@fix{#1}%
+ \AM@Gread@@pdftex{#1}%
+}
\def\AM@getpagecount{%
\setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
+ \pdfximage{\AM@currentdocname@fix}%
\edef\AM@pagecount{\the\pdflastximagepages}%
}
% \end{macrocode}
@@ -4245,6 +4262,13 @@
% \begin{itemize}
% \item Compatibility with |import.sty|.
% \end{itemize}
+%
+% \subsection*{2013/08/25 v0.4v}
+% \begin{itemize}
+% \item |\pdflastximagepages| is not updated if using |\includegraphics|
+% on the same file repeatedly. The provided fix is temporarily until
+% there's a better solution implemented in |pdftex.def|.
+% \end{itemize}
% \Finale
%
% \iffalse
@@ -4627,8 +4651,6 @@ This file demonstrates how to use the pdfpages package.
\generate{\usepreamble\example
\file{pdf-toc.tex}{\from{pdfpages.dtx}{example3}}}
-
-%\Msg{^^46^^75^^65^^72 ^^64^^69^^63^^68^^2c ^^41^^67^^6e^^65^^73^^21^^J}
\Msg{**************************************************************}
\Msg{*}
\Msg{* To finish the installation you have to move the following}
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
index b34e67f242d..94f2d68a4c3 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
+++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4u}
+\def\AM@fileversion{v0.4v}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
+\AM@SVN@Date$Date: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
[\AM@filedate\space\AM@fileversion\space
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
index ed19418a47c..f01f17e753d 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4u}
+\def\AM@fileversion{v0.4v}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
+\AM@SVN@Date$Date: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $
\ProvidesFile{ppdvipdfm.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for dvipdfm (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
index 7b3e146ae11..c6332ea3f7e 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4u}
+\def\AM@fileversion{v0.4v}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
+\AM@SVN@Date$Date: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $
\ProvidesFile{ppdvips.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for dvips (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
index 486a6f16e2b..0292858a2ea 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4u}
+\def\AM@fileversion{v0.4v}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
+\AM@SVN@Date$Date: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $
\ProvidesFile{ppnull.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages dummy driver (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
index dd1ff819e62..cf487cd4f62 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4u}
+\def\AM@fileversion{v0.4v}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
+\AM@SVN@Date$Date: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $
\ProvidesFile{pppdftex.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for pdfTeX (AM)]
@@ -64,8 +64,18 @@
There might be problems with\MessageBreak
the `trim' and `clip' options.\MessageBreak
Please, update your `pdftex.def'}}
+%% \def\AM@getpagecount{%
+%% \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
+%% \edef\AM@pagecount{\the\pdflastximagepages}%
+%% }
+\let\AM@Gread@@pdftex\Gread@@pdftex
+\renewcommand*{\Gread@@pdftex}[1]{%
+ \xdef\AM@currentdocname@fix{#1}%
+ \AM@Gread@@pdftex{#1}%
+}
\def\AM@getpagecount{%
\setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
+ \pdfximage{\AM@currentdocname@fix}%
\edef\AM@pagecount{\the\pdflastximagepages}%
}
\let\AM@pagewidth\pdfpagewidth
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
index a7e924a8970..6731736cb07 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4u}
+\def\AM@fileversion{v0.4v}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
+\AM@SVN@Date$Date: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $
\ProvidesFile{ppvtex.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for VTeX (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
index a0af5fba42b..4a092ede794 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4u}
+\def\AM@fileversion{v0.4v}
\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2013-05-30 15:06:59 +0200 (Thu, 30 May 2013) $
+\AM@SVN@Date$Date: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $
\ProvidesFile{ppxetex.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for XeTeX (AM)]