texlive[63381] Master/texmf-dist: pdfpages (23may22)
commits+karl at tug.org
commits+karl at tug.org
Mon May 23 21:56:44 CEST 2022
Revision: 63381
http://tug.org/svn/texlive?view=revision&revision=63381
Author: karl
Date: 2022-05-23 21:56:44 +0200 (Mon, 23 May 2022)
Log Message:
-----------
pdfpages (23may22)
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 2022-05-23 19:56:28 UTC (rev 63380)
+++ trunk/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx 2022-05-23 19:56:44 UTC (rev 63381)
@@ -27,12 +27,12 @@
%<*dtx>
\makeatletter
%</dtx>
-\def\AM at fileversion{v0.5u}
+\def\AM at fileversion{v0.5v}
\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: 2022-01-29 16:59:20 +0100 $
-\AM at Git@SHA at process$SHA-1: 7a5d1a24653fdc93c11ca1043f6d77a403446d92 $
+\AM at Git@Date at process$Date: 2022-05-22 20:11:16 +0200 $
+\AM at Git@SHA at process$SHA-1: 059ee4174cc52b0e6a4c834c1a9719bcf5a453b0 $
%</!(example1,example2,example3,installer)>
%
%
@@ -1339,6 +1339,7 @@
\newcommand*{\AM at findfile@ii}[1]{%
\ifx\AM at currentdocname\relax
\PackageError{pdfpages}{Cannot find file `#1'}{}%
+ \let\AM at filenotfound\relax
\fi
}
% \end{macrocode}
@@ -1393,7 +1394,7 @@
\def\AM at pagecount{0}%
}{%
\AM at findfile{#2}%
- \if\AM at threadname\relax
+ \ifx\AM at threadname\relax
\def\AM at threadname{\AM at currentdocname}%
\fi
}%
@@ -1481,8 +1482,17 @@
% \macro{\AM at output}
% This is the main output routine used by |\includepdf|
% and |\includepdfmerge|.
+% Let's stop here if the PDF file doesn't exist and the user did not quit
+% \LaTeX\ yet (which may result from `--interaction=scrollmode`).
+% If we do not quit here, we might run into an infinite loop.
% \begin{macrocode}
-\newcommand{\AM at output}[1]{%
+\newcommand\AM at output{%
+ \ifdefined\AM at filenotfound
+ \else
+ \expandafter\AM at output@i
+ \fi
+}
+\newcommand{\AM at output@i}[1]{%
% \end{macrocode}
% For the following calculations we need to know the page size.
% But since we are still before |\newpage| we must not set |\paper{width,height}|
@@ -4851,6 +4861,12 @@
% \item Adding |\leavevmode| before |\@chapter|,... in |addtotoc|.
% Bug fix for \url{https://tex.stackexchange.com/questions/631514/}.
% \end{itemize}
+%
+% \subsection*{2022/05/21 v0.5v}
+% \begin{itemize}
+% \item Do not enter an infinite loop if the PDF file doesn't exist.
+% Bug fix for \url{https://tex.stackexchange.com/questions/644971/}.
+% \end{itemize}
% \Finale
%
% \iffalse
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty 2022-05-23 19:56:28 UTC (rev 63380)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty 2022-05-23 19:56:44 UTC (rev 63381)
@@ -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.5u}
+\def\AM at fileversion{v0.5v}
\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: 2022-01-29 16:59:20 +0100 $
-\AM at Git@SHA at process$SHA-1: 7a5d1a24653fdc93c11ca1043f6d77a403446d92 $
+\AM at Git@Date at process$Date: 2022-05-22 20:11:16 +0200 $
+\AM at Git@SHA at process$SHA-1: 059ee4174cc52b0e6a4c834c1a9719bcf5a453b0 $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
[\AM at Git@Date\space\AM at fileversion\space
@@ -196,6 +196,7 @@
\newcommand*{\AM at findfile@ii}[1]{%
\ifx\AM at currentdocname\relax
\PackageError{pdfpages}{Cannot find file `#1'}{}%
+ \let\AM at filenotfound\relax
\fi
}
\newtoks\AM at global@opts
@@ -221,7 +222,7 @@
\def\AM at pagecount{0}%
}{%
\AM at findfile{#2}%
- \if\AM at threadname\relax
+ \ifx\AM at threadname\relax
\def\AM at threadname{\AM at currentdocname}%
\fi
}%
@@ -288,7 +289,13 @@
processed. Check `addtolist'}%
\fi
}
-\newcommand{\AM at output}[1]{%
+\newcommand\AM at output{%
+ \ifdefined\AM at filenotfound
+ \else
+ \expandafter\AM at output@i
+ \fi
+}
+\newcommand{\AM at output@i}[1]{%
\AM at getpagedimen
\ifdim\AM at pagewidth=\z@
\AM at pagewidth=210mm
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def 2022-05-23 19:56:28 UTC (rev 63380)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def 2022-05-23 19:56:44 UTC (rev 63381)
@@ -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.5u}
+\def\AM at fileversion{v0.5v}
\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: 2022-01-29 16:59:20 +0100 $
-\AM at Git@SHA at process$SHA-1: 7a5d1a24653fdc93c11ca1043f6d77a403446d92 $
+\AM at Git@Date at process$Date: 2022-05-22 20:11:16 +0200 $
+\AM at Git@SHA at process$SHA-1: 059ee4174cc52b0e6a4c834c1a9719bcf5a453b0 $
\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 2022-05-23 19:56:28 UTC (rev 63380)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def 2022-05-23 19:56:44 UTC (rev 63381)
@@ -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.5u}
+\def\AM at fileversion{v0.5v}
\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: 2022-01-29 16:59:20 +0100 $
-\AM at Git@SHA at process$SHA-1: 7a5d1a24653fdc93c11ca1043f6d77a403446d92 $
+\AM at Git@Date at process$Date: 2022-05-22 20:11:16 +0200 $
+\AM at Git@SHA at process$SHA-1: 059ee4174cc52b0e6a4c834c1a9719bcf5a453b0 $
\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 2022-05-23 19:56:28 UTC (rev 63380)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def 2022-05-23 19:56:44 UTC (rev 63381)
@@ -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.5u}
+\def\AM at fileversion{v0.5v}
\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: 2022-01-29 16:59:20 +0100 $
-\AM at Git@SHA at process$SHA-1: 7a5d1a24653fdc93c11ca1043f6d77a403446d92 $
+\AM at Git@Date at process$Date: 2022-05-22 20:11:16 +0200 $
+\AM at Git@SHA at process$SHA-1: 059ee4174cc52b0e6a4c834c1a9719bcf5a453b0 $
\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 2022-05-23 19:56:28 UTC (rev 63380)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppnull.def 2022-05-23 19:56:44 UTC (rev 63381)
@@ -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.5u}
+\def\AM at fileversion{v0.5v}
\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: 2022-01-29 16:59:20 +0100 $
-\AM at Git@SHA at process$SHA-1: 7a5d1a24653fdc93c11ca1043f6d77a403446d92 $
+\AM at Git@Date at process$Date: 2022-05-22 20:11:16 +0200 $
+\AM at Git@SHA at process$SHA-1: 059ee4174cc52b0e6a4c834c1a9719bcf5a453b0 $
\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 2022-05-23 19:56:28 UTC (rev 63380)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def 2022-05-23 19:56:44 UTC (rev 63381)
@@ -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.5u}
+\def\AM at fileversion{v0.5v}
\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: 2022-01-29 16:59:20 +0100 $
-\AM at Git@SHA at process$SHA-1: 7a5d1a24653fdc93c11ca1043f6d77a403446d92 $
+\AM at Git@Date at process$Date: 2022-05-22 20:11:16 +0200 $
+\AM at Git@SHA at process$SHA-1: 059ee4174cc52b0e6a4c834c1a9719bcf5a453b0 $
\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 2022-05-23 19:56:28 UTC (rev 63380)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def 2022-05-23 19:56:44 UTC (rev 63381)
@@ -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.5u}
+\def\AM at fileversion{v0.5v}
\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: 2022-01-29 16:59:20 +0100 $
-\AM at Git@SHA at process$SHA-1: 7a5d1a24653fdc93c11ca1043f6d77a403446d92 $
+\AM at Git@Date at process$Date: 2022-05-22 20:11:16 +0200 $
+\AM at Git@SHA at process$SHA-1: 059ee4174cc52b0e6a4c834c1a9719bcf5a453b0 $
\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 2022-05-23 19:56:28 UTC (rev 63380)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def 2022-05-23 19:56:44 UTC (rev 63381)
@@ -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.5u}
+\def\AM at fileversion{v0.5v}
\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: 2022-01-29 16:59:20 +0100 $
-\AM at Git@SHA at process$SHA-1: 7a5d1a24653fdc93c11ca1043f6d77a403446d92 $
+\AM at Git@Date at process$Date: 2022-05-22 20:11:16 +0200 $
+\AM at Git@SHA at process$SHA-1: 059ee4174cc52b0e6a4c834c1a9719bcf5a453b0 $
\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.