summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdfbin183026 -> 183487 bytes
-rw-r--r--Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx86
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty50
-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, 113 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
index aa63345c7e5..a301c5b5a85 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 e384465d867..07a33efef98 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.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) $
%</!(example1,example2,example3,installer)>
%
%
@@ -80,7 +80,7 @@
%
% \GetFileInfo{pdfpages.dtx}
%
-% \CheckSum{4651}
+% \CheckSum{4592}
%
% \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
@@ -1053,7 +1053,7 @@
\DeclareOption{final}{\AM@pkg@draftfalse}
\DeclareOption{enable-survey}{\AM@pkg@surveytrue}
\DeclareOption{disable-survey}{\AM@pkg@surveyfalse}
-% \begin{macrocode}
+% \end{macrocode}
% |\AM@ifdriverlater| checks that the driver loaded is more recent
% than the given date. See |\@ifpackagelater| from the standard
% \LaTeX\ kernel.
@@ -1159,6 +1159,7 @@
\newif\ifAM@firstpage\AM@firstpagefalse
\newif\ifAM@reflect\AM@reflectfalse
\newif\ifAM@reflectall\AM@reflectallfalse
+\newif\ifAM@scale\AM@scaletrue
% \end{macrocode}
% \subsection{Commands}
% Declare macro names and define default values.
@@ -1449,11 +1450,7 @@
% \end{macrocode}
% Determine scaling factor:
% The logical pages are scaled such, that they match on
-% one sheet of paper. To determine the scaling
-% factor all |scale| options given by the user must be
-% discarded first (|\AM@remove@scale|).
-% But they are \textit{not} discarded when finally being
-% shipped out.
+% one sheet of paper.
% \begin{macrocode}
\@ifundefined{AM@pagetemplate}
{\AM@readfirst{\AM@pagelist}%
@@ -1560,7 +1557,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
@@ -2305,50 +2304,6 @@
\edef\AM@resorteddoclist{\expandafter\@gobble\AM@resorteddoclist}%
}
% \end{macrocode}
-% \macro{\AM@remove@scale}
-% \macro{\AM@remove@scalei}
-% \macro{\AM@remove@scaleii}
-% Remove the \texttt{scale} item from the options list (|#1|)
-% and then save it in |\AM@options|.
-% \begin{macrocode}
-\newif\ifAM@scale
-\newcommand{\AM@remove@scale}{}
-\def\AM@remove@scale#1{%
- \def\AM@options{}%
- \AM@remove@scalei#1,\END,
-}
-% \end{macrocode}
-% \begin{macrocode}
-\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
-}
-% \end{macrocode}
-% \begin{macrocode}
-\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
-}
-% \end{macrocode}
% \macro{\AM@split@options}
% \macro{\AM@split@optionsi}
% \macro{\AM@split@oprionsii}
@@ -2363,6 +2318,7 @@
\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,
}
@@ -2443,7 +2399,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}%
+ }{}%
}
% \end{macrocode}
% \macro{\AM@trim@space}
@@ -3497,15 +3458,6 @@
\gdef\AM@XeTeXquote{"}%
}
% \end{macrocode}
-% Get last page number.
-% \begin{macrocode}
-% \def\AM@remove@relax#1\relax{#1}
-% \def\AM@getpagecount{%
-% \edef\AM@pagecount{\expandafter\AM@remove@relax
-% \the\XeTeXpdfpagecount\AM@XeTeXquote
-% \AM@currentdocname\AM@XeTeXquote\relax}%
-% }
-% \end{macrocode}
% Get last page number. |\XeTeXpdfpagecount| is only defined
% for |pdf| files. For all other file types |\AM@pagecount|
% must be set to |1| explicitely.
@@ -4217,6 +4169,12 @@
% after |\setkeys|.
% \end{itemize}
%
+%
+% \subsection*{2011/07/02 v0.4p}
+% \begin{itemize}
+% \item Bugfix: |templatesize| ignored |scale| option.
+% \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 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)]
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 13:36:28 +0000