summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/pdfpages
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-01-28 22:12:12 +0000
committerKarl Berry <karl@freefriends.org>2020-01-28 22:12:12 +0000
commit960a0f0d00f3a7fee9942fdda1e00be219ef37bc (patch)
treef34c8a70151edeb54a42db4d1a14829030e243e7 /Master/texmf-dist/tex/latex/pdfpages
parent8732f3abb619bccf3d6e8aead1b98c6b04468c75 (diff)
pdfpages (28jan20)
git-svn-id: svn://tug.org/texlive/trunk@53583 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/pdfpages')
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty61
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def8
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppdvips.def8
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppluatex.def8
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppnull.def8
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pppdftex.def8
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppvtex.def8
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/ppxetex.def8
8 files changed, 75 insertions, 42 deletions
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
index 0b8382d4f28..cf94695aa36 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-2019 Andreas MATTHIAS
+%% Copyright (C) 2001-2020 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5p}
+\def\AM@fileversion{v0.5q}
\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: 2019-12-17 19:25:27 +0100 $
-\AM@Git@SHA@process$SHA-1: a9f02534fb2a372bd05e8b882e851706165e532b $
+\AM@Git@Date@process$Date: 2020-01-28 18:31:23 +0100 $
+\AM@Git@SHA@process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
[\AM@Git@Date\space\AM@fileversion\space
@@ -97,6 +97,7 @@
\def\AM@ClearShipoutPicture{\ClearShipoutPicture}}
\let\Orig@AM@AddToShipoutPicture\AM@AddToShipoutPicture
\newif\ifAM@openright\AM@openrightfalse
+\newif\ifAM@openrighteach\AM@openrighteachfalse
\newif\ifAM@frame\AM@framefalse
\newif\ifAM@landscape\AM@landscapefalse
\newif\ifAM@turn\AM@turntrue
@@ -202,11 +203,12 @@
}
\newcommand*{\includepdf}[2][]{%
\begingroup
+ \AM@pagecnt\@ne
\let\AM@threadname\relax
\def\AM@tmp{pdfpages}
\expandafter\AM@split@options
\expandafter\AM@tmp
- \expandafter{\the\AM@global@opts,#1}
+ \expandafter{\the\AM@global@opts,#1}%
\edef\AM@temp{{pdfpages}{\the\@temptokena}}%
\expandafter\setkeys\AM@temp
\ifthenelse{\boolean{AM@pkg@draft} \and \boolean{AM@survey}}{%
@@ -251,6 +253,7 @@
}
\newcommand*{\includepdfmerge}[2][]{%
\begingroup
+ \AM@pagecnt\@ne
\let\AM@currentdocname\relax
\def\AM@tmp{pdfpages}
\expandafter\AM@split@options
@@ -319,7 +322,7 @@
\let\AM@ynup\AM@temp}%
}{}%
\AM@setphantom
- \ifthenelse{\boolean{AM@openright}}
+ \ifthenelse{\boolean{AM@openright}\and\not\boolean{AM@openrighteach}}
{\AM@openright}{}%
\ifx\AM@signature\@empty\AM@filluppagelist
\else\AM@prepare@signature\AM@signaturetrue\AM@turnfalse\fi
@@ -737,16 +740,37 @@
\AM@resetRotate
}{}
}% AM@output
-\newif\ifAM@defaultone
+\newif\ifAM@default@range@added
\newcommand*{\AM@readlist}[1]{%
- \AM@defaultonefalse
+ \AM@default@range@addedtrue
\def\AM@pagelist{}%
\def\AM@doclist{}%
\AM@readlisti#1,\END,
- \ifAM@defaultone\AM@append{1}\fi
+ \AM@add@default@range
\edef\AM@doclist{\expandafter\@gobble\AM@doclist\@empty}%
\edef\AM@pagelist{\expandafter\@gobble\AM@pagelist\@empty}%
}
+\def\AM@add@default@range{%
+ \ifAM@default@range@added
+ \else
+ \expandafter\AM@read@defaultpages\AM@pagestemp,\END,
+ \fi
+ \AM@default@range@addedtrue
+}
+\def\AM@read@defaultpages#1,{%
+ \ifx\END#1
+ \else
+ \edef\AM@x{\AM@trim@space{#1}}%
+ \ifx\AM@x\@empty
+ \AM@append{}%
+ \AM@ReturnAfterElseFiFi\AM@read@defaultpages
+ \else
+ \expandafter\AM@checkrange\AM@x-\END
+ \AM@expand@range\AM@i\AM@ii
+ \AM@ReturnAfterFiFi\AM@read@defaultpages
+ \fi
+ \fi
+}
\newcommand{\AM@readlisti}{}
\def\AM@readlisti#1,{%
\ifx\AM@currentdocname\relax
@@ -763,7 +787,7 @@
\def\AM@range@or@docname#1{%
\edef\AM@arg{\AM@trim@space{#1}}%
\ifx\AM@arg\@empty
- \AM@append{}
+ \AM@append{}%
\else
\expandafter\AM@checkrange\AM@arg-\END
\ifAM@isrange
@@ -771,8 +795,10 @@
\AM@setnewdocname{\AM@arg}%
\else
\AM@expand@range\AM@i\AM@ii
+ \AM@default@range@addedtrue
\fi
\else
+ \AM@add@default@range
\AM@setnewdocname{\AM@arg}%
\fi
\fi
@@ -862,14 +888,19 @@
\fi
}
\newcommand*{\AM@setnewdocname}[1]{%
- \ifAM@defaultone
- \AM@append{1}%
+ \ifAM@openrighteach
+ \ifodd\AM@pagecnt
+ \AM@append{}
+ \fi
\fi
+ \AM@add@default@range
\edef\AM@temp{\AM@trim@space{#1}}%
\AM@findfile{\AM@temp}%
- \AM@defaultonetrue
+ \AM@default@range@addedfalse
}
+\newcount\AM@pagecnt
\newcommand*{\AM@append}[1]{%
+ \advance\AM@pagecnt\@ne
\edef\AM@doclist{\AM@doclist,\AM@currentdocname}%
\edef\AM@pagelist{\AM@pagelist,#1}%
\ifAM@doublepages
@@ -885,7 +916,6 @@
\edef\AM@pagelist{\AM@pagelist,#1}%
\repeat
\fi
- \AM@defaultonefalse
}
\newif\ifAM@endoflist\AM@endoflistfalse
\newcommand{\AM@getfirst}{}
@@ -915,6 +945,7 @@
}
\def\AM@ReturnAfterFi#1\fi{\fi#1}
\def\AM@ReturnAfterFiFi#1\fi\fi{\fi\fi#1}
+\def\AM@ReturnAfterElseFiFi#1\else#2\fi#3\fi{\fi\fi#1}
\newcommand{\AM@getlasti}{}
\def\AM@getlasti#1,#2\END{%
\ifx\\#2\\%
@@ -1096,6 +1127,7 @@
\equal{offset}{\AM@temp}\or
\equal{frame}{\AM@temp}\or
\equal{openright}{\AM@temp}\or
+ \equal{openrighteach}{\AM@temp}\or
\equal{pagecommand}{\AM@temp}\or
\equal{landscape}{\AM@temp}\or
\equal{turn}{\AM@temp}\or
@@ -1513,6 +1545,7 @@
\define@key{pdfpages}{offset}{\AM@parse@offset#1 \\}
\define@key{pdfpages}{frame}[true]{\setboolean{AM@frame}{#1}}
\define@key{pdfpages}{openright}[true]{\setboolean{AM@openright}{#1}}
+\define@key{pdfpages}{openrighteach}[true]{\setboolean{AM@openrighteach}{#1}}
\define@key{pdfpages}{pagecommand}{\def\AM@pagecommand{#1}}
\define@key{pdfpages}{landscape}[true]{\setboolean{AM@landscape}{#1}}
\define@key{pdfpages}{turn}[true]{\setboolean{AM@turn}{#1}}
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
index 345b569b977..a5f4f28943a 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2019 Andreas MATTHIAS
+%% Copyright (C) 2001-2020 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5p}
+\def\AM@fileversion{v0.5q}
\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: 2019-12-17 19:25:27 +0100 $
-\AM@Git@SHA@process$SHA-1: a9f02534fb2a372bd05e8b882e851706165e532b $
+\AM@Git@Date@process$Date: 2020-01-28 18:31:23 +0100 $
+\AM@Git@SHA@process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
\ProvidesFile{ppdvipdfmx.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for dvipdfmx (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
index 7594cd6de81..4e11f2ec2af 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-2019 Andreas MATTHIAS
+%% Copyright (C) 2001-2020 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5p}
+\def\AM@fileversion{v0.5q}
\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: 2019-12-17 19:25:27 +0100 $
-\AM@Git@SHA@process$SHA-1: a9f02534fb2a372bd05e8b882e851706165e532b $
+\AM@Git@Date@process$Date: 2020-01-28 18:31:23 +0100 $
+\AM@Git@SHA@process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
\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 91f453b283d..15449c4b674 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2019 Andreas MATTHIAS
+%% Copyright (C) 2001-2020 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5p}
+\def\AM@fileversion{v0.5q}
\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: 2019-12-17 19:25:27 +0100 $
-\AM@Git@SHA@process$SHA-1: a9f02534fb2a372bd05e8b882e851706165e532b $
+\AM@Git@Date@process$Date: 2020-01-28 18:31:23 +0100 $
+\AM@Git@SHA@process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
\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 74bad50993c..1c453a6bce5 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-2019 Andreas MATTHIAS
+%% Copyright (C) 2001-2020 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5p}
+\def\AM@fileversion{v0.5q}
\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: 2019-12-17 19:25:27 +0100 $
-\AM@Git@SHA@process$SHA-1: a9f02534fb2a372bd05e8b882e851706165e532b $
+\AM@Git@Date@process$Date: 2020-01-28 18:31:23 +0100 $
+\AM@Git@SHA@process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
\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 8d228104ca3..a92a80b49c3 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-2019 Andreas MATTHIAS
+%% Copyright (C) 2001-2020 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5p}
+\def\AM@fileversion{v0.5q}
\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: 2019-12-17 19:25:27 +0100 $
-\AM@Git@SHA@process$SHA-1: a9f02534fb2a372bd05e8b882e851706165e532b $
+\AM@Git@Date@process$Date: 2020-01-28 18:31:23 +0100 $
+\AM@Git@SHA@process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
\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 463e6431855..91224d9c98d 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-2019 Andreas MATTHIAS
+%% Copyright (C) 2001-2020 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5p}
+\def\AM@fileversion{v0.5q}
\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: 2019-12-17 19:25:27 +0100 $
-\AM@Git@SHA@process$SHA-1: a9f02534fb2a372bd05e8b882e851706165e532b $
+\AM@Git@Date@process$Date: 2020-01-28 18:31:23 +0100 $
+\AM@Git@SHA@process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
\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 3245b470053..342cade368a 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-2019 Andreas MATTHIAS
+%% Copyright (C) 2001-2020 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias@gmail.com>.
%%
-\def\AM@fileversion{v0.5p}
+\def\AM@fileversion{v0.5q}
\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: 2019-12-17 19:25:27 +0100 $
-\AM@Git@SHA@process$SHA-1: a9f02534fb2a372bd05e8b882e851706165e532b $
+\AM@Git@Date@process$Date: 2020-01-28 18:31:23 +0100 $
+\AM@Git@SHA@process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
\ProvidesFile{ppxetex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for XeTeX (AM)]