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/tex/latex/pdfpages/pdfpages.sty | |
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/tex/latex/pdfpages/pdfpages.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty | 32 |
1 files changed, 13 insertions, 19 deletions
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 |