summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-08-17 22:18:28 +0000
committerKarl Berry <karl@freefriends.org>2015-08-17 22:18:28 +0000
commitc8f75ec470f047e10ae646187bffc9745d25bcb3 (patch)
tree3e5abd413c1f9eb2007bb96fc2036d2c2d6ea21c
parentb8487f5800276cf85bb543f7405b7315580bc450 (diff)
pdfpages (17aug15)
git-svn-id: svn://tug.org/texlive/trunk@38140 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdfbin290195 -> 290196 bytes
-rw-r--r--Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx22
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty8
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def12
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppdvips.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppluatex.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppnull.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pppdftex.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppvtex.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppxetex.def6
10 files changed, 45 insertions, 33 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
index 3312d60800a..471f9d6458a 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 adac8ba5fb7..a992c2bf948 100644
--- a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
+++ b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
@@ -27,12 +27,12 @@
%<*dtx>
\makeatletter
%</dtx>
-\def\AM@fileversion{v0.5b}
+\def\AM@fileversion{v0.5c}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2015-08-13 17:38:37 +0200 $
-\AM@Git@SHA@process$SHA-1: 54e50f1cc837f422c29e405d8b7d7849b0530ceb $
+\AM@Git@Date@process$Date: 2015-08-16 20:57:52 +0200 $
+\AM@Git@SHA@process$SHA-1: 0165ce378c8de8098af302bb25e577befd88f5d0 $
%</!(example1,example2,example3,installer)>
%
%
@@ -1649,6 +1649,7 @@
% \begin{macrocode}
\setboolean{AM@endoflist}{false}%
\whiledo{\not\boolean{AM@endoflist}}{%
+ \newpage
\AM@getfirst{\AM@pagelist}%
\edef\AM@page{\the\toks@}%
\AM@isphantom
@@ -1835,7 +1836,6 @@
% \end{macrocode}
% Ship out page.
% \begin{macrocode}
- \newpage
\ifnum\AM@xnupi=1
\ifnum\AM@ynupi=1
\ifAM@reflectall \setbox\AM@pagebox\null \fi
@@ -3991,7 +3991,8 @@
% Try reading output of program |extractbb|.
% \begin{macrocode}
\ifx\AM@pagecount\AM@undefined
- \immediate\openin\@inputcheck=\AM@quote|extractbb -O \AM@currentdocname\AM@quote
+ \immediate\openin\@inputcheck=
+ \AM@quote|extractbb -O \AM@currentdocname\AM@quote
\AM@read@xbb\@inputcheck
\immediate\closein\@inputcheck
\fi
@@ -4045,7 +4046,8 @@
\AM@pageheight=\paperheight
}
\def\AM@setpagedimen{%
- \special{pdf:pagesize width \the\AM@pagewidth\space height \the\AM@pageheight\space}
+ \special{pdf:pagesize width \the\AM@pagewidth\space
+ height \the\AM@pageheight\space}
}
\def\AM@pagesize@boogie{%
\ifdim\AM@pagewidth=\z@
@@ -4505,6 +4507,14 @@
% \item Driver dvipdfm removed.
% \item Driver dvipdfmx added.
% \end{itemize}
+%
+% \subsection*{2015/08/13 v0.5b}
+% \begin{itemize}
+% \item Driver dvipdfmx uses |extractbb| to get the total number of
+% pages of a PDF.
+% \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 f22cdad75ad..c96de60d739 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
+++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5b}
+\def\AM@fileversion{v0.5c}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2015-08-13 17:38:37 +0200 $
-\AM@Git@SHA@process$SHA-1: 54e50f1cc837f422c29e405d8b7d7849b0530ceb $
+\AM@Git@Date@process$Date: 2015-08-16 20:57:52 +0200 $
+\AM@Git@SHA@process$SHA-1: 0165ce378c8de8098af302bb25e577befd88f5d0 $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
[\AM@Git@Date\space\AM@fileversion\space
@@ -428,6 +428,7 @@
\fi
\setboolean{AM@endoflist}{false}%
\whiledo{\not\boolean{AM@endoflist}}{%
+ \newpage
\AM@getfirst{\AM@pagelist}%
\edef\AM@page{\the\toks@}%
\AM@isphantom
@@ -581,7 +582,6 @@
\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
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
index e334f0447a4..9406745a106 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5b}
+\def\AM@fileversion{v0.5c}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2015-08-13 17:38:37 +0200 $
-\AM@Git@SHA@process$SHA-1: 54e50f1cc837f422c29e405d8b7d7849b0530ceb $
+\AM@Git@Date@process$Date: 2015-08-16 20:57:52 +0200 $
+\AM@Git@SHA@process$SHA-1: 0165ce378c8de8098af302bb25e577befd88f5d0 $
\ProvidesFile{ppdvipdfmx.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for dvipdfmx (AM)]
@@ -58,7 +58,8 @@
\AM@read@xbb\@inputcheck
\immediate\closein\@inputcheck
\ifx\AM@pagecount\AM@undefined
- \immediate\openin\@inputcheck=\AM@quote|extractbb -O \AM@currentdocname\AM@quote
+ \immediate\openin\@inputcheck=
+ \AM@quote|extractbb -O \AM@currentdocname\AM@quote
\AM@read@xbb\@inputcheck
\immediate\closein\@inputcheck
\fi
@@ -95,7 +96,8 @@
\AM@pageheight=\paperheight
}
\def\AM@setpagedimen{%
- \special{pdf:pagesize width \the\AM@pagewidth\space height \the\AM@pageheight\space}
+ \special{pdf:pagesize width \the\AM@pagewidth\space
+ height \the\AM@pageheight\space}
}
\def\AM@pagesize@boogie{%
\ifdim\AM@pagewidth=\z@
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
index 658d1d004a2..f18424b5cfe 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5b}
+\def\AM@fileversion{v0.5c}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2015-08-13 17:38:37 +0200 $
-\AM@Git@SHA@process$SHA-1: 54e50f1cc837f422c29e405d8b7d7849b0530ceb $
+\AM@Git@Date@process$Date: 2015-08-16 20:57:52 +0200 $
+\AM@Git@SHA@process$SHA-1: 0165ce378c8de8098af302bb25e577befd88f5d0 $
\ProvidesFile{ppdvips.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for dvips (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
index 43fcc3abb66..af0c2f15512 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5b}
+\def\AM@fileversion{v0.5c}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2015-08-13 17:38:37 +0200 $
-\AM@Git@SHA@process$SHA-1: 54e50f1cc837f422c29e405d8b7d7849b0530ceb $
+\AM@Git@Date@process$Date: 2015-08-16 20:57:52 +0200 $
+\AM@Git@SHA@process$SHA-1: 0165ce378c8de8098af302bb25e577befd88f5d0 $
\ProvidesFile{ppluatex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for LuaTeX (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
index 690f520e3f3..70082d1252b 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5b}
+\def\AM@fileversion{v0.5c}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2015-08-13 17:38:37 +0200 $
-\AM@Git@SHA@process$SHA-1: 54e50f1cc837f422c29e405d8b7d7849b0530ceb $
+\AM@Git@Date@process$Date: 2015-08-16 20:57:52 +0200 $
+\AM@Git@SHA@process$SHA-1: 0165ce378c8de8098af302bb25e577befd88f5d0 $
\ProvidesFile{ppnull.def}
[\AM@Git@Date\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 f2c6ee05ac1..09f71572238 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5b}
+\def\AM@fileversion{v0.5c}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2015-08-13 17:38:37 +0200 $
-\AM@Git@SHA@process$SHA-1: 54e50f1cc837f422c29e405d8b7d7849b0530ceb $
+\AM@Git@Date@process$Date: 2015-08-16 20:57:52 +0200 $
+\AM@Git@SHA@process$SHA-1: 0165ce378c8de8098af302bb25e577befd88f5d0 $
\ProvidesFile{pppdftex.def}
[\AM@Git@Date\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 d09ad1b7425..b8e1dfe572d 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5b}
+\def\AM@fileversion{v0.5c}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2015-08-13 17:38:37 +0200 $
-\AM@Git@SHA@process$SHA-1: 54e50f1cc837f422c29e405d8b7d7849b0530ceb $
+\AM@Git@Date@process$Date: 2015-08-16 20:57:52 +0200 $
+\AM@Git@SHA@process$SHA-1: 0165ce378c8de8098af302bb25e577befd88f5d0 $
\ProvidesFile{ppvtex.def}
[\AM@Git@Date\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 faa09e8596d..a6cfc3d37c5 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5b}
+\def\AM@fileversion{v0.5c}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2015-08-13 17:38:37 +0200 $
-\AM@Git@SHA@process$SHA-1: 54e50f1cc837f422c29e405d8b7d7849b0530ceb $
+\AM@Git@Date@process$Date: 2015-08-16 20:57:52 +0200 $
+\AM@Git@SHA@process$SHA-1: 0165ce378c8de8098af302bb25e577befd88f5d0 $
\ProvidesFile{ppxetex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for XeTeX (AM)]