diff options
author | Karl Berry <karl@freefriends.org> | 2012-03-18 23:22:40 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-03-18 23:22:40 +0000 |
commit | 09694285d9871ef93f944fb34f22d0612c4e92ea (patch) | |
tree | 303545a34927627ae84ef14ae649a8fd6b57146a /Master/texmf-dist | |
parent | 4259209d35460c4a5011aa52ffb619c557591c03 (diff) |
pdfpages (18mar12)
git-svn-id: svn://tug.org/texlive/trunk@25688 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf | bin | 183487 -> 183412 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx | 59 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty | 32 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def | 18 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppdvips.def | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppnull.def | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/pppdftex.def | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppvtex.def | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppxetex.def | 6 |
9 files changed, 82 insertions, 57 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf Binary files differindex a301c5b5a85..e60a0daaddc 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 07a33efef98..2d968ec4e80 100644 --- a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx +++ b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx @@ -2,7 +2,7 @@ % \iffalse % %<*(package,pppdftexdef,ppvtexdef,ppxetexdef,ppdvipsdef,ppdvipdfmdef,ppnulldef)> -%% Copyright (C) 2001-2010 Andreas MATTHIAS +%% Copyright (C) 2001-2012 Andreas MATTHIAS %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3c @@ -27,10 +27,10 @@ %<*dtx> \makeatletter %</dtx> -\def\AM@fileversion{v0.4p} +\def\AM@fileversion{v0.4r} \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: 2011-07-31 16:09:45 +0200 (Sun, 31 Jul 2011) $ +\AM@SVN@Date$Date: 2012-03-08 18:53:37 +0100 (Thu, 08 Mar 2012) $ %</!(example1,example2,example3,installer)> % % @@ -80,7 +80,7 @@ % % \GetFileInfo{pdfpages.dtx} % -% \CheckSum{4592} +% \CheckSum{4599} % % \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 @@ -1068,17 +1068,11 @@ % \end{macrocode} % These options overrule the automatic detection of the \TeX-engine. % \begin{macrocode} -\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{pdftex}{\def\AM@driver{pdftex}} +\DeclareOption{vtex}{\def\AM@driver{vtex}} +\DeclareOption{xetex}{\def\AM@driver{xetex}} +\DeclareOption{dvips}{\def\AM@driver{dvips}} +\DeclareOption{dvipdfm}{\def\AM@driver{dvipdfm}} \DeclareOption{null}{\def\AM@driver{null}} % \end{macrocode} % \begin{macrocode} @@ -1108,7 +1102,7 @@ % % \begin{macrocode} \RequirePackage{ifthen, calc, eso-pic} -\RequirePackage[\AM@graphics@driver]{graphicx} +\RequirePackage{graphicx} \newif\ifAM@DVIoutput\AM@DVIoutputfalse \input{pp\AM@driver.def} \ifx\AM@endinput\relax\expandafter\endinput\fi @@ -1207,10 +1201,10 @@ % Check, if |#1| is a positive integer. % \begin{macrocode} \newif\ifAM@integer -\newcommand{\AM@checkinteger}{} -\def\AM@checkinteger#1{% - \ifcat _\ifnum9<1#1_\else A\fi - \AM@integertrue +\def\AM@checkinteger#1{\afterassignment\AM@checkinteger@i\count255=0#1 \END} +\def\AM@checkinteger@i#1\END{% + \ifx\END#1\END + \AM@integertrue \else \AM@integerfalse \fi @@ -3753,6 +3747,25 @@ % % \subsubsection{Dvipdfm driver} % +% Package |graphicx| should be loaded with the |dvipdfm| driver. +% However, |\RequirePackage[dvipdfm]{graphicx}| is not recommended +% because it will cause an `option clash' if a user loaded |graphicx| +% with additional options before. Thus, we expect the user to load +% |graphicx| with |dvipdfm| driver before loading pdfpages. +% \begin{macrocode} +\def\AM@tmp{dvipdfm.def} +\ifx\Gin@driver\AM@tmp\else + \PackageWarningNoLine{pdfpages}{% + Graphicx not loaded with driver `dvipdfm'.\MessageBreak + Please, load graphicx explicitely before pdfpages,\MessageBreak + e.g.:\MessageBreak + \@spaces \string\usepackage[dvipdfm]{graphicx}\MessageBreak + \@spaces \string\usepackage[dvipdfm]{pdfpages}\MessageBreak + This time I will try to load `dvipdfm.def' which \MessageBreak + will overwrite `Gin@driver'. Let's hope for the best} + \input{dvipdfm.def} +\fi +% \end{macrocode} % \begin{macrocode} \def\AM@notsupported#1{% \PackageWarning{pdfpages}{#1 not supported by driver dvipdfm}} @@ -4175,6 +4188,12 @@ % \item Bugfix: |templatesize| ignored |scale| option. % \end{itemize} % +% +% \subsection*{2012/03/08 v0.4q} +% \begin{itemize} +% \item Macro |\AM@checkinteger| rewritten. +% \item Loading |graphicx.sty| without explicit driver information. +% \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 4278f180c81..021e10fb93a 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-2010 Andreas MATTHIAS +%% Copyright (C) 2001-2012 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.4p} +\def\AM@fileversion{v0.4r} \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: 2011-07-31 16:09:45 +0200 (Sun, 31 Jul 2011) $ +\AM@SVN@Date$Date: 2012-03-08 18:53:37 +0100 (Thu, 08 Mar 2012) $ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfpages} [\AM@filedate\space\AM@fileversion\space @@ -41,17 +41,11 @@ \def\AM@ifdriverlater{\@ifl@ter{def}} \InputIfFileExists{pdfpages.cfg}{% \PackageInfo{pdfpages}{Loading configuration file `pdfpages.cfg'}}{} -\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{pdftex}{\def\AM@driver{pdftex}} +\DeclareOption{vtex}{\def\AM@driver{vtex}} +\DeclareOption{xetex}{\def\AM@driver{xetex}} +\DeclareOption{dvips}{\def\AM@driver{dvips}} +\DeclareOption{dvipdfm}{\def\AM@driver{dvipdfm}} \DeclareOption{null}{\def\AM@driver{null}} \ProcessOptions \@ifundefined{AM@driver}{ @@ -66,7 +60,7 @@ \endgroup }{} \RequirePackage{ifthen, calc, eso-pic} -\RequirePackage[\AM@graphics@driver]{graphicx} +\RequirePackage{graphicx} \newif\ifAM@DVIoutput\AM@DVIoutputfalse \input{pp\AM@driver.def} \ifx\AM@endinput\relax\expandafter\endinput\fi @@ -144,10 +138,10 @@ \fi } \newif\ifAM@integer -\newcommand{\AM@checkinteger}{} -\def\AM@checkinteger#1{% - \ifcat _\ifnum9<1#1_\else A\fi - \AM@integertrue +\def\AM@checkinteger#1{\afterassignment\AM@checkinteger@i\count255=0#1 \END} +\def\AM@checkinteger@i#1\END{% + \ifx\END#1\END + \AM@integertrue \else \AM@integerfalse \fi diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def index dfea03a9aaa..a346bdc26c8 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-2010 Andreas MATTHIAS +%% Copyright (C) 2001-2012 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,25 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4p} +\def\AM@fileversion{v0.4r} \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: 2011-07-31 16:09:45 +0200 (Sun, 31 Jul 2011) $ +\AM@SVN@Date$Date: 2012-03-08 18:53:37 +0100 (Thu, 08 Mar 2012) $ \ProvidesFile{ppdvipdfm.def} [\AM@filedate\space\AM@fileversion\space Pdfpages driver for dvipdfm (AM)] +\def\AM@tmp{dvipdfm.def} +\ifx\Gin@driver\AM@tmp\else + \PackageWarningNoLine{pdfpages}{% + Graphicx not loaded with driver `dvipdfm'.\MessageBreak + Please, load graphicx explicitely before pdfpages,\MessageBreak + e.g.:\MessageBreak + \@spaces \string\usepackage[dvipdfm]{graphicx}\MessageBreak + \@spaces \string\usepackage[dvipdfm]{pdfpages}\MessageBreak + This time I will try to load `dvipdfm.def' which \MessageBreak + will overwrite `Gin@driver'. Let's hope for the best} + \input{dvipdfm.def} +\fi \def\AM@notsupported#1{% \PackageWarning{pdfpages}{#1 not supported by driver dvipdfm}} \def\AM@getpagecount{% diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def index 9efa73fd653..e78abe2422d 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-2010 Andreas MATTHIAS +%% Copyright (C) 2001-2012 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.4p} +\def\AM@fileversion{v0.4r} \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: 2011-07-31 16:09:45 +0200 (Sun, 31 Jul 2011) $ +\AM@SVN@Date$Date: 2012-03-08 18:53:37 +0100 (Thu, 08 Mar 2012) $ \ProvidesFile{ppdvips.def} [\AM@filedate\space\AM@fileversion\space Pdfpages driver for dvips (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def index dae03b18222..eccabc9ed46 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-2010 Andreas MATTHIAS +%% Copyright (C) 2001-2012 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.4p} +\def\AM@fileversion{v0.4r} \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: 2011-07-31 16:09:45 +0200 (Sun, 31 Jul 2011) $ +\AM@SVN@Date$Date: 2012-03-08 18:53:37 +0100 (Thu, 08 Mar 2012) $ \ProvidesFile{ppnull.def} [\AM@filedate\space\AM@fileversion\space Pdfpages dummy driver (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def index c27b7ad2128..42120b3a452 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-2010 Andreas MATTHIAS +%% Copyright (C) 2001-2012 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.4p} +\def\AM@fileversion{v0.4r} \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: 2011-07-31 16:09:45 +0200 (Sun, 31 Jul 2011) $ +\AM@SVN@Date$Date: 2012-03-08 18:53:37 +0100 (Thu, 08 Mar 2012) $ \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 0bdc7390f24..cf26d0caf6f 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-2010 Andreas MATTHIAS +%% Copyright (C) 2001-2012 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.4p} +\def\AM@fileversion{v0.4r} \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: 2011-07-31 16:09:45 +0200 (Sun, 31 Jul 2011) $ +\AM@SVN@Date$Date: 2012-03-08 18:53:37 +0100 (Thu, 08 Mar 2012) $ \ProvidesFile{ppvtex.def} [\AM@filedate\space\AM@fileversion\space Pdfpages driver for VTeX (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def index f94e308d75a..544c674a462 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-2010 Andreas MATTHIAS +%% Copyright (C) 2001-2012 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.4p} +\def\AM@fileversion{v0.4r} \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: 2011-07-31 16:09:45 +0200 (Sun, 31 Jul 2011) $ +\AM@SVN@Date$Date: 2012-03-08 18:53:37 +0100 (Thu, 08 Mar 2012) $ \ProvidesFile{ppxetex.def} [\AM@filedate\space\AM@fileversion\space Pdfpages driver for XeTeX (AM)] |