From abf16904fa655d4b73614dacb33af43ba0420a45 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 16 Jan 2017 23:12:37 +0000 Subject: pdfpages (15jan17) git-svn-id: svn://tug.org/texlive/trunk@42973 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty | 13 ++++++++----- Master/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 +++--- 8 files changed, 29 insertions(+), 26 deletions(-) (limited to 'Master/texmf-dist/tex/latex/pdfpages') diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty index 278790de1de..1089e0443ca 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.5g} +\def\AM@fileversion{v0.5h} \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: 2016-12-11 20:23:58 +0100 $ -\AM@Git@SHA@process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $ +\AM@Git@Date@process$Date: 2017-01-14 23:28:27 +0100 $ +\AM@Git@SHA@process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfpages} [\AM@Git@Date\space\AM@fileversion\space @@ -129,6 +129,8 @@ \newif\ifAM@reflectall\AM@reflectallfalse \newif\ifAM@scale\AM@scaletrue \newif\ifAM@newpage\AM@newpagefalse +\newif\ifAM@memoir\AM@memoirfalse +\@ifclassloaded{memoir}{\AM@memoirtrue}{} \newcommand*{\AM@pagestemp}{1} \newcommand*{\AM@pagecommand}{\thispagestyle{empty}} \newcommand*{\AM@lscape@rot}{0} @@ -657,11 +659,12 @@ \setlength{\paperheight}{\AM@pageheight}% \AM@fitpaper@special \AM@setpagedimen - \@ifundefined{stockwidth}{}{% + \ifAM@memoir \setlength{\stockwidth}{\AM@pagewidth}% \setlength{\stockheight}{\AM@pageheight}% \setlength{\trimtop}{0pt}% - \setlength{\trimedge}{0pt}}% + \setlength{\trimedge}{0pt}% + \fi }{} \ifdim\paperwidth=\z@ \let\paperwidth\AM@pagewidth diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def index ed05f3ce2fa..28826a76e2a 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.5g} +\def\AM@fileversion{v0.5h} \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: 2016-12-11 20:23:58 +0100 $ -\AM@Git@SHA@process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $ +\AM@Git@Date@process$Date: 2017-01-14 23:28:27 +0100 $ +\AM@Git@SHA@process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $ \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 868b30f484c..7a90095c8c8 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.5g} +\def\AM@fileversion{v0.5h} \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: 2016-12-11 20:23:58 +0100 $ -\AM@Git@SHA@process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $ +\AM@Git@Date@process$Date: 2017-01-14 23:28:27 +0100 $ +\AM@Git@SHA@process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $ \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 a0410f14839..ff0735971ea 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.5g} +\def\AM@fileversion{v0.5h} \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: 2016-12-11 20:23:58 +0100 $ -\AM@Git@SHA@process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $ +\AM@Git@Date@process$Date: 2017-01-14 23:28:27 +0100 $ +\AM@Git@SHA@process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $ \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 3778cd7f508..c542237cd5e 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.5g} +\def\AM@fileversion{v0.5h} \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: 2016-12-11 20:23:58 +0100 $ -\AM@Git@SHA@process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $ +\AM@Git@Date@process$Date: 2017-01-14 23:28:27 +0100 $ +\AM@Git@SHA@process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $ \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 32a827c4b74..eb22d6592f3 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.5g} +\def\AM@fileversion{v0.5h} \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: 2016-12-11 20:23:58 +0100 $ -\AM@Git@SHA@process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $ +\AM@Git@Date@process$Date: 2017-01-14 23:28:27 +0100 $ +\AM@Git@SHA@process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $ \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 b3285758be5..d80ca3066d6 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.5g} +\def\AM@fileversion{v0.5h} \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: 2016-12-11 20:23:58 +0100 $ -\AM@Git@SHA@process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $ +\AM@Git@Date@process$Date: 2017-01-14 23:28:27 +0100 $ +\AM@Git@SHA@process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $ \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 d7e47986791..bcffde77730 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.5g} +\def\AM@fileversion{v0.5h} \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: 2016-12-11 20:23:58 +0100 $ -\AM@Git@SHA@process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $ +\AM@Git@Date@process$Date: 2017-01-14 23:28:27 +0100 $ +\AM@Git@SHA@process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $ \ProvidesFile{ppxetex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for XeTeX (AM)] -- cgit v1.2.3