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/doc/latex/pdfpages/pdfpages.pdf | Bin 289792 -> 294376 bytes .../texmf-dist/source/latex/pdfpages/pdfpages.dtx | 25 ++++++++++++++++----- Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty | 13 ++++++----- .../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, 48 insertions(+), 32 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 500319a6937..2b2bffb8670 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 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 % -\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 $ % % % @@ -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 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