diff options
38 files changed, 22 insertions, 13 deletions
diff --git a/Master/texmf-dist/doc/latex/base/alltt.pdf b/Master/texmf-dist/doc/latex/base/alltt.pdf Binary files differindex f00d5288b58..8ffc33f79e4 100644 --- a/Master/texmf-dist/doc/latex/base/alltt.pdf +++ b/Master/texmf-dist/doc/latex/base/alltt.pdf diff --git a/Master/texmf-dist/doc/latex/base/changes.txt b/Master/texmf-dist/doc/latex/base/changes.txt index 9a3ba249182..ff447ae871d 100644 --- a/Master/texmf-dist/doc/latex/base/changes.txt +++ b/Master/texmf-dist/doc/latex/base/changes.txt @@ -5,6 +5,16 @@ are not part of the distribution. ======================================================================= ######################### +# 2015/01/01 PL 2 Release +######################### + +2015-07-06 David Carlisle <latex-bugs@latex-project.org> + + * ltvers.dtx: PL2 + + * ltoutput.dtx: fix docstrip guard for latexrelease latex/4434 + +######################### # 2015/01/01 PL 1 Release ######################### diff --git a/Master/texmf-dist/doc/latex/base/classes.pdf b/Master/texmf-dist/doc/latex/base/classes.pdf Binary files differindex 2948dd26c3b..305f191f7e0 100644 --- a/Master/texmf-dist/doc/latex/base/classes.pdf +++ b/Master/texmf-dist/doc/latex/base/classes.pdf diff --git a/Master/texmf-dist/doc/latex/base/cmfonts.pdf b/Master/texmf-dist/doc/latex/base/cmfonts.pdf Binary files differindex 3fe1a8aad81..1cecdea418c 100644 --- a/Master/texmf-dist/doc/latex/base/cmfonts.pdf +++ b/Master/texmf-dist/doc/latex/base/cmfonts.pdf diff --git a/Master/texmf-dist/doc/latex/base/doc.pdf b/Master/texmf-dist/doc/latex/base/doc.pdf Binary files differindex 9eb2e981718..31f9954ccd1 100644 --- a/Master/texmf-dist/doc/latex/base/doc.pdf +++ b/Master/texmf-dist/doc/latex/base/doc.pdf diff --git a/Master/texmf-dist/doc/latex/base/docstrip.pdf b/Master/texmf-dist/doc/latex/base/docstrip.pdf Binary files differindex 43c6bc9aa9e..8d4aac738f8 100644 --- a/Master/texmf-dist/doc/latex/base/docstrip.pdf +++ b/Master/texmf-dist/doc/latex/base/docstrip.pdf diff --git a/Master/texmf-dist/doc/latex/base/exscale.pdf b/Master/texmf-dist/doc/latex/base/exscale.pdf Binary files differindex d193a7b2170..fb84be2d09a 100644 --- a/Master/texmf-dist/doc/latex/base/exscale.pdf +++ b/Master/texmf-dist/doc/latex/base/exscale.pdf diff --git a/Master/texmf-dist/doc/latex/base/fix-cm.pdf b/Master/texmf-dist/doc/latex/base/fix-cm.pdf Binary files differindex a6ef935119a..96362f047e8 100644 --- a/Master/texmf-dist/doc/latex/base/fix-cm.pdf +++ b/Master/texmf-dist/doc/latex/base/fix-cm.pdf diff --git a/Master/texmf-dist/doc/latex/base/graphpap.pdf b/Master/texmf-dist/doc/latex/base/graphpap.pdf Binary files differindex 7e1fa989a18..2a8873d578c 100644 --- a/Master/texmf-dist/doc/latex/base/graphpap.pdf +++ b/Master/texmf-dist/doc/latex/base/graphpap.pdf diff --git a/Master/texmf-dist/doc/latex/base/ifthen.pdf b/Master/texmf-dist/doc/latex/base/ifthen.pdf Binary files differindex 8bbf36f3d95..0aab7702cb3 100644 --- a/Master/texmf-dist/doc/latex/base/ifthen.pdf +++ b/Master/texmf-dist/doc/latex/base/ifthen.pdf diff --git a/Master/texmf-dist/doc/latex/base/inputenc.pdf b/Master/texmf-dist/doc/latex/base/inputenc.pdf Binary files differindex 4d0a16d7860..6d78e779cd8 100644 --- a/Master/texmf-dist/doc/latex/base/inputenc.pdf +++ b/Master/texmf-dist/doc/latex/base/inputenc.pdf diff --git a/Master/texmf-dist/doc/latex/base/latexrelease.pdf b/Master/texmf-dist/doc/latex/base/latexrelease.pdf Binary files differindex 60a8b5b02fb..d14fdc3f88d 100644 --- a/Master/texmf-dist/doc/latex/base/latexrelease.pdf +++ b/Master/texmf-dist/doc/latex/base/latexrelease.pdf diff --git a/Master/texmf-dist/doc/latex/base/latexsym.pdf b/Master/texmf-dist/doc/latex/base/latexsym.pdf Binary files differindex 3eeb9ea1fc8..c712d0f99fd 100644 --- a/Master/texmf-dist/doc/latex/base/latexsym.pdf +++ b/Master/texmf-dist/doc/latex/base/latexsym.pdf diff --git a/Master/texmf-dist/doc/latex/base/lb2.pdf b/Master/texmf-dist/doc/latex/base/lb2.pdf Binary files differindex 3863b0f6f90..fb34f569d5a 100644 --- a/Master/texmf-dist/doc/latex/base/lb2.pdf +++ b/Master/texmf-dist/doc/latex/base/lb2.pdf diff --git a/Master/texmf-dist/doc/latex/base/letter.pdf b/Master/texmf-dist/doc/latex/base/letter.pdf Binary files differindex 3dc4a369806..07adce9db18 100644 --- a/Master/texmf-dist/doc/latex/base/letter.pdf +++ b/Master/texmf-dist/doc/latex/base/letter.pdf diff --git a/Master/texmf-dist/doc/latex/base/lgc2.pdf b/Master/texmf-dist/doc/latex/base/lgc2.pdf Binary files differindex ee1a8762985..e6bfe0f17e0 100644 --- a/Master/texmf-dist/doc/latex/base/lgc2.pdf +++ b/Master/texmf-dist/doc/latex/base/lgc2.pdf diff --git a/Master/texmf-dist/doc/latex/base/lppl.pdf b/Master/texmf-dist/doc/latex/base/lppl.pdf Binary files differindex 93a7509b45a..5e50e88903b 100644 --- a/Master/texmf-dist/doc/latex/base/lppl.pdf +++ b/Master/texmf-dist/doc/latex/base/lppl.pdf diff --git a/Master/texmf-dist/doc/latex/base/ltunicode.pdf b/Master/texmf-dist/doc/latex/base/ltunicode.pdf Binary files differindex aba86c1ee90..f9782c78a90 100644 --- a/Master/texmf-dist/doc/latex/base/ltunicode.pdf +++ b/Master/texmf-dist/doc/latex/base/ltunicode.pdf diff --git a/Master/texmf-dist/doc/latex/base/ltxdoc.pdf b/Master/texmf-dist/doc/latex/base/ltxdoc.pdf Binary files differindex 196b6b6fef7..e546bf3057d 100644 --- a/Master/texmf-dist/doc/latex/base/ltxdoc.pdf +++ b/Master/texmf-dist/doc/latex/base/ltxdoc.pdf diff --git a/Master/texmf-dist/doc/latex/base/makeindx.pdf b/Master/texmf-dist/doc/latex/base/makeindx.pdf Binary files differindex 9d3f99a289a..587032b3b1f 100644 --- a/Master/texmf-dist/doc/latex/base/makeindx.pdf +++ b/Master/texmf-dist/doc/latex/base/makeindx.pdf diff --git a/Master/texmf-dist/doc/latex/base/manual.pdf b/Master/texmf-dist/doc/latex/base/manual.pdf Binary files differindex ce7f5d5dc7c..745ff9ed56a 100644 --- a/Master/texmf-dist/doc/latex/base/manual.pdf +++ b/Master/texmf-dist/doc/latex/base/manual.pdf diff --git a/Master/texmf-dist/doc/latex/base/nfssfont.pdf b/Master/texmf-dist/doc/latex/base/nfssfont.pdf Binary files differindex 82aa430bbf1..366f6bba7d1 100644 --- a/Master/texmf-dist/doc/latex/base/nfssfont.pdf +++ b/Master/texmf-dist/doc/latex/base/nfssfont.pdf diff --git a/Master/texmf-dist/doc/latex/base/proc.pdf b/Master/texmf-dist/doc/latex/base/proc.pdf Binary files differindex 5834fe928dc..df60028d892 100644 --- a/Master/texmf-dist/doc/latex/base/proc.pdf +++ b/Master/texmf-dist/doc/latex/base/proc.pdf diff --git a/Master/texmf-dist/doc/latex/base/slides.pdf b/Master/texmf-dist/doc/latex/base/slides.pdf Binary files differindex 6f24a3ee718..9f38490c677 100644 --- a/Master/texmf-dist/doc/latex/base/slides.pdf +++ b/Master/texmf-dist/doc/latex/base/slides.pdf diff --git a/Master/texmf-dist/doc/latex/base/slifonts.pdf b/Master/texmf-dist/doc/latex/base/slifonts.pdf Binary files differindex 364beda03ec..74d5f49b2b6 100644 --- a/Master/texmf-dist/doc/latex/base/slifonts.pdf +++ b/Master/texmf-dist/doc/latex/base/slifonts.pdf diff --git a/Master/texmf-dist/doc/latex/base/source2e.pdf b/Master/texmf-dist/doc/latex/base/source2e.pdf Binary files differindex 438e9a89af8..ab09dca1851 100644 --- a/Master/texmf-dist/doc/latex/base/source2e.pdf +++ b/Master/texmf-dist/doc/latex/base/source2e.pdf diff --git a/Master/texmf-dist/doc/latex/base/syntonly.pdf b/Master/texmf-dist/doc/latex/base/syntonly.pdf Binary files differindex 2c3c0c9bb56..f09659a4557 100644 --- a/Master/texmf-dist/doc/latex/base/syntonly.pdf +++ b/Master/texmf-dist/doc/latex/base/syntonly.pdf diff --git a/Master/texmf-dist/doc/latex/base/tlc2.pdf b/Master/texmf-dist/doc/latex/base/tlc2.pdf Binary files differindex 02faed1f6de..6e80c4f5c1c 100644 --- a/Master/texmf-dist/doc/latex/base/tlc2.pdf +++ b/Master/texmf-dist/doc/latex/base/tlc2.pdf diff --git a/Master/texmf-dist/doc/latex/base/utf8ienc.pdf b/Master/texmf-dist/doc/latex/base/utf8ienc.pdf Binary files differindex 430548f45bd..f175bcb0f05 100644 --- a/Master/texmf-dist/doc/latex/base/utf8ienc.pdf +++ b/Master/texmf-dist/doc/latex/base/utf8ienc.pdf diff --git a/Master/texmf-dist/doc/latex/base/webcomp.pdf b/Master/texmf-dist/doc/latex/base/webcomp.pdf Binary files differindex b14d1b4edab..a0c46b54da3 100644 --- a/Master/texmf-dist/doc/latex/base/webcomp.pdf +++ b/Master/texmf-dist/doc/latex/base/webcomp.pdf diff --git a/Master/texmf-dist/source/latex/base/ltoutput.dtx b/Master/texmf-dist/source/latex/base/ltoutput.dtx index 05bf6819e8b..4e04c4b064c 100644 --- a/Master/texmf-dist/source/latex/base/ltoutput.dtx +++ b/Master/texmf-dist/source/latex/base/ltoutput.dtx @@ -30,14 +30,14 @@ %%% From File: ltoutput.dtx %<flafter>\ProvidesPackage{flafter} %<fltrace>\ProvidesPackage{fltrace} -%<flafter,fltrace> [2015/03/12 v1.2m +%<flafter,fltrace> [2015/07/12 v1.2n %<flafter> Standard LaTeX floats after reference (FMi)] %<fltrace> Tracing LaTeX floats algorithm (FMi)] % %<*driver> % \fi \ProvidesFile{ltoutput.dtx} - [2015/03/12 v1.2m LaTeX Kernel (Output Routine)] + [2015/07/06 v1.2n LaTeX Kernel (Output Routine)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltoutput.dtx} @@ -2875,7 +2875,7 @@ % \end{macrocode} % Next set of docstrip guards are a bit weird, essentially % |\@addtotoporbot| ends up inside the kernel and the -% \texttt{fltrace} package and |\@addtotoporbot| shows up in the +% \texttt{fltrace} package and |\@addtobot| shows up in the % \texttt{flafter} package. Guess that could have been done a bit % more obvious :-) % \begin{macrocode} @@ -2885,12 +2885,12 @@ %</trace> \@addtotoporbot %</2ekernel|fltrace|latexrelease> -%<*!2ekernel&!fltrace> +%<*!2ekernel&!fltrace&!latexrelease> %<*trace> \fl@trace{not here: sent to addtobot}% %</trace> \@addtobot -%</!2ekernel&!fltrace> +%</!2ekernel&!fltrace&!latexrelease> \fi \fi \fi diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx index 55573527b54..1f90d0366e6 100644 --- a/Master/texmf-dist/source/latex/base/ltvers.dtx +++ b/Master/texmf-dist/source/latex/base/ltvers.dtx @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{ltvers.dtx} - [2015/06/23 v1.0t LaTeX Kernel (Version Info)] + [2015/07/06 v1.0u LaTeX Kernel (Version Info)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltvers.dtx} @@ -96,7 +96,7 @@ {2015/01/01} %</2ekernel|latexrelease> %<*2ekernel> -\def\patch@level{1} +\def\patch@level{2} % \end{macrocode} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/source/latex/base/unpack.ins b/Master/texmf-dist/source/latex/base/unpack.ins index 02a7630d9bb..8b89ac975d0 100644 --- a/Master/texmf-dist/source/latex/base/unpack.ins +++ b/Master/texmf-dist/source/latex/base/unpack.ins @@ -41,7 +41,7 @@ { \def\ProvidesFile#1\end#2{} -\def\everyjob#1\endinput{} +\def\everyjob#1\endinput{\fi} \@@input ltvers.dtx \Msg{**********************************************} \Msg{*} diff --git a/Master/texmf-dist/tex/latex/base/flafter.sty b/Master/texmf-dist/tex/latex/base/flafter.sty index a1f16091269..09871eab0b7 100644 --- a/Master/texmf-dist/tex/latex/base/flafter.sty +++ b/Master/texmf-dist/tex/latex/base/flafter.sty @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutput.dtx \ProvidesPackage{flafter} - [2015/03/12 v1.2m + [2015/07/12 v1.2n Standard LaTeX floats after reference (FMi)] \IncludeInRelease{2015/01/01}% {\@addtocurcol}{float order in 2-column}% diff --git a/Master/texmf-dist/tex/latex/base/fltrace.sty b/Master/texmf-dist/tex/latex/base/fltrace.sty index 968e1bc7b3c..6e69906de84 100644 --- a/Master/texmf-dist/tex/latex/base/fltrace.sty +++ b/Master/texmf-dist/tex/latex/base/fltrace.sty @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutput.dtx \ProvidesPackage{fltrace} - [2015/03/12 v1.2m + [2015/07/12 v1.2n Tracing LaTeX floats algorithm (FMi)] \def\onecolumn{% \clearpage diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx index feb482a60ba..8c64775b606 100644 --- a/Master/texmf-dist/tex/latex/base/latex.ltx +++ b/Master/texmf-dist/tex/latex/base/latex.ltx @@ -664,7 +664,7 @@ \def\fmtname{LaTeX2e} \edef\fmtversion {2015/01/01} -\def\patch@level{1} +\def\patch@level{2} \iffalse \def\reserved@a#1/#2/#3\@nil{% \count@\year diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty index ea9bdddf6c6..76bf06342e4 100644 --- a/Master/texmf-dist/tex/latex/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty @@ -833,7 +833,6 @@ of this package available from CTAN} \if@insert \else \@addtotoporbot - \@addtobot \fi \fi \fi diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 7edfad1ba3b..8e6349a1993 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -3202,7 +3202,7 @@ sub runins { for (grep (/$thispatt/, @filenames)) { my $env_mktex = "env MKTEXTFM=0 MKTEXMF=0 MKTEXPK=0"; # do not infinite loop on docstrip "output directory", e.g., fltpoint. - &runjob ("yes | sed 10q | $env_mktex $insrunner $_"); + &runjob ("yes | sed 1000q | $env_mktex $insrunner $_"); # bbold.dtx generates bbold.ins, and then does "low level hacks" to # run the .ins itself. We don't want to do anything. |