From 29d07a8cd3db51f6eeecc9b1d2cc4d8fd9c7466b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 14 Aug 2006 23:00:18 +0000 Subject: pdfpages 0.4a (14aug06) git-svn-id: svn://tug.org/texlive/trunk@1958 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty | 192 ++++++++++++++-------- Master/texmf-dist/tex/latex/pdfpages/ppnull.def | 78 +++++++++ Master/texmf-dist/tex/latex/pdfpages/pppdftex.def | 35 ++-- Master/texmf-dist/tex/latex/pdfpages/ppvtex.def | 29 +++- 4 files changed, 247 insertions(+), 87 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/pdfpages/ppnull.def (limited to 'Master/texmf-dist/tex/latex/pdfpages') diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty index 3dd1d0cc26b..fdcd7dc8439 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty +++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty @@ -6,29 +6,33 @@ %% %% pdfpages.dtx (with options: `package') %% -%% This is a package for PDFLaTeX, which makes it -%% easy to insert pages of external PDF documents. -%% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2003 Andreas MATTHIAS. -%% -%% This program may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.2 -%% of this license or (at your option) any later version. -%% The latest version of this license is in +%% Copyright (C) 2001-2006 Andreas MATTHIAS +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any +%% later version. The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.2 or later is part of all distributions of LaTeX -%% version 1999/12/01 or later. +%% and version 1.3c or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Andreas Matthias . %% %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS . %% +\def\AM@fileversion{v0.4a} +\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: 2006-08-12 01:13:35 +0200 (Sat, 12 Aug 2006) $ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfpages} - [2004/01/31 v0.3e + [\AM@filedate\space\AM@fileversion\space Insert pages of external PDF documents (AM)] -\def\AM@version{0.3e} \newif\ifAM@pkg@draft \AM@pkg@draftfalse \newif\ifAM@pkg@survey \AM@pkg@surveyfalse \DeclareOption{draft}{\AM@pkg@drafttrue} @@ -37,23 +41,17 @@ \DeclareOption{disable-survey}{\AM@pkg@surveyfalse} \ProcessOptions \def\AM@ifdriverlater{\@ifl@ter{def}} -\def\AM@driver{pdftex} \begingroup \@ifundefined{pdfoutput}{% \@ifundefined{OpMode}{% - \PackageError{pdfpages} - {You are using neither pdfTeX nor VTeX.\MessageBreak - Package pdfpages does not work with other\MessageBreak - TeX implementations} - {Please, change to pdfTeX or VTeX to use this - package!}% - \aftergroup\endinput + \def\AM@driver{null} }{\gdef\AM@driver{vtex}}% -}{} +}{\gdef\AM@driver{pdftex}} \endgroup \RequirePackage{ifthen, graphicx, calc, eso-pic} +\newif\ifAM@DVIoutput\AM@DVIoutputfalse \input{pp\AM@driver.def} -\ifx\AM@endinput\relax\endinput\fi +\ifx\AM@endinput\relax\expandafter\endinput\fi \ifAM@pkg@survey \let\AM@setanchor\AM@anchor@special \RequirePackage{count1to}% @@ -64,6 +62,7 @@ \def\AM@ClearShipoutPicture{\relax}} {\def\AM@AddToShipoutPicture{\AddToShipoutPicture}% \def\AM@ClearShipoutPicture{\ClearShipoutPicture}} + \let\Orig@AM@AddToShipoutPicture\AM@AddToShipoutPicture \newif\ifAM@openright\AM@openrightfalse \newif\ifAM@frame\AM@framefalse \newif\ifAM@landscape\AM@landscapefalse @@ -85,6 +84,8 @@ \newif\ifAM@doublepagestmpi\AM@doublepagestmpifalse \newif\ifAM@linkfilename\AM@linkfilenamefalse \newif\ifAM@signature\AM@signaturefalse +\newif\ifAM@signaturestar\AM@signaturestarfalse +\newif\ifAM@booklet\AM@bookletfalse \newif\ifAM@sigrotate\AM@sigrotatefalse \newif\ifAM@newwindow\AM@newwindowtrue \newif\ifAM@rescale\AM@rescalefalse @@ -104,9 +105,7 @@ \newcommand*{\AM@ARBug@hook}{} \newcommand*{\AM@xrprefix}{} \newcommand*{\AM@picturecommand}{}\newcommand*{\AM@picturecommandstar}{} - \newsavebox{\AM@pagebox} - \newif\ifAM@thumbpdf \newif\ifAM@pdflscape \AtBeginDocument{% @@ -149,7 +148,7 @@ \ifx\AM@currentdocname\relax \edef\AM@currentdocname{\AM@dir#1}% \fi - }% + }{}% }% }% \@tfor \fi @@ -225,22 +224,23 @@ \AM@ClearShipoutPicture } \newcommand{\AM@CheckAtEnd}{% - \ifx\@empty\AM@toclist\else - \PackageWarning{pdfpages}{% - There's something wrong with the entries\MessageBreak - of `addtotoc'. Not all entries were\MessageBreak - processed. Check `addtotoc'}% - \fi - \ifx\@empty\AM@loflist\else - \PackageWarning{pdfpages}{% - There's something wrong with the entries\MessageBreak - of `addtolist'. Not all entries were\MessageBreak - processed. Check `addtolist'}% - \fi + \ifx\@empty\AM@toclist\else + \PackageWarning{pdfpages}{% + There's something wrong with the entries\MessageBreak + of `addtotoc'. Not all entries were\MessageBreak + processed. Check `addtotoc'}% + \fi + \ifx\@empty\AM@loflist\else + \PackageWarning{pdfpages}{% + There's something wrong with the entries\MessageBreak + of `addtolist'. Not all entries were\MessageBreak + processed. Check `addtolist'}% + \fi } \newcommand{\AM@output}[1]{% \c@totalnumber=0 \if@twocolumn\let\AM@twocolumn\relax \onecolumn \fi + \AM@disable@includegraphics \@ifundefined{AM@xnup} {\def\AM@xnup{\@ne}\def\AM@ynup{\@ne}% \def\AM@xnupminusi{\z@}\def\AM@ynupminusi{\z@}}{}% @@ -252,8 +252,6 @@ \ifAM@pkg@draft \setkeys{Gin}{draft=true}% \else \setkeys{Gin}{draft=false}% \fi - \ifthenelse{\boolean{AM@pkg@draft} \and \boolean{AM@survey}} - {}{\AM@getpagecount} \ifthenelse{\boolean{AM@landscape}} {\def\AM@lscape@rot{90}% \@ifundefined{AM@shortnupsyntax}{} @@ -292,7 +290,7 @@ \ifthenelse{\boolean{AM@reflect}} {\let\AM@reflectbox\reflectbox} {\let\AM@reflectbox\relax}% -\setbox\AM@pagebox\null + \setbox\AM@pagebox\null \ifthenelse{\boolean{AM@column}} {\def\AM@xnupi{\@ne}% \def\AM@ynupi{\z@}} @@ -313,9 +311,13 @@ \else \AM@split@options{Gin@noscale}{#1}% \let\AM@filelist@save\@filelist - \setbox\@tempboxa=\hbox{% - \expandafter\includegraphics\expandafter[\the\@temptokena, - page=\AM@page, angle=\AM@lscape@rot]{\AM@docname}}% + \ifAM@DVIoutput + \setbox\@tempboxa=\hbox{\rule{597pt}{845pt}} + \else + \setbox\@tempboxa=\hbox{% + \expandafter\includegraphics\expandafter[\the\@temptokena, + page=\AM@page, angle=\AM@lscape@rot]{\AM@docname}}% + \fi \ifthenelse{\boolean{AM@fitpaper}} {\setlength{\AM@pagewidth}{\the\wd\@tempboxa}% \setlength{\AM@pageheight}{\the\ht\@tempboxa}% @@ -551,8 +553,7 @@ \def\AM@region{region}% \ifx\AM@linkfit\AM@region \setlength{\@tempdima}{\the\ht\@tempboxa + \the\dp\@tempboxa}% - \edef\AM@linkfit{fitr width\the\wd\@tempboxa\space - height0pt depth\the\@tempdima}% + \let\AM@linkfit\AM@linkfit@special \fi \ifAM@phantompage \def\AM@shippage{}% @@ -694,6 +695,11 @@ \edef\AM@tempii{\AM@trim@space{#1}}% \expandafter\ifx\expandafter\\\AM@tempii\\ \@tempcntb=\AM@pagecount\relax + \ifAM@DVIoutput + \ifnum\AM@pagecount=1 + \@tempcntb\@tempcnta + \fi + \fi \advance\@tempcntb\@ne \whiledo{\@tempcnta<\@tempcntb}{% \AM@append{\the\@tempcnta}% @@ -720,7 +726,7 @@ \fi \fi } -\newcommand*{\AM@checkpagenumber}[1]{% +\providecommand*{\AM@checkpagenumber}[1]{% \ifnum#1>\AM@pagecount\relax \ifthenelse{\boolean{AM@pkg@draft} \and \boolean{AM@survey}}{% }{% @@ -776,6 +782,7 @@ \@ifundefined{AM@temp}{\def#1{}}{\edef#1{\AM@temp}}% } \def\AM@ReturnAfterFi#1\fi{\fi#1} +\def\AM@ReturnAfterFiFi#1\fi\fi{\fi\fi#1} \newcommand{\AM@getlasti}{} \def\AM@getlasti#1,#2\END{% \ifx\\#2\\% @@ -801,6 +808,30 @@ \repeat \edef\AM@lastnitems{\AM@templist}% } +\newcommand{\AM@split@firstn}{} +\def\AM@split@firstn#1#2{% + \edef\AM@tmp{\expandafter\@gobble\string#1@firstn}% + \AM@getfirst{#1}% + \expandafter\edef\csname\AM@tmp\endcsname{\the\toks@}% + \@tempcnta=\@ne + \@tempcntb=#2 \divide\@tempcntb\tw@ + \loop\ifnum\@tempcnta<\@tempcntb + \AM@getfirst{#1}% + \expandafter\edef\csname\AM@tmp\endcsname + {\@nameuse{\AM@tmp},\the\toks@}% + \advance\@tempcnta\@ne + \repeat + \edef\AM@tmp{\expandafter\@gobble\string#1@lastn}% + \AM@getfirst{#1}% + \expandafter\edef\csname\AM@tmp\endcsname{\the\toks@}% + \@tempcnta=\@ne + \loop\ifnum\@tempcnta<\@tempcntb + \AM@getfirst{#1}% + \expandafter\edef\csname\AM@tmp\endcsname + {\the\toks@,\@nameuse{\AM@tmp}}% + \advance\@tempcnta\@ne + \repeat +} \newif\ifAM@again\AM@againtrue \newcommand{\AM@count}{} \def\AM@count#1{% @@ -991,13 +1022,16 @@ \equal{doublepagestwist*}{\AM@temp}\or \equal{doublepagestwistodd*}{\AM@temp}\or \equal{signature}{\AM@temp}\or + \equal{signature*}{\AM@temp}\or + \equal{booklet}{\AM@temp}\or \equal{pagetemplate}{\AM@temp}\or \equal{rotateoversize}{\AM@temp}\or \equal{picturecommand}{\AM@temp}\or \equal{picturecommand*}{\AM@temp}\or \equal{newwindow}{\AM@temp}\or \equal{reflect}{\AM@temp}\or - \equal{reflect*}{\AM@temp}} + \equal{reflect*}{\AM@temp}\or + \equal{lastpage}{\AM@temp}} {\AM@pdfpages@optionstrue}{}% \ifthenelse{\equal{scale}{\AM@temp}}{\AM@scaletrue}{}% } @@ -1083,6 +1117,15 @@ \def\AM@prepare@signature{% \def\AM@newpagelist{}% \def\AM@newdoclist{}% +\ifAM@booklet + \AM@countpagelist + \@tempcntb=\@tempcnta + \divide\@tempcnta by 4 + \multiply\@tempcnta by 4 + \advance\@tempcntb-\@tempcnta + \ifnum\@tempcntb=0\else \advance\@tempcnta by 4\fi + \edef\AM@signature{\the\@tempcnta}% +\fi \@tempcnta=\AM@signature\relax \divide\@tempcnta by 4 \multiply\@tempcnta by 4 @@ -1105,34 +1148,36 @@ \def\AM@sort{% \def\AM@sigpagelist{}% \def\AM@sigdoclist{}% - \@tempcntb=\AM@signature\relax - \AM@getlastn{\AM@pagelist}{\@tempcntb}% - \edef\AM@lastnpages{\AM@lastnitems}% - \AM@getlastn{\AM@doclist}{\@tempcntb}% - \edef\AM@lastndocs{\AM@lastnitems}% - \@tempcnta=0 + \AM@split@firstn{\AM@pagelist}{\AM@signature}% + \AM@split@firstn{\AM@doclist}{\AM@signature}% \def\AM@first{% - \AM@getfirst{\AM@lastnpages}% + \AM@getfirst{\AM@pagelist@firstn}% \edef\AM@sigpagelist{\AM@sigpagelist,\the\toks@}% - \AM@getfirst{\AM@lastndocs}% + \AM@getfirst{\AM@doclist@firstn}% \edef\AM@sigdoclist{\AM@sigdoclist,\the\toks@}% }% \def\AM@last{% - \AM@getlast{\AM@lastnpages}% - \edef\AM@sigpagelist{\AM@sigpagelist,\AM@lastitem}% - \AM@getlast{\AM@lastndocs}% - \edef\AM@sigdoclist{\AM@sigdoclist,\AM@lastitem}% + \AM@getfirst{\AM@pagelist@lastn}% + \edef\AM@sigpagelist{\AM@sigpagelist,\the\toks@}% + \AM@getfirst{\AM@doclist@lastn}% + \edef\AM@sigdoclist{\AM@sigdoclist,\the\toks@}% }% + \@tempcnta=\z@ + \@tempcntb=\AM@signature\relax \whiledo{\@tempcnta<\@tempcntb}{% \ifAM@landscape - \AM@last\AM@first\AM@last\AM@first + \ifAM@signaturestar + \AM@first\AM@last\AM@first\AM@last + \else + \AM@last\AM@first\AM@last\AM@first + \fi \else \AM@first\AM@last\AM@first\AM@last \fi \advance\@tempcnta by 4 }% - \edef\AM@newpagelist{\AM@sigpagelist\AM@newpagelist}% - \edef\AM@newdoclist{\AM@sigdoclist\AM@newdoclist}% + \edef\AM@newpagelist{\AM@newpagelist\AM@sigpagelist}% + \edef\AM@newdoclist{\AM@newdoclist\AM@sigdoclist}% \ifx\AM@pagelist\@empty \else\expandafter\AM@sort \fi @@ -1224,7 +1269,7 @@ \def\@captype{\AM@lof@list}% \long\def\@makecaption##1##2{}% \let\@fs@capt\relax% float.sty - \caption{\AM@lof@heading}% + \expandafter\caption\expandafter{\AM@lof@heading}% \AM@addtolist@hook \@ifundefined{hyper@@anchor}{}{% \@ifundefined{float@caption}{% @@ -1243,7 +1288,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{#3}% + \edef\AM@lof@heading{\AM@trim@leadingspace{#3}}% \def\AM@lof@label{\AM@trim@space{#4}}% \AM@checkinteger{\AM@lof@page}% \ifAM@integer\else @@ -1332,7 +1377,13 @@ \fi } \AtBeginDocument{\AM@TeXpower@hook} -\define@key{pdfpages}{pages}{\def\AM@pagestemp{#1}} +\def\AM@CheckValue#1#2{% + \ifx\\#2\\\PackageError{pdfpages} + {Option `#1' must have a non-empty value}% + \fi +} +\define@key{pdfpages}{pages}{\AM@CheckValue{pages}{#1}% + \def\AM@pagestemp{#1}} \define@key{pdfpages}{nup}{\AM@parse@nup#1x\END} \define@key{pdfpages}{deltax}{\AM@parse@deltax#1 \\} \define@key{pdfpages}{deltay}{\AM@parse@deltay#1 \\} @@ -1389,7 +1440,12 @@ \AM@doublepagestmpfalse\AM@doublepagestmpitrue \AM@doublepagestwistxtrue} \define@key{pdfpages}{signature}{\def\AM@signature{#1}} -\define@key{pdfpages}{pagetemplate}{\def\AM@pagetemplate{#1}} +\define@key{pdfpages}{signature*}{\def\AM@signature{#1}% + \AM@signaturestartrue} +\define@key{pdfpages}{booklet}[true]{\setboolean{AM@booklet}{#1}% + \def\AM@signature{x}} +\define@key{pdfpages}{pagetemplate}{\AM@CheckValue{pagetemplate}{#1}% + \def\AM@pagetemplate{#1}} \define@key{pdfpages}{rotateoversize}[true]% {\setboolean{AM@rotateoversize}{#1}} \define@key{pdfpages}{picturecommand}{\def\AM@picturecommand{#1}} @@ -1397,6 +1453,7 @@ \define@key{pdfpages}{newwindow}[true]{\setboolean{AM@newwindow}{#1}} \define@key{pdfpages}{reflect*}[true]{\setboolean{AM@reflect}{#1}} \define@key{pdfpages}{reflect}[true]{\setboolean{AM@reflectall}{#1}} +\define@key{pdfpages}{lastpage}{\def\AM@pagecount{#1}} \newcommand{\AM@parse@nup}{} \def\AM@parse@nup#1x#2\END{% \ifx\\#2\\% @@ -1437,7 +1494,6 @@ } \InputIfFileExists{pdfpages.fix}{% \PackageInfo{pdfpages}{Loading patch file `pdfpages.fix'}}{} - \endinput %% %% End of file `pdfpages.sty'. diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def new file mode 100644 index 00000000000..a538bc80221 --- /dev/null +++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def @@ -0,0 +1,78 @@ +%% +%% This is file `ppnull.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% pdfpages.dtx (with options: `ppnulldef') +%% +%% This file is part of the pdfpages package. +%% +%% Copyright (C) 2001-2006 Andreas MATTHIAS +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any +%% later version. The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3c or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Andreas Matthias . +%% +%% Please send error reports and suggestions for improvements to +%% Andreas MATTHIAS . +%% +\def\AM@fileversion{v0.4a} +\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: 2006-08-12 01:13:35 +0200 (Sat, 12 Aug 2006) $ +\ProvidesFile{ppnull.def} + [\AM@filedate\space\AM@fileversion\space + Pdfpages' dummy driver (AM)] +\AM@DVIoutputtrue +\PackageWarningNoLine{pdfpages}{% + I will use a dummy \string\includepdf\space command\MessageBreak + which will NOT insert any pages, because\MessageBreak + you are producing DVI output} +\def\AM@findfile#1{% + \def\AM@currentdocname{#1}% +} +\def\AM@getpagecount{% + \ifx\AM@pagecount\AM@undefined + \PackageWarningNoLine{pdfpages}{% + I cannot determine the number of pages of the\MessageBreak + included document, while in DVI mode. You can\MessageBreak + use the option `lastpage' to give me a hint}% + \edef\AM@pagecount{1}% + \fi +} +\let\AM@pagewidth\paperwidth +\let\AM@pageheight\paperheight +\def\AM@setpagedimen{% + \setlength{\paperwidth}{\the\wd\@tempboxa}% + \setlength{\paperheight}{\the\ht\@tempboxa}% +} +\let\AM@fitpaper@special\relax +\def\AM@findfile#1{% + \def\AM@currentdocname{}% +} +\let\AM@setlscape\relax +\let\AM@linktodoc@special@begin\relax +\let\AM@linktodoc@special@end\relax +\let\AM@survey@special@begin\relax +\let\AM@survey@special@end\relax +\let\AM@thread@special@begin\relax +\let\AM@thread@special@end\relax +\let\AM@dest@special\relax +\let\AM@anchor@special\relax +\let\AM@linkfit@special\relax +\def\AM@disable@includegraphics{% + \renewcommand\includegraphics[2][]{}% +} +\newcommand*{\AM@checkpagenumber}[1]{} +\endinput +%% +%% End of file `ppnull.def'. diff --git a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def index 18fc3c62ac5..537326f7008 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def @@ -6,18 +6,31 @@ %% %% pdfpages.dtx (with options: `pppdftexdef') %% -%% This is a package for PDFLaTeX, which makes it -%% easy to insert pages of external PDF documents. -%% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2003 Andreas MATTHIAS. -%% +%% Copyright (C) 2001-2006 Andreas MATTHIAS +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any +%% later version. The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3c or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Andreas Matthias . +%% %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS . %% +\def\AM@fileversion{v0.4a} +\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: 2006-08-12 01:13:35 +0200 (Sat, 12 Aug 2006) $ \ProvidesFile{pppdftex.def} - [2004/01/31 v0.3e + [\AM@filedate\space\AM@fileversion\space Pdfpages driver for pdfTeX (AM)] \ifnum\pdftexversion<100 \PackageError{pdfpages} @@ -28,11 +41,7 @@ \expandafter\endinput \fi \ifcase\pdfoutput - \PackageError{pdfpages} - {You produce DVI output but PDF output\MessageBreak - is needed for package pdfpages} - {Set output to PDF. (use: \pdfoutput = 1)} - \let\AM@endinput\relax + \input{ppnull.def} \expandafter\endinput \fi \begingroup @@ -102,7 +111,9 @@ \let\AM@thread@special@end\relax \def\AM@dest@special{\pdfdest name {\AM@linkname.\AM@page} \AM@linkfit} \def\AM@anchor@special{\pdfdest name {pdfpages.\the\count1} fit} - +\edef\AM@linkfit@special{fitr width\the\wd\@tempboxa\space + height0pt depth\the\@tempdima} +\let\AM@disable@includegraphics\relax \endinput %% %% End of file `pppdftex.def'. diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def index a47ec1f4572..484a1aa121d 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def @@ -6,18 +6,31 @@ %% %% pdfpages.dtx (with options: `ppvtexdef') %% -%% This is a package for PDFLaTeX, which makes it -%% easy to insert pages of external PDF documents. -%% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2003 Andreas MATTHIAS. -%% +%% Copyright (C) 2001-2006 Andreas MATTHIAS +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any +%% later version. The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3c or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Andreas Matthias . +%% %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS . %% +\def\AM@fileversion{v0.4a} +\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: 2006-08-12 01:13:35 +0200 (Sat, 12 Aug 2006) $ \ProvidesFile{ppvtex.def} - [2004/01/31 v0.3e + [\AM@filedate\space\AM@fileversion\space Pdfpages driver for VTeX (AM)] \ifnum\VTeXversion<822 \PackageError{pdfpages} @@ -76,7 +89,9 @@ \def\AM@thread@special@end{\special{!endthread}} \def\AM@dest@special{\special{!aname \AM@linkname.\AM@page}} \def\AM@anchor@special{\special{!aname pdfpages.\the\count1}} - +\edef\AM@linkfit@special{fit}%r width\the\wd\@tempboxa\space + % height0pt depth\the\@tempdima} +\let\AM@disable@includegraphics\relax \endinput %% %% End of file `ppvtex.def'. -- cgit v1.2.3