summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-01-13 00:04:20 +0000
committerKarl Berry <karl@freefriends.org>2010-01-13 00:04:20 +0000
commitbf3ee8e4da13507d79b5af06868c9a3b1eb456db (patch)
tree5da692d6cf8c9d4a5a06fb8913abf58e14847918 /Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
parentdc30361cc7b17d023d5808b86cd735d319755728 (diff)
pdfpages update (12jan10)
git-svn-id: svn://tug.org/texlive/trunk@16690 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty')
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty17
1 files changed, 11 insertions, 6 deletions
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{%