texlive[42973] Master/texmf-dist: pdfpages (15jan17)

commits+karl at tug.org commits+karl at tug.org
Tue Jan 17 00:12:37 CET 2017


Revision: 42973
          http://tug.org/svn/texlive?view=revision&revision=42973
Author:   karl
Date:     2017-01-17 00:12:37 +0100 (Tue, 17 Jan 2017)
Log Message:
-----------
pdfpages (15jan17)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
    trunk/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
    trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
    trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
    trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
    trunk/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
    trunk/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
    trunk/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
    trunk/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
    trunk/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def

Modified: trunk/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx	2017-01-16 23:12:25 UTC (rev 42972)
+++ trunk/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx	2017-01-16 23:12:37 UTC (rev 42973)
@@ -27,12 +27,12 @@
 %<*dtx>
 \makeatletter
 %</dtx>
-\def\AM at fileversion{v0.5g}
+\def\AM at fileversion{v0.5h}
 \def\AM at Git@Date at process$#1: #2 #3${\AM at Git@Date at process@i#2\END}
 \def\AM at Git@Date at process@i#1-#2-#3\END{\def\AM at Git@Date{#1/#2/#3}}
 \def\AM at Git@SHA at process$#1: #2${\def\AM at Git@SHA{#2}}
-\AM at Git@Date at process$Date: 2016-12-11 20:23:58 +0100 $
-\AM at Git@SHA at process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $
+\AM at Git@Date at process$Date: 2017-01-14 23:28:27 +0100 $
+\AM at Git@SHA at 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 at scale\AM at scaletrue
 \newif\ifAM at newpage\AM at newpagefalse
 %    \end{macrocode}
+%    Check, if memoir is loaded.
+%    \begin{macrocode}
+\newif\ifAM at memoir\AM at memoirfalse
+\@ifclassloaded{memoir}{\AM at memoirtrue}{}
+%    \end{macrocode}
 %    \subsection{Commands}
 %    Declare macro names and define default values.
 %    \begin{macrocode}
@@ -1960,11 +1966,12 @@
       \setlength{\paperheight}{\AM at pageheight}%
       \AM at fitpaper@special
       \AM at setpagedimen
-      \@ifundefined{stockwidth}{}{%
+      \ifAM at memoir
         \setlength{\stockwidth}{\AM at pagewidth}%
         \setlength{\stockheight}{\AM at 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

Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty	2017-01-16 23:12:25 UTC (rev 42972)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty	2017-01-16 23:12:37 UTC (rev 42973)
@@ -24,12 +24,12 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias at gmail.com>.
 %%
-\def\AM at fileversion{v0.5g}
+\def\AM at fileversion{v0.5h}
 \def\AM at Git@Date at process$#1: #2 #3${\AM at Git@Date at process@i#2\END}
 \def\AM at Git@Date at process@i#1-#2-#3\END{\def\AM at Git@Date{#1/#2/#3}}
 \def\AM at Git@SHA at process$#1: #2${\def\AM at Git@SHA{#2}}
-\AM at Git@Date at process$Date: 2016-12-11 20:23:58 +0100 $
-\AM at Git@SHA at process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $
+\AM at Git@Date at process$Date: 2017-01-14 23:28:27 +0100 $
+\AM at Git@SHA at process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdfpages}
    [\AM at Git@Date\space\AM at fileversion\space
@@ -129,6 +129,8 @@
 \newif\ifAM at reflectall\AM at reflectallfalse
 \newif\ifAM at scale\AM at scaletrue
 \newif\ifAM at newpage\AM at newpagefalse
+\newif\ifAM at memoir\AM at memoirfalse
+\@ifclassloaded{memoir}{\AM at memoirtrue}{}
 \newcommand*{\AM at pagestemp}{1}
 \newcommand*{\AM at pagecommand}{\thispagestyle{empty}}
 \newcommand*{\AM at lscape@rot}{0}
@@ -657,11 +659,12 @@
       \setlength{\paperheight}{\AM at pageheight}%
       \AM at fitpaper@special
       \AM at setpagedimen
-      \@ifundefined{stockwidth}{}{%
+      \ifAM at memoir
         \setlength{\stockwidth}{\AM at pagewidth}%
         \setlength{\stockheight}{\AM at pageheight}%
         \setlength{\trimtop}{0pt}%
-        \setlength{\trimedge}{0pt}}%
+        \setlength{\trimedge}{0pt}%
+      \fi
     }{}
     \ifdim\paperwidth=\z@
       \let\paperwidth\AM at pagewidth

Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def	2017-01-16 23:12:25 UTC (rev 42972)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def	2017-01-16 23:12:37 UTC (rev 42973)
@@ -24,12 +24,12 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias at gmail.com>.
 %%
-\def\AM at fileversion{v0.5g}
+\def\AM at fileversion{v0.5h}
 \def\AM at Git@Date at process$#1: #2 #3${\AM at Git@Date at process@i#2\END}
 \def\AM at Git@Date at process@i#1-#2-#3\END{\def\AM at Git@Date{#1/#2/#3}}
 \def\AM at Git@SHA at process$#1: #2${\def\AM at Git@SHA{#2}}
-\AM at Git@Date at process$Date: 2016-12-11 20:23:58 +0100 $
-\AM at Git@SHA at process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $
+\AM at Git@Date at process$Date: 2017-01-14 23:28:27 +0100 $
+\AM at Git@SHA at process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $
 \ProvidesFile{ppdvipdfmx.def}
    [\AM at Git@Date\space\AM at fileversion\space
     Pdfpages driver for dvipdfmx (AM)]

Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def	2017-01-16 23:12:25 UTC (rev 42972)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def	2017-01-16 23:12:37 UTC (rev 42973)
@@ -24,12 +24,12 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias at gmail.com>.
 %%
-\def\AM at fileversion{v0.5g}
+\def\AM at fileversion{v0.5h}
 \def\AM at Git@Date at process$#1: #2 #3${\AM at Git@Date at process@i#2\END}
 \def\AM at Git@Date at process@i#1-#2-#3\END{\def\AM at Git@Date{#1/#2/#3}}
 \def\AM at Git@SHA at process$#1: #2${\def\AM at Git@SHA{#2}}
-\AM at Git@Date at process$Date: 2016-12-11 20:23:58 +0100 $
-\AM at Git@SHA at process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $
+\AM at Git@Date at process$Date: 2017-01-14 23:28:27 +0100 $
+\AM at Git@SHA at process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $
 \ProvidesFile{ppdvips.def}
    [\AM at Git@Date\space\AM at fileversion\space
     Pdfpages driver for dvips (AM)]

Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def	2017-01-16 23:12:25 UTC (rev 42972)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def	2017-01-16 23:12:37 UTC (rev 42973)
@@ -24,12 +24,12 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias at gmail.com>.
 %%
-\def\AM at fileversion{v0.5g}
+\def\AM at fileversion{v0.5h}
 \def\AM at Git@Date at process$#1: #2 #3${\AM at Git@Date at process@i#2\END}
 \def\AM at Git@Date at process@i#1-#2-#3\END{\def\AM at Git@Date{#1/#2/#3}}
 \def\AM at Git@SHA at process$#1: #2${\def\AM at Git@SHA{#2}}
-\AM at Git@Date at process$Date: 2016-12-11 20:23:58 +0100 $
-\AM at Git@SHA at process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $
+\AM at Git@Date at process$Date: 2017-01-14 23:28:27 +0100 $
+\AM at Git@SHA at process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $
 \ProvidesFile{ppluatex.def}
    [\AM at Git@Date\space\AM at fileversion\space
     Pdfpages driver for LuaTeX (AM)]

Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/ppnull.def	2017-01-16 23:12:25 UTC (rev 42972)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppnull.def	2017-01-16 23:12:37 UTC (rev 42973)
@@ -24,12 +24,12 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias at gmail.com>.
 %%
-\def\AM at fileversion{v0.5g}
+\def\AM at fileversion{v0.5h}
 \def\AM at Git@Date at process$#1: #2 #3${\AM at Git@Date at process@i#2\END}
 \def\AM at Git@Date at process@i#1-#2-#3\END{\def\AM at Git@Date{#1/#2/#3}}
 \def\AM at Git@SHA at process$#1: #2${\def\AM at Git@SHA{#2}}
-\AM at Git@Date at process$Date: 2016-12-11 20:23:58 +0100 $
-\AM at Git@SHA at process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $
+\AM at Git@Date at process$Date: 2017-01-14 23:28:27 +0100 $
+\AM at Git@SHA at process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $
 \ProvidesFile{ppnull.def}
    [\AM at Git@Date\space\AM at fileversion\space
     Pdfpages dummy driver (AM)]

Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def	2017-01-16 23:12:25 UTC (rev 42972)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def	2017-01-16 23:12:37 UTC (rev 42973)
@@ -24,12 +24,12 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias at gmail.com>.
 %%
-\def\AM at fileversion{v0.5g}
+\def\AM at fileversion{v0.5h}
 \def\AM at Git@Date at process$#1: #2 #3${\AM at Git@Date at process@i#2\END}
 \def\AM at Git@Date at process@i#1-#2-#3\END{\def\AM at Git@Date{#1/#2/#3}}
 \def\AM at Git@SHA at process$#1: #2${\def\AM at Git@SHA{#2}}
-\AM at Git@Date at process$Date: 2016-12-11 20:23:58 +0100 $
-\AM at Git@SHA at process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $
+\AM at Git@Date at process$Date: 2017-01-14 23:28:27 +0100 $
+\AM at Git@SHA at process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $
 \ProvidesFile{pppdftex.def}
    [\AM at Git@Date\space\AM at fileversion\space
     Pdfpages driver for pdfTeX (AM)]

Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def	2017-01-16 23:12:25 UTC (rev 42972)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def	2017-01-16 23:12:37 UTC (rev 42973)
@@ -24,12 +24,12 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias at gmail.com>.
 %%
-\def\AM at fileversion{v0.5g}
+\def\AM at fileversion{v0.5h}
 \def\AM at Git@Date at process$#1: #2 #3${\AM at Git@Date at process@i#2\END}
 \def\AM at Git@Date at process@i#1-#2-#3\END{\def\AM at Git@Date{#1/#2/#3}}
 \def\AM at Git@SHA at process$#1: #2${\def\AM at Git@SHA{#2}}
-\AM at Git@Date at process$Date: 2016-12-11 20:23:58 +0100 $
-\AM at Git@SHA at process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $
+\AM at Git@Date at process$Date: 2017-01-14 23:28:27 +0100 $
+\AM at Git@SHA at process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $
 \ProvidesFile{ppvtex.def}
    [\AM at Git@Date\space\AM at fileversion\space
     Pdfpages driver for VTeX (AM)]

Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def	2017-01-16 23:12:25 UTC (rev 42972)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def	2017-01-16 23:12:37 UTC (rev 42973)
@@ -24,12 +24,12 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias at gmail.com>.
 %%
-\def\AM at fileversion{v0.5g}
+\def\AM at fileversion{v0.5h}
 \def\AM at Git@Date at process$#1: #2 #3${\AM at Git@Date at process@i#2\END}
 \def\AM at Git@Date at process@i#1-#2-#3\END{\def\AM at Git@Date{#1/#2/#3}}
 \def\AM at Git@SHA at process$#1: #2${\def\AM at Git@SHA{#2}}
-\AM at Git@Date at process$Date: 2016-12-11 20:23:58 +0100 $
-\AM at Git@SHA at process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $
+\AM at Git@Date at process$Date: 2017-01-14 23:28:27 +0100 $
+\AM at Git@SHA at process$SHA-1: b15cf658a4b84d4e5a202ef16a697bb6e90a20a3 $
 \ProvidesFile{ppxetex.def}
    [\AM at Git@Date\space\AM at fileversion\space
     Pdfpages driver for XeTeX (AM)]



More information about the tex-live-commits mailing list