texlive[47612] Master: latex2e (4may18)
commits+karl at tug.org
commits+karl at tug.org
Sat May 5 00:03:47 CEST 2018
Revision: 47612
http://tug.org/svn/texlive?view=revision&revision=47612
Author: karl
Date: 2018-05-05 00:03:45 +0200 (Sat, 05 May 2018)
Log Message:
-----------
latex2e (4may18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/base/alltt.pdf
trunk/Master/texmf-dist/doc/latex/base/cfgguide.pdf
trunk/Master/texmf-dist/doc/latex/base/changes.txt
trunk/Master/texmf-dist/doc/latex/base/classes.pdf
trunk/Master/texmf-dist/doc/latex/base/clsguide.pdf
trunk/Master/texmf-dist/doc/latex/base/cmfonts.pdf
trunk/Master/texmf-dist/doc/latex/base/cyrguide.pdf
trunk/Master/texmf-dist/doc/latex/base/doc.pdf
trunk/Master/texmf-dist/doc/latex/base/docstrip.pdf
trunk/Master/texmf-dist/doc/latex/base/encguide.pdf
trunk/Master/texmf-dist/doc/latex/base/exscale.pdf
trunk/Master/texmf-dist/doc/latex/base/fix-cm.pdf
trunk/Master/texmf-dist/doc/latex/base/fntguide.pdf
trunk/Master/texmf-dist/doc/latex/base/graphpap.pdf
trunk/Master/texmf-dist/doc/latex/base/ifthen.pdf
trunk/Master/texmf-dist/doc/latex/base/inputenc.pdf
trunk/Master/texmf-dist/doc/latex/base/latexchanges.pdf
trunk/Master/texmf-dist/doc/latex/base/latexchanges.tex
trunk/Master/texmf-dist/doc/latex/base/latexrelease.pdf
trunk/Master/texmf-dist/doc/latex/base/latexsym.pdf
trunk/Master/texmf-dist/doc/latex/base/lb2.pdf
trunk/Master/texmf-dist/doc/latex/base/letter.pdf
trunk/Master/texmf-dist/doc/latex/base/lgc2.pdf
trunk/Master/texmf-dist/doc/latex/base/lppl.pdf
trunk/Master/texmf-dist/doc/latex/base/ltluatex.pdf
trunk/Master/texmf-dist/doc/latex/base/ltnews.pdf
trunk/Master/texmf-dist/doc/latex/base/ltx3info.pdf
trunk/Master/texmf-dist/doc/latex/base/ltxdoc.pdf
trunk/Master/texmf-dist/doc/latex/base/makeindx.pdf
trunk/Master/texmf-dist/doc/latex/base/manual.pdf
trunk/Master/texmf-dist/doc/latex/base/modguide.pdf
trunk/Master/texmf-dist/doc/latex/base/nfssfont.pdf
trunk/Master/texmf-dist/doc/latex/base/proc.pdf
trunk/Master/texmf-dist/doc/latex/base/slides.pdf
trunk/Master/texmf-dist/doc/latex/base/slifonts.pdf
trunk/Master/texmf-dist/doc/latex/base/source2e.pdf
trunk/Master/texmf-dist/doc/latex/base/syntonly.pdf
trunk/Master/texmf-dist/doc/latex/base/tlc2.pdf
trunk/Master/texmf-dist/doc/latex/base/tulm.pdf
trunk/Master/texmf-dist/doc/latex/base/usrguide.pdf
trunk/Master/texmf-dist/doc/latex/base/utf8ienc.pdf
trunk/Master/texmf-dist/doc/latex/base/webcomp.pdf
trunk/Master/texmf-dist/doc/latex/tools/afterpage.pdf
trunk/Master/texmf-dist/doc/latex/tools/array.pdf
trunk/Master/texmf-dist/doc/latex/tools/bm.pdf
trunk/Master/texmf-dist/doc/latex/tools/calc.pdf
trunk/Master/texmf-dist/doc/latex/tools/changes.txt
trunk/Master/texmf-dist/doc/latex/tools/dcolumn.pdf
trunk/Master/texmf-dist/doc/latex/tools/delarray.pdf
trunk/Master/texmf-dist/doc/latex/tools/enumerate.pdf
trunk/Master/texmf-dist/doc/latex/tools/fileerr.pdf
trunk/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf
trunk/Master/texmf-dist/doc/latex/tools/ftnright.pdf
trunk/Master/texmf-dist/doc/latex/tools/hhline.pdf
trunk/Master/texmf-dist/doc/latex/tools/indentfirst.pdf
trunk/Master/texmf-dist/doc/latex/tools/layout.pdf
trunk/Master/texmf-dist/doc/latex/tools/longtable.pdf
trunk/Master/texmf-dist/doc/latex/tools/multicol.pdf
trunk/Master/texmf-dist/doc/latex/tools/rawfonts.pdf
trunk/Master/texmf-dist/doc/latex/tools/shellesc.pdf
trunk/Master/texmf-dist/doc/latex/tools/showkeys.pdf
trunk/Master/texmf-dist/doc/latex/tools/somedefs.pdf
trunk/Master/texmf-dist/doc/latex/tools/tabularx.pdf
trunk/Master/texmf-dist/doc/latex/tools/theorem.pdf
trunk/Master/texmf-dist/doc/latex/tools/tools-overview.pdf
trunk/Master/texmf-dist/doc/latex/tools/trace.pdf
trunk/Master/texmf-dist/doc/latex/tools/varioref.pdf
trunk/Master/texmf-dist/doc/latex/tools/verbatim.pdf
trunk/Master/texmf-dist/doc/latex/tools/xr.pdf
trunk/Master/texmf-dist/doc/latex/tools/xspace.pdf
trunk/Master/texmf-dist/source/latex/base/docstrip.dtx
trunk/Master/texmf-dist/source/latex/base/ltluatex.dtx
trunk/Master/texmf-dist/source/latex/base/ltvers.dtx
trunk/Master/texmf-dist/source/latex/tools/array.dtx
trunk/Master/texmf-dist/tex/latex/base/docstrip.tex
trunk/Master/texmf-dist/tex/latex/base/latex.ltx
trunk/Master/texmf-dist/tex/latex/base/ltluatex.lua
trunk/Master/texmf-dist/tex/latex/base/ltluatex.tex
trunk/Master/texmf-dist/tex/latex/tools/array.sty
trunk/Master/texmf-dist/tex/latex/tools/multicol-2017-04-11.sty
trunk/Master/tlpkg/libexec/ctan2tds
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/tools/array-2016-10-06.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/base/a4.pdf
trunk/Master/texmf-dist/doc/latex/base/ltclass.pdf
trunk/Master/texmf-dist/doc/latex/base/ltcounts.pdf
trunk/Master/texmf-dist/doc/latex/base/ltdirchk.pdf
trunk/Master/texmf-dist/doc/latex/base/ltfssbas.pdf
trunk/Master/texmf-dist/doc/latex/base/ltoutenc.pdf
trunk/Master/texmf-dist/doc/latex/base/tlb-utf8-bom.pdf
trunk/Master/texmf-dist/doc/latex/base/tlb-utf8-dec-utf8-2017.pdf
trunk/Master/texmf-dist/doc/latex/base/us.pdf
Deleted: trunk/Master/texmf-dist/doc/latex/base/a4.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/alltt.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/cfgguide.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/changes.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/base/changes.txt 2018-05-04 17:53:27 UTC (rev 47611)
+++ trunk/Master/texmf-dist/doc/latex/base/changes.txt 2018-05-04 22:03:45 UTC (rev 47612)
@@ -5,6 +5,14 @@
=======================================================================
#########################
+# 2018-04-01 PL 4 Release
+#########################
+
+2018-05-03 David Carlisle <David.Carlisle at latex-project.org>
+
+ * docstrip.dtx: Reset catcodes for non ASCII .ins files
+
+#########################
# 2018-04-01 PL 3 Release
#########################
Modified: trunk/Master/texmf-dist/doc/latex/base/classes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/clsguide.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/cmfonts.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/cyrguide.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/docstrip.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/encguide.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/exscale.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/fix-cm.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/fntguide.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/graphpap.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/ifthen.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/inputenc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/latexchanges.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/latexchanges.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/base/latexchanges.tex 2018-05-04 17:53:27 UTC (rev 47611)
+++ trunk/Master/texmf-dist/doc/latex/base/latexchanges.tex 2018-05-04 22:03:45 UTC (rev 47612)
@@ -72,6 +72,10 @@
with the \Lpack{latexrelease} package being available to revert
changes to use definitions from an earlier format.
+\section{Changes introduced in 2018-04-01 patch~4}
+No changes to the format, but \texttt{docstrip} adjusted so that non-ASCII
+\texttt{.ins} files work with the new UTF-8 defaults.
+
\section{Changes introduced in 2018-04-01 patch~3}
Additional adjustments for GitHub issues 34 and 38, adjustment to the
location of some documentation files, such as \texttt{source2e.tex} to
Modified: trunk/Master/texmf-dist/doc/latex/base/latexrelease.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/latexsym.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/lb2.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/letter.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/lgc2.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/lppl.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/base/ltclass.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/base/ltcounts.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/base/ltdirchk.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/base/ltfssbas.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/ltluatex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/ltnews.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/base/ltoutenc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/ltx3info.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/ltxdoc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/makeindx.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/manual.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/modguide.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/nfssfont.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/proc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/slides.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/slifonts.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/source2e.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/syntonly.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/base/tlb-utf8-bom.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/base/tlb-utf8-dec-utf8-2017.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/tlc2.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/tulm.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/base/us.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/usrguide.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/utf8ienc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/base/webcomp.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/afterpage.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/array.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/bm.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/calc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/changes.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tools/changes.txt 2018-05-04 17:53:27 UTC (rev 47611)
+++ trunk/Master/texmf-dist/doc/latex/tools/changes.txt 2018-05-04 22:03:45 UTC (rev 47612)
@@ -5,6 +5,12 @@
are not part of the distribution.
=======================================================================
+2018-04-30 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * array.dtx Explicity place the row strut inside \\ before
+ hitting \cr in case the last cell is a multicolumn cell
+ (issue 42)
+
2018-04-20 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* multicol.dtx: restoring column status when leaving a boxed
Modified: trunk/Master/texmf-dist/doc/latex/tools/dcolumn.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/delarray.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/enumerate.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/fileerr.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/ftnright.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/hhline.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/indentfirst.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/layout.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/longtable.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/multicol.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/rawfonts.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/shellesc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/showkeys.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/somedefs.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/tabularx.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/theorem.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/tools-overview.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/trace.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/varioref.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/verbatim.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/xr.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tools/xspace.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/base/docstrip.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/base/docstrip.dtx 2018-05-04 17:53:27 UTC (rev 47611)
+++ trunk/Master/texmf-dist/source/latex/base/docstrip.dtx 2018-05-04 22:03:45 UTC (rev 47612)
@@ -29,9 +29,9 @@
\catcode`\{=1
\catcode`\}=2
\def\filename{docstrip.dtx}
-\def\fileversion{2.5f}
-\def\filedate{2018/04/10}
-\def\docdate {2018/04/10}
+\def\fileversion{2.5g}
+\def\filedate{2018/05/03}
+\def\docdate {2018/05/03}
%%
%
%\iffalse
@@ -1031,6 +1031,19 @@
\newlinechar=`\^^J
% \end{macrocode}
%
+% \changes{2.58}{2018/05/03}{Read 8bit raw to leave high bits in the
+% .ins files unchanged}
+% Reset the catcodes of 8-bit characters so that processing a \texttt{.ins}
+% file with plain \TeX\ or \LaTeX\ both work.
+% \begin{macrocode}
+\count@=128\relax
+\loop
+ \catcode\count@ 12\relax
+\ifnum\count@ <255\relax
+ \advance\count@\@ne
+\repeat
+% \end{macrocode}
+%
% \subsubsection{Switches}
% \begin{macro}{\ifGenerate}
% The program will check if a
Modified: trunk/Master/texmf-dist/source/latex/base/ltluatex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/base/ltluatex.dtx 2018-05-04 17:53:27 UTC (rev 47611)
+++ trunk/Master/texmf-dist/source/latex/base/ltluatex.dtx 2018-05-04 22:03:45 UTC (rev 47612)
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 2015 2017
+% Copyright 2015 2017 2018
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -24,7 +24,7 @@
\ProvidesFile{ltluatex.dtx}
%</driver>
%<*tex>
-[2017/04/28 v1.1f
+[2018/05/02 v1.1g
%</tex>
%<plain> LuaTeX support for plain TeX (core)
%<*tex>
@@ -1230,6 +1230,7 @@
local callbacktypes = callbacktypes or {
% \end{macrocode}
% Section 8.2: file discovery callbacks.
+% \changes{v1.1g}{2018/05/02}{find\_sfd\_file removed}
% \begin{macrocode}
find_read_file = exclusive,
find_write_file = exclusive,
@@ -1239,7 +1240,6 @@
find_vf_file = data,
find_map_file = data,
find_enc_file = data,
- find_sfd_file = data,
find_pk_file = data,
find_data_file = data,
find_opentype_file = data,
@@ -1247,7 +1247,7 @@
find_type1_file = data,
find_image_file = data,
% \end{macrocode}
-%
+% \changes{v1.1g}{2018/05/02}{read\_sfd\_file removed}
% \begin{macrocode}
open_read_file = exclusive,
read_font_file = exclusive,
@@ -1254,7 +1254,6 @@
read_vf_file = exclusive,
read_map_file = exclusive,
read_enc_file = exclusive,
- read_sfd_file = exclusive,
read_pk_file = exclusive,
read_data_file = exclusive,
read_truetype_file = exclusive,
@@ -1303,19 +1302,21 @@
% Section 8.5: information reporting callbacks.
% \changes{v1.0m}{2016/02/11}{show\_warning\_message added}
% \changes{v1.0p}{2016/11/17}{call\_edit added}
+% \changes{v1.1g}{2018/05/02}{finish\_synctex\_callback added}
% \begin{macrocode}
- pre_dump = simple,
- start_run = simple,
- stop_run = simple,
- start_page_number = simple,
- stop_page_number = simple,
- show_error_hook = simple,
- show_warning_message = simple,
- show_error_message = simple,
- show_lua_error_hook = simple,
- start_file = simple,
- stop_file = simple,
- call_edit = simple,
+ pre_dump = simple,
+ start_run = simple,
+ stop_run = simple,
+ start_page_number = simple,
+ stop_page_number = simple,
+ show_error_hook = simple,
+ show_warning_message = simple,
+ show_error_message = simple,
+ show_lua_error_hook = simple,
+ start_file = simple,
+ stop_file = simple,
+ call_edit = simple,
+ finish_synctex_callback = simple,
% \end{macrocode}
% Section 8.6: PDF-related callbacks.
% \begin{macrocode}
@@ -1324,8 +1325,10 @@
% \end{macrocode}
% Section 8.7: font-related callbacks.
% \changes{v1.1e}{2017/03/28}{glyph\_stream\_provider added}
+% \changes{v1.1g}{2018/05/02}{glyph\_not\_found added}
% \begin{macrocode}
- define_font = exclusive,
+ define_font = exclusive,
+ glyph_not_found = exclusive,
glyph_stream_provider = exclusive,
% \end{macrocode}
% \changes{v1.0m}{2016/02/11}{pdf\_stream\_filter\_callback removed}
Modified: trunk/Master/texmf-dist/source/latex/base/ltvers.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/base/ltvers.dtx 2018-05-04 17:53:27 UTC (rev 47611)
+++ trunk/Master/texmf-dist/source/latex/base/ltvers.dtx 2018-05-04 22:03:45 UTC (rev 47612)
@@ -115,7 +115,7 @@
{2018-04-01}
%</2ekernel|latexrelease>
%<*2ekernel>
-\def\patch at level{3}
+\def\patch at level{4}
% \end{macrocode}
% \end{macro}
% \end{macro}
Modified: trunk/Master/texmf-dist/source/latex/tools/array.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tools/array.dtx 2018-05-04 17:53:27 UTC (rev 47611)
+++ trunk/Master/texmf-dist/source/latex/tools/array.dtx 2018-05-04 22:03:45 UTC (rev 47612)
@@ -25,8 +25,14 @@
%% Package `array' to use with LaTeX 2e
%% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved.
%<+package>\NeedsTeXFormat{LaTeX2e}[1995/06/01]
+%<+package>\providecommand\DeclareRelease[3]{}
+%<+package>\providecommand\DeclareCurrentRelease[2]{}
+%<+package>
+%<+package>\DeclareRelease{}{2016-10-06}{array-2016-10-06.sty}
+%<+package>\DeclareCurrentRelease{}{2018-04-30}
+%<+package>
%<+package>\ProvidesPackage{array}
-%<+package> [2018/04/07 v2.4g Tabular extension package (FMi)]
+%<+package> [2018/04/30 v2.4h Tabular extension package (FMi)]
%
% \fi
%
@@ -2161,7 +2167,15 @@
% \begin{macrocode}
\def\@xargarraycr#1{\unskip\gdef\do at row@strut
{\@tempdima #1\advance\@tempdima \dp\@arstrutbox
- \vrule \@depth\@tempdima \@width\z@\global\let\do at row@strut\relax}\cr}
+ \vrule \@depth\@tempdima \@width\z@\global\let\do at row@strut\relax}%
+% \end{macrocode}
+% If the last column is a =\multicolumn= cell then we need to
+% insert the row strut now as it isn't inside the template (as that
+% got =\omit=ted).
+% \changes{v2.4h}{2018/04/30}{Fixing issue 42}
+ % \begin{macrocode}
+ \ifnum\@multicnt >\z@ \do at row@strut \fi
+ \cr}
\let\do at row@strut\relax
% \end{macrocode}
%
Modified: trunk/Master/texmf-dist/tex/latex/base/docstrip.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/base/docstrip.tex 2018-05-04 17:53:27 UTC (rev 47611)
+++ trunk/Master/texmf-dist/tex/latex/base/docstrip.tex 2018-05-04 22:03:45 UTC (rev 47612)
@@ -44,9 +44,9 @@
\catcode`\{=1
\catcode`\}=2
\def\filename{docstrip.dtx}
-\def\fileversion{2.5f}
-\def\filedate{2018/04/10}
-\def\docdate {2018/04/10}
+\def\fileversion{2.5g}
+\def\filedate{2018/05/03}
+\def\docdate {2018/05/03}
%%
%% The docstrip program for use with TeX.
%% Copyright (C) 1989-1991 Frank Mittelbach
@@ -111,6 +111,12 @@
\let\bgroup={ \let\egroup=}
\catcode`\@=11
\newlinechar=`\^^J
+\count@=128\relax
+\loop
+ \catcode\count@ 12\relax
+\ifnum\count@ <255\relax
+ \advance\count@\@ne
+\repeat
\newif\ifGenerate
\newif\ifContinue
\newif\ifForlist
Modified: trunk/Master/texmf-dist/tex/latex/base/latex.ltx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/base/latex.ltx 2018-05-04 17:53:27 UTC (rev 47611)
+++ trunk/Master/texmf-dist/tex/latex/base/latex.ltx 2018-05-04 22:03:45 UTC (rev 47612)
@@ -701,7 +701,7 @@
\def\fmtname{LaTeX2e}
\edef\fmtversion
{2018-04-01}
-\def\patch at level{3}
+\def\patch at level{4}
\iffalse
\def\reserved at a#1/#2/#3\@nil{%
\count@\year
Modified: trunk/Master/texmf-dist/tex/latex/base/ltluatex.lua
===================================================================
--- trunk/Master/texmf-dist/tex/latex/base/ltluatex.lua 2018-05-04 17:53:27 UTC (rev 47611)
+++ trunk/Master/texmf-dist/tex/latex/base/ltluatex.lua 2018-05-04 22:03:45 UTC (rev 47612)
@@ -243,7 +243,6 @@
find_vf_file = data,
find_map_file = data,
find_enc_file = data,
- find_sfd_file = data,
find_pk_file = data,
find_data_file = data,
find_opentype_file = data,
@@ -255,7 +254,6 @@
read_vf_file = exclusive,
read_map_file = exclusive,
read_enc_file = exclusive,
- read_sfd_file = exclusive,
read_pk_file = exclusive,
read_data_file = exclusive,
read_truetype_file = exclusive,
@@ -284,21 +282,23 @@
kerning = simple,
insert_local_par = simple,
mlist_to_hlist = list,
- pre_dump = simple,
- start_run = simple,
- stop_run = simple,
- start_page_number = simple,
- stop_page_number = simple,
- show_error_hook = simple,
- show_warning_message = simple,
- show_error_message = simple,
- show_lua_error_hook = simple,
- start_file = simple,
- stop_file = simple,
- call_edit = simple,
+ pre_dump = simple,
+ start_run = simple,
+ stop_run = simple,
+ start_page_number = simple,
+ stop_page_number = simple,
+ show_error_hook = simple,
+ show_warning_message = simple,
+ show_error_message = simple,
+ show_lua_error_hook = simple,
+ start_file = simple,
+ stop_file = simple,
+ call_edit = simple,
+ finish_synctex_callback = simple,
finish_pdffile = data,
finish_pdfpage = data,
- define_font = exclusive,
+ define_font = exclusive,
+ glyph_not_found = exclusive,
glyph_stream_provider = exclusive,
}
luatexbase.callbacktypes=callbacktypes
Modified: trunk/Master/texmf-dist/tex/latex/base/ltluatex.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/base/ltluatex.tex 2018-05-04 17:53:27 UTC (rev 47611)
+++ trunk/Master/texmf-dist/tex/latex/base/ltluatex.tex 2018-05-04 22:03:45 UTC (rev 47612)
@@ -47,7 +47,7 @@
#1#2[#3]{\endgroup\immediate\write-1{File: #1 #3}}
\fi
\ProvidesFile{ltluatex.tex}
-[2017/04/28 v1.1f
+[2018/05/02 v1.1g
LuaTeX support for plain TeX (core)
]
\edef\etatcatcode{\the\catcode`\@}
Added: trunk/Master/texmf-dist/tex/latex/tools/array-2016-10-06.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tools/array-2016-10-06.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/tools/array-2016-10-06.sty 2018-05-04 22:03:45 UTC (rev 47612)
@@ -0,0 +1,341 @@
+%%
+%% This is an old release of `array.sty',
+%%
+%% Copyright 1993-2016
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%%
+%% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'.
+%% --------------------------------------------------------------------------
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%%
+%% Package `array' to use with LaTeX 2e
+%% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved.
+\NeedsTeXFormat{LaTeX2e}[1995/06/01]
+\ProvidesPackage{array}
+ [2016/10/06 v2.4d Tabular extension package (FMi)]
+%%
+
+\def\@addtopreamble#1{\xdef\@preamble{\@preamble #1}}
+\def\@testpach{\@chclass
+ \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else
+ \ifnum \@lastchclass=7 5 \else
+ \ifnum \@lastchclass=8 \tw@ \else
+ \ifnum \@lastchclass=9 \thr@@
+ \else \z@
+ \ifnum \@lastchclass = 10 \else
+ \edef\@nextchar{\expandafter\string\@nextchar}%
+ \@chnum
+ \if \@nextchar c\z@ \else
+ \if \@nextchar l\@ne \else
+ \if \@nextchar r\tw@ \else
+ \z@ \@chclass
+ \if\@nextchar |\@ne \else
+ \if \@nextchar !6 \else
+ \if \@nextchar @7 \else
+ \if \@nextchar <8 \else
+ \if \@nextchar >9 \else
+ 10
+ \@chnum
+ \if \@nextchar m\thr@@\else
+ \if \@nextchar p4 \else
+ \if \@nextchar b5 \else
+ \z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi
+ \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi}
+\def\@xexpast#1*#2#3#4\@@{%
+ \@tempcnta #2
+ \toks@={#1}\@temptokena={#3}%
+ \let\the at toksz\relax \let\the at toks\relax
+ \def\@tempa{\the at toksz}%
+ \ifnum\@tempcnta >0 \@whilenum\@tempcnta >0\do
+ {\edef\@tempa{\@tempa\the at toks}\advance \@tempcnta \m at ne}%
+ \let \@tempb \@xexpast \else
+ \let \@tempb \@xexnoop \fi
+ \def\the at toksz{\the\toks@}\def\the at toks{\the\@temptokena}%
+ \edef\@tempa{\@tempa}%
+ \expandafter \@tempb \@tempa #4\@@}
+\def\prepnext at tok{\advance \count@ \@ne
+ \toks\count@{}}
+\def\save at decl{\toks\count@ \expandafter{\@nextchar}}
+\def\insert at column{%
+ \the at toks \the \@tempcnta
+ \ignorespaces \@sharp \unskip
+ \the at toks \the \count@ \relax}
+\newdimen\col at sep
+\def\@acol{\@addtopreamble{\hskip\col at sep}}
+\def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue
+ \let\@sharp\relax \let\@startpbox\relax \let\@endpbox\relax
+ \@xexpast #1*0x\@@
+ \count@\m at ne
+ \let\the at toks\relax
+ \prepnext at tok
+ \expandafter \@tfor \expandafter \@nextchar
+ \expandafter :\expandafter =\@tempa \do
+ {\@testpach
+ \ifcase \@chclass \@classz \or \@classi \or \@classii
+ \or \save at decl \or \or \@classv \or \@classvi
+ \or \@classvii \or \@classviii \or \@classix
+ \or \@classx \fi
+ \@lastchclass\@chclass}%
+ \ifcase\@lastchclass
+ \@acol \or
+ \or
+ \@acol \or
+ \@preamerr \thr@@ \or
+ \@preamerr \tw@ \@addtopreamble\@sharp \or
+ \or
+ \else \@preamerr \@ne \fi
+ \def\the at toks{\the\toks}}
+\def\@classx{%
+ \ifcase \@lastchclass
+ \@acolampacol \or
+ \@addamp \@acol \or
+ \@acolampacol \or
+ \or
+ \@acol \@firstampfalse \or
+ \@addamp
+ \fi}
+\def\@classz{\@classx
+ \@tempcnta \count@
+ \prepnext at tok
+ \@addtopreamble{\ifcase \@chnum
+ \hfil
+ \d at llarbegin
+ \insert at column
+ \d at llarend \hfil \or
+ \hskip1sp\d at llarbegin \insert at column \d at llarend \hfil \or
+ \hfil\hskip1sp\d at llarbegin \insert at column \d at llarend \or
+ $\vcenter
+ \@startpbox{\@nextchar}\insert at column \@endpbox $\or
+ \vtop \@startpbox{\@nextchar}\insert at column \@endpbox \or
+ \vbox \@startpbox{\@nextchar}\insert at column \@endpbox
+ \fi}\prepnext at tok}
+\def\@classix{\ifnum \@lastchclass = \thr@@
+ \@preamerr \thr@@ \fi
+ \@classx}
+\def\@classviii{\ifnum \@lastchclass >\z@
+ \@preamerr 4\@chclass 6 \@classvi \fi}
+\def\@arrayrule{\@addtopreamble \vline}
+\def\@classvii{\ifnum \@lastchclass = \thr@@
+ \@preamerr \thr@@ \fi}
+\def\@classvi{\ifcase \@lastchclass
+ \@acol \or
+ \@addtopreamble{\hskip \doublerulesep}\or
+ \@acol \or
+ \@classvii
+ \fi}
+\def\@classii{\advance \count@ \m at ne
+ \save at decl\prepnext at tok}
+\def\@classv{\save at decl
+ \@addtopreamble{\d at llarbegin\the at toks\the\count@\relax\d at llarend}%
+ \prepnext at tok}
+\def\@classi{\@classvi
+ \ifcase \@chnum \@arrayrule \or
+ \@classv \fi}
+\def\@startpbox#1{\bgroup
+ \setlength\hsize{#1}\@arrayparboxrestore
+ \everypar{%
+ \vrule \@height \ht\@arstrutbox \@width \z@
+ \everypar{}}%
+ }
+\def\@endpbox{\@finalstrut\@arstrutbox \egroup\hfil}
+\def\@array[#1]#2{%
+ \@tempdima \ht \strutbox
+ \advance \@tempdima by\extrarowheight
+ \setbox \@arstrutbox \hbox{\vrule
+ \@height \arraystretch \@tempdima
+ \@depth \arraystretch \dp \strutbox
+ \@width \z@}%
+ \begingroup
+ \@mkpream{#2}%
+ \xdef\@preamble{\noexpand \ialign \@halignto
+ \bgroup \@arstrut \@preamble
+ \tabskip \z@ \cr}%
+ \endgroup
+ \@arrayleft
+ \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi \fi
+ \bgroup
+ \let \@sharp ##\let \protect \relax
+ \lineskip \z@
+ \baselineskip \z@
+ \m at th
+ \let\\\@arraycr \let\tabularnewline\\\let\par\@empty \@preamble}
+\def\arraybackslash{\let\\\tabularnewline}
+\newdimen \extrarowheight
+\extrarowheight=0pt
+\def\@arstrut{\unhcopy\@arstrutbox}
+\def\@arraycr{\relax\iffalse{\fi\ifnum 0=`}\fi
+ \@ifstar \@xarraycr \@xarraycr}
+\def\@xarraycr{\@ifnextchar [%
+ \@argarraycr {\ifnum 0=`{}\fi\cr}}
+\def\@argarraycr[#1]{\ifnum0=`{}\fi\ifdim #1>\z@
+ \expandafter\@xargarraycr\else
+ \expandafter\@yargarraycr\fi{#1}}
+\def\@xargarraycr#1{\unskip
+ \@tempdima #1\advance\@tempdima \dp\@arstrutbox
+ \vrule \@depth\@tempdima \@width\z@ \cr}
+\def\@yargarraycr#1{\cr\noalign{\vskip #1}}
+\long\def\multicolumn#1#2#3{%
+ \multispan{#1}\begingroup
+ \def\@addamp{\if at firstamp \@firstampfalse \else
+ \@preamerr 5\fi}%
+ \@mkpream{#2}\@addtopreamble\@empty
+ \endgroup
+ \def\@sharp{#3}%
+ \@arstrut \@preamble
+ \null
+ \ignorespaces}
+\let\d at llarbegin\begingroup
+\let\d at llarend\endgroup
+\def\array{\col at sep\arraycolsep
+ \def\d at llarbegin{$}\let\d at llarend\d at llarbegin\def\@halignto{}%
+ \@tabarray}
+\def\@tabarray{\@ifnextchar[{\@array}{\@array[c]}}
+\def\tabular{\def\@halignto{}\@tabular}
+\expandafter\def\csname tabular*\endcsname#1{%
+ \setlength\dimen@{#1}%
+ \edef\@halignto{to\the\dimen@}\@tabular}
+\def\@tabular{%
+ \leavevmode
+ \hbox \bgroup $\col at sep\tabcolsep \let\d at llarbegin\begingroup
+ \let\d at llarend\endgroup
+ \@tabarray}
+\def\endarray{\crcr \egroup \egroup \gdef\@preamble{}}
+\def\endtabular{\endarray $\egroup}
+\expandafter\let\csname endtabular*\endcsname=\endtabular
+\let\@ampacol=\relax \let\@expast=\relax
+\let\@arrayclassiv=\relax \let\@arrayclassz=\relax
+\let\@tabclassiv=\relax \let\@tabclassz=\relax
+\let\@arrayacol=\relax \let\@tabacol=\relax
+\let\@tabularcr=\relax \let\@@endpbox=\relax
+\let\@argtabularcr=\relax \let\@xtabularcr=\relax
+\def\@preamerr#1{\def\@tempd{{..} at wrong position: }%
+ \PackageError{array}{%
+ \ifcase #1 Illegal pream-token (\@nextchar): `c' used\or %0
+ Missing arg: token ignored\or %1
+ Empty preamble: `l' used\or %2
+ >\@tempd token ignored\or %3
+ <\@tempd changed to !{..}\or %4
+ Only one column-spec. allowed.\fi}\@ehc} %5
+\def\newcolumntype#1{%
+ \edef\NC at char{\string#1}%
+ \@ifundefined{NC at find@\NC at char}%
+ {\@tfor\next:=<>clrmbp@!|\do{\if\noexpand\next\NC at char
+ \PackageWarning{array}%
+ {Redefining primitive column \NC at char}\fi}%
+ \NC at list\expandafter{\the\NC at list\NC at do#1}}%
+ {\PackageWarning{array}{Column \NC at char\space is already defined}}%
+ \@namedef{NC at find@\NC at char}##1#1{\NC@{##1}}%
+ \@ifnextchar[{\newcol@{\NC at char}}{\newcol@{\NC at char}[0]}}
+\def\newcol@#1[#2]#3{\expandafter\@reargdef
+ \csname NC at rewrite@#1\endcsname[#2]{\NC at find#3}}
+\def\NC@#1{%
+ \@temptokena\expandafter{\the\@temptokena#1}\futurelet\next\NC at ifend}
+\def\NC at ifend{%
+ \ifx\next\relax
+ \else\@tempswatrue\expandafter\NC at rewrite\fi}
+\def\NC at do#1{%
+ \expandafter\let\expandafter\NC at rewrite
+ \csname NC at rewrite@\string#1\endcsname
+ \expandafter\let\expandafter\NC at find
+ \csname NC at find@\string#1\endcsname
+ \expandafter\@temptokena\expandafter{\expandafter}%
+ \expandafter\NC at find\the\@temptokena#1\relax}
+\def\showcols{{\def\NC at do##1{\let\NC at do\NC at show}\the\NC at list}}
+\def\NC at show#1{%
+ \typeout{Column #1\expandafter\expandafter\expandafter\NC at strip
+ \expandafter\meaning\csname NC at rewrite@#1\endcsname\@@}}
+\def\NC at strip#1:#2->#3 #4\@@{#2 -> #4}
+\newtoks\NC at list
+\newcolumntype{*}[2]{}
+\long\@namedef{NC at rewrite@*}#1#2{%
+ \count@#1\relax
+ \loop
+ \ifnum\count@>\z@
+ \advance\count@\m at ne
+ \@temptokena\expandafter{\the\@temptokena#2}%
+ \repeat
+ \NC at find}
+\let\@xexpast\relax
+\let\@xexnoop\relax
+\def\save at decl{\toks \count@ = \expandafter\expandafter\expandafter
+ {\expandafter\@nextchar\the\toks\count@}}
+\def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue
+ \let\@sharp\relax \let\@startpbox\relax \let\@endpbox\relax
+ \@temptokena{#1}\@tempswatrue
+ \@whilesw\if at tempswa\fi{\@tempswafalse\the\NC at list}%
+ \count@\m at ne
+ \let\the at toks\relax
+ \prepnext at tok
+ \expandafter \@tfor \expandafter \@nextchar
+ \expandafter :\expandafter =\the\@temptokena \do
+ {\@testpach
+ \ifcase \@chclass \@classz \or \@classi \or \@classii
+ \or \save at decl \or \or \@classv \or \@classvi
+ \or \@classvii \or \@classviii
+ \or \@classx
+ \or \@classx \fi
+ \@lastchclass\@chclass}%
+ \ifcase\@lastchclass
+ \@acol \or
+ \or
+ \@acol \or
+ \@preamerr \thr@@ \or
+ \@preamerr \tw@ \@addtopreamble\@sharp \or
+ \or
+ \else \@preamerr \@ne \fi
+ \def\the at toks{\the\toks}}
+\let\@classix\relax
+\def\@classviii{\ifnum \@lastchclass >\z@\ifnum\@lastchclass=\tw@\else
+ \@preamerr 4\@chclass 6 \@classvi \fi\fi}
+\def\@classv{\save at decl
+ \expandafter\NC at ecs\@nextchar\extracolsep{}\extracolsep\@@@
+ \@addtopreamble{\d at llarbegin\the at toks\the\count@\relax\d at llarend}%
+ \prepnext at tok}
+\def\NC at ecs#1\extracolsep#2#3\extracolsep#4\@@@{\def\@tempa{#2}%
+ \ifx\@tempa\@empty\else\toks\count@={#1\tabskip#2\relax#3}\fi}
+\def\@tabarray{\@ifnextchar[{\@@array}{\@@array[c]}}
+\let\@@array\@array
+\def\endarray{\crcr \egroup \egroup \@arrayright \gdef\@preamble{}}
+\let\@arrayleft\@empty
+\let\@arrayright\@empty
+\newlength{\extratabsurround}
+\setlength{\extratabsurround}{2pt}
+\newlength{\backup at length}
+\newcommand{\firsthline}{%
+ \multicolumn1c{%
+ \global\backup at length\ht\@arstrutbox
+ \global\advance\backup at length\dp\@arstrutbox
+ \global\advance\backup at length\arrayrulewidth
+ \raise\extratabsurround\copy\@arstrutbox
+ }\\[-\backup at length]\hline
+}
+\newcommand{\lasthline}{\hline\multicolumn1c{%
+ \global\backup at length2\ht\@arstrutbox
+ \global\advance\backup at length2\dp\@arstrutbox
+ \global\advance\backup at length\arrayrulewidth
+ }\\[-\backup at length]%
+ \multicolumn1c{%
+ \lower\extratabsurround\copy\@arstrutbox
+ }%
+}
+\CheckCommand*\@xhline{\ifx\reserved at a\hline
+ \vskip\doublerulesep
+ \vskip-\arrayrulewidth
+ \fi
+ \ifnum0=`{\fi}}
+\renewcommand*\@xhline{\ifx\reserved at a\hline
+ \vskip\doublerulesep
+ \fi
+ \ifnum0=`{\fi}}
+\endinput
+%%
+%% End of file `array.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/tools/array-2016-10-06.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/tools/array.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tools/array.sty 2018-05-04 17:53:27 UTC (rev 47611)
+++ trunk/Master/texmf-dist/tex/latex/tools/array.sty 2018-05-04 22:03:45 UTC (rev 47612)
@@ -38,8 +38,14 @@
%% Package `array' to use with LaTeX 2e
%% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved.
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
+\providecommand\DeclareRelease[3]{}
+\providecommand\DeclareCurrentRelease[2]{}
+
+\DeclareRelease{}{2016-10-06}{array-2016-10-06.sty}
+\DeclareCurrentRelease{}{2018-04-30}
+
\ProvidesPackage{array}
- [2018/04/07 v2.4g Tabular extension package (FMi)]
+ [2018/04/30 v2.4h Tabular extension package (FMi)]
%%
\def\@addtopreamble#1{\xdef\@preamble{\@preamble #1}}
@@ -217,7 +223,10 @@
\expandafter\@yargarraycr\fi{#1}}
\def\@xargarraycr#1{\unskip\gdef\do at row@strut
{\@tempdima #1\advance\@tempdima \dp\@arstrutbox
- \vrule \@depth\@tempdima \@width\z@\global\let\do at row@strut\relax}\cr}
+ \vrule \@depth\@tempdima \@width\z@\global\let\do at row@strut\relax}%
+ % \begin{macrocode}
+ \ifnum\@multicnt >\z@ \do at row@strut \fi
+ \cr}
\let\do at row@strut\relax
\def\@yargarraycr#1{\cr\noalign{\vskip #1}}
\long\def\multicolumn#1#2#3{%
Modified: trunk/Master/texmf-dist/tex/latex/tools/multicol-2017-04-11.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tools/multicol-2017-04-11.sty 2018-05-04 17:53:27 UTC (rev 47611)
+++ trunk/Master/texmf-dist/tex/latex/tools/multicol-2017-04-11.sty 2018-05-04 22:03:45 UTC (rev 47612)
@@ -20,13 +20,7 @@
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
%%
-%% This file may only be distributed together with a copy of the LaTeX
-%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle'
-%% without such generated files.
%%
-%% The list of all files belonging to the LaTeX `Tools Bundle' is
-%% given in the file `manifest.txt'.
-%%
%% Package `multicol' to use with LaTeX2e
%% Copyright 1989-2016 Frank Mittelbach
%%
Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds 2018-05-04 17:53:27 UTC (rev 47611)
+++ trunk/Master/tlpkg/libexec/ctan2tds 2018-05-04 22:03:45 UTC (rev 47612)
@@ -1060,7 +1060,7 @@
'slashbox', "die 'skipping, noinfo license, c.1993'",
'slidenotes', "die 'skipping, nonfree'",
'smallcap', "die 'skipping, questionable license, 1996'",
- 'smflatex', "die 'skipping, nosource'",
+ 'smflatex', "die 'skipping, clashing names'",
'softmaker-freefonts', "die 'skipping, requires nonfree fonts'",
'soulpos', "die 'skipping, use bezos'",
'soyombo', "die 'skipping, noinfo license, Mongolian ca.1996'",
More information about the tex-live-commits
mailing list