diff options
author | Karl Berry <karl@freefriends.org> | 2017-01-16 23:12:37 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-01-16 23:12:37 +0000 |
commit | abf16904fa655d4b73614dacb33af43ba0420a45 (patch) | |
tree | f9a6767668acbe7246ddb586deb9ce83101018ed /Master/texmf-dist/source | |
parent | caa95c11d20fa882a04b0a0c8580e0015b840374 (diff) |
pdfpages (15jan17)
git-svn-id: svn://tug.org/texlive/trunk@42973 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r-- | Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx index 3b6704e1bf0..7412227b0b6 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 %</dtx> -\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 $ %</!(example1,example2,example3,installer)> % % @@ -84,7 +84,7 @@ % % \GetFileInfo{pdfpages.dtx} % -% \CheckSum{4925} +% \CheckSum{4931} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -108,6 +108,7 @@ \documentclass{ltxdoc} \usepackage{array} \usepackage{graphicx} +\usepackage{cmap} \usepackage{hypdoc} \hypersetup{colorlinks, linkcolor=blue, pdfstartview={Fit}, bookmarksopenlevel=1, bookmarksnumbered=false} @@ -1248,6 +1249,11 @@ \newif\ifAM@scale\AM@scaletrue \newif\ifAM@newpage\AM@newpagefalse % \end{macrocode} +% Check, if memoir is loaded. +% \begin{macrocode} +\newif\ifAM@memoir\AM@memoirfalse +\@ifclassloaded{memoir}{\AM@memoirtrue}{} +% \end{macrocode} % \subsection{Commands} % Declare macro names and define default values. % \begin{macrocode} @@ -1960,11 +1966,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 }{} % \end{macrocode} % |eso-pic| needs |\paperwidth| and |\paperheight|, which may @@ -4651,6 +4658,12 @@ % on each page where |addtotoc| inserted a label. % \end{itemize} % +% \subsection*{2017/01/12 v0.5h} +% \begin{itemize} +% \item Do not use |\stockwidth| to check for memoir, |\stockwidth| is used +% by other packages as well. +% \end{itemize} +% % \Finale % % \iffalse |