texlive[52154] Master/texmf-dist: pdfpages (23sep19)
commits+karl at tug.org
commits+karl at tug.org
Mon Sep 23 00:17:23 CEST 2019
Revision: 52154
http://tug.org/svn/texlive?view=revision&revision=52154
Author: karl
Date: 2019-09-23 00:17:22 +0200 (Mon, 23 Sep 2019)
Log Message:
-----------
pdfpages (23sep19)
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 2019-09-22 22:17:04 UTC (rev 52153)
+++ trunk/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx 2019-09-22 22:17:22 UTC (rev 52154)
@@ -27,12 +27,12 @@
%<*dtx>
\makeatletter
%</dtx>
-\def\AM at fileversion{v0.5l}
+\def\AM at fileversion{v0.5n}
\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-10-31 14:12:08 +0100 $
-\AM at Git@SHA at process$SHA-1: 9deefd6c8c22356ce47773245098390089885925 $
+\AM at Git@Date at process$Date: 2019-09-21 22:35:13 +0200 $
+\AM at Git@SHA at process$SHA-1: f6e5700ba0dc915398ae6b0f222a8cc7f0ff2eff $
%</!(example1,example2,example3,installer)>
%
%
@@ -84,7 +84,7 @@
%
% \GetFileInfo{pdfpages.dtx}
%
-% \CheckSum{4930}
+% \CheckSum{4964}
%
% \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
@@ -1181,8 +1181,8 @@
}
% \end{macrocode}
% Let's save the original meaning of |\includegraphics|, because
-% graphicx.sty in demo mode (`demo' option) will overwrite |\includegraphics|
-% \emph{after} |\begin{document}|.
+% graphicx.sty in demo mode (`demo' option) will overwrite the definition of
+% |\includegraphics| \emph{after} |\begin{document}|.
% \begin{macrocode}
\let\AM at Ginclude@graphics\Ginclude at graphics
% \end{macrocode}
@@ -1256,18 +1256,29 @@
% \end{macrocode}
% \macro{\AM at checkinteger}
% Check, if |#1| is a positive integer.
+% (Note: |\AM at checkinteger| was not reliable in older versions (<0.5n) of
+% this package. Let's use the definition from \emph{biblatex.sty} which seems
+% to be much better.)
% \begin{macrocode}
\newif\ifAM at integer
-\begingroup
-\@makeother_
-\gdef\AM at checkinteger#1{%
- \ifcat _\ifnum9<1#1_\else A\fi
- \AM at integertrue
+\def\AM at checkinteger#1{%
+ \expandafter\AM at checkinteger@\expandafter{#1}}
+% \end{macrocode}
+% \begin{macrocode}
+\def\AM at checkinteger@#1{%
+ \begingroup
+ \def\do##1{\uccode`##1=`\%}%
+ \do\0\do\1\do\2\do\3\do\4\do\5\do\6\do\7\do\8\do\9%
+ \makeatletter
+ \catcode`\%=9
+ \endlinechar\m at ne
+ \uppercase{\scantokens{\def\AM at temp{#1}}}%
+ \ifx\AM at temp\@empty
+ \global\AM at integertrue
\else
- \AM at integerfalse
+ \global\AM at integerfalse
\fi
-}
-\endgroup
+ \endgroup}
% \end{macrocode}
% \macro{\AM at findfile}
% Find file and set |\AM at currentdocname|.
@@ -2041,8 +2052,11 @@
% \end{macrocode}
% \macro{\AM at readlist}
% \macro{\AM at readlisti}
+% \macro{\AM at range@or at docname}
% \macro{\AM at checkrange}
-% \macro{\AM at checklast}
+% \macro{\AM at expand@range}
+% \macro{\AM at check@valid at pagenumber}
+% \macro{\AM at strip@slash}
% \macro{\AM at checkpagenumber}
% \macro{\AM at setnewdocname}
% \macro{\AM at append}
@@ -2075,42 +2089,48 @@
\def\AM at temp{#1}%
\ifx\END#1
\else
- \AM at checkrange#1-\END
+ \AM at range@or at docname{#1}%
\expandafter\AM at readlisti
\fi
}
% \end{macrocode}
% \begin{macrocode}
-\newcommand{\AM at checkrange}{}
-\def\AM at checkrange#1-#2\END{%
- \edef\AM at tempi{\AM at trim@space{#1}}%
- \ifx\\#2\\%
- \AM at checkinteger{\AM at tempi}%
- \ifAM at integer
- \AM at checkpagenumber{\AM at tempi}%
- \AM at append{\AM at tempi}%
+\def\AM at range@or at docname#1{%
+ \edef\AM at arg{\AM at trim@space{#1}}%
+ \expandafter\AM at checkrange\AM at arg-\END
+ \ifAM at isrange
+ \ifx\AM at currentdocname\relax
+ \AM at setnewdocname{\AM at arg}%
\else
- \expandafter\ifx\expandafter\\\AM at tempi\\\AM at append{}%
- \else\AM at setnewdocname{\AM at tempi}\fi
+ \AM at expand@range\AM at i\AM at ii
\fi
\else
- \expandafter\ifx\expandafter\\\AM at tempi\\%
- \@tempcnta=1\relax
- \AM at checklast#2\END
+ \AM at setnewdocname{\AM at arg}%
+ \fi
+}
+% \end{macrocode}
+% \begin{macrocode}
+\def\AM at last{last}
+\def\AM at empty{}
+\newif\ifAM at isrange
+% \end{macrocode}
+% \begin{macrocode}
+\def\AM at checkrange#1-#2\END{%
+ \AM at israngefalse
+ \AM at check@valid at pagenumber{#1}%
+ \ifx\\#1\\%
+ \def\AM at i{1}%
+ \else
+ \edef\AM at i{#1}%
+ \fi
+ \def\AM at ii{}%
+ \ifAM at isrange
+ \ifx\\#2\\%
\else
- \def\AM at cmp{last}%
- \ifx\AM at cmp\AM at tempi
- \@tempcnta=\AM at pagecount\relax
- \AM at checklast#2\END
- \else
- \AM at checkinteger{\AM at tempi}%
- \ifAM at integer
- \@tempcnta=\AM at tempi\relax
- \AM at checkpagenumber{\the\@tempcnta}%
- \AM at checklast#2\END
- \else
- \AM at setnewdocname{\AM at temp}%
- \fi
+ \edef\AM at ii{\AM at strip@slash#2\END}%
+ \AM at check@valid at pagenumber{\AM at ii}%
+ \ifx\AM at ii\AM at empty
+ \let\AM at ii\AM at last
\fi
\fi
\fi
@@ -2117,44 +2137,61 @@
}
% \end{macrocode}
% \begin{macrocode}
-\newcommand{\AM at checklast}{}
-\def\AM at checklast#1-\END{%
- \edef\AM at tempii{\AM at trim@space{#1}}%
- \expandafter\ifx\expandafter\\\AM at tempii\\
- \@tempcntb=\AM at pagecount\relax
- \ifAM at DVIoutput
- \ifnum\AM at pagecount=1
- \@tempcntb\@tempcnta
- \fi
- \fi
- \advance\@tempcntb\@ne
- \whiledo{\@tempcnta<\@tempcntb}{%
- \AM at append{\the\@tempcnta}%
- \advance\@tempcnta\@ne
- }%
+\def\AM at expand@range#1#2{%
+ \edef\AM at i{#1}%
+ \edef\AM at ii{#2}%
+ \ifx\AM at i\AM at last
+ \let\AM at i\AM at lastpage
+ \let\AM at i\AM at pagecount
+ \fi
+ \ifx\AM at ii\AM at last
+ \let\AM at ii\AM at lastpage
+ \let\AM at ii\AM at pagecount
+ \fi
+ \ifx\AM at ii\AM at empty
+ \let\AM at ii\AM at i
+ \fi
+ \@tempcnta=\AM at i\relax
+ \@tempcntb=\AM at ii\relax
+ \ifnum\@tempcnta<\@tempcntb
+ \def\AM at rel{<}%
+ \let\AM at inc\@ne
\else
- \def\AM at cmp{last}%
- \ifx\AM at cmp\AM at tempii
- \let\AM at tempii\AM at pagecount
- \fi
- \AM at checkinteger{\AM at tempii}%
- \ifAM at integer
- \@tempcntb=\AM at tempii\relax
- \AM at checkpagenumber{\the\@tempcntb}%
- \ifnum\@tempcnta<\@tempcntb \def\AM at rel{<}\def\AM at inc{\@ne}%
- \else \def\AM at rel{>}\def\AM at inc{\m at ne}\fi
- \advance\@tempcntb\AM at inc
- \whiledo{\@tempcnta\AM at rel\@tempcntb}{%
- \AM at append{\the\@tempcnta}%
- \advance\@tempcnta\AM at inc
- }%
- \else
- \AM at setnewdocname{\AM at temp}%
- \fi
+ \def\AM at rel{>}%
+ \let\AM at inc\m at ne
\fi
+ \advance\@tempcntb\AM at inc
+ \whiledo{\@tempcnta\AM at rel\@tempcntb}{%
+ \AM at checkpagenumber{\the\@tempcnta}%
+ \AM at append{\the\@tempcnta}%
+ \advance\@tempcnta\AM at inc
+ }%
}
% \end{macrocode}
% \begin{macrocode}
+\def\AM at check@valid at pagenumber#1{%
+ \AM at checkinteger{#1}%
+ \ifAM at integer
+ \AM at israngetrue
+ \else
+ \AM at israngefalse
+ \fi
+ \edef\AM at tmp{#1}%
+ \ifx\AM at tmp\AM at last
+ \AM at israngetrue
+ \fi
+}
+% \end{macrocode}
+% \begin{macrocode}
+\def\AM at strip@slash#1-#2\END{%
+ \ifx\\#2\\%
+ #1%
+ \else
+ #1-#2%
+ \fi
+}
+% \end{macrocode}
+% \begin{macrocode}
\providecommand*{\AM at checkpagenumber}[1]{%
\ifnum#1>\AM at pagecount\relax
\ifthenelse{\boolean{AM at pkg@draft} \and \boolean{AM at survey}}{%
@@ -2891,11 +2928,11 @@
\newtoks\AM at toc@title
\newcommand{\AM at parse@toclisti}{}
\def\AM at parse@toclisti#1,#2,#3,#4,#5,#6\END{%
- \def\AM at toc@page{\AM at trim@space{#1}}%
- \def\AM at toc@section{\AM at trim@space{#2}}%
- \def\AM at toc@level{\AM at trim@space{#3}}%
+ \edef\AM at toc@page{\AM at trim@space{#1}}%
+ \edef\AM at toc@section{\AM at trim@space{#2}}%
+ \edef\AM at toc@level{\AM at trim@space{#3}}%
\AM at toc@title{\ignorespaces #4}%
- \def\AM at toc@label{\AM at trim@space{#5}}%
+ \edef\AM at toc@label{\AM at trim@space{#5}}%
\AM at checkinteger{\AM at toc@page}%
\ifAM at integer\else
\PackageError{pdfpages}
@@ -2960,10 +2997,10 @@
% \begin{macrocode}
\newcommand{\AM at parse@loflisti}{}
\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}}%
+ \edef\AM at lof@page{\AM at trim@space{#1}}%
+ \edef\AM at lof@list{\AM at trim@space{#2}}%
\def\AM at lof@heading{\ignorespaces #3}%
- \def\AM at lof@label{\AM at trim@space{#4}}%
+ \edef\AM at lof@label{\AM at trim@space{#4}}%
\AM at checkinteger{\AM at lof@page}%
\ifAM at integer\else
\PackageError{pdfpages}
@@ -3078,7 +3115,7 @@
% \begin{macrocode}
\def\AM at CheckValue#1#2{%
\ifx\\#2\\\PackageError{pdfpages}
- {Option `#1' must have a non-empty value}%
+ {Option `#1' must have a non-empty value}{}%
\fi
}
% \end{macrocode}
@@ -3091,7 +3128,7 @@
\AM at CheckValue{pages}{#1}%
\def\AM at pagestemp{#1}}
\define at key{pdfpages}{pages}{\AM at CheckValue{pages}{#1}%
- \def\AM at pagestemp{#1}}
+ \edef\AM at pagestemp{#1}}
\define at key{pdfpages}{nup}{\AM at parse@nup#1x\END}
\define at key{pdfpages}{deltax}{\AM at parse@deltax#1 \\}
\define at key{pdfpages}{deltay}{\AM at parse@deltay#1 \\}
@@ -4279,10 +4316,9 @@
% \begin{macrocode}
\AM at DVIoutputtrue
\PackageWarningNoLine{pdfpages}{%
- I will use a dummy \string\includepdf\space command which\MessageBreak
- will insert empty pages instead of the actual PDF,\MessageBreak
- because we are running in
- \ifAM at pkg@demo `demo' mode%
+ I will use a dummy \string\includepdf\space command\MessageBreak
+ which will insert empty pages instead of the actual\MessageBreak
+ PDF file because we are running in \ifAM at pkg@demo `demo' mode%
\else DVI mode or with\MessageBreak dvips driver%
\fi}
% \end{macrocode}
@@ -4662,6 +4698,19 @@
% |signature*| and |landscape| together.
% \end{itemize}
%
+% \subsection*{2019/09/19 v0.5m}
+% \begin{itemize}
+% \item Expanding argument for |pages| option: \par
+% |\def\foo{1-4}\includepdf[pages=\foo]{dummy.pdf}|
+% \end{itemize}
+%
+% \subsection*{2019/09/21 v0.5n}
+% \begin{itemize}
+% \item |\AM at checkinteger| rewritten.
+% \item File names like `1.pdf' or `1-2.pdf' are now handled correctly by |\includepdfmerge|.
+% Rewritten |\AM at range@or at docname|, |\AM at checkrange|, |\AM at expand@range|, ...
+% \end{itemize}
+%
% \Finale
%
% \iffalse
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty 2019-09-22 22:17:04 UTC (rev 52153)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty 2019-09-22 22:17:22 UTC (rev 52154)
@@ -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.5l}
+\def\AM at fileversion{v0.5n}
\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-10-31 14:12:08 +0100 $
-\AM at Git@SHA at process$SHA-1: 9deefd6c8c22356ce47773245098390089885925 $
+\AM at Git@Date at process$Date: 2019-09-21 22:35:13 +0200 $
+\AM at Git@SHA at process$SHA-1: f6e5700ba0dc915398ae6b0f222a8cc7f0ff2eff $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
[\AM at Git@Date\space\AM at fileversion\space
@@ -146,16 +146,22 @@
\newcommand*{\AM at picturecommandstar}{}
\newsavebox{\AM at pagebox}
\newif\ifAM at integer
-\begingroup
-\@makeother_
-\gdef\AM at checkinteger#1{%
- \ifcat _\ifnum9<1#1_\else A\fi
- \AM at integertrue
+\def\AM at checkinteger#1{%
+ \expandafter\AM at checkinteger@\expandafter{#1}}
+\def\AM at checkinteger@#1{%
+ \begingroup
+ \def\do##1{\uccode`##1=`\%}%
+ \do\0\do\1\do\2\do\3\do\4\do\5\do\6\do\7\do\8\do\9%
+ \makeatletter
+ \catcode`\%=9
+ \endlinechar\m at ne
+ \uppercase{\scantokens{\def\AM at temp{#1}}}%
+ \ifx\AM at temp\@empty
+ \global\AM at integertrue
\else
- \AM at integerfalse
+ \global\AM at integerfalse
\fi
-}
-\endgroup
+ \endgroup}
\newcommand*{\AM at findfile@i}[2]{%
\ifAM at pkg@demo
\else
@@ -750,80 +756,95 @@
\def\AM at temp{#1}%
\ifx\END#1
\else
- \AM at checkrange#1-\END
+ \AM at range@or at docname{#1}%
\expandafter\AM at readlisti
\fi
}
-\newcommand{\AM at checkrange}{}
-\def\AM at checkrange#1-#2\END{%
- \edef\AM at tempi{\AM at trim@space{#1}}%
- \ifx\\#2\\%
- \AM at checkinteger{\AM at tempi}%
- \ifAM at integer
- \AM at checkpagenumber{\AM at tempi}%
- \AM at append{\AM at tempi}%
+\def\AM at range@or at docname#1{%
+ \edef\AM at arg{\AM at trim@space{#1}}%
+ \expandafter\AM at checkrange\AM at arg-\END
+ \ifAM at isrange
+ \ifx\AM at currentdocname\relax
+ \AM at setnewdocname{\AM at arg}%
\else
- \expandafter\ifx\expandafter\\\AM at tempi\\\AM at append{}%
- \else\AM at setnewdocname{\AM at tempi}\fi
+ \AM at expand@range\AM at i\AM at ii
\fi
\else
- \expandafter\ifx\expandafter\\\AM at tempi\\%
- \@tempcnta=1\relax
- \AM at checklast#2\END
+ \AM at setnewdocname{\AM at arg}%
+ \fi
+}
+\def\AM at last{last}
+\def\AM at empty{}
+\newif\ifAM at isrange
+\def\AM at checkrange#1-#2\END{%
+ \AM at israngefalse
+ \AM at check@valid at pagenumber{#1}%
+ \ifx\\#1\\%
+ \def\AM at i{1}%
+ \else
+ \edef\AM at i{#1}%
+ \fi
+ \def\AM at ii{}%
+ \ifAM at isrange
+ \ifx\\#2\\%
\else
- \def\AM at cmp{last}%
- \ifx\AM at cmp\AM at tempi
- \@tempcnta=\AM at pagecount\relax
- \AM at checklast#2\END
- \else
- \AM at checkinteger{\AM at tempi}%
- \ifAM at integer
- \@tempcnta=\AM at tempi\relax
- \AM at checkpagenumber{\the\@tempcnta}%
- \AM at checklast#2\END
- \else
- \AM at setnewdocname{\AM at temp}%
- \fi
+ \edef\AM at ii{\AM at strip@slash#2\END}%
+ \AM at check@valid at pagenumber{\AM at ii}%
+ \ifx\AM at ii\AM at empty
+ \let\AM at ii\AM at last
\fi
\fi
\fi
}
-\newcommand{\AM at checklast}{}
-\def\AM at checklast#1-\END{%
- \edef\AM at tempii{\AM at trim@space{#1}}%
- \expandafter\ifx\expandafter\\\AM at tempii\\
- \@tempcntb=\AM at pagecount\relax
- \ifAM at DVIoutput
- \ifnum\AM at pagecount=1
- \@tempcntb\@tempcnta
- \fi
- \fi
- \advance\@tempcntb\@ne
- \whiledo{\@tempcnta<\@tempcntb}{%
- \AM at append{\the\@tempcnta}%
- \advance\@tempcnta\@ne
- }%
+\def\AM at expand@range#1#2{%
+ \edef\AM at i{#1}%
+ \edef\AM at ii{#2}%
+ \ifx\AM at i\AM at last
+ \let\AM at i\AM at lastpage
+ \let\AM at i\AM at pagecount
+ \fi
+ \ifx\AM at ii\AM at last
+ \let\AM at ii\AM at lastpage
+ \let\AM at ii\AM at pagecount
+ \fi
+ \ifx\AM at ii\AM at empty
+ \let\AM at ii\AM at i
+ \fi
+ \@tempcnta=\AM at i\relax
+ \@tempcntb=\AM at ii\relax
+ \ifnum\@tempcnta<\@tempcntb
+ \def\AM at rel{<}%
+ \let\AM at inc\@ne
\else
- \def\AM at cmp{last}%
- \ifx\AM at cmp\AM at tempii
- \let\AM at tempii\AM at pagecount
- \fi
- \AM at checkinteger{\AM at tempii}%
- \ifAM at integer
- \@tempcntb=\AM at tempii\relax
- \AM at checkpagenumber{\the\@tempcntb}%
- \ifnum\@tempcnta<\@tempcntb \def\AM at rel{<}\def\AM at inc{\@ne}%
- \else \def\AM at rel{>}\def\AM at inc{\m at ne}\fi
- \advance\@tempcntb\AM at inc
- \whiledo{\@tempcnta\AM at rel\@tempcntb}{%
- \AM at append{\the\@tempcnta}%
- \advance\@tempcnta\AM at inc
- }%
- \else
- \AM at setnewdocname{\AM at temp}%
- \fi
+ \def\AM at rel{>}%
+ \let\AM at inc\m at ne
\fi
+ \advance\@tempcntb\AM at inc
+ \whiledo{\@tempcnta\AM at rel\@tempcntb}{%
+ \AM at checkpagenumber{\the\@tempcnta}%
+ \AM at append{\the\@tempcnta}%
+ \advance\@tempcnta\AM at inc
+ }%
}
+\def\AM at check@valid at pagenumber#1{%
+ \AM at checkinteger{#1}%
+ \ifAM at integer
+ \AM at israngetrue
+ \else
+ \AM at israngefalse
+ \fi
+ \edef\AM at tmp{#1}%
+ \ifx\AM at tmp\AM at last
+ \AM at israngetrue
+ \fi
+}
+\def\AM at strip@slash#1-#2\END{%
+ \ifx\\#2\\%
+ #1%
+ \else
+ #1-#2%
+ \fi
+}
\providecommand*{\AM at checkpagenumber}[1]{%
\ifnum#1>\AM at pagecount\relax
\ifthenelse{\boolean{AM at pkg@draft} \and \boolean{AM at survey}}{%
@@ -1330,11 +1351,11 @@
\newtoks\AM at toc@title
\newcommand{\AM at parse@toclisti}{}
\def\AM at parse@toclisti#1,#2,#3,#4,#5,#6\END{%
- \def\AM at toc@page{\AM at trim@space{#1}}%
- \def\AM at toc@section{\AM at trim@space{#2}}%
- \def\AM at toc@level{\AM at trim@space{#3}}%
+ \edef\AM at toc@page{\AM at trim@space{#1}}%
+ \edef\AM at toc@section{\AM at trim@space{#2}}%
+ \edef\AM at toc@level{\AM at trim@space{#3}}%
\AM at toc@title{\ignorespaces #4}%
- \def\AM at toc@label{\AM at trim@space{#5}}%
+ \edef\AM at toc@label{\AM at trim@space{#5}}%
\AM at checkinteger{\AM at toc@page}%
\ifAM at integer\else
\PackageError{pdfpages}
@@ -1377,10 +1398,10 @@
}
\newcommand{\AM at parse@loflisti}{}
\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}}%
+ \edef\AM at lof@page{\AM at trim@space{#1}}%
+ \edef\AM at lof@list{\AM at trim@space{#2}}%
\def\AM at lof@heading{\ignorespaces #3}%
- \def\AM at lof@label{\AM at trim@space{#4}}%
+ \edef\AM at lof@label{\AM at trim@space{#4}}%
\AM at checkinteger{\AM at lof@page}%
\ifAM at integer\else
\PackageError{pdfpages}
@@ -1470,7 +1491,7 @@
\AtBeginDocument{\AM at TeXpower@hook}
\def\AM at CheckValue#1#2{%
\ifx\\#2\\\PackageError{pdfpages}
- {Option `#1' must have a non-empty value}%
+ {Option `#1' must have a non-empty value}{}%
\fi
}
\define at key{pdfpages}{page}{\PackageWarningNoLine{pdfpages}{%
@@ -1480,7 +1501,7 @@
\AM at CheckValue{pages}{#1}%
\def\AM at pagestemp{#1}}
\define at key{pdfpages}{pages}{\AM at CheckValue{pages}{#1}%
- \def\AM at pagestemp{#1}}
+ \edef\AM at pagestemp{#1}}
\define at key{pdfpages}{nup}{\AM at parse@nup#1x\END}
\define at key{pdfpages}{deltax}{\AM at parse@deltax#1 \\}
\define at key{pdfpages}{deltay}{\AM at parse@deltay#1 \\}
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def 2019-09-22 22:17:04 UTC (rev 52153)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def 2019-09-22 22:17:22 UTC (rev 52154)
@@ -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.5l}
+\def\AM at fileversion{v0.5n}
\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-10-31 14:12:08 +0100 $
-\AM at Git@SHA at process$SHA-1: 9deefd6c8c22356ce47773245098390089885925 $
+\AM at Git@Date at process$Date: 2019-09-21 22:35:13 +0200 $
+\AM at Git@SHA at process$SHA-1: f6e5700ba0dc915398ae6b0f222a8cc7f0ff2eff $
\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 2019-09-22 22:17:04 UTC (rev 52153)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def 2019-09-22 22:17:22 UTC (rev 52154)
@@ -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.5l}
+\def\AM at fileversion{v0.5n}
\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-10-31 14:12:08 +0100 $
-\AM at Git@SHA at process$SHA-1: 9deefd6c8c22356ce47773245098390089885925 $
+\AM at Git@Date at process$Date: 2019-09-21 22:35:13 +0200 $
+\AM at Git@SHA at process$SHA-1: f6e5700ba0dc915398ae6b0f222a8cc7f0ff2eff $
\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 2019-09-22 22:17:04 UTC (rev 52153)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def 2019-09-22 22:17:22 UTC (rev 52154)
@@ -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.5l}
+\def\AM at fileversion{v0.5n}
\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-10-31 14:12:08 +0100 $
-\AM at Git@SHA at process$SHA-1: 9deefd6c8c22356ce47773245098390089885925 $
+\AM at Git@Date at process$Date: 2019-09-21 22:35:13 +0200 $
+\AM at Git@SHA at process$SHA-1: f6e5700ba0dc915398ae6b0f222a8cc7f0ff2eff $
\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 2019-09-22 22:17:04 UTC (rev 52153)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppnull.def 2019-09-22 22:17:22 UTC (rev 52154)
@@ -24,21 +24,20 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias at gmail.com>.
%%
-\def\AM at fileversion{v0.5l}
+\def\AM at fileversion{v0.5n}
\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-10-31 14:12:08 +0100 $
-\AM at Git@SHA at process$SHA-1: 9deefd6c8c22356ce47773245098390089885925 $
+\AM at Git@Date at process$Date: 2019-09-21 22:35:13 +0200 $
+\AM at Git@SHA at process$SHA-1: f6e5700ba0dc915398ae6b0f222a8cc7f0ff2eff $
\ProvidesFile{ppnull.def}
[\AM at Git@Date\space\AM at fileversion\space
Pdfpages dummy driver (AM)]
\AM at DVIoutputtrue
\PackageWarningNoLine{pdfpages}{%
- I will use a dummy \string\includepdf\space command which\MessageBreak
- will insert empty pages instead of the actual PDF,\MessageBreak
- because we are running in
- \ifAM at pkg@demo `demo' mode%
+ I will use a dummy \string\includepdf\space command\MessageBreak
+ which will insert empty pages instead of the actual\MessageBreak
+ PDF file because we are running in \ifAM at pkg@demo `demo' mode%
\else DVI mode or with\MessageBreak dvips driver%
\fi}
\def\AM at findfile#1{%
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def 2019-09-22 22:17:04 UTC (rev 52153)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def 2019-09-22 22:17:22 UTC (rev 52154)
@@ -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.5l}
+\def\AM at fileversion{v0.5n}
\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-10-31 14:12:08 +0100 $
-\AM at Git@SHA at process$SHA-1: 9deefd6c8c22356ce47773245098390089885925 $
+\AM at Git@Date at process$Date: 2019-09-21 22:35:13 +0200 $
+\AM at Git@SHA at process$SHA-1: f6e5700ba0dc915398ae6b0f222a8cc7f0ff2eff $
\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 2019-09-22 22:17:04 UTC (rev 52153)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def 2019-09-22 22:17:22 UTC (rev 52154)
@@ -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.5l}
+\def\AM at fileversion{v0.5n}
\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-10-31 14:12:08 +0100 $
-\AM at Git@SHA at process$SHA-1: 9deefd6c8c22356ce47773245098390089885925 $
+\AM at Git@Date at process$Date: 2019-09-21 22:35:13 +0200 $
+\AM at Git@SHA at process$SHA-1: f6e5700ba0dc915398ae6b0f222a8cc7f0ff2eff $
\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 2019-09-22 22:17:04 UTC (rev 52153)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def 2019-09-22 22:17:22 UTC (rev 52154)
@@ -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.5l}
+\def\AM at fileversion{v0.5n}
\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-10-31 14:12:08 +0100 $
-\AM at Git@SHA at process$SHA-1: 9deefd6c8c22356ce47773245098390089885925 $
+\AM at Git@Date at process$Date: 2019-09-21 22:35:13 +0200 $
+\AM at Git@SHA at process$SHA-1: f6e5700ba0dc915398ae6b0f222a8cc7f0ff2eff $
\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