From bf3ee8e4da13507d79b5af06868c9a3b1eb456db Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 13 Jan 2010 00:04:20 +0000 Subject: pdfpages update (12jan10) git-svn-id: svn://tug.org/texlive/trunk@16690 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/pdfpages/pdfpages.dtx | 31 +++++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/source') 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 % -\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) $ % % % @@ -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 -- cgit v1.2.3