summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdfbin183415 -> 182746 bytes
-rw-r--r--Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx31
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty17
-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.def4
-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, 47 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
index 63e8f13715e..2fa2b02be08 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 f1986b20084..76e6ae2e1ba 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.4i}
+\def\AM@fileversion{v0.4j}
\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: 2009-10-31 13:40:37 +0100 (Sat, 31 Oct 2009) $
+\AM@SVN@Date$Date: 2010-01-12 19:05:14 +0100 (Tue, 12 Jan 2010) $
%</!(example1,example2,example3,installer)>
%
%
@@ -80,7 +80,7 @@
%
% \GetFileInfo{pdfpages.dtx}
%
-% \CheckSum{4623}
+% \CheckSum{4637}
%
% \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
@@ -1425,12 +1425,12 @@
% \end{macrocode}
% \begin{macrocode}
\ifthenelse{\boolean{AM@frame}}
- {\let\AM@fbox\fbox}
- {\let\AM@fbox\relax
+ {\global\let\AM@fbox\fbox}
+ {\global\let\AM@fbox\relax
\setlength{\fboxrule}{\z@}}%
\ifthenelse{\boolean{AM@reflect}}
- {\let\AM@reflectbox\reflectbox}
- {\let\AM@reflectbox\relax}%
+ {\global\let\AM@reflectbox\reflectbox}
+ {\global\let\AM@reflectbox\relax}%
\setbox\AM@pagebox\null
% \end{macrocode}
% \begin{macrocode}
@@ -1727,6 +1727,15 @@
\setlength{\@tempdima}{\AM@localscale}%
\edef\AM@localscale{\strip@pt\@tempdima}%
% \end{macrocode}
+% The above calculation are wrong if |noautoscale| is used.
+% Thus reset values here.
+% \begin{macrocode}
+ \ifAM@noautoscale
+ \def\AM@localxoff{\z@}%
+ \def\AM@localyoff{\z@}%
+ \def\AM@localscale{1}%
+ \fi
+% \end{macrocode}
% \begin{macrocode}
\let\AM@filelist@save\@filelist
\AM@split@options{Gin}{#1}%
@@ -4172,6 +4181,14 @@
% doesn't need that
% \end{itemize}
%
+% \subsection*{2010/01/12 v0.4j}
+% \begin{itemize}
+% \item Make |\AM@reflectbox| and |\AM@fbox| global definitions which is
+% necessary for package textpos.sty.
+% \item Refrain from setting |\AM@localxoff|, |\AM@localyoff|,
+% and |\AM@localscale| if option |noautoscale| is used.
+% \end{itemize}
+%
% \Finale
%
% \iffalse
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
index 8614429e949..57739dc6920 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.4i}
+\def\AM@fileversion{v0.4j}
\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: 2009-10-31 13:40:37 +0100 (Sat, 31 Oct 2009) $
+\AM@SVN@Date$Date: 2010-01-12 19:05:14 +0100 (Tue, 12 Jan 2010) $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
[\AM@filedate\space\AM@fileversion\space
@@ -303,12 +303,12 @@
\edef\AM@doclist{\AM@doclist,\AM@resorteddoclist}%
\fi}{}%
\ifthenelse{\boolean{AM@frame}}
- {\let\AM@fbox\fbox}
- {\let\AM@fbox\relax
+ {\global\let\AM@fbox\fbox}
+ {\global\let\AM@fbox\relax
\setlength{\fboxrule}{\z@}}%
\ifthenelse{\boolean{AM@reflect}}
- {\let\AM@reflectbox\reflectbox}
- {\let\AM@reflectbox\relax}%
+ {\global\let\AM@reflectbox\reflectbox}
+ {\global\let\AM@reflectbox\relax}%
\setbox\AM@pagebox\null
\ifthenelse{\boolean{AM@column}}
{\def\AM@xnupi{\@ne}%
@@ -542,6 +542,11 @@
\fi
\setlength{\@tempdima}{\AM@localscale}%
\edef\AM@localscale{\strip@pt\@tempdima}%
+ \ifAM@noautoscale
+ \def\AM@localxoff{\z@}%
+ \def\AM@localyoff{\z@}%
+ \def\AM@localscale{1}%
+ \fi
\let\AM@filelist@save\@filelist
\AM@split@options{Gin}{#1}%
\setbox\@tempboxa=\hbox{%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
index 4932101cdb3..8a060f7170b 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.4i}
+\def\AM@fileversion{v0.4j}
\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: 2009-10-31 13:40:37 +0100 (Sat, 31 Oct 2009) $
+\AM@SVN@Date$Date: 2010-01-12 19:05:14 +0100 (Tue, 12 Jan 2010) $
\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 1d37b379630..ffc7ef448e5 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.4i}
+\def\AM@fileversion{v0.4j}
\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: 2009-10-31 13:40:37 +0100 (Sat, 31 Oct 2009) $
+\AM@SVN@Date$Date: 2010-01-12 19:05:14 +0100 (Tue, 12 Jan 2010) $
\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 edcc1be7a41..197109b2046 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.4i}
+\def\AM@fileversion{v0.4j}
\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: 2009-10-31 13:40:37 +0100 (Sat, 31 Oct 2009) $
+\AM@SVN@Date$Date: 2010-01-12 19:05:14 +0100 (Tue, 12 Jan 2010) $
\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 1cae2726dd6..1036c619022 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.4i}
+\def\AM@fileversion{v0.4j}
\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: 2009-10-31 13:40:37 +0100 (Sat, 31 Oct 2009) $
+\AM@SVN@Date$Date: 2010-01-12 19:05:14 +0100 (Tue, 12 Jan 2010) $
\ProvidesFile{pppdftex.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for pdfTeX (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
index 7d6042aa036..41f79ce0dd4 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.4i}
+\def\AM@fileversion{v0.4j}
\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: 2009-10-31 13:40:37 +0100 (Sat, 31 Oct 2009) $
+\AM@SVN@Date$Date: 2010-01-12 19:05:14 +0100 (Tue, 12 Jan 2010) $
\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 7a7c4e6e487..567c978aab6 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.4i}
+\def\AM@fileversion{v0.4j}
\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: 2009-10-31 13:40:37 +0100 (Sat, 31 Oct 2009) $
+\AM@SVN@Date$Date: 2010-01-12 19:05:14 +0100 (Tue, 12 Jan 2010) $
\ProvidesFile{ppxetex.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for XeTeX (AM)]