summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-16 23:12:37 +0000
committerKarl Berry <karl@freefriends.org>2017-01-16 23:12:37 +0000
commitabf16904fa655d4b73614dacb33af43ba0420a45 (patch)
treef9a6767668acbe7246ddb586deb9ce83101018ed /Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
parentcaa95c11d20fa882a04b0a0c8580e0015b840374 (diff)
pdfpages (15jan17)
git-svn-id: svn://tug.org/texlive/trunk@42973 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty')
-rw-r--r--Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty13
1 files changed, 8 insertions, 5 deletions
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 <andreas.matthias@gmail.com>.
%%
-\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