texlive[71386] Master/texmf-dist: pdfpages (29may24)
commits+karl at tug.org
commits+karl at tug.org
Wed May 29 22:12:57 CEST 2024
Revision: 71386
https://tug.org/svn/texlive?view=revision&revision=71386
Author: karl
Date: 2024-05-29 22:12:57 +0200 (Wed, 29 May 2024)
Log Message:
-----------
pdfpages (29may24)
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 2024-05-29 20:12:48 UTC (rev 71385)
+++ trunk/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx 2024-05-29 20:12:57 UTC (rev 71386)
@@ -27,12 +27,12 @@
%<*dtx>
\makeatletter
%</dtx>
-\def\AM at fileversion{v0.5y}
+\def\AM at fileversion{v0.6a}
\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: 2024-01-21 13:41:59 +0100 $
-\AM at Git@SHA at process$SHA-1: 019995ba4828f9b782eae8f6d4c9e90f257fa598 $
+\AM at Git@Date at process$Date: 2024-05-29 13:40:24 +0200 $
+\AM at Git@SHA at process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $
%</!(example1,example2,example3,installer)>
%
%
@@ -84,7 +84,7 @@
%
% \GetFileInfo{pdfpages.dtx}
%
-% \CheckSum{5106}
+% \CheckSum{5113}
%
% \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
@@ -3831,6 +3831,10 @@
% these tex-files to use e.g. |\includegraphics|. However, this does not
% work out of the box for pdfpages with XeTeX-driver (as it does with
% pdftex-driver). We have to use |\import at path| of |import.sty|.
+%
+% Oups: |Subfiles.sty| uses |\import at path| as well. But we shall \emph{not}
+% use |\import at path| in combination with |subfiles.sty|. Let's use macro |\subfix|
+% to check for |subfiles.sty|.
% \begin{macrocode}
\def\AM at getpagecount{%
\expandafter\filename at parse\expandafter{\AM at currentdocname}%
@@ -3839,10 +3843,14 @@
\noexpand\def\noexpand\type at ext{.\filename at ext}}}%
\type at ext
\ifx\type at ext\AM at pdf@ext
- \ifdefined\import at path
- \let\AM at import@path\import at path
+ \ifdefined\subfix
+ \let\AM at import@path\@empty
\else
- \let\AM at import@path\@empty
+ \ifdefined\import at path
+ \let\AM at import@path\import at path
+ \else
+ \let\AM at import@path\@empty
+ \fi
\fi
\setbox\@tempboxa=\hbox{\includegraphics{\AM at currentdocname}}%
\edef\AM at pagecount{\the\XeTeXpdfpagecount\AM at XeTeXquote
@@ -4887,6 +4895,13 @@
% \item Define |\@setmarks| if undefined.
% \end{itemize}
% \end{itemize}
+%
+% \subsection*{2024/04/29 v0.6a}
+% \begin{itemize}
+% \item Bugfix for ppxetex driver: Don't use |\import at path| in combination
+% with |subfiles.sty|.
+% \end{itemize}
+%
% \Finale
%
% \iffalse
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty 2024-05-29 20:12:48 UTC (rev 71385)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty 2024-05-29 20:12:57 UTC (rev 71386)
@@ -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.5y}
+\def\AM at fileversion{v0.6a}
\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: 2024-01-21 13:41:59 +0100 $
-\AM at Git@SHA at process$SHA-1: 019995ba4828f9b782eae8f6d4c9e90f257fa598 $
+\AM at Git@Date at process$Date: 2024-05-29 13:40:24 +0200 $
+\AM at Git@SHA at process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
[\AM at Git@Date\space\AM at fileversion\space
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def 2024-05-29 20:12:48 UTC (rev 71385)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def 2024-05-29 20:12:57 UTC (rev 71386)
@@ -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.5y}
+\def\AM at fileversion{v0.6a}
\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: 2024-01-21 13:41:59 +0100 $
-\AM at Git@SHA at process$SHA-1: 019995ba4828f9b782eae8f6d4c9e90f257fa598 $
+\AM at Git@Date at process$Date: 2024-05-29 13:40:24 +0200 $
+\AM at Git@SHA at process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $
\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 2024-05-29 20:12:48 UTC (rev 71385)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def 2024-05-29 20:12:57 UTC (rev 71386)
@@ -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.5y}
+\def\AM at fileversion{v0.6a}
\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: 2024-01-21 13:41:59 +0100 $
-\AM at Git@SHA at process$SHA-1: 019995ba4828f9b782eae8f6d4c9e90f257fa598 $
+\AM at Git@Date at process$Date: 2024-05-29 13:40:24 +0200 $
+\AM at Git@SHA at process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $
\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 2024-05-29 20:12:48 UTC (rev 71385)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def 2024-05-29 20:12:57 UTC (rev 71386)
@@ -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.5y}
+\def\AM at fileversion{v0.6a}
\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: 2024-01-21 13:41:59 +0100 $
-\AM at Git@SHA at process$SHA-1: 019995ba4828f9b782eae8f6d4c9e90f257fa598 $
+\AM at Git@Date at process$Date: 2024-05-29 13:40:24 +0200 $
+\AM at Git@SHA at process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $
\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 2024-05-29 20:12:48 UTC (rev 71385)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppnull.def 2024-05-29 20:12:57 UTC (rev 71386)
@@ -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.5y}
+\def\AM at fileversion{v0.6a}
\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: 2024-01-21 13:41:59 +0100 $
-\AM at Git@SHA at process$SHA-1: 019995ba4828f9b782eae8f6d4c9e90f257fa598 $
+\AM at Git@Date at process$Date: 2024-05-29 13:40:24 +0200 $
+\AM at Git@SHA at process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $
\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 2024-05-29 20:12:48 UTC (rev 71385)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def 2024-05-29 20:12:57 UTC (rev 71386)
@@ -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.5y}
+\def\AM at fileversion{v0.6a}
\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: 2024-01-21 13:41:59 +0100 $
-\AM at Git@SHA at process$SHA-1: 019995ba4828f9b782eae8f6d4c9e90f257fa598 $
+\AM at Git@Date at process$Date: 2024-05-29 13:40:24 +0200 $
+\AM at Git@SHA at process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $
\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 2024-05-29 20:12:48 UTC (rev 71385)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def 2024-05-29 20:12:57 UTC (rev 71386)
@@ -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.5y}
+\def\AM at fileversion{v0.6a}
\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: 2024-01-21 13:41:59 +0100 $
-\AM at Git@SHA at process$SHA-1: 019995ba4828f9b782eae8f6d4c9e90f257fa598 $
+\AM at Git@Date at process$Date: 2024-05-29 13:40:24 +0200 $
+\AM at Git@SHA at process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $
\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 2024-05-29 20:12:48 UTC (rev 71385)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def 2024-05-29 20:12:57 UTC (rev 71386)
@@ -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.5y}
+\def\AM at fileversion{v0.6a}
\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: 2024-01-21 13:41:59 +0100 $
-\AM at Git@SHA at process$SHA-1: 019995ba4828f9b782eae8f6d4c9e90f257fa598 $
+\AM at Git@Date at process$Date: 2024-05-29 13:40:24 +0200 $
+\AM at Git@SHA at process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $
\ProvidesFile{ppxetex.def}
[\AM at Git@Date\space\AM at fileversion\space
Pdfpages driver for XeTeX (AM)]
@@ -52,10 +52,14 @@
\noexpand\def\noexpand\type at ext{.\filename at ext}}}%
\type at ext
\ifx\type at ext\AM at pdf@ext
- \ifdefined\import at path
- \let\AM at import@path\import at path
+ \ifdefined\subfix
+ \let\AM at import@path\@empty
\else
- \let\AM at import@path\@empty
+ \ifdefined\import at path
+ \let\AM at import@path\import at path
+ \else
+ \let\AM at import@path\@empty
+ \fi
\fi
\setbox\@tempboxa=\hbox{\includegraphics{\AM at currentdocname}}%
\edef\AM at pagecount{\the\XeTeXpdfpagecount\AM at XeTeXquote
More information about the tex-live-commits
mailing list.