summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-06-25 11:16:05 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-06-25 11:16:05 +0000
commit6a27ab893b3290a9236fea469b0c39ec049cacd6 (patch)
tree7759bcc68f5944e533a52c15f14e78a229a06a23
parent4530a2c792171b2f0db4d844f06a3a52d3d41b94 (diff)
pdfpages 0.4f 2008/06/22
git-svn-id: svn://tug.org/texlive/trunk@9036 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdfbin172136 -> 171990 bytes
-rw-r--r--Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx23
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty8
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppnull.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pppdftex.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppvtex.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppxetex.def6
7 files changed, 31 insertions, 24 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
index c22e2aab977..52bd37de991 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 46f3f3ebf89..01fe415be47 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.4e}
+\def\AM@fileversion{v0.4f}
\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: 2008-05-11 00:31:21 +0200 (Sun, 11 May 2008) $
+\AM@SVN@Date$Date: 2008-06-22 22:50:12 +0200 (Sun, 22 Jun 2008) $
%</!(example1,example2,example3,installer)>
%
%
@@ -1448,9 +1448,9 @@
% \begin{macrocode}
\ifthenelse{\boolean{AM@fitpaper}}
{\setlength{\AM@pagewidth}{\the\wd\@tempboxa}%
- \setlength{\AM@pageheight}{\the\ht\@tempboxa}%
+ \setlength{\AM@pageheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}%
\setlength{\paperwidth}{\the\wd\@tempboxa}%
- \setlength{\paperheight}{\the\ht\@tempboxa}%
+ \setlength{\paperheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}%
\AM@fitpaper@special
\AM@setpagedimen
\@ifundefined{stockwidth}{}{%
@@ -3159,7 +3159,7 @@
\let\AM@pageheight\pdfpageheight
\def\AM@setpagedimen{%
\setlength{\pdfpagewidth}{\the\wd\@tempboxa}%
- \setlength{\pdfpageheight}{\the\ht\@tempboxa}%
+ \setlength{\pdfpageheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}%
}
\let\AM@pagesize@boogie\relax
% \end{macrocode}
@@ -3347,7 +3347,7 @@
\let\AM@pageheight\mediaheight
\def\AM@setpagedimen{%
\setlength{\mediawidth}{\the\wd\@tempboxa}%
- \setlength{\mediaheight}{\the\ht\@tempboxa}%
+ \setlength{\mediaheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}%
}
\let\AM@pagesize@boogie\relax
% \end{macrocode}
@@ -3474,7 +3474,7 @@
\let\AM@pageheight\pdfpageheight
\def\AM@setpagedimen{%
\setlength{\pdfpagewidth}{\the\wd\@tempboxa}%
- \setlength{\pdfpageheight}{\the\ht\@tempboxa}%
+ \setlength{\pdfpageheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}%
}
\def\AM@pagesize@boogie{%
\ifdim\AM@pagewidth=\z@
@@ -3669,7 +3669,7 @@
\let\AM@pageheight\paperheight
\def\AM@setpagedimen{%
\setlength{\paperwidth}{\the\wd\@tempboxa}%
- \setlength{\paperheight}{\the\ht\@tempboxa}%
+ \setlength{\paperheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}%
}
\let\AM@pagesize@boogie\relax
% \end{macrocode}
@@ -3834,6 +3834,13 @@
% in the caption-argument of |addtolist|.
% \end{itemize}
%
+% \subsection*{2008/06/05 v0.4f}
+% \begin{itemize}
+% \item If |fitpaper| is used together with |angle| the resulting
+% |\@tempboxa| might have a depth unequal to zero. Taking this
+% into consideration when calculation page dimensions.
+% \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 a5394336a0e..55aec8fd333 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.4e}
+\def\AM@fileversion{v0.4f}
\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: 2008-05-11 00:31:21 +0200 (Sun, 11 May 2008) $
+\AM@SVN@Date$Date: 2008-06-22 22:50:12 +0200 (Sun, 22 Jun 2008) $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
[\AM@filedate\space\AM@fileversion\space
@@ -335,9 +335,9 @@
\fi
\ifthenelse{\boolean{AM@fitpaper}}
{\setlength{\AM@pagewidth}{\the\wd\@tempboxa}%
- \setlength{\AM@pageheight}{\the\ht\@tempboxa}%
+ \setlength{\AM@pageheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}%
\setlength{\paperwidth}{\the\wd\@tempboxa}%
- \setlength{\paperheight}{\the\ht\@tempboxa}%
+ \setlength{\paperheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}%
\AM@fitpaper@special
\AM@setpagedimen
\@ifundefined{stockwidth}{}{%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
index 6b1b8db78ea..4e56776ce2f 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.4e}
+\def\AM@fileversion{v0.4f}
\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: 2008-05-11 00:31:21 +0200 (Sun, 11 May 2008) $
+\AM@SVN@Date$Date: 2008-06-22 22:50:12 +0200 (Sun, 22 Jun 2008) $
\ProvidesFile{ppnull.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages dummy driver (AM)]
@@ -53,7 +53,7 @@
\let\AM@pageheight\paperheight
\def\AM@setpagedimen{%
\setlength{\paperwidth}{\the\wd\@tempboxa}%
- \setlength{\paperheight}{\the\ht\@tempboxa}%
+ \setlength{\paperheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}%
}
\let\AM@pagesize@boogie\relax
\let\AM@fitpaper@special\relax
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
index c2126f09207..1a7871f6fd2 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.4e}
+\def\AM@fileversion{v0.4f}
\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: 2008-05-11 00:31:21 +0200 (Sun, 11 May 2008) $
+\AM@SVN@Date$Date: 2008-06-22 22:50:12 +0200 (Sun, 22 Jun 2008) $
\ProvidesFile{pppdftex.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for pdfTeX (AM)]
@@ -72,7 +72,7 @@
\let\AM@pageheight\pdfpageheight
\def\AM@setpagedimen{%
\setlength{\pdfpagewidth}{\the\wd\@tempboxa}%
- \setlength{\pdfpageheight}{\the\ht\@tempboxa}%
+ \setlength{\pdfpageheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}%
}
\let\AM@pagesize@boogie\relax
\let\AM@fitpaper@special\relax
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
index 652ff8d4c29..9d396c32e66 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.4e}
+\def\AM@fileversion{v0.4f}
\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: 2008-05-11 00:31:21 +0200 (Sun, 11 May 2008) $
+\AM@SVN@Date$Date: 2008-06-22 22:50:12 +0200 (Sun, 22 Jun 2008) $
\ProvidesFile{ppvtex.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for VTeX (AM)]
@@ -62,7 +62,7 @@
\let\AM@pageheight\mediaheight
\def\AM@setpagedimen{%
\setlength{\mediawidth}{\the\wd\@tempboxa}%
- \setlength{\mediaheight}{\the\ht\@tempboxa}%
+ \setlength{\mediaheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}%
}
\let\AM@pagesize@boogie\relax
\def\AM@setlscape{\special{pS:
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
index 8a513843d09..eccf83e9c91 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
@@ -12,10 +12,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4e}
+\def\AM@fileversion{v0.4f}
\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: 2008-05-11 00:31:21 +0200 (Sun, 11 May 2008) $
+\AM@SVN@Date$Date: 2008-06-22 22:50:12 +0200 (Sun, 22 Jun 2008) $
\ProvidesFile{ppxetex.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for XeTeX (AM)]
@@ -53,7 +53,7 @@
\let\AM@pageheight\pdfpageheight
\def\AM@setpagedimen{%
\setlength{\pdfpagewidth}{\the\wd\@tempboxa}%
- \setlength{\pdfpageheight}{\the\ht\@tempboxa}%
+ \setlength{\pdfpageheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}%
}
\def\AM@pagesize@boogie{%
\ifdim\AM@pagewidth=\z@