diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty | 136 |
1 files changed, 78 insertions, 58 deletions
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty index 8a2dc0521e6..0bfa88b8d09 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.4w} +\def\AM@fileversion{v0.4x} \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: 2015-04-15 23:44:35 +0200 (Wed, 15 Apr 2015) $ +\AM@SVN@Date$Date: 2015-05-11 18:08:19 +0200 (Mon, 11 May 2015) $ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfpages} [\AM@filedate\space\AM@fileversion\space @@ -65,6 +65,8 @@ \RequirePackage{ifthen, calc, eso-pic} \RequirePackage{graphicx} \newif\ifAM@DVIoutput\AM@DVIoutputfalse +\newdimen\AM@pagewidth +\newdimen\AM@pageheight \input{pp\AM@driver.def} \ifx\AM@endinput\relax\expandafter\endinput\fi \ifAM@pkg@survey @@ -258,8 +260,26 @@ \fi } \newcommand{\AM@output}[1]{% - \c@totalnumber=0 - \if@twocolumn\let\AM@twocolumn\relax \onecolumn \fi + \AM@getpagedimen + \ifdim\AM@pagewidth=\z@ + \AM@pagewidth=210mm + \PackageWarningNoLine{pdfpages}{% + Erroneous page width of 0.0pt is corrected}% + \fi + \ifdim\AM@pageheight=\z@ + \AM@pageheight=297mm + \PackageWarningNoLine{pdfpages}{% + Erroneous page height of 0.0pt is corrected}% + \fi + \xdef\@deferlist{\@toplist\@botlist\@deferlist}% + \gdef\@toplist{}% + \gdef\@botlist{}% + \xdef\@dbldeferlist{\@dbltoplist\@dbldeferlist}% + \gdef\@dbltoplist{}% + \global\let\AM@deferlist\@deferlist + \gdef\@deferlist{}% + \global\let\AM@dbldeferlist\@dbldeferlist + \gdef\@dbldeferlist{}% \AM@disable@includegraphics \@ifundefined{AM@xnup} {\def\AM@xnup{\@ne}\def\AM@ynup{\@ne}% @@ -324,7 +344,6 @@ {\edef\AM@page{\AM@pagetemplate}}% \AM@readfirst{\AM@doclist}% \edef\AM@docname{\the\toks@}% - \newpage \AM@isphantom \ifAM@noautoscale \def\AM@globalscale{1}% @@ -343,37 +362,12 @@ page=\AM@page, angle=\AM@lscape@rot]{\AM@docname}}% \fi \fi - \ifthenelse{\boolean{AM@fitpaper}} - {\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}{}{% - \setlength{\stockwidth}{\AM@pagewidth}% - \setlength{\stockheight}{\AM@pageheight}% - \setlength{\trimtop}{0pt}% - \setlength{\trimedge}{0pt}}% - }{}% - \ifdim\AM@pagewidth=\z@ - \AM@pagewidth=210mm - \PackageWarningNoLine{pdfpages}{% - Erroneous page width of 0.0pt is corrected}% - \fi - \ifdim\AM@pageheight=\z@ - \AM@pageheight=297mm - \PackageWarningNoLine{pdfpages}{% - Erroneous page height of 0.0pt is corrected}% - \fi - \ifdim\paperwidth=\z@ - \let\paperwidth\AM@pagewidth - \fi - \ifdim\paperheight=\z@ - \let\paperheight\AM@pageheight - \fi + \ifthenelse{\boolean{AM@fitpaper}}{ + \setlength{\AM@pagewidth}{\wd\@tempboxa}% + \setlength{\AM@pageheight}{\ht\@tempboxa + \dp\@tempboxa}% + }{}% \def\AM@xscale{% - (\paperwidth - \tw@\fboxrule*\AM@xnup + (\AM@pagewidth - \tw@\fboxrule*\AM@xnup - \AM@deltax * \AM@xnupminusi) / (\AM@xnup * \real{\strip@pt\wd\@tempboxa}) }% @@ -381,7 +375,7 @@ \edef\AM@xscale{\strip@pt\@tempdima}% \setlength{\@tempdimb}{\ht\@tempboxa + \dp\@tempboxa}% \def\AM@yscale{ - (\paperheight - \tw@\fboxrule*\AM@ynup + (\AM@pageheight - \tw@\fboxrule*\AM@ynup - \AM@deltay *\AM@ynupminusi) / (\AM@ynup * \real{\strip@pt\@tempdimb}) }% @@ -416,11 +410,11 @@ \edef\AM@templateheight{\the\@tempdima}% \setlength{\@tempdimb}{\ht\@tempboxa + \dp\@tempboxa}% \def\AM@xmargin{% - (\paperwidth - (\wd\@tempboxa+\tw@\fboxrule)*\AM@xnup + (\AM@pagewidth - (\wd\@tempboxa+\tw@\fboxrule)*\AM@xnup - \AM@deltax * \AM@xnupminusi) * \real{.5}% }% \def\AM@ymargin{% - (\paperheight - (\@tempdimb+\tw@\fboxrule)*\AM@ynup + (\AM@pageheight - (\@tempdimb+\tw@\fboxrule)*\AM@ynup - \AM@deltay * \AM@ynupminusi) * \real{.5}% }% \setlength{\@tempdima}{\AM@xmargin}% @@ -590,6 +584,12 @@ \edef\AM@ypos{\strip@pt\@tempdima}% \setlength{\fboxsep}{\z@}% \AM@region@calc + \newpage + \ifnum\AM@xnupi=1 + \ifnum\AM@ynupi=1 + \ifAM@reflectall \setbox\AM@pagebox\null \fi + \fi + \fi \ifAM@phantompage \def\AM@shippage{}% \else @@ -621,6 +621,27 @@ \fi \AM@AddToShipoutPicture{\setlength{\unitlength}{\p@}% \global\let\AM@filelist@save\@filelist}% + \ifthenelse{\boolean{AM@fitpaper}}{ + \setlength{\paperwidth}{\AM@pagewidth}% + \setlength{\paperheight}{\AM@pageheight}% + \AM@fitpaper@special + \AM@setpagedimen + \@ifundefined{stockwidth}{}{% + \setlength{\stockwidth}{\AM@pagewidth}% + \setlength{\stockheight}{\AM@pageheight}% + \setlength{\trimtop}{0pt}% + \setlength{\trimedge}{0pt}}% + }{} + \ifdim\paperwidth=\z@ + \let\paperwidth\AM@pagewidth + \fi + \ifdim\paperheight=\z@ + \let\paperheight\AM@pageheight + \fi + \if@twocolumn + \@twocolumnfalse + \let\AM@twocolumn\relax + \fi \ifAM@reflectall \begin{lrbox}{\AM@pagebox} \global\let\AM@filelist@save\@filelist @@ -657,20 +678,23 @@ }% \AM@ClearShipoutPicture \fi - \newpage - \ifAM@reflectall \setbox\AM@pagebox\null \fi - \ifAM@pdflscape\PLS@Rotate{0}\fi - \AM@ClearShipoutPicture + \ifAM@signature \ifAM@sigrotate\AM@sigrotatefalse\else\AM@sigrotatetrue\fi \@tempdima=\AM@xoffset\relax \multiply\@tempdima\m@ne - \edef\AM@xoffset{\the\@tempdima} + \edef\AM@xoffset{\the\@tempdima}% \fi \fi \fi }% whiledo - \ifx\AM@twocolumn\relax\twocolumn\fi + \global\let\@deferlist\AM@deferlist + \global\let\@dbldeferlist\AM@dbldeferlist + \ifx\AM@twocolumn\relax + \@twocolumntrue + \@firstcolumnfalse + \fi + \newpage }% AM@output \newif\ifAM@defaultone \newcommand*{\AM@readlist}[1]{% @@ -1153,15 +1177,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 + \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 @@ -1524,7 +1548,7 @@ \def\AM@parse@nupi#1x{\def\AM@ynup{#1}} \newcommand{\AM@parse@templatesize}{} \def\AM@parse@templatesize#1#2\END{% - \setbox\AM@templatesizebox=\hbox{\rule{#1}{#2}} + \setbox\AM@templatesizebox=\hbox{\rule{#1}{#2}}% \AM@templatesizetrue } \newbox\AM@templatesizebox @@ -1549,10 +1573,6 @@ } \InputIfFileExists{pdfpages.fix}{% \PackageInfo{pdfpages}{Loading patch file `pdfpages.fix'}}{} -%% \def\AM@getpagecount{% -%% \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}% -%% \edef\AM@pagecount{\the\pdflastximagepages}% -%% } \endinput %% %% End of file `pdfpages.sty'. |