From 85c20709586c694fd35ab82b4964d1d52a9db409 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 18 Dec 2019 22:05:58 +0000 Subject: pdfpages (18dec19) git-svn-id: svn://tug.org/texlive/trunk@53180 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf | Bin 292653 -> 293116 bytes .../texmf-dist/source/latex/pdfpages/pdfpages.dtx | 24 ++++++++++++--------- Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty | 24 ++++++++++++--------- .../texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def | 6 +++--- Master/texmf-dist/tex/latex/pdfpages/ppdvips.def | 6 +++--- Master/texmf-dist/tex/latex/pdfpages/ppluatex.def | 6 +++--- Master/texmf-dist/tex/latex/pdfpages/ppnull.def | 6 +++--- Master/texmf-dist/tex/latex/pdfpages/pppdftex.def | 6 +++--- Master/texmf-dist/tex/latex/pdfpages/ppvtex.def | 6 +++--- Master/texmf-dist/tex/latex/pdfpages/ppxetex.def | 6 +++--- 10 files changed, 49 insertions(+), 41 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf index c4193d39ec5..45790dd807d 100644 Binary files a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf and b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf differ diff --git a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx index d1b10ffe56e..d9d974377bf 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 % -\def\AM@fileversion{v0.5o} +\def\AM@fileversion{v0.5p} \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-11-21 22:42:07 +0100 $ -\AM@Git@SHA@process$SHA-1: 93ad0990b7b033614833d48104c875c739c217aa $ +\AM@Git@Date@process$Date: 2019-12-17 19:25:27 +0100 $ +\AM@Git@SHA@process$SHA-1: a9f02534fb2a372bd05e8b882e851706165e532b $ % % % @@ -2097,15 +2097,19 @@ % \begin{macrocode} \def\AM@range@or@docname#1{% \edef\AM@arg{\AM@trim@space{#1}}% - \expandafter\AM@checkrange\AM@arg-\END - \ifAM@isrange - \ifx\AM@currentdocname\relax - \AM@setnewdocname{\AM@arg}% + \ifx\AM@arg\@empty + \AM@append{} + \else + \expandafter\AM@checkrange\AM@arg-\END + \ifAM@isrange + \ifx\AM@currentdocname\relax + \AM@setnewdocname{\AM@arg}% + \else + \AM@expand@range\AM@i\AM@ii + \fi \else - \AM@expand@range\AM@i\AM@ii + \AM@setnewdocname{\AM@arg}% \fi - \else - \AM@setnewdocname{\AM@arg}% \fi } % \end{macrocode} diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty index 3d500e40880..0b8382d4f28 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 . %% -\def\AM@fileversion{v0.5o} +\def\AM@fileversion{v0.5p} \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-11-21 22:42:07 +0100 $ -\AM@Git@SHA@process$SHA-1: 93ad0990b7b033614833d48104c875c739c217aa $ +\AM@Git@Date@process$Date: 2019-12-17 19:25:27 +0100 $ +\AM@Git@SHA@process$SHA-1: a9f02534fb2a372bd05e8b882e851706165e532b $ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfpages} [\AM@Git@Date\space\AM@fileversion\space @@ -762,15 +762,19 @@ } \def\AM@range@or@docname#1{% \edef\AM@arg{\AM@trim@space{#1}}% - \expandafter\AM@checkrange\AM@arg-\END - \ifAM@isrange - \ifx\AM@currentdocname\relax - \AM@setnewdocname{\AM@arg}% + \ifx\AM@arg\@empty + \AM@append{} + \else + \expandafter\AM@checkrange\AM@arg-\END + \ifAM@isrange + \ifx\AM@currentdocname\relax + \AM@setnewdocname{\AM@arg}% + \else + \AM@expand@range\AM@i\AM@ii + \fi \else - \AM@expand@range\AM@i\AM@ii + \AM@setnewdocname{\AM@arg}% \fi - \else - \AM@setnewdocname{\AM@arg}% \fi } \def\AM@last{last} diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def index 4ef486fc996..345b569b977 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 . %% -\def\AM@fileversion{v0.5o} +\def\AM@fileversion{v0.5p} \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-11-21 22:42:07 +0100 $ -\AM@Git@SHA@process$SHA-1: 93ad0990b7b033614833d48104c875c739c217aa $ +\AM@Git@Date@process$Date: 2019-12-17 19:25:27 +0100 $ +\AM@Git@SHA@process$SHA-1: a9f02534fb2a372bd05e8b882e851706165e532b $ \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 10b0c2b8681..7594cd6de81 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 . %% -\def\AM@fileversion{v0.5o} +\def\AM@fileversion{v0.5p} \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-11-21 22:42:07 +0100 $ -\AM@Git@SHA@process$SHA-1: 93ad0990b7b033614833d48104c875c739c217aa $ +\AM@Git@Date@process$Date: 2019-12-17 19:25:27 +0100 $ +\AM@Git@SHA@process$SHA-1: a9f02534fb2a372bd05e8b882e851706165e532b $ \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 bd861ba8f43..91f453b283d 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 . %% -\def\AM@fileversion{v0.5o} +\def\AM@fileversion{v0.5p} \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-11-21 22:42:07 +0100 $ -\AM@Git@SHA@process$SHA-1: 93ad0990b7b033614833d48104c875c739c217aa $ +\AM@Git@Date@process$Date: 2019-12-17 19:25:27 +0100 $ +\AM@Git@SHA@process$SHA-1: a9f02534fb2a372bd05e8b882e851706165e532b $ \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 9b9da4fe6bb..74bad50993c 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 . %% -\def\AM@fileversion{v0.5o} +\def\AM@fileversion{v0.5p} \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-11-21 22:42:07 +0100 $ -\AM@Git@SHA@process$SHA-1: 93ad0990b7b033614833d48104c875c739c217aa $ +\AM@Git@Date@process$Date: 2019-12-17 19:25:27 +0100 $ +\AM@Git@SHA@process$SHA-1: a9f02534fb2a372bd05e8b882e851706165e532b $ \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 9d59ada62c7..8d228104ca3 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 . %% -\def\AM@fileversion{v0.5o} +\def\AM@fileversion{v0.5p} \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-11-21 22:42:07 +0100 $ -\AM@Git@SHA@process$SHA-1: 93ad0990b7b033614833d48104c875c739c217aa $ +\AM@Git@Date@process$Date: 2019-12-17 19:25:27 +0100 $ +\AM@Git@SHA@process$SHA-1: a9f02534fb2a372bd05e8b882e851706165e532b $ \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 0fea33492b7..463e6431855 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 . %% -\def\AM@fileversion{v0.5o} +\def\AM@fileversion{v0.5p} \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-11-21 22:42:07 +0100 $ -\AM@Git@SHA@process$SHA-1: 93ad0990b7b033614833d48104c875c739c217aa $ +\AM@Git@Date@process$Date: 2019-12-17 19:25:27 +0100 $ +\AM@Git@SHA@process$SHA-1: a9f02534fb2a372bd05e8b882e851706165e532b $ \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 9b4be649542..3245b470053 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 . %% -\def\AM@fileversion{v0.5o} +\def\AM@fileversion{v0.5p} \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-11-21 22:42:07 +0100 $ -\AM@Git@SHA@process$SHA-1: 93ad0990b7b033614833d48104c875c739c217aa $ +\AM@Git@Date@process$Date: 2019-12-17 19:25:27 +0100 $ +\AM@Git@SHA@process$SHA-1: a9f02534fb2a372bd05e8b882e851706165e532b $ \ProvidesFile{ppxetex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for XeTeX (AM)] -- cgit v1.2.3