diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf | bin | 294749 -> 294500 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx | 49 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty | 38 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppdvips.def | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppluatex.def | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppnull.def | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/pppdftex.def | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppvtex.def | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppxetex.def | 6 |
10 files changed, 55 insertions, 74 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf Binary files differindex 2b019de3a6c..4071bead5a7 100644 --- a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf +++ b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf diff --git a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx index a3dab664d9a..afd0d81e03e 100644 --- a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx +++ b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx @@ -27,12 +27,12 @@ %<*dtx> \makeatletter %</dtx> -\def\AM@fileversion{v0.5i} +\def\AM@fileversion{v0.5j} \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: 2017-06-14 22:06:21 +0200 $ -\AM@Git@SHA@process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $ +\AM@Git@Date@process$Date: 2017-07-14 19:56:55 +0200 $ +\AM@Git@SHA@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,24 +2602,7 @@ % \macro{\AM@trim@leadingspace} % Removes leading space. % \begin{macrocode} -\DeclareRobustCommand{\AM@trim@leadingspace}[1]{% - \AM@@trim@leadingspace#1 \END{#1}% -} -% \end{macrocode} -% \begin{macrocode} -\def\AM@@trim@leadingspace#1 #2\END#3{% - \begingroup - \def\x{#1}% - \expandafter\endgroup - \ifx\x\@empty - \AM@remove@leadingspace#3\END - \else - #3% - \fi -} -% \end{macrocode} -% \begin{macrocode} -\@firstofone{\def\AM@remove@leadingspace} #1\END{#1} +\DeclareRobustCommand{\AM@trim@leadingspace}[1]{\ifdim\z@=0pt#1\fi} % \end{macrocode} % \macro{\AM@isphantom} % Checks, if current page is an empty (phantom) page. @@ -2966,13 +2949,16 @@ \def\AM@addtolist{% \def\@captype{\AM@lof@list}% \long\def\@makecaption##1##2{}% - \let\@fs@capt\relax% float.sty - \expandafter\caption\expandafter{\AM@lof@heading}% + \def\@fs@capt##1##2{}% float.sty \AM@addtolist@hook - \@ifundefined{hyper@@anchor}{}{% - \@ifundefined{float@caption}{% - \hyper@@anchor{\@currentHref}{\relax}% - }{}}% + \@ifundefined{hyper@@anchor}{% + \expandafter\caption\expandafter{\AM@lof@heading}% + }{% + \hyper@makecurrent{\@captype}% + \expandafter\caption\expandafter{\AM@lof@heading}% + \hyper@@anchor{\@currentHref}{\relax}% + \let\Hy@float@currentHref\@undefined + }% \label{\AM@lof@label}% \vskip-\baselineskip } @@ -2990,7 +2976,7 @@ \def\AM@parse@loflisti#1,#2,#3,#4,#5\END{% \def\AM@lof@page{\AM@trim@space{#1}}% \def\AM@lof@list{\AM@trim@space{#2}}% - \def\AM@lof@heading{#3}% + \def\AM@lof@heading{\ignorespaces #3}% \def\AM@lof@label{\AM@trim@space{#4}}% \AM@checkinteger{\AM@lof@page}% \ifAM@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 diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty index 7639195961a..bb5fb61962d 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty +++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.5i} +\def\AM@fileversion{v0.5j} \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: 2017-06-14 22:06:21 +0200 $ -\AM@Git@SHA@process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $ +\AM@Git@Date@process$Date: 2017-07-14 19:56:55 +0200 $ +\AM@Git@SHA@process$SHA-1: 5cfd471736b8290e5fba3ced19e38e96b7f30949 $ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfpages} [\AM@Git@Date\space\AM@fileversion\space @@ -1124,20 +1124,7 @@ \expandafter\AM@trim@spacei\expandafter{\ifdim\z@=0pt#1}\fi} \def\AM@trim@spacei#1{\AM@trim@spaceii#1 \END} \def\AM@trim@spaceii#1 #2\END{#1} -\DeclareRobustCommand{\AM@trim@leadingspace}[1]{% - \AM@@trim@leadingspace#1 \END{#1}% -} -\def\AM@@trim@leadingspace#1 #2\END#3{% - \begingroup - \def\x{#1}% - \expandafter\endgroup - \ifx\x\@empty - \AM@remove@leadingspace#3\END - \else - #3% - \fi -} -\@firstofone{\def\AM@remove@leadingspace} #1\END{#1} +\DeclareRobustCommand{\AM@trim@leadingspace}[1]{\ifdim\z@=0pt#1\fi} \newif\ifAM@phantompage \newcommand*{\AM@isphantom}{% \expandafter\ifx\expandafter\\\AM@page\\% @@ -1365,13 +1352,16 @@ \def\AM@addtolist{% \def\@captype{\AM@lof@list}% \long\def\@makecaption##1##2{}% - \let\@fs@capt\relax% float.sty - \expandafter\caption\expandafter{\AM@lof@heading}% + \def\@fs@capt##1##2{}% float.sty \AM@addtolist@hook - \@ifundefined{hyper@@anchor}{}{% - \@ifundefined{float@caption}{% - \hyper@@anchor{\@currentHref}{\relax}% - }{}}% + \@ifundefined{hyper@@anchor}{% + \expandafter\caption\expandafter{\AM@lof@heading}% + }{% + \hyper@makecurrent{\@captype}% + \expandafter\caption\expandafter{\AM@lof@heading}% + \hyper@@anchor{\@currentHref}{\relax}% + \let\Hy@float@currentHref\@undefined + }% \label{\AM@lof@label}% \vskip-\baselineskip } @@ -1385,7 +1375,7 @@ \def\AM@parse@loflisti#1,#2,#3,#4,#5\END{% \def\AM@lof@page{\AM@trim@space{#1}}% \def\AM@lof@list{\AM@trim@space{#2}}% - \def\AM@lof@heading{#3}% + \def\AM@lof@heading{\ignorespaces #3}% \def\AM@lof@label{\AM@trim@space{#4}}% \AM@checkinteger{\AM@lof@page}% \ifAM@integer\else diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def index bc039b67beb..9931fab4c19 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.5i} +\def\AM@fileversion{v0.5j} \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: 2017-06-14 22:06:21 +0200 $ -\AM@Git@SHA@process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $ +\AM@Git@Date@process$Date: 2017-07-14 19:56:55 +0200 $ +\AM@Git@SHA@process$SHA-1: 5cfd471736b8290e5fba3ced19e38e96b7f30949 $ \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 fe83d97a55d..f09ecc9ac8a 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.5i} +\def\AM@fileversion{v0.5j} \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: 2017-06-14 22:06:21 +0200 $ -\AM@Git@SHA@process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $ +\AM@Git@Date@process$Date: 2017-07-14 19:56:55 +0200 $ +\AM@Git@SHA@process$SHA-1: 5cfd471736b8290e5fba3ced19e38e96b7f30949 $ \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 f5775052121..c2716b70730 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.5i} +\def\AM@fileversion{v0.5j} \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: 2017-06-14 22:06:21 +0200 $ -\AM@Git@SHA@process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $ +\AM@Git@Date@process$Date: 2017-07-14 19:56:55 +0200 $ +\AM@Git@SHA@process$SHA-1: 5cfd471736b8290e5fba3ced19e38e96b7f30949 $ \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 afb03e2d8b5..a21d0e5b14a 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.5i} +\def\AM@fileversion{v0.5j} \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: 2017-06-14 22:06:21 +0200 $ -\AM@Git@SHA@process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $ +\AM@Git@Date@process$Date: 2017-07-14 19:56:55 +0200 $ +\AM@Git@SHA@process$SHA-1: 5cfd471736b8290e5fba3ced19e38e96b7f30949 $ \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 9495e1adcd6..804b2511116 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.5i} +\def\AM@fileversion{v0.5j} \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: 2017-06-14 22:06:21 +0200 $ -\AM@Git@SHA@process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $ +\AM@Git@Date@process$Date: 2017-07-14 19:56:55 +0200 $ +\AM@Git@SHA@process$SHA-1: 5cfd471736b8290e5fba3ced19e38e96b7f30949 $ \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 e3a1e931f0a..17a298f7598 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.5i} +\def\AM@fileversion{v0.5j} \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: 2017-06-14 22:06:21 +0200 $ -\AM@Git@SHA@process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $ +\AM@Git@Date@process$Date: 2017-07-14 19:56:55 +0200 $ +\AM@Git@SHA@process$SHA-1: 5cfd471736b8290e5fba3ced19e38e96b7f30949 $ \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 3b75f6b23a0..3a8edc9602c 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.5i} +\def\AM@fileversion{v0.5j} \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: 2017-06-14 22:06:21 +0200 $ -\AM@Git@SHA@process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $ +\AM@Git@Date@process$Date: 2017-07-14 19:56:55 +0200 $ +\AM@Git@SHA@process$SHA-1: 5cfd471736b8290e5fba3ced19e38e96b7f30949 $ \ProvidesFile{ppxetex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for XeTeX (AM)] |