summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/pdfpages
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-06-16 21:19:54 +0000
committerKarl Berry <karl@freefriends.org>2015-06-16 21:19:54 +0000
commit442f1512f0e014d65451740c97c82c1373fc67d4 (patch)
treee8be40fdce635c489c8c01f2c73d3d5304c029fd /Master/texmf-dist/tex/latex/pdfpages
parentaabaf017d9f80254268cc35b62b781ad9dc598f6 (diff)
pdfpages (16jun15)
git-svn-id: svn://tug.org/texlive/trunk@37567 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/pdfpages')
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty41
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def15
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppdvips.def15
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppluatex.def15
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppnull.def12
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pppdftex.def15
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppvtex.def15
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppxetex.def15
8 files changed, 75 insertions, 68 deletions
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
index 0bfa88b8d09..164f84c2aff 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
+++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
@@ -24,13 +24,15 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4x}
-\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-05-11 18:08:19 +0200 (Mon, 11 May 2015) $
+\def\AM@fileversion{v0.4y}
+\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-06-15 20:08:28 +0200 $
+\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
- [\AM@filedate\space\AM@fileversion\space
+ [\AM@Git@Date\space\AM@fileversion\space
Insert pages of external PDF documents (AM)]
\newif\ifAM@pkg@draft \AM@pkg@draftfalse
\newif\ifAM@pkg@survey \AM@pkg@surveyfalse
@@ -74,6 +76,7 @@
\RequirePackage{count1to}%
\AddToShipoutPicture{\AM@setanchor}%
\fi
+\RequirePackage{pdflscape}
\@ifpackagelater{eso-pic}{2001/07/20}
{\def\AM@AddToShipoutPicture{\AddToShipoutPicture*}%
\def\AM@ClearShipoutPicture{\relax}}
@@ -126,23 +129,6 @@
\newcommand*{\AM@picturecommand}{}
\newcommand*{\AM@picturecommandstar}{}
\newsavebox{\AM@pagebox}
-\newif\ifAM@thumbpdf
-\newif\ifAM@pdflscape
-\AtBeginDocument{%
- \@ifpackageloaded{thumbpdf}{\AM@thumbpdftrue}{\AM@thumbpdffalse}%
- \@ifpackageloaded{pdflscape}{\AM@pdflscapetrue}{\AM@pdflscapefalse}%
- \ifAM@thumbpdf
- \ifAM@pdflscape
- \def\AM@setlscape{\PLS@Rotate{90}}%
- \else
- \PackageWarningNoLine{pdfpages}{%
- You are using `thumbpdf.sty' but not\MessageBreak
- `pdflscape.sty'.\MessageBreak
- Please, insert `pdflscape.sty' in your document\MessageBreak
- to get a pleasant PDF document with thumbs}%
- \fi
- \fi
-}
\newif\ifAM@integer
\begingroup
\@makeother_
@@ -659,10 +645,9 @@
\ifnum\AM@ynupi=\AM@ynup\relax
\begingroup\AM@pagecommand\endgroup
\hskip\z@
- \ifthenelse{\boolean{AM@turn}}
- {\ifthenelse{\boolean{AM@landscape}}
- {\AM@setlscape}{}}
- {}%
+ \ifthenelse{\boolean{AM@turn}\AND\boolean{AM@landscape}}{%
+ \AM@setRotate
+ }{}
\AM@AddToShipoutPicture{%
\begingroup\AM@picturecommand\endgroup}%
\ifAM@firstpage
@@ -678,7 +663,6 @@
}%
\AM@ClearShipoutPicture
\fi
-
\ifAM@signature
\ifAM@sigrotate\AM@sigrotatefalse\else\AM@sigrotatetrue\fi
\@tempdima=\AM@xoffset\relax
@@ -695,6 +679,9 @@
\@firstcolumnfalse
\fi
\newpage
+ \ifthenelse{\boolean{AM@turn}\AND\boolean{AM@landscape}}{%
+ \AM@resetRotate
+ }{}
}% AM@output
\newif\ifAM@defaultone
\newcommand*{\AM@readlist}[1]{%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
index f113dffe845..0f2174e3dfb 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
@@ -24,12 +24,14 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4x}
-\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-05-11 18:08:19 +0200 (Mon, 11 May 2015) $
+\def\AM@fileversion{v0.4y}
+\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-06-15 20:08:28 +0200 $
+\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $
\ProvidesFile{ppdvipdfm.def}
- [\AM@filedate\space\AM@fileversion\space
+ [\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for dvipdfm (AM)]
\def\AM@tmp{dvipdfm.def}
\ifx\Gin@driver\AM@tmp\else
@@ -63,7 +65,8 @@
\paperheight\AM@pageheight
}
\let\AM@pagesize@boogie\relax
-\def\AM@setlscape{\AM@notsupported{Page rotation}}
+\def\AM@setRotate{\AM@notsupported{Page rotation}}
+\def\AM@resetRotate{}
\def\AM@fitpaper@special{\AM@notsupported{Option fitpaper}}
\def\AM@findfile#1{%
\AM@findfile@i{#1}{pdf}%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
index 77f33a6a607..5bd0969e0c2 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
@@ -24,12 +24,14 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4x}
-\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-05-11 18:08:19 +0200 (Mon, 11 May 2015) $
+\def\AM@fileversion{v0.4y}
+\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-06-15 20:08:28 +0200 $
+\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $
\ProvidesFile{ppdvips.def}
- [\AM@filedate\space\AM@fileversion\space
+ [\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for dvips (AM)]
\def\AM@notsupported#1{%
\PackageWarning{pdfpages}{#1 not supported by driver dvips}}
@@ -51,7 +53,8 @@
\paperheight\AM@pageheight
}
\let\AM@pagesize@boogie\relax
-\def\AM@setlscape{\AM@notsupported{Page rotations}}
+\def\AM@setRotate{\AM@notsupported{Page rotations}}
+\def\AM@resetRotate{}
\def\AM@fitpaper@special{\AM@notsupported{Option fitpaper}}
\def\AM@findfile#1{%
\AM@findfile@i{#1}{eps}%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
index 241c47eeda3..65028a453a7 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
@@ -24,12 +24,14 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4x}
-\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-05-11 18:08:19 +0200 (Mon, 11 May 2015) $
+\def\AM@fileversion{v0.4y}
+\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-06-15 20:08:28 +0200 $
+\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $
\ProvidesFile{ppluatex.def}
- [\AM@filedate\space\AM@fileversion\space
+ [\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for luaTeX (AM)]
\ifcase\pdfoutput
\input{ppnull.def}
@@ -64,7 +66,8 @@
\let\AM@IfFileExists\grffile@IfFileExists}{%
\let\AM@IfFileExists\IfFileExists}%
}
-\def\AM@setlscape{\pdfpageattr{/Rotate 90}}
+\def\AM@setRotate{\PLS@Rotate{90}}
+\def\AM@resetRotate{\PLS@Rotate{0}}
\def\AM@linktodoc@special@begin{%
\pdfannot width \wd\@tempboxa
height \ht\@tempboxa
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
index 2f1769b8bd3..16df34ef404 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
@@ -24,12 +24,14 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4x}
-\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-05-11 18:08:19 +0200 (Mon, 11 May 2015) $
+\def\AM@fileversion{v0.4y}
+\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-06-15 20:08:28 +0200 $
+\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $
\ProvidesFile{ppnull.def}
- [\AM@filedate\space\AM@fileversion\space
+ [\AM@Git@Date\space\AM@fileversion\space
Pdfpages dummy driver (AM)]
\AM@DVIoutputtrue
\PackageWarningNoLine{pdfpages}{%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
index bd8cc33aa80..f867ffe3e23 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
@@ -24,12 +24,14 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4x}
-\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-05-11 18:08:19 +0200 (Mon, 11 May 2015) $
+\def\AM@fileversion{v0.4y}
+\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-06-15 20:08:28 +0200 $
+\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $
\ProvidesFile{pppdftex.def}
- [\AM@filedate\space\AM@fileversion\space
+ [\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for pdfTeX (AM)]
\ifnum\pdftexversion<100
\PackageError{pdfpages}
@@ -93,7 +95,8 @@
\let\AM@IfFileExists\grffile@IfFileExists}{%
\let\AM@IfFileExists\IfFileExists}%
}
-\def\AM@setlscape{\pdfpageattr{/Rotate 90}}
+\def\AM@setRotate{\PLS@Rotate{90}}
+\def\AM@resetRotate{\PLS@Rotate{0}}
\def\AM@linktodoc@special@begin{%
\pdfannot width \wd\@tempboxa
height \ht\@tempboxa
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
index 65c68f7129b..c37988fa12c 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
@@ -24,12 +24,14 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4x}
-\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-05-11 18:08:19 +0200 (Mon, 11 May 2015) $
+\def\AM@fileversion{v0.4y}
+\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-06-15 20:08:28 +0200 $
+\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $
\ProvidesFile{ppvtex.def}
- [\AM@filedate\space\AM@fileversion\space
+ [\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for VTeX (AM)]
\begingroup
\@ifundefined{ver@vtex.def}{%
@@ -67,10 +69,11 @@
\mediaheight\AM@pageheight
}
\let\AM@pagesize@boogie\relax
-\def\AM@setlscape{\special{pS:
+\def\AM@setRotate{\special{pS:
[{ThisPage}\string<\string</Rotate 90\string>\string>%]
/PUT pdfmark}%
}
+\def\AM@resetRotate{}
\def\AM@fitpaper@special{%
\immediate\xspecial{option updatemediasizes="on"}}
\def\AM@findfile#1{%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
index 9d1b3820179..9fad5dceef1 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
@@ -24,12 +24,14 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.4x}
-\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-05-11 18:08:19 +0200 (Mon, 11 May 2015) $
+\def\AM@fileversion{v0.4y}
+\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-06-15 20:08:28 +0200 $
+\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $
\ProvidesFile{ppxetex.def}
- [\AM@filedate\space\AM@fileversion\space
+ [\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for XeTeX (AM)]
\begingroup
\@ifundefined{ver@xetex.def}{%
@@ -111,7 +113,8 @@
\def\reserved@a{#2}%
\fi
\reserved@a}
-\def\AM@setlscape{\special{pdf: put @thispage << /Rotate 90 >>}}
+\def\AM@setRotate{\PLS@Rotate{90}}
+\def\AM@resetRotate{\PLS@Rotate{0}}
\def\AM@linktodoc@special@begin{%
\special{pdf: annot
width \the\wd\@tempboxa\space