From 9242c82c38de68039c9b2b949ef6775d808cc0f4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 29 Jan 2022 21:49:21 +0000 Subject: pdfpages (29jan22) git-svn-id: svn://tug.org/texlive/trunk@61801 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf | Bin 298716 -> 301209 bytes .../texmf-dist/source/latex/pdfpages/pdfpages.dtx | 18 ++++++++++++------ Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty | 10 +++++----- .../texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def | 8 ++++---- Master/texmf-dist/tex/latex/pdfpages/ppdvips.def | 8 ++++---- Master/texmf-dist/tex/latex/pdfpages/ppluatex.def | 8 ++++---- Master/texmf-dist/tex/latex/pdfpages/ppnull.def | 8 ++++---- Master/texmf-dist/tex/latex/pdfpages/pppdftex.def | 8 ++++---- Master/texmf-dist/tex/latex/pdfpages/ppvtex.def | 8 ++++---- Master/texmf-dist/tex/latex/pdfpages/ppxetex.def | 8 ++++---- 10 files changed, 45 insertions(+), 39 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf index df6493f4d55..1fea4ad0c18 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 10188c05a9c..2deaa462065 100644 --- a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx +++ b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx @@ -2,7 +2,7 @@ % \iffalse % %<*(package,pppdftexdef,ppluatexdef,ppvtexdef,ppxetexdef,ppdvipsdef,ppdvipdfmxdef,ppnulldef)> -%% Copyright (C) 2001-2021 Andreas MATTHIAS +%% Copyright (C) 2001-2022 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 % -\def\AM@fileversion{v0.5t} +\def\AM@fileversion{v0.5u} \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: 2021-03-06 23:19:52 +0100 $ -\AM@Git@SHA@process$SHA-1: 591720c980385429528b3bf2256f2d4f7c2c55e9 $ +\AM@Git@Date@process$Date: 2022-01-29 16:59:20 +0100 $ +\AM@Git@SHA@process$SHA-1: 7a5d1a24653fdc93c11ca1043f6d77a403446d92 $ % % % @@ -84,7 +84,7 @@ % % \GetFileInfo{pdfpages.dtx} % -% \CheckSum{5076} +% \CheckSum{5077} % % \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 @@ -2974,7 +2974,7 @@ \AM@addtotoc@hook \edef\AM@temp{{\AM@toc@section}{\AM@toc@level}% {\z@}{\z@}{\z@}{}[\the\AM@toc@title]{}}% - \edef\AM@tempi{\noexpand\csname @\AM@toc@section\noexpand\endcsname% + \edef\AM@tempi{\leavevmode\noexpand\csname @\AM@toc@section\noexpand\endcsname% [\the\AM@toc@title]{}}% \@ifundefined{@\AM@toc@section} {\expandafter\@sect\AM@temp @@ -4845,6 +4845,12 @@ % \item Page rotation: Use new pdfmanagement macros if they are % available, and fallback to pdflscape if they are not available. % \end{itemize} +% +% \subsection*{2022/01/29 v0.5u} +% \begin{itemize} +% \item Adding |\leavevmode| before |\@chapter|,... in |addtotoc|. +% Bug fix for \url{https://tex.stackexchange.com/questions/631514/}. +% \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 faee6c6c7e5..6517bf86a5d 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty +++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2021 Andreas MATTHIAS +%% Copyright (C) 2001-2022 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 . %% -\def\AM@fileversion{v0.5t} +\def\AM@fileversion{v0.5u} \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: 2021-03-06 23:19:52 +0100 $ -\AM@Git@SHA@process$SHA-1: 591720c980385429528b3bf2256f2d4f7c2c55e9 $ +\AM@Git@Date@process$Date: 2022-01-29 16:59:20 +0100 $ +\AM@Git@SHA@process$SHA-1: 7a5d1a24653fdc93c11ca1043f6d77a403446d92 $ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfpages} [\AM@Git@Date\space\AM@fileversion\space @@ -1377,7 +1377,7 @@ \AM@addtotoc@hook \edef\AM@temp{{\AM@toc@section}{\AM@toc@level}% {\z@}{\z@}{\z@}{}[\the\AM@toc@title]{}}% - \edef\AM@tempi{\noexpand\csname @\AM@toc@section\noexpand\endcsname% + \edef\AM@tempi{\leavevmode\noexpand\csname @\AM@toc@section\noexpand\endcsname% [\the\AM@toc@title]{}}% \@ifundefined{@\AM@toc@section} {\expandafter\@sect\AM@temp diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def index 23d8c147147..700ea28a055 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2021 Andreas MATTHIAS +%% Copyright (C) 2001-2022 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 . %% -\def\AM@fileversion{v0.5t} +\def\AM@fileversion{v0.5u} \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: 2021-03-06 23:19:52 +0100 $ -\AM@Git@SHA@process$SHA-1: 591720c980385429528b3bf2256f2d4f7c2c55e9 $ +\AM@Git@Date@process$Date: 2022-01-29 16:59:20 +0100 $ +\AM@Git@SHA@process$SHA-1: 7a5d1a24653fdc93c11ca1043f6d77a403446d92 $ \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 7f3f7de8cb5..b65744c2add 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2021 Andreas MATTHIAS +%% Copyright (C) 2001-2022 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 . %% -\def\AM@fileversion{v0.5t} +\def\AM@fileversion{v0.5u} \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: 2021-03-06 23:19:52 +0100 $ -\AM@Git@SHA@process$SHA-1: 591720c980385429528b3bf2256f2d4f7c2c55e9 $ +\AM@Git@Date@process$Date: 2022-01-29 16:59:20 +0100 $ +\AM@Git@SHA@process$SHA-1: 7a5d1a24653fdc93c11ca1043f6d77a403446d92 $ \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 f2dc66fb558..f04dac7cc6c 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2021 Andreas MATTHIAS +%% Copyright (C) 2001-2022 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 . %% -\def\AM@fileversion{v0.5t} +\def\AM@fileversion{v0.5u} \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: 2021-03-06 23:19:52 +0100 $ -\AM@Git@SHA@process$SHA-1: 591720c980385429528b3bf2256f2d4f7c2c55e9 $ +\AM@Git@Date@process$Date: 2022-01-29 16:59:20 +0100 $ +\AM@Git@SHA@process$SHA-1: 7a5d1a24653fdc93c11ca1043f6d77a403446d92 $ \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 2c89a21c108..0ca6c75519c 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2021 Andreas MATTHIAS +%% Copyright (C) 2001-2022 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 . %% -\def\AM@fileversion{v0.5t} +\def\AM@fileversion{v0.5u} \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: 2021-03-06 23:19:52 +0100 $ -\AM@Git@SHA@process$SHA-1: 591720c980385429528b3bf2256f2d4f7c2c55e9 $ +\AM@Git@Date@process$Date: 2022-01-29 16:59:20 +0100 $ +\AM@Git@SHA@process$SHA-1: 7a5d1a24653fdc93c11ca1043f6d77a403446d92 $ \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 d3c01383bbe..84fb71af6f3 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2021 Andreas MATTHIAS +%% Copyright (C) 2001-2022 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 . %% -\def\AM@fileversion{v0.5t} +\def\AM@fileversion{v0.5u} \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: 2021-03-06 23:19:52 +0100 $ -\AM@Git@SHA@process$SHA-1: 591720c980385429528b3bf2256f2d4f7c2c55e9 $ +\AM@Git@Date@process$Date: 2022-01-29 16:59:20 +0100 $ +\AM@Git@SHA@process$SHA-1: 7a5d1a24653fdc93c11ca1043f6d77a403446d92 $ \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 a6f7ef62360..836a05931c6 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2021 Andreas MATTHIAS +%% Copyright (C) 2001-2022 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 . %% -\def\AM@fileversion{v0.5t} +\def\AM@fileversion{v0.5u} \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: 2021-03-06 23:19:52 +0100 $ -\AM@Git@SHA@process$SHA-1: 591720c980385429528b3bf2256f2d4f7c2c55e9 $ +\AM@Git@Date@process$Date: 2022-01-29 16:59:20 +0100 $ +\AM@Git@SHA@process$SHA-1: 7a5d1a24653fdc93c11ca1043f6d77a403446d92 $ \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 5cf9299d32b..348fa066b70 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2021 Andreas MATTHIAS +%% Copyright (C) 2001-2022 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 . %% -\def\AM@fileversion{v0.5t} +\def\AM@fileversion{v0.5u} \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: 2021-03-06 23:19:52 +0100 $ -\AM@Git@SHA@process$SHA-1: 591720c980385429528b3bf2256f2d4f7c2c55e9 $ +\AM@Git@Date@process$Date: 2022-01-29 16:59:20 +0100 $ +\AM@Git@SHA@process$SHA-1: 7a5d1a24653fdc93c11ca1043f6d77a403446d92 $ \ProvidesFile{ppxetex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for XeTeX (AM)] -- cgit v1.2.3