diff options
author | Karl Berry <karl@freefriends.org> | 2015-04-17 22:11:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-04-17 22:11:36 +0000 |
commit | 277463648965be21e215d982f6623c11a2e154ee (patch) | |
tree | 1fa8c3f5ab5052ba4b85231729bcd96faecd3b11 | |
parent | 9d73edf70f696c94e5792b550c678cfd26c68cd6 (diff) |
pdfpages (17apr15)
git-svn-id: svn://tug.org/texlive/trunk@36894 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/pdfpages/pdf-ex.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pdfpages/pdf-hyp.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pdfpages/pdf-toc.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf | bin | 287115 -> 286392 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx | 70 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/pdfpages/pdfpages.ins | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty | 27 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppdvips.def | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppluatex.def | 162 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppnull.def | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/pppdftex.def | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppvtex.def | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppxetex.def | 10 |
14 files changed, 285 insertions, 48 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdf-ex.tex b/Master/texmf-dist/doc/latex/pdfpages/pdf-ex.tex index cfcdfd0bf95..e09c10a69e0 100644 --- a/Master/texmf-dist/doc/latex/pdfpages/pdf-ex.tex +++ b/Master/texmf-dist/doc/latex/pdfpages/pdf-ex.tex @@ -11,6 +11,10 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% +%% \def\AM@getpagecount{% +%% \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}% +%% \edef\AM@pagecount{\the\pdflastximagepages}% +%% } \documentclass[a4paper,12pt]{article} \usepackage[final]{pdfpages} \usepackage{verbatim} diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdf-hyp.tex b/Master/texmf-dist/doc/latex/pdfpages/pdf-hyp.tex index dd7672e7ee5..7bcbf3b3cda 100644 --- a/Master/texmf-dist/doc/latex/pdfpages/pdf-hyp.tex +++ b/Master/texmf-dist/doc/latex/pdfpages/pdf-hyp.tex @@ -11,6 +11,10 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% +%% \def\AM@getpagecount{% +%% \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}% +%% \edef\AM@pagecount{\the\pdflastximagepages}% +%% } \documentclass[a4paper,12pt]{article} \usepackage[final]{pdfpages} \usepackage{verbatim} diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdf-toc.tex b/Master/texmf-dist/doc/latex/pdfpages/pdf-toc.tex index 6199822f7b9..56db9cf4270 100644 --- a/Master/texmf-dist/doc/latex/pdfpages/pdf-toc.tex +++ b/Master/texmf-dist/doc/latex/pdfpages/pdf-toc.tex @@ -11,6 +11,10 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% +%% \def\AM@getpagecount{% +%% \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}% +%% \edef\AM@pagecount{\the\pdflastximagepages}% +%% } \documentclass[a4paper]{book} \usepackage{pdfpages} \usepackage{verbatim} diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf Binary files differindex f882ac6e863..0bb140742d9 100644 --- a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf +++ b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf diff --git a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx index 9f71b1b6464..77d6a592f96 100644 --- a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx +++ b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx @@ -1,8 +1,8 @@ % % \iffalse % -%<*(package,pppdftexdef,ppvtexdef,ppxetexdef,ppdvipsdef,ppdvipdfmdef,ppnulldef)> -%% Copyright (C) 2001-2012 Andreas MATTHIAS +%<*(package,pppdftexdef,ppluatexdef,ppvtexdef,ppxetexdef,ppdvipsdef,ppdvipdfmdef,ppnulldef)> +%% Copyright (C) 2001-2015 Andreas MATTHIAS %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3c @@ -15,7 +15,7 @@ %% The Current Maintainer of this work is %% Andreas Matthias <andreas.matthias@gmail.com>. % -%</(package,pppdftexdef,ppvtexdef,ppxetexdef,ppdvipsdef,ppdvipdfmdef,ppnulldef)> +%</(package,pppdftexdef,ppluatexdef,ppvtexdef,ppxetexdef,ppdvipsdef,ppdvipdfmdef,ppnulldef)> %<*!installer> %% %% Please send error reports and suggestions for improvements to @@ -27,10 +27,10 @@ %<*dtx> \makeatletter %</dtx> -\def\AM@fileversion{v0.4v} +\def\AM@fileversion{v0.4w} \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: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $ +\AM@SVN@Date$Date: 2015-04-15 23:44:35 +0200 (Wed, 15 Apr 2015) $ %</!(example1,example2,example3,installer)> % % @@ -40,6 +40,7 @@ %<package>\NeedsTeXFormat{LaTeX2e} %<package>\ProvidesPackage{pdfpages} %<pppdftexdef>\ProvidesFile{pppdftex.def} +%<ppluatexdef>\ProvidesFile{ppluatex.def} %<ppvtexdef>\ProvidesFile{ppvtex.def} %<ppxetexdef>\ProvidesFile{ppxetex.def} %<ppdvipsdef>\ProvidesFile{ppdvips.def} @@ -69,6 +70,7 @@ % %<package> Insert pages of external PDF documents (AM)] %<pppdftexdef> Pdfpages driver for pdfTeX (AM)] +%<ppluatexdef> Pdfpages driver for luaTeX (AM)] %<ppvtexdef> Pdfpages driver for VTeX (AM)] %<ppxetexdef> Pdfpages driver for XeTeX (AM)] %<ppdvipsdef> Pdfpages driver for dvips (AM)] @@ -80,7 +82,7 @@ % % \GetFileInfo{pdfpages.dtx} % -% \CheckSum{4663} +% \CheckSum{4669} % % \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 @@ -124,6 +126,7 @@ % % \def\pdfTeX{pdfTeX} % \def\pdfLaTeX{pdfLaTeX} +% \def\luaTeX{luaTeX} % \def\VTeX{VTeX} % \def\XeTeX{XeTeX} % \def\dvips{dvips} @@ -134,6 +137,7 @@ % % \pdfstringdefDisableCommands{% % \def\pdfTeX{pdfTeX}% +% \def\luaTeX{luaTeX}% % \def\VTeX{VTeX}% % \def\XeTeX{XeTeX}% % } @@ -190,7 +194,7 @@ % inclusion. (Using |\includepdf|, |\includegraphics|, or other low-level % commands.) % -% However, there's a gleam of hope. Some links may be extracted and later +% However, there's a glimmer of hope. Some links may be extracted and later % reinserted by a package called \emph{pax} which can be downloaded from % CTAN \cite{pax}. Have a look at it! % @@ -1072,6 +1076,7 @@ % These options overrule the automatic detection of the \TeX-engine. % \begin{macrocode} \DeclareOption{pdftex}{\def\AM@driver{pdftex}} +\DeclareOption{luatex}{\def\AM@driver{luatex}} \DeclareOption{vtex}{\def\AM@driver{vtex}} \DeclareOption{xetex}{\def\AM@driver{xetex}} \DeclareOption{dvips}{\def\AM@driver{dvips}} @@ -1091,13 +1096,15 @@ % \begin{macrocode} \@ifundefined{AM@driver}{ \begingroup - \@ifundefined{pdftexversion}{% - \@ifundefined{XeTeXversion}{% - \@ifundefined{OpMode}{% - \def\AM@driver{null} - }{\gdef\AM@driver{vtex}}% - }{\gdef\AM@driver{xetex}}% - }{\gdef\AM@driver{pdftex}} + \@ifundefined{luatexversion}{% + \@ifundefined{pdftexversion}{% + \@ifundefined{XeTeXversion}{% + \@ifundefined{OpMode}{% + \def\AM@driver{null} + }{\gdef\AM@driver{vtex}}% + }{\gdef\AM@driver{xetex}}% + }{\gdef\AM@driver{pdftex}}% + }{\gdef\AM@driver{luatex}}% \endgroup }{} % \end{macrocode} @@ -3109,14 +3116,15 @@ % % \subsection{Driver files} % -% \iffalse -%<*pppdftexdef> -% \fi +% \subsubsection{\pdfTeX\ and \luaTeX\ drivers} % -% \subsubsection{\pdfTeX\ driver} +% The driver file for \pdfTeX\ and \luaTeX\ are mostly the same. +% So far they only differ in checking of the version numbers of +% the \TeX-engines and graphicx driver files. % -% Check \pdfTeX\ version and output. +% Check \pdfTeX\ version. % \begin{macrocode} +%<*pppdftexdef> \ifnum\pdftexversion<100 \PackageError{pdfpages} {Package pdfpages requires at least\MessageBreak @@ -3125,10 +3133,17 @@ \let\AM@endinput\relax \expandafter\endinput \fi +%</pppdftexdef> +% \end{macrocode} +% Insert dummy driver |ppnull.def| if we are not running in PDF mode. +% \begin{macrocode} +%<*(pppdftexdef,ppluatexdef)> \ifcase\pdfoutput \input{ppnull.def} \expandafter\endinput \fi +%</(pppdftexdef,ppluatexdef)> +%<*pppdftexdef> % \end{macrocode} % Check if the graphics package was loaded with an % incompatible driver option (e.g. dvips). @@ -3171,7 +3186,9 @@ There might be problems with\MessageBreak the `trim' and `clip' options.\MessageBreak Please, update your `pdftex.def'}} +%</pppdftexdef> % \end{macrocode} +% % Get last page number. % % \noindent @@ -3189,6 +3206,7 @@ %% } % \end{macrocode} % \begin{macrocode} +%<*(pppdftexdef,ppluatexdef)> \let\AM@Gread@@pdftex\Gread@@pdftex \renewcommand*{\Gread@@pdftex}[1]{% \xdef\AM@currentdocname@fix{#1}% @@ -3341,7 +3359,7 @@ % \end{macrocode} % % \iffalse -%</pppdftexdef> +%</(pppdftexdef,ppluatexdef)> % %<*ppvtexdef> % \fi @@ -4269,6 +4287,16 @@ % on the same file repeatedly. The provided fix is temporarily until % there's a better solution implemented in |pdftex.def|. % \end{itemize} +% +% \subsection*{2015/04/14 v0.4w} +% \begin{itemize} +% \item Driver file for \luaTeX: +% So far \luaTeX\ used the driver file of \pdfTeX, which does not work +% any more. As of luaTeX-0.80 the deprecated primitive |\pdftexversion| is +% removed. Thus \luaTeX\ chokes on the code for checking the version number +% of \pdfTeX. Therefore \luaTeX\ gets its on driver file |ppluatex.def|. +% \end{itemize} +% % \Finale % % \iffalse @@ -4631,6 +4659,8 @@ This file demonstrates how to use the pdfpages package. \generate{\usepreamble\package \file{pppdftex.def}{\from{pdfpages.dtx}{pppdftexdef}}} \generate{\usepreamble\package + \file{ppluatex.def}{\from{pdfpages.dtx}{ppluatexdef}}} +\generate{\usepreamble\package \file{ppvtex.def}{\from{pdfpages.dtx}{ppvtexdef}}} \generate{\usepreamble\package \file{ppxetex.def}{\from{pdfpages.dtx}{ppxetexdef}}} diff --git a/Master/texmf-dist/source/latex/pdfpages/pdfpages.ins b/Master/texmf-dist/source/latex/pdfpages/pdfpages.ins index e792ff00de9..fe0c146ea06 100644 --- a/Master/texmf-dist/source/latex/pdfpages/pdfpages.ins +++ b/Master/texmf-dist/source/latex/pdfpages/pdfpages.ins @@ -21,6 +21,10 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% +%% \def\AM@getpagecount{% +%% \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}% +%% \edef\AM@pagecount{\the\pdflastximagepages}% +%% } \input docstrip \askforoverwritefalse \keepsilent @@ -44,6 +48,8 @@ This file demonstrates how to use the pdfpages package. \generate{\usepreamble\package \file{pppdftex.def}{\from{pdfpages.dtx}{pppdftexdef}}} \generate{\usepreamble\package + \file{ppluatex.def}{\from{pdfpages.dtx}{ppluatexdef}}} +\generate{\usepreamble\package \file{ppvtex.def}{\from{pdfpages.dtx}{ppvtexdef}}} \generate{\usepreamble\package \file{ppxetex.def}{\from{pdfpages.dtx}{ppxetexdef}}} diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty index 94f2d68a4c3..8a2dc0521e6 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty +++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2012 Andreas MATTHIAS +%% Copyright (C) 2001-2015 Andreas MATTHIAS %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3c @@ -24,10 +24,10 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4v} +\def\AM@fileversion{v0.4w} \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: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $ +\AM@SVN@Date$Date: 2015-04-15 23:44:35 +0200 (Wed, 15 Apr 2015) $ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfpages} [\AM@filedate\space\AM@fileversion\space @@ -42,6 +42,7 @@ \InputIfFileExists{pdfpages.cfg}{% \PackageInfo{pdfpages}{Loading configuration file `pdfpages.cfg'}}{} \DeclareOption{pdftex}{\def\AM@driver{pdftex}} +\DeclareOption{luatex}{\def\AM@driver{luatex}} \DeclareOption{vtex}{\def\AM@driver{vtex}} \DeclareOption{xetex}{\def\AM@driver{xetex}} \DeclareOption{dvips}{\def\AM@driver{dvips}} @@ -50,13 +51,15 @@ \ProcessOptions \@ifundefined{AM@driver}{ \begingroup - \@ifundefined{pdftexversion}{% - \@ifundefined{XeTeXversion}{% - \@ifundefined{OpMode}{% - \def\AM@driver{null} - }{\gdef\AM@driver{vtex}}% - }{\gdef\AM@driver{xetex}}% - }{\gdef\AM@driver{pdftex}} + \@ifundefined{luatexversion}{% + \@ifundefined{pdftexversion}{% + \@ifundefined{XeTeXversion}{% + \@ifundefined{OpMode}{% + \def\AM@driver{null} + }{\gdef\AM@driver{vtex}}% + }{\gdef\AM@driver{xetex}}% + }{\gdef\AM@driver{pdftex}}% + }{\gdef\AM@driver{luatex}}% \endgroup }{} \RequirePackage{ifthen, calc, eso-pic} @@ -1546,6 +1549,10 @@ } \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'. diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def index f01f17e753d..4c1ae3b89ca 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2012 Andreas MATTHIAS +%% Copyright (C) 2001-2015 Andreas MATTHIAS %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3c @@ -24,13 +24,17 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4v} +\def\AM@fileversion{v0.4w} \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: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $ +\AM@SVN@Date$Date: 2015-04-15 23:44:35 +0200 (Wed, 15 Apr 2015) $ \ProvidesFile{ppdvipdfm.def} [\AM@filedate\space\AM@fileversion\space Pdfpages driver for dvipdfm (AM)] +%% \def\AM@getpagecount{% +%% \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}% +%% \edef\AM@pagecount{\the\pdflastximagepages}% +%% } \def\AM@tmp{dvipdfm.def} \ifx\Gin@driver\AM@tmp\else \PackageWarningNoLine{pdfpages}{% diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def index c6332ea3f7e..ae0bc06455d 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2012 Andreas MATTHIAS +%% Copyright (C) 2001-2015 Andreas MATTHIAS %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3c @@ -24,13 +24,17 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4v} +\def\AM@fileversion{v0.4w} \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: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $ +\AM@SVN@Date$Date: 2015-04-15 23:44:35 +0200 (Wed, 15 Apr 2015) $ \ProvidesFile{ppdvips.def} [\AM@filedate\space\AM@fileversion\space Pdfpages driver for dvips (AM)] +%% \def\AM@getpagecount{% +%% \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}% +%% \edef\AM@pagecount{\the\pdflastximagepages}% +%% } \def\AM@notsupported#1{% \PackageWarning{pdfpages}{#1 not supported by driver dvips}} \def\AM@getpagecount{% diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def new file mode 100644 index 00000000000..7f68c81f325 --- /dev/null +++ b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def @@ -0,0 +1,162 @@ +%% +%% This is file `ppluatex.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% pdfpages.dtx (with options: `ppluatexdef') +%% +%% This file is part of the pdfpages package. +%% +%% Copyright (C) 2001-2015 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>. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is +%% Andreas Matthias <andreas.matthias@gmail.com>. +%% +%% Please send error reports and suggestions for improvements to +%% Andreas MATTHIAS <andreas.matthias@gmail.com>. +%% +\def\AM@fileversion{v0.4w} +\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) $ +\ProvidesFile{ppluatex.def} + [\AM@filedate\space\AM@fileversion\space + Pdfpages driver for luaTeX (AM)] +\ifcase\pdfoutput + \input{ppnull.def} + \expandafter\endinput +\fi +%% \def\AM@getpagecount{% +%% \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}% +%% \edef\AM@pagecount{\the\pdflastximagepages}% +%% } +\let\AM@Gread@@pdftex\Gread@@pdftex +\renewcommand*{\Gread@@pdftex}[1]{% + \xdef\AM@currentdocname@fix{#1}% + \AM@Gread@@pdftex{#1}% +} +\def\AM@getpagecount{% + \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}% + \pdfximage{\AM@currentdocname@fix}% + \edef\AM@pagecount{\the\pdflastximagepages}% +} +\let\AM@pagewidth\pdfpagewidth +\let\AM@pageheight\pdfpageheight +\def\AM@setpagedimen{% + \setlength{\pdfpagewidth}{\wd\@tempboxa}% + \setlength{\pdfpageheight}{\ht\@tempboxa + \dp\@tempboxa}% +} +\let\AM@pagesize@boogie\relax +\let\AM@fitpaper@special\relax +\def\AM@findfile#1{% + \AM@findfile@i{#1}{pdf}% + \AM@findfile@ii{#1}% +} +\AtBeginDocument{% +\@ifpackageloaded{grffile}{% + \let\AM@IfFileExists\grffile@IfFileExists}{% + \let\AM@IfFileExists\IfFileExists}% +} +\def\AM@setlscape{\pdfpageattr{/Rotate 90}} +\def\AM@linktodoc@special@begin{% + \pdfannot width \wd\@tempboxa + height \ht\@tempboxa + depth \dp\@tempboxa + {/Subtype /Link /Border [0 0 0] + /A << /S /GoToR + /F (\AM@linkfilename) + /D [\AM@linktodoc@page@m@ne \AM@linktodocfit] + \ifAM@newwindow/NewWindow true\fi >>}% +} +\let\AM@linktodoc@special@end\relax +\def\AM@survey@special@begin{% + \pdfannot width \wd\@tempboxa + height \ht\@tempboxa + depth \dp\@tempboxa + {/Subtype /Link /Border [0 0 0] + /A << /S /GoTo + /D (pdfpages.\AM@linktodoc@page@m@ne) >>}% +} +\let\AM@survey@special@end\relax +\def\AM@thread@special@begin{% + \pdfthread width \wd\@tempboxa + height \ht\@tempboxa + depth \dp\@tempboxa + attr {/I <<\threadinfodict>>}% + name {\AM@threadname}% +} +\let\AM@thread@special@end\relax +\def\AM@view{fit} +\def\AM@dest@special{\pdfdest name {\AM@linkname.\AM@page} \AM@view} +\def\AM@anchor@special{\pdfdest name {pdfpages.\the\count1} fit} +\def\AM@convert@dest#1{% + \expandafter\AM@convert@dest@i\ifdim\z@=0pt#1 \END\fi} +\def\AM@convert@dest@i#1 #2\END{% + \begingroup + \def\tag{#1}% + \def\x{FitH}% + \ifx\x\tag + \gdef\AM@view{fith}% + \else + \def\x{FitBH}% + \ifx\x\tag + \gdef\AM@view{fitbh}% + \else + \def\x{FitV}% + \ifx\x\tag + \gdef\AM@view{fitv}% + \else + \def\x{FitBV}% + \ifx\x\tag + \gdef\AM@view{fitbv}% + \else + \def\x{FitR}% + \ifx\x\tag + \gdef\AM@view{fitr}% + \PackageWarningNoLine{pdfpages}{% + `linkfit=FitR' is not supported, + I will try `linkfit=Region'.}% + \def\tag{region}% + \else + \def\x{FitB}% + \ifx\x\tag + \gdef\AM@view{fitb}% + \else + \def\x{XZY}% + \ifx\x\tag + \gdef\AM@view{xyz zoom #2}% + \else + \def\x{Region}% + \ifx\x\tag + \gdef\AM@view{fitr + width\the\wd\@tempboxa\space + height0pt depth\AM@region@depth}% + \else + \gdef\AM@view{fit}% + \fi + \fi + \fi + \fi + \fi + \fi + \fi + \fi + \endgroup +} +\def\AM@region@calc{% + \setlength{\@tempdima}{\ht\@tempboxa + \dp\@tempboxa} + \edef\AM@region@depth{\the\@tempdima} +} +\let\AM@disable@includegraphics\relax +\endinput +%% +%% End of file `ppluatex.def'. diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def index 0292858a2ea..b5fae37f777 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2012 Andreas MATTHIAS +%% Copyright (C) 2001-2015 Andreas MATTHIAS %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3c @@ -24,13 +24,17 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4v} +\def\AM@fileversion{v0.4w} \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: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $ +\AM@SVN@Date$Date: 2015-04-15 23:44:35 +0200 (Wed, 15 Apr 2015) $ \ProvidesFile{ppnull.def} [\AM@filedate\space\AM@fileversion\space Pdfpages dummy driver (AM)] +%% \def\AM@getpagecount{% +%% \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}% +%% \edef\AM@pagecount{\the\pdflastximagepages}% +%% } \AM@DVIoutputtrue \PackageWarningNoLine{pdfpages}{% I will use a dummy \string\includepdf\space command\MessageBreak diff --git a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def index cf487cd4f62..4c909340139 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2012 Andreas MATTHIAS +%% Copyright (C) 2001-2015 Andreas MATTHIAS %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3c @@ -24,10 +24,10 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4v} +\def\AM@fileversion{v0.4w} \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: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $ +\AM@SVN@Date$Date: 2015-04-15 23:44:35 +0200 (Wed, 15 Apr 2015) $ \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 6731736cb07..5981ce0cc30 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2012 Andreas MATTHIAS +%% Copyright (C) 2001-2015 Andreas MATTHIAS %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3c @@ -24,13 +24,17 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4v} +\def\AM@fileversion{v0.4w} \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: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $ +\AM@SVN@Date$Date: 2015-04-15 23:44:35 +0200 (Wed, 15 Apr 2015) $ \ProvidesFile{ppvtex.def} [\AM@filedate\space\AM@fileversion\space Pdfpages driver for VTeX (AM)] +%% \def\AM@getpagecount{% +%% \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}% +%% \edef\AM@pagecount{\the\pdflastximagepages}% +%% } \begingroup \@ifundefined{ver@vtex.def}{% \PackageError{pdfpages} diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def index 4a092ede794..7f034f417ec 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2012 Andreas MATTHIAS +%% Copyright (C) 2001-2015 Andreas MATTHIAS %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3c @@ -24,13 +24,17 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4v} +\def\AM@fileversion{v0.4w} \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: 2013-08-25 15:19:23 +0200 (Sun, 25 Aug 2013) $ +\AM@SVN@Date$Date: 2015-04-15 23:44:35 +0200 (Wed, 15 Apr 2015) $ \ProvidesFile{ppxetex.def} [\AM@filedate\space\AM@fileversion\space Pdfpages driver for XeTeX (AM)] +%% \def\AM@getpagecount{% +%% \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}% +%% \edef\AM@pagecount{\the\pdflastximagepages}% +%% } \begingroup \@ifundefined{ver@xetex.def}{% \PackageError{pdfpages} |