pdfpages 2011/07/02 v0.4p

git-svn-id: svn://tug.org/texlive/trunk@23319 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 25 insertions, 49 deletions

diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
index 73937a96136..4278f180c81 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.4n}
+\def\AM@fileversion{v0.4p}
 \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: 2011-03-10 19:57:14 +0100 (Thu, 10 Mar 2011) $
+\AM@SVN@Date$Date: 2011-07-31 16:09:45 +0200 (Sun, 31 Jul 2011) $
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdfpages}
    [\AM@filedate\space\AM@fileversion\space
@@ -111,6 +111,7 @@
 \newif\ifAM@firstpage\AM@firstpagefalse
 \newif\ifAM@reflect\AM@reflectfalse
 \newif\ifAM@reflectall\AM@reflectallfalse
+\newif\ifAM@scale\AM@scaletrue
 \newcommand*{\AM@pagestemp}{1}
 \newcommand*{\AM@pagecommand}{\thispagestyle{empty}}
 \newcommand*{\AM@lscape@rot}{0}
@@ -398,7 +399,9 @@
   \AM@split@options{Gin}{#1}%
   \ifAM@templatesize
     \setbox\@tempboxa=\hbox{%
-      \scalebox{\AM@globalscale}{\copy\AM@templatesizebox}}%
+      \scalebox{\AM@scale@factor}{\copy\AM@templatesizebox}}%
+    \setbox\@tempboxa=\hbox{%
+      \scalebox{\AM@globalscale}{\copy\@tempboxa}}%
     \setbox\@tempboxa=\hbox{%
       \rotatebox{\AM@lscape@rot}{\copy\@tempboxa}}%
   \else
@@ -958,43 +961,11 @@
   \edef\AM@resortedpagelist{\expandafter\@gobble\AM@resortedpagelist}%
   \edef\AM@resorteddoclist{\expandafter\@gobble\AM@resorteddoclist}%
 }
-\newif\ifAM@scale
-\newcommand{\AM@remove@scale}{}
-\def\AM@remove@scale#1{%
-  \def\AM@options{}%
-  \AM@remove@scalei#1,\END,
-}
-\newcommand{\AM@remove@scalei}{}
-\def\AM@remove@scalei#1,{%
-  \ifx\END#1
-  \else
-    \AM@scalefalse
-    \AM@remove@scaleii#1=\END
-    \ifAM@scale
-    \else
-      \ifx\empty\AM@options
-        \edef\AM@options{#1}%
-      \else
-        \toks@\expandafter{\AM@options,#1}%
-        \edef\AM@options{\the\toks@}%
-      \fi
-    \fi
-    \expandafter\AM@remove@scalei
-  \fi
-}
-\newcommand{\AM@remove@scaleii}{}
-\def\AM@remove@scaleii#1=#2\END{%
-  \ifx\\#2\\%
-  \else
-    \def\AM@temp{#1}%
-    \edef\AM@temp{\AM@trim@space{\AM@temp}}%
-    \ifthenelse{\equal{scale}{\AM@temp}}{\AM@scaletrue}{}%
-  \fi
-}
 \newif\ifAM@pdfpages@options
 \newcommand{\AM@split@options}{}
 \def\AM@split@options#1#2{%
   \def\AM@param{#1}%
+  \def\AM@scale@factor{1}%
   \@temptokena{}%
   \AM@split@optionsi#2,\END,
 }
@@ -1071,7 +1042,12 @@
               \equal{reflect*}{\AM@temp}\or
               \equal{lastpage}{\AM@temp}}
              {\AM@pdfpages@optionstrue}{}%
-  \ifthenelse{\equal{scale}{\AM@temp}}{\AM@scaletrue}{}%
+  \ifthenelse{\equal{scale}{\AM@temp}}{%
+    \AM@scaletrue
+    \def\AM@ooo##1={##1}
+    \setlength{\@tempdima}{\p@ * \AM@scale@factor * \real{\AM@ooo#2}}%
+    \edef\AM@scale@factor{\strip@pt\@tempdima}%
+  }{}%
 }
 \newcommand{\AM@trim@space}{}\newcommand{\AM@trim@spacei}{}
 \newcommand{\AM@trim@spaceii}{}
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
index dc3a4429951..dfea03a9aaa 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.4n}
+\def\AM@fileversion{v0.4p}
 \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: 2011-03-10 19:57:14 +0100 (Thu, 10 Mar 2011) $
+\AM@SVN@Date$Date: 2011-07-31 16:09:45 +0200 (Sun, 31 Jul 2011) $
 \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 b98302b2196..9efa73fd653 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.4n}
+\def\AM@fileversion{v0.4p}
 \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: 2011-03-10 19:57:14 +0100 (Thu, 10 Mar 2011) $
+\AM@SVN@Date$Date: 2011-07-31 16:09:45 +0200 (Sun, 31 Jul 2011) $
 \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 339df40c645..dae03b18222 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.4n}
+\def\AM@fileversion{v0.4p}
 \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: 2011-03-10 19:57:14 +0100 (Thu, 10 Mar 2011) $
+\AM@SVN@Date$Date: 2011-07-31 16:09:45 +0200 (Sun, 31 Jul 2011) $
 \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 507d36570a7..c27b7ad2128 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.4n}
+\def\AM@fileversion{v0.4p}
 \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: 2011-03-10 19:57:14 +0100 (Thu, 10 Mar 2011) $
+\AM@SVN@Date$Date: 2011-07-31 16:09:45 +0200 (Sun, 31 Jul 2011) $
 \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 d2b471993de..0bdc7390f24 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.4n}
+\def\AM@fileversion{v0.4p}
 \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: 2011-03-10 19:57:14 +0100 (Thu, 10 Mar 2011) $
+\AM@SVN@Date$Date: 2011-07-31 16:09:45 +0200 (Sun, 31 Jul 2011) $
 \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 e4450807c74..f94e308d75a 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.4n}
+\def\AM@fileversion{v0.4p}
 \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: 2011-03-10 19:57:14 +0100 (Thu, 10 Mar 2011) $
+\AM@SVN@Date$Date: 2011-07-31 16:09:45 +0200 (Sun, 31 Jul 2011) $
 \ProvidesFile{ppxetex.def}
    [\AM@filedate\space\AM@fileversion\space
     Pdfpages driver for XeTeX (AM)]