summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-04 22:03:45 +0000
committerKarl Berry <karl@freefriends.org>2018-05-04 22:03:45 +0000
commit7a7ea7aa5948c4be61b65cd43bd4d3a899ba2b75 (patch)
treee2b55e3d63e0e287c59481243ae3216d5c33bd24
parentdae6dae132662766819bf8fd71f52cc3e650968a (diff)
latex2e (4may18)
git-svn-id: svn://tug.org/texlive/trunk@47612 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/base/a4.pdfbin273213 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/alltt.pdfbin173044 -> 173057 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/cfgguide.pdfbin220011 -> 220023 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/changes.txt8
-rw-r--r--Master/texmf-dist/doc/latex/base/classes.pdfbin520032 -> 520045 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/clsguide.pdfbin373283 -> 373292 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/cmfonts.pdfbin271319 -> 271330 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/cyrguide.pdfbin223768 -> 223781 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/doc.pdfbin634009 -> 634210 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/docstrip.pdfbin471561 -> 472255 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/encguide.pdfbin1248516 -> 1248528 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/exscale.pdfbin194428 -> 194439 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/fix-cm.pdfbin262092 -> 262103 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/fntguide.pdfbin353855 -> 353865 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/graphpap.pdfbin156410 -> 156423 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/ifthen.pdfbin205560 -> 205571 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/inputenc.pdfbin295313 -> 295325 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/latexchanges.pdfbin380648 -> 380974 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/latexchanges.tex4
-rw-r--r--Master/texmf-dist/doc/latex/base/latexrelease.pdfbin244706 -> 244717 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/latexsym.pdfbin192445 -> 192456 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/lb2.pdfbin238438 -> 238449 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/letter.pdfbin307236 -> 307446 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/lgc2.pdfbin203036 -> 203048 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/lppl.pdfbin126054 -> 126066 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/ltclass.pdfbin186042 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/ltcounts.pdfbin188487 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/ltdirchk.pdfbin125340 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/ltfssbas.pdfbin278190 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/ltluatex.pdfbin302180 -> 302184 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/ltnews.pdfbin769771 -> 769783 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/ltoutenc.pdfbin282601 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/ltx3info.pdfbin197967 -> 197978 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/ltxdoc.pdfbin215813 -> 215825 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/makeindx.pdfbin160821 -> 160831 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/manual.pdfbin150355 -> 150366 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/modguide.pdfbin226951 -> 226964 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/nfssfont.pdfbin201953 -> 201966 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/proc.pdfbin217142 -> 217156 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/slides.pdfbin352540 -> 352550 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/slifonts.pdfbin213985 -> 213996 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/source2e.pdfbin2802120 -> 2801915 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/syntonly.pdfbin181754 -> 181959 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/tlb-utf8-bom.pdfbin10608 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/tlb-utf8-dec-utf8-2017.pdfbin11884 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/tlc2.pdfbin274032 -> 274044 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/tulm.pdfbin156587 -> 156599 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/us.pdfbin274315 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/usrguide.pdfbin398314 -> 398326 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/utf8ienc.pdfbin318824 -> 318856 bytes
-rw-r--r--Master/texmf-dist/doc/latex/base/webcomp.pdfbin136227 -> 136240 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/afterpage.pdfbin190093 -> 190105 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/array.pdfbin478523 -> 478926 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/bm.pdfbin307351 -> 307363 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/calc.pdfbin341752 -> 341764 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/changes.txt6
-rw-r--r--Master/texmf-dist/doc/latex/tools/dcolumn.pdfbin199391 -> 199402 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/delarray.pdfbin183607 -> 183619 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/enumerate.pdfbin199246 -> 199254 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/fileerr.pdfbin179856 -> 180054 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/fontsmpl.pdfbin144913 -> 144925 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/ftnright.pdfbin347114 -> 347319 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/hhline.pdfbin175999 -> 176010 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/indentfirst.pdfbin144823 -> 144834 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/layout.pdfbin247347 -> 247357 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/longtable.pdfbin351166 -> 351178 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/multicol.pdfbin489090 -> 489296 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/rawfonts.pdfbin135787 -> 135797 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/shellesc.pdfbin167138 -> 167151 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/showkeys.pdfbin243366 -> 243378 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/somedefs.pdfbin156596 -> 156608 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/tabularx.pdfbin254886 -> 254898 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/theorem.pdfbin323622 -> 323819 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/tools-overview.pdfbin68387 -> 68397 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/trace.pdfbin213436 -> 213447 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/varioref.pdfbin336233 -> 336245 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/verbatim.pdfbin310081 -> 310091 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/xr.pdfbin163150 -> 163163 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tools/xspace.pdfbin238272 -> 238286 bytes
-rw-r--r--Master/texmf-dist/source/latex/base/docstrip.dtx19
-rw-r--r--Master/texmf-dist/source/latex/base/ltluatex.dtx41
-rw-r--r--Master/texmf-dist/source/latex/base/ltvers.dtx2
-rw-r--r--Master/texmf-dist/source/latex/tools/array.dtx18
-rw-r--r--Master/texmf-dist/tex/latex/base/docstrip.tex12
-rw-r--r--Master/texmf-dist/tex/latex/base/latex.ltx2
-rw-r--r--Master/texmf-dist/tex/latex/base/ltluatex.lua30
-rw-r--r--Master/texmf-dist/tex/latex/base/ltluatex.tex2
-rw-r--r--Master/texmf-dist/tex/latex/tools/array-2016-10-06.sty341
-rw-r--r--Master/texmf-dist/tex/latex/tools/array.sty13
-rw-r--r--Master/texmf-dist/tex/latex/tools/multicol-2017-04-11.sty6
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds2
91 files changed, 452 insertions, 54 deletions
diff --git a/Master/texmf-dist/doc/latex/base/a4.pdf b/Master/texmf-dist/doc/latex/base/a4.pdf
deleted file mode 100644
index 17f5a2fc889..00000000000
--- a/Master/texmf-dist/doc/latex/base/a4.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/alltt.pdf b/Master/texmf-dist/doc/latex/base/alltt.pdf
index 1edc2a7ec0c..54cc4bc2ab6 100644
--- a/Master/texmf-dist/doc/latex/base/alltt.pdf
+++ b/Master/texmf-dist/doc/latex/base/alltt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/cfgguide.pdf b/Master/texmf-dist/doc/latex/base/cfgguide.pdf
index ff465f72590..297c76a2a75 100644
--- a/Master/texmf-dist/doc/latex/base/cfgguide.pdf
+++ b/Master/texmf-dist/doc/latex/base/cfgguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/changes.txt b/Master/texmf-dist/doc/latex/base/changes.txt
index 9e399e28b5d..51741d1d200 100644
--- a/Master/texmf-dist/doc/latex/base/changes.txt
+++ b/Master/texmf-dist/doc/latex/base/changes.txt
@@ -5,6 +5,14 @@ are not part of the distribution.
=======================================================================
#########################
+# 2018-04-01 PL 4 Release
+#########################
+
+2018-05-03 David Carlisle <David.Carlisle@latex-project.org>
+
+ * docstrip.dtx: Reset catcodes for non ASCII .ins files
+
+#########################
# 2018-04-01 PL 3 Release
#########################
diff --git a/Master/texmf-dist/doc/latex/base/classes.pdf b/Master/texmf-dist/doc/latex/base/classes.pdf
index c51d4b3d1fa..1b30852e824 100644
--- a/Master/texmf-dist/doc/latex/base/classes.pdf
+++ b/Master/texmf-dist/doc/latex/base/classes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/clsguide.pdf b/Master/texmf-dist/doc/latex/base/clsguide.pdf
index efa3439d3ea..eea315777e2 100644
--- a/Master/texmf-dist/doc/latex/base/clsguide.pdf
+++ b/Master/texmf-dist/doc/latex/base/clsguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/cmfonts.pdf b/Master/texmf-dist/doc/latex/base/cmfonts.pdf
index 5d263b4c267..dcbfb2f316c 100644
--- a/Master/texmf-dist/doc/latex/base/cmfonts.pdf
+++ b/Master/texmf-dist/doc/latex/base/cmfonts.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/cyrguide.pdf b/Master/texmf-dist/doc/latex/base/cyrguide.pdf
index a83aa6d9fad..a526e21054f 100644
--- a/Master/texmf-dist/doc/latex/base/cyrguide.pdf
+++ b/Master/texmf-dist/doc/latex/base/cyrguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/doc.pdf b/Master/texmf-dist/doc/latex/base/doc.pdf
index cc2ac306f89..03ff3608772 100644
--- a/Master/texmf-dist/doc/latex/base/doc.pdf
+++ b/Master/texmf-dist/doc/latex/base/doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/docstrip.pdf b/Master/texmf-dist/doc/latex/base/docstrip.pdf
index b1e85f80c6c..6825d9fc650 100644
--- a/Master/texmf-dist/doc/latex/base/docstrip.pdf
+++ b/Master/texmf-dist/doc/latex/base/docstrip.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/encguide.pdf b/Master/texmf-dist/doc/latex/base/encguide.pdf
index d35e906fecd..0a03fda2701 100644
--- a/Master/texmf-dist/doc/latex/base/encguide.pdf
+++ b/Master/texmf-dist/doc/latex/base/encguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/exscale.pdf b/Master/texmf-dist/doc/latex/base/exscale.pdf
index a76a08e43dd..dd0ed24ebca 100644
--- a/Master/texmf-dist/doc/latex/base/exscale.pdf
+++ b/Master/texmf-dist/doc/latex/base/exscale.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/fix-cm.pdf b/Master/texmf-dist/doc/latex/base/fix-cm.pdf
index 8985c365225..e30c8209d4a 100644
--- a/Master/texmf-dist/doc/latex/base/fix-cm.pdf
+++ b/Master/texmf-dist/doc/latex/base/fix-cm.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/fntguide.pdf b/Master/texmf-dist/doc/latex/base/fntguide.pdf
index 69cc489c050..8cc46ad0a5d 100644
--- a/Master/texmf-dist/doc/latex/base/fntguide.pdf
+++ b/Master/texmf-dist/doc/latex/base/fntguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/graphpap.pdf b/Master/texmf-dist/doc/latex/base/graphpap.pdf
index dfee3e58d13..bc21fdc7cfe 100644
--- a/Master/texmf-dist/doc/latex/base/graphpap.pdf
+++ b/Master/texmf-dist/doc/latex/base/graphpap.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/ifthen.pdf b/Master/texmf-dist/doc/latex/base/ifthen.pdf
index fcec30aceb3..5d680d0590f 100644
--- a/Master/texmf-dist/doc/latex/base/ifthen.pdf
+++ b/Master/texmf-dist/doc/latex/base/ifthen.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/inputenc.pdf b/Master/texmf-dist/doc/latex/base/inputenc.pdf
index 220f88954f1..abc7b2bc46d 100644
--- a/Master/texmf-dist/doc/latex/base/inputenc.pdf
+++ b/Master/texmf-dist/doc/latex/base/inputenc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/latexchanges.pdf b/Master/texmf-dist/doc/latex/base/latexchanges.pdf
index c9488d7d0ac..318b179db8f 100644
--- a/Master/texmf-dist/doc/latex/base/latexchanges.pdf
+++ b/Master/texmf-dist/doc/latex/base/latexchanges.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/latexchanges.tex b/Master/texmf-dist/doc/latex/base/latexchanges.tex
index 909df8a974f..b41d98aa8b8 100644
--- a/Master/texmf-dist/doc/latex/base/latexchanges.tex
+++ b/Master/texmf-dist/doc/latex/base/latexchanges.tex
@@ -72,6 +72,10 @@ policy. Improvements and bug fixes will be made to the format sources,
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
diff --git a/Master/texmf-dist/doc/latex/base/latexrelease.pdf b/Master/texmf-dist/doc/latex/base/latexrelease.pdf
index 53b29dc808f..f80d2b4c6f5 100644
--- a/Master/texmf-dist/doc/latex/base/latexrelease.pdf
+++ b/Master/texmf-dist/doc/latex/base/latexrelease.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/latexsym.pdf b/Master/texmf-dist/doc/latex/base/latexsym.pdf
index ca4d45c0e20..050821f4c51 100644
--- a/Master/texmf-dist/doc/latex/base/latexsym.pdf
+++ b/Master/texmf-dist/doc/latex/base/latexsym.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/lb2.pdf b/Master/texmf-dist/doc/latex/base/lb2.pdf
index 895cfd6d2d0..798d4d9dff6 100644
--- a/Master/texmf-dist/doc/latex/base/lb2.pdf
+++ b/Master/texmf-dist/doc/latex/base/lb2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/letter.pdf b/Master/texmf-dist/doc/latex/base/letter.pdf
index d6f4b5fde00..85b073ee2b6 100644
--- a/Master/texmf-dist/doc/latex/base/letter.pdf
+++ b/Master/texmf-dist/doc/latex/base/letter.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/lgc2.pdf b/Master/texmf-dist/doc/latex/base/lgc2.pdf
index d3585d48e38..3fe21164e2c 100644
--- a/Master/texmf-dist/doc/latex/base/lgc2.pdf
+++ b/Master/texmf-dist/doc/latex/base/lgc2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/lppl.pdf b/Master/texmf-dist/doc/latex/base/lppl.pdf
index 646dd295528..6259dfa5df4 100644
--- a/Master/texmf-dist/doc/latex/base/lppl.pdf
+++ b/Master/texmf-dist/doc/latex/base/lppl.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/ltclass.pdf b/Master/texmf-dist/doc/latex/base/ltclass.pdf
deleted file mode 100644
index 4154f3465d3..00000000000
--- a/Master/texmf-dist/doc/latex/base/ltclass.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/ltcounts.pdf b/Master/texmf-dist/doc/latex/base/ltcounts.pdf
deleted file mode 100644
index 5aeb31295f9..00000000000
--- a/Master/texmf-dist/doc/latex/base/ltcounts.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/ltdirchk.pdf b/Master/texmf-dist/doc/latex/base/ltdirchk.pdf
deleted file mode 100644
index 6ae562a4c20..00000000000
--- a/Master/texmf-dist/doc/latex/base/ltdirchk.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/ltfssbas.pdf b/Master/texmf-dist/doc/latex/base/ltfssbas.pdf
deleted file mode 100644
index f6f8eaa3855..00000000000
--- a/Master/texmf-dist/doc/latex/base/ltfssbas.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/ltluatex.pdf b/Master/texmf-dist/doc/latex/base/ltluatex.pdf
index 76b255a886f..fcb128e4324 100644
--- a/Master/texmf-dist/doc/latex/base/ltluatex.pdf
+++ b/Master/texmf-dist/doc/latex/base/ltluatex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/ltnews.pdf b/Master/texmf-dist/doc/latex/base/ltnews.pdf
index 501fabded57..0226df70996 100644
--- a/Master/texmf-dist/doc/latex/base/ltnews.pdf
+++ b/Master/texmf-dist/doc/latex/base/ltnews.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/ltoutenc.pdf b/Master/texmf-dist/doc/latex/base/ltoutenc.pdf
deleted file mode 100644
index ac555f3f3b2..00000000000
--- a/Master/texmf-dist/doc/latex/base/ltoutenc.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/ltx3info.pdf b/Master/texmf-dist/doc/latex/base/ltx3info.pdf
index b25e0cf86a9..414ff2c2d1d 100644
--- a/Master/texmf-dist/doc/latex/base/ltx3info.pdf
+++ b/Master/texmf-dist/doc/latex/base/ltx3info.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/ltxdoc.pdf b/Master/texmf-dist/doc/latex/base/ltxdoc.pdf
index 8239b962808..77e84c11c6c 100644
--- a/Master/texmf-dist/doc/latex/base/ltxdoc.pdf
+++ b/Master/texmf-dist/doc/latex/base/ltxdoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/makeindx.pdf b/Master/texmf-dist/doc/latex/base/makeindx.pdf
index 0d37ee7790a..d4b146ab5d7 100644
--- a/Master/texmf-dist/doc/latex/base/makeindx.pdf
+++ b/Master/texmf-dist/doc/latex/base/makeindx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/manual.pdf b/Master/texmf-dist/doc/latex/base/manual.pdf
index fc77ae1278e..814fabe12ba 100644
--- a/Master/texmf-dist/doc/latex/base/manual.pdf
+++ b/Master/texmf-dist/doc/latex/base/manual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/modguide.pdf b/Master/texmf-dist/doc/latex/base/modguide.pdf
index 1e07fbf163b..b3f1559b24d 100644
--- a/Master/texmf-dist/doc/latex/base/modguide.pdf
+++ b/Master/texmf-dist/doc/latex/base/modguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/nfssfont.pdf b/Master/texmf-dist/doc/latex/base/nfssfont.pdf
index 316414dceb7..4c5f147804b 100644
--- a/Master/texmf-dist/doc/latex/base/nfssfont.pdf
+++ b/Master/texmf-dist/doc/latex/base/nfssfont.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/proc.pdf b/Master/texmf-dist/doc/latex/base/proc.pdf
index 4985e15c2ac..d8d6a74438d 100644
--- a/Master/texmf-dist/doc/latex/base/proc.pdf
+++ b/Master/texmf-dist/doc/latex/base/proc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/slides.pdf b/Master/texmf-dist/doc/latex/base/slides.pdf
index 04985c4c841..2c563e2005f 100644
--- a/Master/texmf-dist/doc/latex/base/slides.pdf
+++ b/Master/texmf-dist/doc/latex/base/slides.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/slifonts.pdf b/Master/texmf-dist/doc/latex/base/slifonts.pdf
index dbd12e3fdc9..f2ce3abcfe0 100644
--- a/Master/texmf-dist/doc/latex/base/slifonts.pdf
+++ b/Master/texmf-dist/doc/latex/base/slifonts.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/source2e.pdf b/Master/texmf-dist/doc/latex/base/source2e.pdf
index 31626655195..21c8a6699fe 100644
--- a/Master/texmf-dist/doc/latex/base/source2e.pdf
+++ b/Master/texmf-dist/doc/latex/base/source2e.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/syntonly.pdf b/Master/texmf-dist/doc/latex/base/syntonly.pdf
index ec1c5e97259..c6b5e1c1c5c 100644
--- a/Master/texmf-dist/doc/latex/base/syntonly.pdf
+++ b/Master/texmf-dist/doc/latex/base/syntonly.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/tlb-utf8-bom.pdf b/Master/texmf-dist/doc/latex/base/tlb-utf8-bom.pdf
deleted file mode 100644
index 138418b63f5..00000000000
--- a/Master/texmf-dist/doc/latex/base/tlb-utf8-bom.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/tlb-utf8-dec-utf8-2017.pdf b/Master/texmf-dist/doc/latex/base/tlb-utf8-dec-utf8-2017.pdf
deleted file mode 100644
index 8164f0d1de3..00000000000
--- a/Master/texmf-dist/doc/latex/base/tlb-utf8-dec-utf8-2017.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/tlc2.pdf b/Master/texmf-dist/doc/latex/base/tlc2.pdf
index 9c3b8fe34d7..3fedd7f7a64 100644
--- a/Master/texmf-dist/doc/latex/base/tlc2.pdf
+++ b/Master/texmf-dist/doc/latex/base/tlc2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/tulm.pdf b/Master/texmf-dist/doc/latex/base/tulm.pdf
index 509f8b6faa0..9ded6858551 100644
--- a/Master/texmf-dist/doc/latex/base/tulm.pdf
+++ b/Master/texmf-dist/doc/latex/base/tulm.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/us.pdf b/Master/texmf-dist/doc/latex/base/us.pdf
deleted file mode 100644
index cdf1956c422..00000000000
--- a/Master/texmf-dist/doc/latex/base/us.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/usrguide.pdf b/Master/texmf-dist/doc/latex/base/usrguide.pdf
index cd7d46e452e..6f767888c69 100644
--- a/Master/texmf-dist/doc/latex/base/usrguide.pdf
+++ b/Master/texmf-dist/doc/latex/base/usrguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/utf8ienc.pdf b/Master/texmf-dist/doc/latex/base/utf8ienc.pdf
index 03e4acc00a6..358f0abce1a 100644
--- a/Master/texmf-dist/doc/latex/base/utf8ienc.pdf
+++ b/Master/texmf-dist/doc/latex/base/utf8ienc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/base/webcomp.pdf b/Master/texmf-dist/doc/latex/base/webcomp.pdf
index 659f7686ae1..b95e6335805 100644
--- a/Master/texmf-dist/doc/latex/base/webcomp.pdf
+++ b/Master/texmf-dist/doc/latex/base/webcomp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/afterpage.pdf b/Master/texmf-dist/doc/latex/tools/afterpage.pdf
index 447c8613062..4bedac74277 100644
--- a/Master/texmf-dist/doc/latex/tools/afterpage.pdf
+++ b/Master/texmf-dist/doc/latex/tools/afterpage.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/array.pdf b/Master/texmf-dist/doc/latex/tools/array.pdf
index e7047f2f699..f06f38a9930 100644
--- a/Master/texmf-dist/doc/latex/tools/array.pdf
+++ b/Master/texmf-dist/doc/latex/tools/array.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/bm.pdf b/Master/texmf-dist/doc/latex/tools/bm.pdf
index d5d73ee3768..9c5984cdff8 100644
--- a/Master/texmf-dist/doc/latex/tools/bm.pdf
+++ b/Master/texmf-dist/doc/latex/tools/bm.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/calc.pdf b/Master/texmf-dist/doc/latex/tools/calc.pdf
index 0419256fddd..afe69b7e686 100644
--- a/Master/texmf-dist/doc/latex/tools/calc.pdf
+++ b/Master/texmf-dist/doc/latex/tools/calc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/changes.txt b/Master/texmf-dist/doc/latex/tools/changes.txt
index a18fa532a38..b4ae449af3a 100644
--- a/Master/texmf-dist/doc/latex/tools/changes.txt
+++ b/Master/texmf-dist/doc/latex/tools/changes.txt
@@ -5,6 +5,12 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
=======================================================================
+2018-04-30 Frank Mittelbach <Frank.Mittelbach@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@latex-project.org>
* multicol.dtx: restoring column status when leaving a boxed
diff --git a/Master/texmf-dist/doc/latex/tools/dcolumn.pdf b/Master/texmf-dist/doc/latex/tools/dcolumn.pdf
index e8e501460b1..a977927c743 100644
--- a/Master/texmf-dist/doc/latex/tools/dcolumn.pdf
+++ b/Master/texmf-dist/doc/latex/tools/dcolumn.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/delarray.pdf b/Master/texmf-dist/doc/latex/tools/delarray.pdf
index 83db7b2290e..4a6dd21c114 100644
--- a/Master/texmf-dist/doc/latex/tools/delarray.pdf
+++ b/Master/texmf-dist/doc/latex/tools/delarray.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/enumerate.pdf b/Master/texmf-dist/doc/latex/tools/enumerate.pdf
index dd8a1aee793..d11a8c34703 100644
--- a/Master/texmf-dist/doc/latex/tools/enumerate.pdf
+++ b/Master/texmf-dist/doc/latex/tools/enumerate.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/fileerr.pdf b/Master/texmf-dist/doc/latex/tools/fileerr.pdf
index c57c3113f44..a83841876c1 100644
--- a/Master/texmf-dist/doc/latex/tools/fileerr.pdf
+++ b/Master/texmf-dist/doc/latex/tools/fileerr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf b/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf
index ea7df56ef58..3f65905851e 100644
--- a/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf
+++ b/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/ftnright.pdf b/Master/texmf-dist/doc/latex/tools/ftnright.pdf
index 2a9ee590aa4..87bdf66f854 100644
--- a/Master/texmf-dist/doc/latex/tools/ftnright.pdf
+++ b/Master/texmf-dist/doc/latex/tools/ftnright.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/hhline.pdf b/Master/texmf-dist/doc/latex/tools/hhline.pdf
index b17ebe498d3..a2b4fe17290 100644
--- a/Master/texmf-dist/doc/latex/tools/hhline.pdf
+++ b/Master/texmf-dist/doc/latex/tools/hhline.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/indentfirst.pdf b/Master/texmf-dist/doc/latex/tools/indentfirst.pdf
index ed63dff63d6..2dbfa1b4bcf 100644
--- a/Master/texmf-dist/doc/latex/tools/indentfirst.pdf
+++ b/Master/texmf-dist/doc/latex/tools/indentfirst.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/layout.pdf b/Master/texmf-dist/doc/latex/tools/layout.pdf
index b381efcaa75..f9b73cb9922 100644
--- a/Master/texmf-dist/doc/latex/tools/layout.pdf
+++ b/Master/texmf-dist/doc/latex/tools/layout.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/longtable.pdf b/Master/texmf-dist/doc/latex/tools/longtable.pdf
index 4926c2a28cf..b220e54d484 100644
--- a/Master/texmf-dist/doc/latex/tools/longtable.pdf
+++ b/Master/texmf-dist/doc/latex/tools/longtable.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/multicol.pdf b/Master/texmf-dist/doc/latex/tools/multicol.pdf
index ce12881674e..b3f7ca5620a 100644
--- a/Master/texmf-dist/doc/latex/tools/multicol.pdf
+++ b/Master/texmf-dist/doc/latex/tools/multicol.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/rawfonts.pdf b/Master/texmf-dist/doc/latex/tools/rawfonts.pdf
index 43f5b75e2ba..2fa7c0e618f 100644
--- a/Master/texmf-dist/doc/latex/tools/rawfonts.pdf
+++ b/Master/texmf-dist/doc/latex/tools/rawfonts.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/shellesc.pdf b/Master/texmf-dist/doc/latex/tools/shellesc.pdf
index 83180429984..9ccb5f004e3 100644
--- a/Master/texmf-dist/doc/latex/tools/shellesc.pdf
+++ b/Master/texmf-dist/doc/latex/tools/shellesc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/showkeys.pdf b/Master/texmf-dist/doc/latex/tools/showkeys.pdf
index 9487b3a1454..d5f0413c385 100644
--- a/Master/texmf-dist/doc/latex/tools/showkeys.pdf
+++ b/Master/texmf-dist/doc/latex/tools/showkeys.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/somedefs.pdf b/Master/texmf-dist/doc/latex/tools/somedefs.pdf
index 84de306e859..5c902e1a355 100644
--- a/Master/texmf-dist/doc/latex/tools/somedefs.pdf
+++ b/Master/texmf-dist/doc/latex/tools/somedefs.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/tabularx.pdf b/Master/texmf-dist/doc/latex/tools/tabularx.pdf
index 3216b8d2db9..262212bbbbc 100644
--- a/Master/texmf-dist/doc/latex/tools/tabularx.pdf
+++ b/Master/texmf-dist/doc/latex/tools/tabularx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/theorem.pdf b/Master/texmf-dist/doc/latex/tools/theorem.pdf
index e6080639a70..18c16d5fe4a 100644
--- a/Master/texmf-dist/doc/latex/tools/theorem.pdf
+++ b/Master/texmf-dist/doc/latex/tools/theorem.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/tools-overview.pdf b/Master/texmf-dist/doc/latex/tools/tools-overview.pdf
index 8fb6095475e..94aa0249c1b 100644
--- a/Master/texmf-dist/doc/latex/tools/tools-overview.pdf
+++ b/Master/texmf-dist/doc/latex/tools/tools-overview.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/trace.pdf b/Master/texmf-dist/doc/latex/tools/trace.pdf
index b37197dd380..fd01498d26e 100644
--- a/Master/texmf-dist/doc/latex/tools/trace.pdf
+++ b/Master/texmf-dist/doc/latex/tools/trace.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/varioref.pdf b/Master/texmf-dist/doc/latex/tools/varioref.pdf
index 9ec1745c90d..dc803f98711 100644
--- a/Master/texmf-dist/doc/latex/tools/varioref.pdf
+++ b/Master/texmf-dist/doc/latex/tools/varioref.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/verbatim.pdf b/Master/texmf-dist/doc/latex/tools/verbatim.pdf
index 769bfa2d5cd..0fe88e6d5a6 100644
--- a/Master/texmf-dist/doc/latex/tools/verbatim.pdf
+++ b/Master/texmf-dist/doc/latex/tools/verbatim.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/xr.pdf b/Master/texmf-dist/doc/latex/tools/xr.pdf
index 7c6c1ed47e9..2b56b7eebda 100644
--- a/Master/texmf-dist/doc/latex/tools/xr.pdf
+++ b/Master/texmf-dist/doc/latex/tools/xr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tools/xspace.pdf b/Master/texmf-dist/doc/latex/tools/xspace.pdf
index 6b03ada9dae..4fe955f83b1 100644
--- a/Master/texmf-dist/doc/latex/tools/xspace.pdf
+++ b/Master/texmf-dist/doc/latex/tools/xspace.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/base/docstrip.dtx b/Master/texmf-dist/source/latex/base/docstrip.dtx
index 29afc6f6267..be3dda6d32d 100644
--- a/Master/texmf-dist/source/latex/base/docstrip.dtx
+++ b/Master/texmf-dist/source/latex/base/docstrip.dtx
@@ -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 @@ Z
\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
diff --git a/Master/texmf-dist/source/latex/base/ltluatex.dtx b/Master/texmf-dist/source/latex/base/ltluatex.dtx
index 180fb7bc290..4686785cf57 100644
--- a/Master/texmf-dist/source/latex/base/ltluatex.dtx
+++ b/Master/texmf-dist/source/latex/base/ltluatex.dtx
@@ -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 types = {
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 @@ local callbacktypes = callbacktypes or {
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,14 +1247,13 @@ local callbacktypes = callbacktypes or {
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,
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 @@ local callbacktypes = callbacktypes or {
% 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}
-% \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,
+% \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,
+ finish_synctex_callback = simple,
% \end{macrocode}
% Section 8.6: PDF-related callbacks.
% \begin{macrocode}
@@ -1324,8 +1325,10 @@ local callbacktypes = callbacktypes or {
% \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}
diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx
index bc8c1866451..05f2361b026 100644
--- a/Master/texmf-dist/source/latex/base/ltvers.dtx
+++ b/Master/texmf-dist/source/latex/base/ltvers.dtx
@@ -115,7 +115,7 @@
{2018-04-01}
%</2ekernel|latexrelease>
%<*2ekernel>
-\def\patch@level{3}
+\def\patch@level{4}
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/tools/array.dtx b/Master/texmf-dist/source/latex/tools/array.dtx
index f20d41f7d37..d8f3687a026 100644
--- a/Master/texmf-dist/source/latex/tools/array.dtx
+++ b/Master/texmf-dist/source/latex/tools/array.dtx
@@ -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@row@strut
{\@tempdima #1\advance\@tempdima \dp\@arstrutbox
- \vrule \@depth\@tempdima \@width\z@\global\let\do@row@strut\relax}\cr}
+ \vrule \@depth\@tempdima \@width\z@\global\let\do@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@row@strut \fi
+ \cr}
\let\do@row@strut\relax
% \end{macrocode}
%
diff --git a/Master/texmf-dist/tex/latex/base/docstrip.tex b/Master/texmf-dist/tex/latex/base/docstrip.tex
index e2031f3d189..58eb8a1488c 100644
--- a/Master/texmf-dist/tex/latex/base/docstrip.tex
+++ b/Master/texmf-dist/tex/latex/base/docstrip.tex
@@ -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 @@ Z
\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
diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx
index 55eebb2bd46..df97702703f 100644
--- a/Master/texmf-dist/tex/latex/base/latex.ltx
+++ b/Master/texmf-dist/tex/latex/base/latex.ltx
@@ -701,7 +701,7 @@
\def\fmtname{LaTeX2e}
\edef\fmtversion
{2018-04-01}
-\def\patch@level{3}
+\def\patch@level{4}
\iffalse
\def\reserved@a#1/#2/#3\@nil{%
\count@\year
diff --git a/Master/texmf-dist/tex/latex/base/ltluatex.lua b/Master/texmf-dist/tex/latex/base/ltluatex.lua
index 3ca87ef1aec..1f88541c5f8 100644
--- a/Master/texmf-dist/tex/latex/base/ltluatex.lua
+++ b/Master/texmf-dist/tex/latex/base/ltluatex.lua
@@ -243,7 +243,6 @@ local callbacktypes = callbacktypes or {
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 @@ local callbacktypes = callbacktypes or {
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 @@ local callbacktypes = callbacktypes or {
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
diff --git a/Master/texmf-dist/tex/latex/base/ltluatex.tex b/Master/texmf-dist/tex/latex/base/ltluatex.tex
index 54880ca181d..eda191ab532 100644
--- a/Master/texmf-dist/tex/latex/base/ltluatex.tex
+++ b/Master/texmf-dist/tex/latex/base/ltluatex.tex
@@ -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`\@}
diff --git a/Master/texmf-dist/tex/latex/tools/array-2016-10-06.sty b/Master/texmf-dist/tex/latex/tools/array-2016-10-06.sty
new file mode 100644
index 00000000000..0b619362d47
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/tools/array-2016-10-06.sty
@@ -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@toksz\relax \let\the@toks\relax
+ \def\@tempa{\the@toksz}%
+ \ifnum\@tempcnta >0 \@whilenum\@tempcnta >0\do
+ {\edef\@tempa{\@tempa\the@toks}\advance \@tempcnta \m@ne}%
+ \let \@tempb \@xexpast \else
+ \let \@tempb \@xexnoop \fi
+ \def\the@toksz{\the\toks@}\def\the@toks{\the\@temptokena}%
+ \edef\@tempa{\@tempa}%
+ \expandafter \@tempb \@tempa #4\@@}
+\def\prepnext@tok{\advance \count@ \@ne
+ \toks\count@{}}
+\def\save@decl{\toks\count@ \expandafter{\@nextchar}}
+\def\insert@column{%
+ \the@toks \the \@tempcnta
+ \ignorespaces \@sharp \unskip
+ \the@toks \the \count@ \relax}
+\newdimen\col@sep
+\def\@acol{\@addtopreamble{\hskip\col@sep}}
+\def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue
+ \let\@sharp\relax \let\@startpbox\relax \let\@endpbox\relax
+ \@xexpast #1*0x\@@
+ \count@\m@ne
+ \let\the@toks\relax
+ \prepnext@tok
+ \expandafter \@tfor \expandafter \@nextchar
+ \expandafter :\expandafter =\@tempa \do
+ {\@testpach
+ \ifcase \@chclass \@classz \or \@classi \or \@classii
+ \or \save@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@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@tok
+ \@addtopreamble{\ifcase \@chnum
+ \hfil
+ \d@llarbegin
+ \insert@column
+ \d@llarend \hfil \or
+ \hskip1sp\d@llarbegin \insert@column \d@llarend \hfil \or
+ \hfil\hskip1sp\d@llarbegin \insert@column \d@llarend \or
+ $\vcenter
+ \@startpbox{\@nextchar}\insert@column \@endpbox $\or
+ \vtop \@startpbox{\@nextchar}\insert@column \@endpbox \or
+ \vbox \@startpbox{\@nextchar}\insert@column \@endpbox
+ \fi}\prepnext@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@ne
+ \save@decl\prepnext@tok}
+\def\@classv{\save@decl
+ \@addtopreamble{\d@llarbegin\the@toks\the\count@\relax\d@llarend}%
+ \prepnext@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@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@firstamp \@firstampfalse \else
+ \@preamerr 5\fi}%
+ \@mkpream{#2}\@addtopreamble\@empty
+ \endgroup
+ \def\@sharp{#3}%
+ \@arstrut \@preamble
+ \null
+ \ignorespaces}
+\let\d@llarbegin\begingroup
+\let\d@llarend\endgroup
+\def\array{\col@sep\arraycolsep
+ \def\d@llarbegin{$}\let\d@llarend\d@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@sep\tabcolsep \let\d@llarbegin\begingroup
+ \let\d@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@char{\string#1}%
+ \@ifundefined{NC@find@\NC@char}%
+ {\@tfor\next:=<>clrmbp@!|\do{\if\noexpand\next\NC@char
+ \PackageWarning{array}%
+ {Redefining primitive column \NC@char}\fi}%
+ \NC@list\expandafter{\the\NC@list\NC@do#1}}%
+ {\PackageWarning{array}{Column \NC@char\space is already defined}}%
+ \@namedef{NC@find@\NC@char}##1#1{\NC@{##1}}%
+ \@ifnextchar[{\newcol@{\NC@char}}{\newcol@{\NC@char}[0]}}
+\def\newcol@#1[#2]#3{\expandafter\@reargdef
+ \csname NC@rewrite@#1\endcsname[#2]{\NC@find#3}}
+\def\NC@#1{%
+ \@temptokena\expandafter{\the\@temptokena#1}\futurelet\next\NC@ifend}
+\def\NC@ifend{%
+ \ifx\next\relax
+ \else\@tempswatrue\expandafter\NC@rewrite\fi}
+\def\NC@do#1{%
+ \expandafter\let\expandafter\NC@rewrite
+ \csname NC@rewrite@\string#1\endcsname
+ \expandafter\let\expandafter\NC@find
+ \csname NC@find@\string#1\endcsname
+ \expandafter\@temptokena\expandafter{\expandafter}%
+ \expandafter\NC@find\the\@temptokena#1\relax}
+\def\showcols{{\def\NC@do##1{\let\NC@do\NC@show}\the\NC@list}}
+\def\NC@show#1{%
+ \typeout{Column #1\expandafter\expandafter\expandafter\NC@strip
+ \expandafter\meaning\csname NC@rewrite@#1\endcsname\@@}}
+\def\NC@strip#1:#2->#3 #4\@@{#2 -> #4}
+\newtoks\NC@list
+\newcolumntype{*}[2]{}
+\long\@namedef{NC@rewrite@*}#1#2{%
+ \count@#1\relax
+ \loop
+ \ifnum\count@>\z@
+ \advance\count@\m@ne
+ \@temptokena\expandafter{\the\@temptokena#2}%
+ \repeat
+ \NC@find}
+\let\@xexpast\relax
+\let\@xexnoop\relax
+\def\save@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@tempswa\fi{\@tempswafalse\the\NC@list}%
+ \count@\m@ne
+ \let\the@toks\relax
+ \prepnext@tok
+ \expandafter \@tfor \expandafter \@nextchar
+ \expandafter :\expandafter =\the\@temptokena \do
+ {\@testpach
+ \ifcase \@chclass \@classz \or \@classi \or \@classii
+ \or \save@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@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@decl
+ \expandafter\NC@ecs\@nextchar\extracolsep{}\extracolsep\@@@
+ \@addtopreamble{\d@llarbegin\the@toks\the\count@\relax\d@llarend}%
+ \prepnext@tok}
+\def\NC@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@length}
+\newcommand{\firsthline}{%
+ \multicolumn1c{%
+ \global\backup@length\ht\@arstrutbox
+ \global\advance\backup@length\dp\@arstrutbox
+ \global\advance\backup@length\arrayrulewidth
+ \raise\extratabsurround\copy\@arstrutbox
+ }\\[-\backup@length]\hline
+}
+\newcommand{\lasthline}{\hline\multicolumn1c{%
+ \global\backup@length2\ht\@arstrutbox
+ \global\advance\backup@length2\dp\@arstrutbox
+ \global\advance\backup@length\arrayrulewidth
+ }\\[-\backup@length]%
+ \multicolumn1c{%
+ \lower\extratabsurround\copy\@arstrutbox
+ }%
+}
+\CheckCommand*\@xhline{\ifx\reserved@a\hline
+ \vskip\doublerulesep
+ \vskip-\arrayrulewidth
+ \fi
+ \ifnum0=`{\fi}}
+\renewcommand*\@xhline{\ifx\reserved@a\hline
+ \vskip\doublerulesep
+ \fi
+ \ifnum0=`{\fi}}
+\endinput
+%%
+%% End of file `array.sty'.
diff --git a/Master/texmf-dist/tex/latex/tools/array.sty b/Master/texmf-dist/tex/latex/tools/array.sty
index 1777fddbfec..f60e38cd37f 100644
--- a/Master/texmf-dist/tex/latex/tools/array.sty
+++ b/Master/texmf-dist/tex/latex/tools/array.sty
@@ -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@row@strut
{\@tempdima #1\advance\@tempdima \dp\@arstrutbox
- \vrule \@depth\@tempdima \@width\z@\global\let\do@row@strut\relax}\cr}
+ \vrule \@depth\@tempdima \@width\z@\global\let\do@row@strut\relax}%
+ % \begin{macrocode}
+ \ifnum\@multicnt >\z@ \do@row@strut \fi
+ \cr}
\let\do@row@strut\relax
\def\@yargarraycr#1{\cr\noalign{\vskip #1}}
\long\def\multicolumn#1#2#3{%
diff --git a/Master/texmf-dist/tex/latex/tools/multicol-2017-04-11.sty b/Master/texmf-dist/tex/latex/tools/multicol-2017-04-11.sty
index d76ecc9ad9d..e8558e4ce04 100644
--- a/Master/texmf-dist/tex/latex/tools/multicol-2017-04-11.sty
+++ b/Master/texmf-dist/tex/latex/tools/multicol-2017-04-11.sty
@@ -20,12 +20,6 @@
%% 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
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 68b91d056aa..2cdfdeca932 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1060,7 +1060,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'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'",