summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-04-09 16:29:15 +0000
committerKarl Berry <karl@freefriends.org>2012-04-09 16:29:15 +0000
commit55c94cce03411fe9e7f0e7eb764594d57dd77786 (patch)
treed9b76d7fe83bc713d44d9e0b84b001b9cbf2902e /Master
parentc5d0b619ba9e0719b34a60bb7af1018d597d4987 (diff)
pdfpages (8apr12)
git-svn-id: svn://tug.org/texlive/trunk@25883 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdfbin183412 -> 183169 bytes
-rw-r--r--Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx21
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty14
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def4
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppdvips.def4
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppnull.def4
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pppdftex.def4
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppvtex.def4
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppxetex.def4
9 files changed, 35 insertions, 24 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
index e60a0daaddc..bc65cd4dc23 100644
--- a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
+++ b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
index 2d968ec4e80..45445f5871a 100644
--- a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
+++ b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
@@ -27,10 +27,10 @@
%<*dtx>
\makeatletter
%</dtx>
-\def\AM@fileversion{v0.4r}
+\def\AM@fileversion{v0.4s}
\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: 2012-03-08 18:53:37 +0100 (Thu, 08 Mar 2012) $
+\AM@SVN@Date$Date: 2012-04-03 21:07:24 +0200 (Tue, 03 Apr 2012) $
%</!(example1,example2,example3,installer)>
%
%
@@ -1201,14 +1201,16 @@
% Check, if |#1| is a positive integer.
% \begin{macrocode}
\newif\ifAM@integer
-\def\AM@checkinteger#1{\afterassignment\AM@checkinteger@i\count255=0#1 \END}
-\def\AM@checkinteger@i#1\END{%
- \ifx\END#1\END
- \AM@integertrue
+\begingroup
+\@makeother_
+\gdef\AM@checkinteger#1{%
+ \ifcat _\ifnum9<1#1_\else A\fi
+ \AM@integertrue
\else
\AM@integerfalse
\fi
}
+\endgroup
% \end{macrocode}
% \macro{\AM@findfile}
% Find file and set |\AM@currentdocname|.
@@ -4194,6 +4196,13 @@
% \item Macro |\AM@checkinteger| rewritten.
% \item Loading |graphicx.sty| without explicit driver information.
% \end{itemize}
+%
+% \subsection*{2012/04/03 v0.4s}
+% \begin{itemize}
+% \item Revert to the older |\AM@checkinteger| but now with changed
+% catcode for |_| (underscore).
+% \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 021e10fb93a..6a4a813e0c6 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.4r}
+\def\AM@fileversion{v0.4s}
\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: 2012-03-08 18:53:37 +0100 (Thu, 08 Mar 2012) $
+\AM@SVN@Date$Date: 2012-04-03 21:07:24 +0200 (Tue, 03 Apr 2012) $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
[\AM@filedate\space\AM@fileversion\space
@@ -138,14 +138,16 @@
\fi
}
\newif\ifAM@integer
-\def\AM@checkinteger#1{\afterassignment\AM@checkinteger@i\count255=0#1 \END}
-\def\AM@checkinteger@i#1\END{%
- \ifx\END#1\END
- \AM@integertrue
+\begingroup
+\@makeother_
+\gdef\AM@checkinteger#1{%
+ \ifcat _\ifnum9<1#1_\else A\fi
+ \AM@integertrue
\else
\AM@integerfalse
\fi
}
+\endgroup
\newcommand*{\AM@findfile@i}[2]{%
\let\AM@currentdocname\relax
\AM@IfFileExists{#1.#2}{\edef\AM@currentdocname{#1.#2}}{%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
index a346bdc26c8..5fd66056d23 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4r}
+\def\AM@fileversion{v0.4s}
\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: 2012-03-08 18:53:37 +0100 (Thu, 08 Mar 2012) $
+\AM@SVN@Date$Date: 2012-04-03 21:07:24 +0200 (Tue, 03 Apr 2012) $
\ProvidesFile{ppdvipdfm.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for dvipdfm (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
index e78abe2422d..6a4f1da7ffd 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4r}
+\def\AM@fileversion{v0.4s}
\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: 2012-03-08 18:53:37 +0100 (Thu, 08 Mar 2012) $
+\AM@SVN@Date$Date: 2012-04-03 21:07:24 +0200 (Tue, 03 Apr 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 eccabc9ed46..ef5406cff92 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4r}
+\def\AM@fileversion{v0.4s}
\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: 2012-03-08 18:53:37 +0100 (Thu, 08 Mar 2012) $
+\AM@SVN@Date$Date: 2012-04-03 21:07:24 +0200 (Tue, 03 Apr 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 42120b3a452..6cf2d48b9c9 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4r}
+\def\AM@fileversion{v0.4s}
\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: 2012-03-08 18:53:37 +0100 (Thu, 08 Mar 2012) $
+\AM@SVN@Date$Date: 2012-04-03 21:07:24 +0200 (Tue, 03 Apr 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 cf26d0caf6f..bb2c8694502 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4r}
+\def\AM@fileversion{v0.4s}
\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: 2012-03-08 18:53:37 +0100 (Thu, 08 Mar 2012) $
+\AM@SVN@Date$Date: 2012-04-03 21:07:24 +0200 (Tue, 03 Apr 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 544c674a462..cfb00c46c39 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
@@ -24,10 +24,10 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4r}
+\def\AM@fileversion{v0.4s}
\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: 2012-03-08 18:53:37 +0100 (Thu, 08 Mar 2012) $
+\AM@SVN@Date$Date: 2012-04-03 21:07:24 +0200 (Tue, 03 Apr 2012) $
\ProvidesFile{ppxetex.def}
[\AM@filedate\space\AM@fileversion\space
Pdfpages driver for XeTeX (AM)]