diff options
author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2009-11-20 10:36:19 +0000 |
---|---|---|
committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2009-11-20 10:36:19 +0000 |
commit | 64e6072a5dad1d9eb63e27bbb1a00ff4278e49fe (patch) | |
tree | 8f4c38e72cb5ce88cf0275227d508f0769ed1fe1 /Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty | |
parent | 971a4c28d717ab58e5bd3394f497e1cede329128 (diff) |
pdfpages update: v0.4i
git-svn-id: svn://tug.org/texlive/trunk@16101 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.sty | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty index b24c940f261..8614429e949 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.4g} +\def\AM@fileversion{v0.4i} \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-02-07 21:46:53 +0100 (Sat, 07 Feb 2009) $ +\AM@SVN@Date$Date: 2009-10-31 13:40:37 +0100 (Sat, 31 Oct 2009) $ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfpages} [\AM@filedate\space\AM@fileversion\space @@ -41,10 +41,18 @@ \def\AM@ifdriverlater{\@ifl@ter{def}} \InputIfFileExists{pdfpages.cfg}{% \PackageInfo{pdfpages}{Loading configuration file `pdfpages.cfg'}}{} -\DeclareOption{pdftex}{\def\AM@driver{pdftex}} -\DeclareOption{vtex}{\def\AM@driver{vtex}} +\def\AM@graphics@driver{} +\DeclareOption{pdftex}{% + \def\AM@driver{pdftex}\let\AM@graphics@driver\AM@driver} +\DeclareOption{vtex}{% + \def\AM@driver{vtex}\let\AM@graphics@driver\AM@driver} +\DeclareOption{xetex}{% + \def\AM@driver{xetex}\let\AM@graphics@driver\AM@driver} +\DeclareOption{dvips}{% + \def\AM@driver{dvips}\let\AM@graphics@driver\AM@driver} +\DeclareOption{dvipdfm}{% + \def\AM@driver{dvipdfm}\let\AM@graphics@driver\AM@driver} \DeclareOption{null}{\def\AM@driver{null}} -\DeclareOption{xetex}{\def\AM@driver{xetex}} \ProcessOptions \@ifundefined{AM@driver}{ \begingroup @@ -57,7 +65,8 @@ }{\gdef\AM@driver{pdftex}} \endgroup }{} -\RequirePackage{ifthen, graphicx, calc, eso-pic} +\RequirePackage{ifthen, calc, eso-pic} +\RequirePackage[\AM@graphics@driver]{graphicx} \newif\ifAM@DVIoutput\AM@DVIoutputfalse \input{pp\AM@driver.def} \ifx\AM@endinput\relax\expandafter\endinput\fi @@ -334,10 +343,10 @@ \fi \fi \ifthenelse{\boolean{AM@fitpaper}} - {\setlength{\AM@pagewidth}{\the\wd\@tempboxa}% - \setlength{\AM@pageheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}% - \setlength{\paperwidth}{\the\wd\@tempboxa}% - \setlength{\paperheight}{\the\ht\@tempboxa+\the\dp\@tempboxa}% + {\setlength{\AM@pagewidth}{\wd\@tempboxa}% + \setlength{\AM@pageheight}{\ht\@tempboxa + \dp\@tempboxa}% + \setlength{\paperwidth}{\wd\@tempboxa}% + \setlength{\paperheight}{\ht\@tempboxa + \dp\@tempboxa}% \AM@fitpaper@special \AM@setpagedimen \@ifundefined{stockwidth}{}{% @@ -478,7 +487,7 @@ page=\AM@page, scale=\AM@globalscale, angle=\AM@lscape@rot]{\AM@docname}}% \edef\AM@localwd{\the\wd\@tempboxa}% - \setlength{\@tempdima}{\the\ht\@tempboxa + \the\dp\@tempboxa}% + \setlength{\@tempdima}{\ht\@tempboxa + \dp\@tempboxa}% \edef\AM@localht{\the\@tempdima}% \AM@rescalefalse \ifdim\AM@localwd=\AM@templatewidth \else \AM@rescaletrue \fi @@ -507,7 +516,7 @@ angle=\AM@lscape@rot, angle=90]{\AM@docname}}% \let\@filelist\AM@filelist@save \edef\AM@localwd{\the\wd\@tempboxa}% - \setlength{\@tempdima}{\the\ht\@tempboxa + \the\dp\@tempboxa}% + \setlength{\@tempdima}{\ht\@tempboxa + \dp\@tempboxa}% \edef\AM@localht{\the\@tempdima}% \fi \setlength{\@tempdima} @@ -625,7 +634,8 @@ {\ifthenelse{\boolean{AM@landscape}} {\AM@setlscape}{}} {}% - \AM@AddToShipoutPicture{\begingroup\AM@picturecommand\endgroup}% + \AM@AddToShipoutPicture{% + \begingroup\AM@picturecommand\endgroup}% \ifAM@firstpage \AM@AddToShipoutPicture{% \begingroup\AM@picturecommandstar\endgroup}% @@ -749,7 +759,7 @@ \ifthenelse{\boolean{AM@pkg@draft} \and \boolean{AM@survey}}{% }{% \PackageError{pdfpages} - {page number #1 of `\AM@currentdocname' does not exist} + {page #1 of `\AM@currentdocname' does not exist} {You have set a wrong page number in the `pages' option. Document \MessageBreak `\AM@currentdocname' does not have #1 pages.}% @@ -1278,7 +1288,7 @@ \def\AM@toc@page{\AM@trim@space{#1}}% \def\AM@toc@section{\AM@trim@space{#2}}% \def\AM@toc@level{\AM@trim@space{#3}}% - \AM@toc@title\expandafter{\ifdim\z@=0pt#4}\fi + \AM@toc@title{\ignorespaces #4}% \def\AM@toc@label{\AM@trim@space{#5}}% \AM@checkinteger{\AM@toc@page}% \ifAM@integer\else @@ -1321,7 +1331,7 @@ \def\AM@parse@loflisti#1,#2,#3,#4,#5\END{% \def\AM@lof@page{\AM@trim@space{#1}}% \def\AM@lof@list{\AM@trim@space{#2}}% - \def\AM@lof@heading{\AM@trim@leadingspace{#3}}% + \def\AM@lof@heading{#3}% \def\AM@lof@label{\AM@trim@space{#4}}% \AM@checkinteger{\AM@lof@page}% \ifAM@integer\else |