texlive[44812] Master/texmf-dist: pdfpages (15jul17)
commits+karl at tug.org
commits+karl at tug.org
Sat Jul 15 23:26:18 CEST 2017
Revision: 44812
http://tug.org/svn/texlive?view=revision&revision=44812
Author: karl
Date: 2017-07-15 23:26:18 +0200 (Sat, 15 Jul 2017)
Log Message:
-----------
pdfpages (15jul17)
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-07-15 18:28:32 UTC (rev 44811)
+++ trunk/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx 2017-07-15 21:26:18 UTC (rev 44812)
@@ -27,12 +27,12 @@
%<*dtx>
\makeatletter
%</dtx>
-\def\AM at fileversion{v0.5i}
+\def\AM at fileversion{v0.5j}
\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: 2017-06-14 22:06:21 +0200 $
-\AM at Git@SHA at process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $
+\AM at Git@Date at process$Date: 2017-07-14 19:56:55 +0200 $
+\AM at Git@SHA at process$SHA-1: 5cfd471736b8290e5fba3ced19e38e96b7f30949 $
%</!(example1,example2,example3,installer)>
%
%
@@ -84,7 +84,7 @@
%
% \GetFileInfo{pdfpages.dtx}
%
-% \CheckSum{4931}
+% \CheckSum{4923}
%
% \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
@@ -2602,25 +2602,8 @@
% \macro{\AM at trim@leadingspace}
% Removes leading space.
% \begin{macrocode}
-\DeclareRobustCommand{\AM at trim@leadingspace}[1]{%
- \AM@@trim at leadingspace#1 \END{#1}%
-}
+\DeclareRobustCommand{\AM at trim@leadingspace}[1]{\ifdim\z@=0pt#1\fi}
% \end{macrocode}
-% \begin{macrocode}
-\def\AM@@trim at leadingspace#1 #2\END#3{%
- \begingroup
- \def\x{#1}%
- \expandafter\endgroup
- \ifx\x\@empty
- \AM at remove@leadingspace#3\END
- \else
- #3%
- \fi
-}
-% \end{macrocode}
-% \begin{macrocode}
-\@firstofone{\def\AM at remove@leadingspace} #1\END{#1}
-% \end{macrocode}
% \macro{\AM at isphantom}
% Checks, if current page is an empty (phantom) page.
% \begin{macrocode}
@@ -2966,13 +2949,16 @@
\def\AM at addtolist{%
\def\@captype{\AM at lof@list}%
\long\def\@makecaption##1##2{}%
- \let\@fs at capt\relax% float.sty
- \expandafter\caption\expandafter{\AM at lof@heading}%
+ \def\@fs at capt##1##2{}% float.sty
\AM at addtolist@hook
- \@ifundefined{hyper@@anchor}{}{%
- \@ifundefined{float at caption}{%
- \hyper@@anchor{\@currentHref}{\relax}%
- }{}}%
+ \@ifundefined{hyper@@anchor}{%
+ \expandafter\caption\expandafter{\AM at lof@heading}%
+ }{%
+ \hyper at makecurrent{\@captype}%
+ \expandafter\caption\expandafter{\AM at lof@heading}%
+ \hyper@@anchor{\@currentHref}{\relax}%
+ \let\Hy at float@currentHref\@undefined
+ }%
\label{\AM at lof@label}%
\vskip-\baselineskip
}
@@ -2990,7 +2976,7 @@
\def\AM at parse@loflisti#1,#2,#3,#4,#5\END{%
\def\AM at lof@page{\AM at trim@space{#1}}%
\def\AM at lof@list{\AM at trim@space{#2}}%
- \def\AM at lof@heading{#3}%
+ \def\AM at lof@heading{\ignorespaces #3}%
\def\AM at lof@label{\AM at trim@space{#4}}%
\AM at checkinteger{\AM at lof@page}%
\ifAM at integer\else
@@ -4673,6 +4659,11 @@
% of a PDF correctly.
% \end{itemize}
%
+% \subsection*{2017/07/14 v0.5j}
+% \begin{itemize}
+% \item Fixed |addtolist| which was broken when used with |float.sty|.
+% \end{itemize}
+%
% \Finale
%
% \iffalse
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty 2017-07-15 18:28:32 UTC (rev 44811)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty 2017-07-15 21:26:18 UTC (rev 44812)
@@ -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.5i}
+\def\AM at fileversion{v0.5j}
\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: 2017-06-14 22:06:21 +0200 $
-\AM at Git@SHA at process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $
+\AM at Git@Date at process$Date: 2017-07-14 19:56:55 +0200 $
+\AM at Git@SHA at process$SHA-1: 5cfd471736b8290e5fba3ced19e38e96b7f30949 $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
[\AM at Git@Date\space\AM at fileversion\space
@@ -1124,20 +1124,7 @@
\expandafter\AM at trim@spacei\expandafter{\ifdim\z@=0pt#1}\fi}
\def\AM at trim@spacei#1{\AM at trim@spaceii#1 \END}
\def\AM at trim@spaceii#1 #2\END{#1}
-\DeclareRobustCommand{\AM at trim@leadingspace}[1]{%
- \AM@@trim at leadingspace#1 \END{#1}%
-}
-\def\AM@@trim at leadingspace#1 #2\END#3{%
- \begingroup
- \def\x{#1}%
- \expandafter\endgroup
- \ifx\x\@empty
- \AM at remove@leadingspace#3\END
- \else
- #3%
- \fi
-}
-\@firstofone{\def\AM at remove@leadingspace} #1\END{#1}
+\DeclareRobustCommand{\AM at trim@leadingspace}[1]{\ifdim\z@=0pt#1\fi}
\newif\ifAM at phantompage
\newcommand*{\AM at isphantom}{%
\expandafter\ifx\expandafter\\\AM at page\\%
@@ -1365,13 +1352,16 @@
\def\AM at addtolist{%
\def\@captype{\AM at lof@list}%
\long\def\@makecaption##1##2{}%
- \let\@fs at capt\relax% float.sty
- \expandafter\caption\expandafter{\AM at lof@heading}%
+ \def\@fs at capt##1##2{}% float.sty
\AM at addtolist@hook
- \@ifundefined{hyper@@anchor}{}{%
- \@ifundefined{float at caption}{%
- \hyper@@anchor{\@currentHref}{\relax}%
- }{}}%
+ \@ifundefined{hyper@@anchor}{%
+ \expandafter\caption\expandafter{\AM at lof@heading}%
+ }{%
+ \hyper at makecurrent{\@captype}%
+ \expandafter\caption\expandafter{\AM at lof@heading}%
+ \hyper@@anchor{\@currentHref}{\relax}%
+ \let\Hy at float@currentHref\@undefined
+ }%
\label{\AM at lof@label}%
\vskip-\baselineskip
}
@@ -1385,7 +1375,7 @@
\def\AM at parse@loflisti#1,#2,#3,#4,#5\END{%
\def\AM at lof@page{\AM at trim@space{#1}}%
\def\AM at lof@list{\AM at trim@space{#2}}%
- \def\AM at lof@heading{#3}%
+ \def\AM at lof@heading{\ignorespaces #3}%
\def\AM at lof@label{\AM at trim@space{#4}}%
\AM at checkinteger{\AM at lof@page}%
\ifAM at integer\else
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def 2017-07-15 18:28:32 UTC (rev 44811)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def 2017-07-15 21:26:18 UTC (rev 44812)
@@ -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.5i}
+\def\AM at fileversion{v0.5j}
\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: 2017-06-14 22:06:21 +0200 $
-\AM at Git@SHA at process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $
+\AM at Git@Date at process$Date: 2017-07-14 19:56:55 +0200 $
+\AM at Git@SHA at process$SHA-1: 5cfd471736b8290e5fba3ced19e38e96b7f30949 $
\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-07-15 18:28:32 UTC (rev 44811)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def 2017-07-15 21:26:18 UTC (rev 44812)
@@ -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.5i}
+\def\AM at fileversion{v0.5j}
\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: 2017-06-14 22:06:21 +0200 $
-\AM at Git@SHA at process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $
+\AM at Git@Date at process$Date: 2017-07-14 19:56:55 +0200 $
+\AM at Git@SHA at process$SHA-1: 5cfd471736b8290e5fba3ced19e38e96b7f30949 $
\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-07-15 18:28:32 UTC (rev 44811)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def 2017-07-15 21:26:18 UTC (rev 44812)
@@ -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.5i}
+\def\AM at fileversion{v0.5j}
\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: 2017-06-14 22:06:21 +0200 $
-\AM at Git@SHA at process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $
+\AM at Git@Date at process$Date: 2017-07-14 19:56:55 +0200 $
+\AM at Git@SHA at process$SHA-1: 5cfd471736b8290e5fba3ced19e38e96b7f30949 $
\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-07-15 18:28:32 UTC (rev 44811)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppnull.def 2017-07-15 21:26:18 UTC (rev 44812)
@@ -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.5i}
+\def\AM at fileversion{v0.5j}
\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: 2017-06-14 22:06:21 +0200 $
-\AM at Git@SHA at process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $
+\AM at Git@Date at process$Date: 2017-07-14 19:56:55 +0200 $
+\AM at Git@SHA at process$SHA-1: 5cfd471736b8290e5fba3ced19e38e96b7f30949 $
\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-07-15 18:28:32 UTC (rev 44811)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def 2017-07-15 21:26:18 UTC (rev 44812)
@@ -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.5i}
+\def\AM at fileversion{v0.5j}
\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: 2017-06-14 22:06:21 +0200 $
-\AM at Git@SHA at process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $
+\AM at Git@Date at process$Date: 2017-07-14 19:56:55 +0200 $
+\AM at Git@SHA at process$SHA-1: 5cfd471736b8290e5fba3ced19e38e96b7f30949 $
\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-07-15 18:28:32 UTC (rev 44811)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def 2017-07-15 21:26:18 UTC (rev 44812)
@@ -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.5i}
+\def\AM at fileversion{v0.5j}
\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: 2017-06-14 22:06:21 +0200 $
-\AM at Git@SHA at process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $
+\AM at Git@Date at process$Date: 2017-07-14 19:56:55 +0200 $
+\AM at Git@SHA at process$SHA-1: 5cfd471736b8290e5fba3ced19e38e96b7f30949 $
\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-07-15 18:28:32 UTC (rev 44811)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def 2017-07-15 21:26:18 UTC (rev 44812)
@@ -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.5i}
+\def\AM at fileversion{v0.5j}
\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: 2017-06-14 22:06:21 +0200 $
-\AM at Git@SHA at process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $
+\AM at Git@Date at process$Date: 2017-07-14 19:56:55 +0200 $
+\AM at Git@SHA at process$SHA-1: 5cfd471736b8290e5fba3ced19e38e96b7f30949 $
\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