texlive[57378] Master/texmf-dist: pdfpages (10jan21)
commits+karl at tug.org
commits+karl at tug.org
Sun Jan 10 22:56:31 CET 2021
Revision: 57378
http://tug.org/svn/texlive?view=revision&revision=57378
Author: karl
Date: 2021-01-10 22:56:31 +0100 (Sun, 10 Jan 2021)
Log Message:
-----------
pdfpages (10jan21)
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 2021-01-10 21:56:05 UTC (rev 57377)
+++ trunk/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx 2021-01-10 21:56:31 UTC (rev 57378)
@@ -2,7 +2,7 @@
% \iffalse
%
%<*(package,pppdftexdef,ppluatexdef,ppvtexdef,ppxetexdef,ppdvipsdef,ppdvipdfmxdef,ppnulldef)>
-%% Copyright (C) 2001-2020 Andreas MATTHIAS
+%% Copyright (C) 2001-2021 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -27,12 +27,12 @@
%<*dtx>
\makeatletter
%</dtx>
-\def\AM at fileversion{v0.5q}
+\def\AM at fileversion{v0.5r}
\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: 2020-01-28 18:31:23 +0100 $
-\AM at Git@SHA at process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
+\AM at Git@Date at process$Date: 2021-01-09 21:30:43 +0100 $
+\AM at Git@SHA at process$SHA-1: 835dfb0d7e5502acd5c811aa9c00b2e44eae9cbd $
%</!(example1,example2,example3,installer)>
%
%
@@ -84,7 +84,7 @@
%
% \GetFileInfo{pdfpages.dtx}
%
-% \CheckSum{5022}
+% \CheckSum{5059}
%
% \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{booktabs}
\usepackage{cmap}
\usepackage{hypdoc}
\hypersetup{colorlinks, linkcolor=blue, pdfstartview={Fit},
@@ -515,8 +516,8 @@
% \item[linktodoc] Lets the inserted pages be hyperlinks to the
% document from which they were extracted.
% Note that the \PDF-Viewer will not find the
-% file, if \meta{filename} has not filename
-% extension (.pdf).
+% file, if filename extension (.pdf) is missing
+% in \meta{filename}.
% Either `true' or `false' (or no value, which
% is equivalent to `true'). \df{linktodoc=false}
% \end{description}
@@ -1238,6 +1239,28 @@
\newif\ifAM at memoir\AM at memoirfalse
\@ifclassloaded{memoir}{\AM at memoirtrue}{}
% \end{macrocode}
+% Pdfpages calls |\includegraphics| several times to retrieve necessary
+% information like width, height, or number of pages without actually
+% typesetting the image. Just the final call to |\includegraphics| will
+% eventually typeset the image. Packages which hook into
+% |\includegraphics| and whish to check whether or not this is the final
+% call to |\includegraphics| can do so by using the counter
+% |\pdfpages at includegraphics@status|:
+% \begin{quotation}
+% \begin{tabular}{@{}cl@{}}
+% \toprule
+% Status & Use of |\includegraphics| ...\\
+% \midrule
+% 0 & outside of pdfpages\\
+% 1 & inside of pdfpages: final call\\
+% 2 & inside of pdfpages: non-final call, for internal use\\
+% \bottomrule
+% \end{tabular}
+% \end{quotation}
+% \begin{macrocode}
+\newcount\pdfpages at includegraphics@status
+\pdfpages at includegraphics@status\z@
+% \end{macrocode}
% \subsection{Commands}
% Declare macro names and define default values.
% \begin{macrocode}
@@ -1352,6 +1375,7 @@
% \begin{macrocode}
\newcommand*{\includepdf}[2][]{%
\begingroup
+ \global\pdfpages at includegraphics@status\tw@
\AM at pagecnt\@ne
\let\AM at threadname\relax
\def\AM at tmp{pdfpages}
@@ -1410,6 +1434,7 @@
\AM at CheckAtEnd
\endgroup
\AM at ClearShipoutPicture
+ \global\pdfpages at includegraphics@status\z@
}
% \end{macrocode}
% \macro{\includepdfmerge}
@@ -1417,6 +1442,7 @@
% \begin{macrocode}
\newcommand*{\includepdfmerge}[2][]{%
\begingroup
+ \global\pdfpages at includegraphics@status\tw@
\AM at pagecnt\@ne
\let\AM at currentdocname\relax
\def\AM at tmp{pdfpages}
@@ -1430,6 +1456,7 @@
\AM at CheckAtEnd
\endgroup
\AM at ClearShipoutPicture
+ \global\pdfpages at includegraphics@status\z@
}
% \end{macrocode}
% \macro{\AM at CheckAtEnd}
@@ -1936,11 +1963,13 @@
\noexpand\raise \ht\@tempboxa \hbox{\AM at hyper@begin at i}%
% \end{macrocode}
% \begin{macrocode}
+ \global\pdfpages at includegraphics@status\@ne
\AM at hyper@begin at ii\noexpand\AM at fbox{%
\noexpand\AM at ARBug@hook
\noexpand\AM at reflectbox{%
\expandafter\noexpand\expandafter
\includegraphics\AM at opts{\AM at docname}}}%
+ \global\pdfpages at includegraphics@status\tw@
\AM at hyper@end}}%
}%
\fi
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty 2021-01-10 21:56:05 UTC (rev 57377)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty 2021-01-10 21:56:31 UTC (rev 57378)
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2020 Andreas MATTHIAS
+%% Copyright (C) 2001-2021 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -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.5q}
+\def\AM at fileversion{v0.5r}
\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: 2020-01-28 18:31:23 +0100 $
-\AM at Git@SHA at process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
+\AM at Git@Date at process$Date: 2021-01-09 21:30:43 +0100 $
+\AM at Git@SHA at process$SHA-1: 835dfb0d7e5502acd5c811aa9c00b2e44eae9cbd $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
[\AM at Git@Date\space\AM at fileversion\space
@@ -132,6 +132,8 @@
\newif\ifAM at newpage\AM at newpagefalse
\newif\ifAM at memoir\AM at memoirfalse
\@ifclassloaded{memoir}{\AM at memoirtrue}{}
+\newcount\pdfpages at includegraphics@status
+\pdfpages at includegraphics@status\z@
\newcommand*{\AM at pagestemp}{1}
\newcommand*{\AM at pagecommand}{\thispagestyle{empty}}
\newcommand*{\AM at lscape@rot}{0}
@@ -203,6 +205,7 @@
}
\newcommand*{\includepdf}[2][]{%
\begingroup
+ \global\pdfpages at includegraphics@status\tw@
\AM at pagecnt\@ne
\let\AM at threadname\relax
\def\AM at tmp{pdfpages}
@@ -250,9 +253,11 @@
\AM at CheckAtEnd
\endgroup
\AM at ClearShipoutPicture
+ \global\pdfpages at includegraphics@status\z@
}
\newcommand*{\includepdfmerge}[2][]{%
\begingroup
+ \global\pdfpages at includegraphics@status\tw@
\AM at pagecnt\@ne
\let\AM at currentdocname\relax
\def\AM at tmp{pdfpages}
@@ -266,6 +271,7 @@
\AM at CheckAtEnd
\endgroup
\AM at ClearShipoutPicture
+ \global\pdfpages at includegraphics@status\z@
}
\newcommand{\AM at CheckAtEnd}{%
\ifx\@empty\AM at toclist\else
@@ -646,11 +652,13 @@
\noexpand\put(\AM at xpos,\AM at ypos){%
\noexpand\raisebox{\dp\@tempboxa}{%
\noexpand\raise \ht\@tempboxa \hbox{\AM at hyper@begin at i}%
+ \global\pdfpages at includegraphics@status\@ne
\AM at hyper@begin at ii\noexpand\AM at fbox{%
\noexpand\AM at ARBug@hook
\noexpand\AM at reflectbox{%
\expandafter\noexpand\expandafter
\includegraphics\AM at opts{\AM at docname}}}%
+ \global\pdfpages at includegraphics@status\tw@
\AM at hyper@end}}%
}%
\fi
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def 2021-01-10 21:56:05 UTC (rev 57377)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def 2021-01-10 21:56:31 UTC (rev 57378)
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2020 Andreas MATTHIAS
+%% Copyright (C) 2001-2021 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -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.5q}
+\def\AM at fileversion{v0.5r}
\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: 2020-01-28 18:31:23 +0100 $
-\AM at Git@SHA at process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
+\AM at Git@Date at process$Date: 2021-01-09 21:30:43 +0100 $
+\AM at Git@SHA at process$SHA-1: 835dfb0d7e5502acd5c811aa9c00b2e44eae9cbd $
\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 2021-01-10 21:56:05 UTC (rev 57377)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def 2021-01-10 21:56:31 UTC (rev 57378)
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2020 Andreas MATTHIAS
+%% Copyright (C) 2001-2021 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -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.5q}
+\def\AM at fileversion{v0.5r}
\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: 2020-01-28 18:31:23 +0100 $
-\AM at Git@SHA at process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
+\AM at Git@Date at process$Date: 2021-01-09 21:30:43 +0100 $
+\AM at Git@SHA at process$SHA-1: 835dfb0d7e5502acd5c811aa9c00b2e44eae9cbd $
\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 2021-01-10 21:56:05 UTC (rev 57377)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def 2021-01-10 21:56:31 UTC (rev 57378)
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2020 Andreas MATTHIAS
+%% Copyright (C) 2001-2021 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -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.5q}
+\def\AM at fileversion{v0.5r}
\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: 2020-01-28 18:31:23 +0100 $
-\AM at Git@SHA at process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
+\AM at Git@Date at process$Date: 2021-01-09 21:30:43 +0100 $
+\AM at Git@SHA at process$SHA-1: 835dfb0d7e5502acd5c811aa9c00b2e44eae9cbd $
\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 2021-01-10 21:56:05 UTC (rev 57377)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppnull.def 2021-01-10 21:56:31 UTC (rev 57378)
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2020 Andreas MATTHIAS
+%% Copyright (C) 2001-2021 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -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.5q}
+\def\AM at fileversion{v0.5r}
\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: 2020-01-28 18:31:23 +0100 $
-\AM at Git@SHA at process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
+\AM at Git@Date at process$Date: 2021-01-09 21:30:43 +0100 $
+\AM at Git@SHA at process$SHA-1: 835dfb0d7e5502acd5c811aa9c00b2e44eae9cbd $
\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 2021-01-10 21:56:05 UTC (rev 57377)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def 2021-01-10 21:56:31 UTC (rev 57378)
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2020 Andreas MATTHIAS
+%% Copyright (C) 2001-2021 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -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.5q}
+\def\AM at fileversion{v0.5r}
\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: 2020-01-28 18:31:23 +0100 $
-\AM at Git@SHA at process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
+\AM at Git@Date at process$Date: 2021-01-09 21:30:43 +0100 $
+\AM at Git@SHA at process$SHA-1: 835dfb0d7e5502acd5c811aa9c00b2e44eae9cbd $
\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 2021-01-10 21:56:05 UTC (rev 57377)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def 2021-01-10 21:56:31 UTC (rev 57378)
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2020 Andreas MATTHIAS
+%% Copyright (C) 2001-2021 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -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.5q}
+\def\AM at fileversion{v0.5r}
\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: 2020-01-28 18:31:23 +0100 $
-\AM at Git@SHA at process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
+\AM at Git@Date at process$Date: 2021-01-09 21:30:43 +0100 $
+\AM at Git@SHA at process$SHA-1: 835dfb0d7e5502acd5c811aa9c00b2e44eae9cbd $
\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 2021-01-10 21:56:05 UTC (rev 57377)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def 2021-01-10 21:56:31 UTC (rev 57378)
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2020 Andreas MATTHIAS
+%% Copyright (C) 2001-2021 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -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.5q}
+\def\AM at fileversion{v0.5r}
\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: 2020-01-28 18:31:23 +0100 $
-\AM at Git@SHA at process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
+\AM at Git@Date at process$Date: 2021-01-09 21:30:43 +0100 $
+\AM at Git@SHA at process$SHA-1: 835dfb0d7e5502acd5c811aa9c00b2e44eae9cbd $
\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.