diff options
| author | Karl Berry <karl@freefriends.org> | 2015-10-28 21:52:54 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2015-10-28 21:52:54 +0000 |
| commit | 01e5c00bb581b8eed8b6cc2b08a9147fb759ce07 (patch) | |
| tree | a1bd9795c6c9c237ced7f461ea4c890b701af333 /Master/texmf-dist | |
| parent | 4957862cf064bc3a65f91f9935028b9214e8fd48 (diff) | |
latex (28oct15)
git-svn-id: svn://tug.org/texlive/trunk@38732 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
56 files changed, 105 insertions, 165 deletions
diff --git a/Master/texmf-dist/doc/latex/base/alltt.pdf b/Master/texmf-dist/doc/latex/base/alltt.pdf Binary files differindex 5d2420a28e0..0324e33481a 100644 --- a/Master/texmf-dist/doc/latex/base/alltt.pdf +++ b/Master/texmf-dist/doc/latex/base/alltt.pdf diff --git a/Master/texmf-dist/doc/latex/base/bugs.txt b/Master/texmf-dist/doc/latex/base/bugs.txt index 03dcdb852ba..7a11db47d42 100644 --- a/Master/texmf-dist/doc/latex/base/bugs.txt +++ b/Master/texmf-dist/doc/latex/base/bugs.txt @@ -10,14 +10,6 @@ Before you report an error, please check that: current or the previous release. Information about the latest release can be found at http://www.latex-project.org/ltnews/. - * The error is not already fixed by a patch added recently to the - current distribution. If you have access to a CTAN archive then - you can easily check whether there is already a patch that fixes - your problem; so please do so. The patches are described in the - files patches.txt and ltpatch.ltx; these are in the current - distribution. This check is especially important if you are using - a distribution that is more than one month old. - * The error is not already mentioned in the documentation of the distribution, e.g. in a .dtx file (in this case it is a feature :-). diff --git a/Master/texmf-dist/doc/latex/base/cfgguide.pdf b/Master/texmf-dist/doc/latex/base/cfgguide.pdf Binary files differindex 7e191de46c8..c7479064836 100644 --- a/Master/texmf-dist/doc/latex/base/cfgguide.pdf +++ b/Master/texmf-dist/doc/latex/base/cfgguide.pdf diff --git a/Master/texmf-dist/doc/latex/base/changes-doc.txt b/Master/texmf-dist/doc/latex/base/changes-doc.txt index c345c46b374..dd75faa0694 100644 --- a/Master/texmf-dist/doc/latex/base/changes-doc.txt +++ b/Master/texmf-dist/doc/latex/base/changes-doc.txt @@ -4,6 +4,10 @@ completeness or accuracy and it contains some references to files that are not part of the distribution. ======================================================================= +2015-10-27 Joseph Wright <latex-bugs@latex-project.org> + + * latexchanges.tex: Bring up to date to 2015/10/01 PL2 + 2015-07-01 David Carlisle <latex-bugs@latex-project.org> * latexchanges.tex: describe the patch level system diff --git a/Master/texmf-dist/doc/latex/base/changes.txt b/Master/texmf-dist/doc/latex/base/changes.txt index 49e78578d9b..c7b05711202 100644 --- a/Master/texmf-dist/doc/latex/base/changes.txt +++ b/Master/texmf-dist/doc/latex/base/changes.txt @@ -5,6 +5,27 @@ are not part of the distribution. ======================================================================= ######################### +# 2015/10/01 PL 2 Release +######################### + + +2015-10-27 David Carlisle <latex-bugs@latex-project.org> + + * ltplain.dtx: globally assign the count to 256/266 + when switching to extended range. + +2015-10-14 David Carlisle <latex-bugs@latex-project.org> + + * build.lua, manifest.txt ltpatch.ltx patches.txt bugs.txt + lose ltpatch.ltx + (which has not been used since the mechanism changed at + 2015/01/01 patch level 1) + +2015-10-03 David Carlisle <latex-bugs@latex-project.org> + + * ltluatex.dtx (luatexbase): write lua allocation messages to the log (only) + +######################### # 2015/10/01 PL 1 Release ######################### diff --git a/Master/texmf-dist/doc/latex/base/classes.pdf b/Master/texmf-dist/doc/latex/base/classes.pdf Binary files differindex 1ab9e782d1a..c42669c1746 100644 --- a/Master/texmf-dist/doc/latex/base/classes.pdf +++ b/Master/texmf-dist/doc/latex/base/classes.pdf diff --git a/Master/texmf-dist/doc/latex/base/clsguide.pdf b/Master/texmf-dist/doc/latex/base/clsguide.pdf Binary files differindex c3223e1138f..d98b16f12db 100644 --- a/Master/texmf-dist/doc/latex/base/clsguide.pdf +++ b/Master/texmf-dist/doc/latex/base/clsguide.pdf diff --git a/Master/texmf-dist/doc/latex/base/cmfonts.pdf b/Master/texmf-dist/doc/latex/base/cmfonts.pdf Binary files differindex f85ddbaad64..a0861872503 100644 --- a/Master/texmf-dist/doc/latex/base/cmfonts.pdf +++ b/Master/texmf-dist/doc/latex/base/cmfonts.pdf diff --git a/Master/texmf-dist/doc/latex/base/cyrguide.pdf b/Master/texmf-dist/doc/latex/base/cyrguide.pdf Binary files differindex cb2685d2e3f..f4ea31dac2b 100644 --- a/Master/texmf-dist/doc/latex/base/cyrguide.pdf +++ b/Master/texmf-dist/doc/latex/base/cyrguide.pdf diff --git a/Master/texmf-dist/doc/latex/base/doc.pdf b/Master/texmf-dist/doc/latex/base/doc.pdf Binary files differindex 7b1b92a34b8..2f57905a00c 100644 --- a/Master/texmf-dist/doc/latex/base/doc.pdf +++ b/Master/texmf-dist/doc/latex/base/doc.pdf diff --git a/Master/texmf-dist/doc/latex/base/docstrip.pdf b/Master/texmf-dist/doc/latex/base/docstrip.pdf Binary files differindex f4b2cdde61d..aa40866a68d 100644 --- a/Master/texmf-dist/doc/latex/base/docstrip.pdf +++ b/Master/texmf-dist/doc/latex/base/docstrip.pdf diff --git a/Master/texmf-dist/doc/latex/base/encguide.pdf b/Master/texmf-dist/doc/latex/base/encguide.pdf Binary files differindex af14bcf12fe..54f593356cf 100644 --- a/Master/texmf-dist/doc/latex/base/encguide.pdf +++ b/Master/texmf-dist/doc/latex/base/encguide.pdf diff --git a/Master/texmf-dist/doc/latex/base/exscale.pdf b/Master/texmf-dist/doc/latex/base/exscale.pdf Binary files differindex 2f7c2b2f70f..a199ee882af 100644 --- a/Master/texmf-dist/doc/latex/base/exscale.pdf +++ b/Master/texmf-dist/doc/latex/base/exscale.pdf diff --git a/Master/texmf-dist/doc/latex/base/fix-cm.pdf b/Master/texmf-dist/doc/latex/base/fix-cm.pdf Binary files differindex ee7750b622d..7b7bec09c04 100644 --- a/Master/texmf-dist/doc/latex/base/fix-cm.pdf +++ b/Master/texmf-dist/doc/latex/base/fix-cm.pdf diff --git a/Master/texmf-dist/doc/latex/base/fntguide.pdf b/Master/texmf-dist/doc/latex/base/fntguide.pdf Binary files differindex 63cd40a0e43..d2d57d424bd 100644 --- a/Master/texmf-dist/doc/latex/base/fntguide.pdf +++ b/Master/texmf-dist/doc/latex/base/fntguide.pdf diff --git a/Master/texmf-dist/doc/latex/base/graphpap.pdf b/Master/texmf-dist/doc/latex/base/graphpap.pdf Binary files differindex 36801c16f6a..5b8b2c51dbb 100644 --- a/Master/texmf-dist/doc/latex/base/graphpap.pdf +++ b/Master/texmf-dist/doc/latex/base/graphpap.pdf diff --git a/Master/texmf-dist/doc/latex/base/ifthen.pdf b/Master/texmf-dist/doc/latex/base/ifthen.pdf Binary files differindex 60b74e7ea0f..ea6bf2b5c6e 100644 --- a/Master/texmf-dist/doc/latex/base/ifthen.pdf +++ b/Master/texmf-dist/doc/latex/base/ifthen.pdf diff --git a/Master/texmf-dist/doc/latex/base/inputenc.pdf b/Master/texmf-dist/doc/latex/base/inputenc.pdf Binary files differindex fe29913080f..553f2472dee 100644 --- a/Master/texmf-dist/doc/latex/base/inputenc.pdf +++ b/Master/texmf-dist/doc/latex/base/inputenc.pdf diff --git a/Master/texmf-dist/doc/latex/base/latexchanges.pdf b/Master/texmf-dist/doc/latex/base/latexchanges.pdf Binary files differindex a3169d2e182..9b7f0add0c3 100644 --- a/Master/texmf-dist/doc/latex/base/latexchanges.pdf +++ b/Master/texmf-dist/doc/latex/base/latexchanges.pdf diff --git a/Master/texmf-dist/doc/latex/base/latexchanges.tex b/Master/texmf-dist/doc/latex/base/latexchanges.tex index 8eef091c83a..ba346fc581f 100644 --- a/Master/texmf-dist/doc/latex/base/latexchanges.tex +++ b/Master/texmf-dist/doc/latex/base/latexchanges.tex @@ -37,7 +37,7 @@ \author{\copyright~Copyright 2015, \LaTeX3 Project Team.\\ All rights reserved.} -\date{1 October 2015} +\date{2 October 2015} % a few commands from doc \newcommand\Lpack[1]{\mbox{\textsf{#1}}} @@ -70,6 +70,17 @@ 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 2015/10/01 patch~2} + +This release fixes the behaviour of the allocation mechanism if the switch +from the standard to extended pool takes place within a group. + +\section{Changes introduced in 2015/10/01 patch~1} +This release allows \Lpack{latexrelease} to revert the +Lua\TeX{}-specific +changes, in particular fixing an incorrect date in part of the mechanism and +adding a method to disable callback management entirely. + \section{Changes introduced in \LaTeX\ 2015/10/01} \subsection{LuaTeX allocation} diff --git a/Master/texmf-dist/doc/latex/base/latexrelease.pdf b/Master/texmf-dist/doc/latex/base/latexrelease.pdf Binary files differindex 555d67d98ad..55f2d6abf38 100644 --- a/Master/texmf-dist/doc/latex/base/latexrelease.pdf +++ b/Master/texmf-dist/doc/latex/base/latexrelease.pdf diff --git a/Master/texmf-dist/doc/latex/base/latexsym.pdf b/Master/texmf-dist/doc/latex/base/latexsym.pdf Binary files differindex 07b496702f1..5f98d713407 100644 --- a/Master/texmf-dist/doc/latex/base/latexsym.pdf +++ b/Master/texmf-dist/doc/latex/base/latexsym.pdf diff --git a/Master/texmf-dist/doc/latex/base/lb2.pdf b/Master/texmf-dist/doc/latex/base/lb2.pdf Binary files differindex 287c5fd4796..fe8c73bb971 100644 --- a/Master/texmf-dist/doc/latex/base/lb2.pdf +++ b/Master/texmf-dist/doc/latex/base/lb2.pdf diff --git a/Master/texmf-dist/doc/latex/base/letter.pdf b/Master/texmf-dist/doc/latex/base/letter.pdf Binary files differindex 4423ccf80d2..4d66d2690f1 100644 --- a/Master/texmf-dist/doc/latex/base/letter.pdf +++ b/Master/texmf-dist/doc/latex/base/letter.pdf diff --git a/Master/texmf-dist/doc/latex/base/lgc2.pdf b/Master/texmf-dist/doc/latex/base/lgc2.pdf Binary files differindex 1407b71e35a..9c16a7e0003 100644 --- a/Master/texmf-dist/doc/latex/base/lgc2.pdf +++ b/Master/texmf-dist/doc/latex/base/lgc2.pdf diff --git a/Master/texmf-dist/doc/latex/base/lppl.pdf b/Master/texmf-dist/doc/latex/base/lppl.pdf Binary files differindex 32398165924..1b0c613caf8 100644 --- a/Master/texmf-dist/doc/latex/base/lppl.pdf +++ b/Master/texmf-dist/doc/latex/base/lppl.pdf diff --git a/Master/texmf-dist/doc/latex/base/ltluatex.pdf b/Master/texmf-dist/doc/latex/base/ltluatex.pdf Binary files differnew file mode 100644 index 00000000000..029fddcb40d --- /dev/null +++ b/Master/texmf-dist/doc/latex/base/ltluatex.pdf diff --git a/Master/texmf-dist/doc/latex/base/ltnews.pdf b/Master/texmf-dist/doc/latex/base/ltnews.pdf Binary files differindex d3d8a111e85..2a1eb6ee1fa 100644 --- a/Master/texmf-dist/doc/latex/base/ltnews.pdf +++ b/Master/texmf-dist/doc/latex/base/ltnews.pdf diff --git a/Master/texmf-dist/doc/latex/base/ltunicode.pdf b/Master/texmf-dist/doc/latex/base/ltunicode.pdf Binary files differindex 66c65e8d61b..a47898beb7e 100644 --- a/Master/texmf-dist/doc/latex/base/ltunicode.pdf +++ b/Master/texmf-dist/doc/latex/base/ltunicode.pdf diff --git a/Master/texmf-dist/doc/latex/base/ltx3info.pdf b/Master/texmf-dist/doc/latex/base/ltx3info.pdf Binary files differindex 631fa378096..ebcf678204a 100644 --- a/Master/texmf-dist/doc/latex/base/ltx3info.pdf +++ b/Master/texmf-dist/doc/latex/base/ltx3info.pdf diff --git a/Master/texmf-dist/doc/latex/base/ltxdoc.pdf b/Master/texmf-dist/doc/latex/base/ltxdoc.pdf Binary files differindex 35c69648e3d..e6b4460220f 100644 --- a/Master/texmf-dist/doc/latex/base/ltxdoc.pdf +++ b/Master/texmf-dist/doc/latex/base/ltxdoc.pdf diff --git a/Master/texmf-dist/doc/latex/base/makeindx.pdf b/Master/texmf-dist/doc/latex/base/makeindx.pdf Binary files differindex 42f9c01b48e..c6cc07de64d 100644 --- a/Master/texmf-dist/doc/latex/base/makeindx.pdf +++ b/Master/texmf-dist/doc/latex/base/makeindx.pdf diff --git a/Master/texmf-dist/doc/latex/base/manifest.txt b/Master/texmf-dist/doc/latex/base/manifest.txt index e76bc3199fc..634aaf5066b 100644 --- a/Master/texmf-dist/doc/latex/base/manifest.txt +++ b/Master/texmf-dist/doc/latex/base/manifest.txt @@ -116,7 +116,6 @@ % ltsect.dtx -- Sectioning and title commands. % ltvers.dtx -- Version identification code. % preload.dtx -- Code for preloading fonts. -% ltpatch.ltx -- Patches to current kernel. % unicode-letters.def -- Data for use with Unicode engines. % % diff --git a/Master/texmf-dist/doc/latex/base/manual.pdf b/Master/texmf-dist/doc/latex/base/manual.pdf Binary files differindex e2137a05bdd..c1666652358 100644 --- a/Master/texmf-dist/doc/latex/base/manual.pdf +++ b/Master/texmf-dist/doc/latex/base/manual.pdf diff --git a/Master/texmf-dist/doc/latex/base/modguide.pdf b/Master/texmf-dist/doc/latex/base/modguide.pdf Binary files differindex 448f6a8eb24..04c6d29dc9d 100644 --- a/Master/texmf-dist/doc/latex/base/modguide.pdf +++ b/Master/texmf-dist/doc/latex/base/modguide.pdf diff --git a/Master/texmf-dist/doc/latex/base/nfssfont.pdf b/Master/texmf-dist/doc/latex/base/nfssfont.pdf Binary files differindex 2b8855cc987..631b15f3a98 100644 --- a/Master/texmf-dist/doc/latex/base/nfssfont.pdf +++ b/Master/texmf-dist/doc/latex/base/nfssfont.pdf diff --git a/Master/texmf-dist/doc/latex/base/patches.txt b/Master/texmf-dist/doc/latex/base/patches.txt deleted file mode 100644 index 7a664401d7a..00000000000 --- a/Master/texmf-dist/doc/latex/base/patches.txt +++ /dev/null @@ -1,60 +0,0 @@ - LaTeX Patches Guide - - 2015/01/01 - - -This document describes the procedure by which changes to the LaTeX -distribution in between major releases could be made. - -Such changes will be made only when major problems are discovered and -fixed. - -Changes which affect the file latex.ltx, and hence the format, are -called `patches to the LaTeX kernel': this concept is described in -detail below. The changes of this type are described briefly at the -end of this file, in chronological order. - -All changes to all files should be listed, in reverse-time order, in -the files called changes.txt: there is one in each distribution -subdirectory. - - -Patches to the LaTeX kernel -=========================== - -Between major releases of LaTeX it may be necessary to make small -updates to fix major problems. - -We have made it relatively easy to install updates that affect only -the format---by placing all these changes in one file, called -ltpatch.ltx. - -In practice due to changing distribution mechanisms since LaTeX2e was -first released we do not now expect to use this patch mechanism, if a -major problem were to be discovered a new updated LaTeX distribution -would be placed on CTAN and distributed via the usual TeX distribution -channels. - -In order to update your LaTeX format you should put -ltpatch.ltx where it can be read by iniTeX and then run iniTeX on -latex.ltx. You do not need to unpack the latex sources again. - -In this run of iniTeX, the file ltpatch.ltx (if it exists) will be -read just before the format file is `dumped'. This will correct any -bugs and it will modify the opening banner of LaTeX: for example, -from: - -LaTeX2e <2015/01/01> - -to: - -LaTeX2e <2015/01/01> patch level 1 - - -(The ltpatch.ltx distributed with this `full' release of LaTeX - is `patch level 0' which does not change the banner.) - - ---- Copyright 1993-2015 - The LaTeX3 Project. All rights reserved --- - diff --git a/Master/texmf-dist/doc/latex/base/proc.pdf b/Master/texmf-dist/doc/latex/base/proc.pdf Binary files differindex 8bf6f6b958b..0ac7c4ed054 100644 --- a/Master/texmf-dist/doc/latex/base/proc.pdf +++ b/Master/texmf-dist/doc/latex/base/proc.pdf diff --git a/Master/texmf-dist/doc/latex/base/slides.pdf b/Master/texmf-dist/doc/latex/base/slides.pdf Binary files differindex 9b2fde09667..03844a53149 100644 --- a/Master/texmf-dist/doc/latex/base/slides.pdf +++ b/Master/texmf-dist/doc/latex/base/slides.pdf diff --git a/Master/texmf-dist/doc/latex/base/slifonts.pdf b/Master/texmf-dist/doc/latex/base/slifonts.pdf Binary files differindex 74f8cdb59c1..c0ebb723f25 100644 --- a/Master/texmf-dist/doc/latex/base/slifonts.pdf +++ b/Master/texmf-dist/doc/latex/base/slifonts.pdf diff --git a/Master/texmf-dist/doc/latex/base/source2e.pdf b/Master/texmf-dist/doc/latex/base/source2e.pdf Binary files differindex a737e6f52fe..1ccbea4b772 100644 --- a/Master/texmf-dist/doc/latex/base/source2e.pdf +++ b/Master/texmf-dist/doc/latex/base/source2e.pdf diff --git a/Master/texmf-dist/doc/latex/base/syntonly.pdf b/Master/texmf-dist/doc/latex/base/syntonly.pdf Binary files differindex 79801f80ebd..78c1ec1034f 100644 --- a/Master/texmf-dist/doc/latex/base/syntonly.pdf +++ b/Master/texmf-dist/doc/latex/base/syntonly.pdf diff --git a/Master/texmf-dist/doc/latex/base/tlc2.pdf b/Master/texmf-dist/doc/latex/base/tlc2.pdf Binary files differindex 2173dfa757a..9a592374b9b 100644 --- a/Master/texmf-dist/doc/latex/base/tlc2.pdf +++ b/Master/texmf-dist/doc/latex/base/tlc2.pdf diff --git a/Master/texmf-dist/doc/latex/base/usrguide.pdf b/Master/texmf-dist/doc/latex/base/usrguide.pdf Binary files differindex 3bf66bb1135..198ed748a03 100644 --- a/Master/texmf-dist/doc/latex/base/usrguide.pdf +++ b/Master/texmf-dist/doc/latex/base/usrguide.pdf diff --git a/Master/texmf-dist/doc/latex/base/utf8ienc.pdf b/Master/texmf-dist/doc/latex/base/utf8ienc.pdf Binary files differindex ec1b1e494bf..f72d59a4a9a 100644 --- a/Master/texmf-dist/doc/latex/base/utf8ienc.pdf +++ b/Master/texmf-dist/doc/latex/base/utf8ienc.pdf diff --git a/Master/texmf-dist/doc/latex/base/webcomp.pdf b/Master/texmf-dist/doc/latex/base/webcomp.pdf Binary files differindex 90520fdff79..f410b4ef792 100644 --- a/Master/texmf-dist/doc/latex/base/webcomp.pdf +++ b/Master/texmf-dist/doc/latex/base/webcomp.pdf diff --git a/Master/texmf-dist/source/latex/base/ltluatex.dtx b/Master/texmf-dist/source/latex/base/ltluatex.dtx index 950b756133d..62d663c8d3f 100644 --- a/Master/texmf-dist/source/latex/base/ltluatex.dtx +++ b/Master/texmf-dist/source/latex/base/ltluatex.dtx @@ -24,7 +24,7 @@ \ProvidesFile{ltluatex.dtx} %</driver> %<*tex> -[2015/10/02 v1.0e +[2015/10/03 v1.0f %</tex> %<plain> LuaTeX support for plain TeX (core) %<*tex> @@ -351,7 +351,7 @@ % % \endgroup % -% \CheckSum{488} +% \CheckSum{491} % \StopEventually{} % % \section{Implementation} @@ -818,6 +818,14 @@ local modules = modules or { } % % \begin{macro}{provides_module} % \changes{v1.0a}{2015/09/24}{Function added} +% \changes{v1.0f}{2015/10/03}{use luatexbase\_log} +% Local function to write to the log. +% \begin{macrocode} +local function luatexbase_log(text) + texio_write_nl("log", text) +end +% \begin{macrocode} +% % Modelled on |\ProvidesPackage|, we store much the same information but % with a little more structure. % \begin{macrocode} @@ -829,8 +837,7 @@ local function provides_module(info) local function spaced(text) return text and (" " .. text) or "" end - texio_write_nl( - "log", + luatexbase_log( "Lua module: " .. info.name .. spaced(info.date) .. spaced(info.version) @@ -1007,7 +1014,7 @@ local function new_attribute(name) return -1 end attributes[name]= tex_count["e@alloc@attribute@count"] - texio_write_nl("Lua-only attribute " .. name .. " = " .. + luatexbase_log("Lua-only attribute " .. name .. " = " .. tex_count["e@alloc@attribute@count"]) return tex_count["e@alloc@attribute@count"] end @@ -1027,7 +1034,7 @@ local function new_whatsit(name) luatexbase_error("No room for a new custom whatsit") return -1 end - texio_write_nl("Custom whatsit " .. (name or "") .. " = " .. + luatexbase_log("Custom whatsit " .. (name or "") .. " = " .. tex_count["e@alloc@whatsit@count"]) return tex_count["e@alloc@whatsit@count"] end @@ -1048,7 +1055,7 @@ local function new_bytecode(name) luatexbase_error("No room for a new bytecode register") return -1 end - texio_write_nl("Lua bytecode " .. (name or "") .. " = " .. + luatexbase_log("Lua bytecode " .. (name or "") .. " = " .. tex_count["e@alloc@bytecode@count"]) return tex_count["e@alloc@bytecode@count"] end @@ -1072,7 +1079,7 @@ local function new_chunkname(name) return -1 end lua.name[chunkname_count]=name - texio_write_nl("Lua chunkname " .. (name or "") .. " = " .. + luatexbase_log("Lua chunkname " .. (name or "") .. " = " .. chunkname_count .. "\n") return chunkname_count end @@ -1412,7 +1419,7 @@ local function add_to_callback(name, func, description) % \end{macrocode} % Keep user informed. % \begin{macrocode} - texio_write_nl( + luatexbase_log( "Inserting `" .. description .. "' at position " .. priority .. " in `" .. name .. "'." ) @@ -1466,7 +1473,7 @@ local function remove_from_callback(name, description) end cb = l[index] table.remove(l, index) - texio_write_nl( + luatexbase_log( "Removing `" .. description .. "' from `" .. name .. "'." ) if #l == 0 then diff --git a/Master/texmf-dist/source/latex/base/ltnews22.tex b/Master/texmf-dist/source/latex/base/ltnews22.tex index 7f6c307b752..c574f60568e 100644 --- a/Master/texmf-dist/source/latex/base/ltnews22.tex +++ b/Master/texmf-dist/source/latex/base/ltnews22.tex @@ -91,9 +91,9 @@ release will revert any changes made in that format, and revert to the definitions as they where at the beginning of 2015. If you wish to share a document using the latest features with a -user restricted to use an older +user restricted to using an older format, you may use the form above and make the \textsf{latexrelease} package -available on the older institution. The package will then update the format +available on the older installation. The package will then update the format definitions as needed to enable the older format to work as if dated on the date specified in the package option. @@ -142,7 +142,7 @@ However, this is not necessarily true for all packages. Only if a package makes use of the \cs{IncludeInRelease} functionality will it adjust to the requested \LaTeX{} release date. Initially this will only be true for -a few selected package and in general it may not even be advisable for packages +a few selected packages and in general it may not even be advisable for packages that have their own well-established release cycles and methods. Thus, to regenerate a document with 100\,\% compatible behavior @@ -173,7 +173,7 @@ which have $2^{15}$ registers of each type ($2^{16}$ in the case of \hologo{LuaTeX}). The \textsf{etex} package has been available to provided an allocation mechanism for these extended registers but now the format will by default allocate in a range suitable for the engine being used. The new -allocation mechanism is different to the \textsf{etex} package mechanism, and +allocation mechanism is different than the \textsf{etex} package mechanism, and supports \hologo{LuaTeX}'s full range and an allocation mechanism for \LaTeX\ floats as described below. @@ -190,8 +190,8 @@ previously defined in the \texttt{xelatex.ini} file used to build the until it finds a suitable page to output them. It allocates $18$ registers for this storage, but this can often be insufficient. The contributed \textsf{morefloats} package has -been available to extend this list, however it also only allocates from the -standard range $0$--$255$ so can not take advantage of the extended registers. +been available to extend this list; however, it also only allocates from the +standard range $0$--$255$ so cannot take advantage of the extended registers. The new allocation mechanism in this release incorporates a new command \verb|\extrafloats|. If you get the error: \mbox{\texttt{Too many unprocessed floats.}} @@ -220,12 +220,12 @@ such that it works with this engine. \section{l3build} This release has been tested and built using a new build system implemented in -\textsf{lua} intended to be run on the \textsf{texlua} interpreter distributed +\textsf{Lua}, intended to be run on the \textsf{texlua} interpreter distributed with modern \TeX\ distributions. It is already separately available from CTAN. This replaces earlier build systems (based at various times on \textsf{make}, \textsf{cons}, and Windows \textsf{bat} files). It allows the sources to be tested and packaged on a range of platforms (within the team, -OS X, Windows, Linux and cygwin platforms are used). It also allows the +OS X, Windows, Linux and Cygwin platforms are used). It also allows the format to be tested on \hologo{XeTeX} and \hologo{LuaTeX} as well as the standard \hologo{pdfTeX}/\eTeX\ engines. diff --git a/Master/texmf-dist/source/latex/base/ltnews23.tex b/Master/texmf-dist/source/latex/base/ltnews23.tex index 30d98b5b5ba..149bd1a74bb 100644 --- a/Master/texmf-dist/source/latex/base/ltnews23.tex +++ b/Master/texmf-dist/source/latex/base/ltnews23.tex @@ -62,38 +62,38 @@ \section{Enhanced support for \hologo{LuaTeX}} -As noted in \LaTeX\ News 22, the 2015/01/01 release of \LaTeX, -introduced built in support for extended TeX systems. +As noted in \LaTeX\ News 22, the 2015/01/01 release of \LaTeX{} +introduced built-in support for extended \TeX\ systems. The range of allocated register numbers (for example, for count registers) is now set according to the underlying engine capabilities to 256, 32768 or 65536. Additional allocators were also added for the facilities added by \hologo{eTeX} (\verb|\newmark|) and \hologo{XeTeX} -(\verb|\newXeTeXintercharclass|). At that time however the work to +(\verb|\newXeTeXintercharclass|). At that time, however, the work to incorporate additional allocators for \hologo{LuaTeX} was not ready for distribution. The main feature of this release is that by default it includes -allocators for \hologo{LuaTeX} provided features, such as lua -functions, bytecode registers, catcode tables and lua callbacks. +allocators for \hologo{LuaTeX}-provided features, such as Lua +functions, bytecode registers, catcode tables and Lua callbacks. Previously these features have been provided by the contributed \package{luatex} (Heiko Oberdiek) and \package{luatexbase} (\'{E}lie Roux, Manuel P\'{e}gouri\'{e}-Gonnard and Philipp Gesang) -packages. However just as +packages. However, just as noted with the \package{etex} package in the previous release, it is better if allocation is handled by the format to avoid problems with conflicts between different allocation schemes, or definitions made before a package-defined allocation scheme is enabled. -The facilities incorporated into the format this release, and +The facilities incorporated into the format with this release, and described below, are closely modelled on the \package{luatexbase} package and we thank the authors, and especially \'{E}lie Roux, for help in arranging this transition. The implementation of these \hologo{LuaTeX} features has been redesigned to match the allocation system introduced in the 2015/01/01 -\LaTeX\ release, and there are some other differences to the previous +\LaTeX\ release, and there are some other differences from the previous \package{luatexbase} package. However, as noted below, \package{luatexbase} is being updated in line with this \LaTeX\ release to provide the previous interface as a wrapper around the new @@ -114,7 +114,7 @@ produced some awkward command names such as \verb|\luatexluafunction|. From this release the names are enabled without the \texttt{luatex} prefix. -In practice this change should not affect many documents, relatively +In practice this change should not affect many documents; relatively few packages access the primitive commands, and many of those are already set up to work with prefixed or unprefixed names, so that they work with multiple formats. @@ -148,14 +148,14 @@ at the start of the document. \subsection{\TeX\ commands for allocation in \hologo{LuaTeX}} For detailed descriptions of the new allocation commands see the documented sources in \textsf{ltluatex.dtx} or chapter N of -\textsf{source2e} however the following new allocation commands are +\textsf{source2e}; however, the following new allocation commands are defined by default in \hologo{LuaTeX}: \verb|\newattribute|, \verb|\newcatcodetable|, \verb|\newluafunction| and \verb|\newwhatsit|. In addition, the commands \verb|\setattribute| and -\verb|\unsetattribute| are defined to set and unset lua attributes +\verb|\unsetattribute| are defined to set and unset Lua attributes (integer values similar to counters, but attached to nodes). Finally several catcode tables are predefined: \verb|\catcodetable@initex|, @@ -163,17 +163,17 @@ several catcode tables are predefined: \verb|\catcodetable@latex|, \verb|\catcodetable@atletter|. -\subsection{Predefined lua functions} -If used with \hologo{LuaTeX}, \LaTeX\ will initialise a lua table, +\subsection{Predefined Lua functions} +If used with \hologo{LuaTeX}, \LaTeX\ will initialise a Lua table, \textsf{luatexbase}, with functions supporting allocation and also -the registering of lua callback functions. +the registering of Lua callback functions. \subsection{Support for older releases and plain \TeX} The \hologo{LuaTeX} allocation functionality made available in this release is also available in plain \TeX\ and older \LaTeX\ releases in the files \textsf{ltluatex.tex} and \textsf{ltluatex.lua} which may be used simply by including the \TeX\ file: \verb|\input{ltluatex}|. -An alternative for old LaTeX releases is to use:\\ +An alternative for old \LaTeX\ releases is to use:\\ \verb|\RequirePackage[2015/10/01]{latexrelease}|\\ which will update the kernel to the current release, including \hologo{LuaTeX} support. @@ -199,14 +199,14 @@ or class previously used the \package{etex} \verb|\reserveinserts| command, it is possible for a document that previously worked to generate an error ``no room for a new insert''. In practice this error can always be avoided by declaring inserts earlier, before the -registers below 256 are all allocated, however it would be better not +registers below 256 are all allocated. However, it is better not to require packages to be re-ordered and in some cases the re-ordering is complicated due to delayed allocations in \verb|\AtBeginDocument|. -In this release a new implementation of +In this release, a new implementation of \verb|\newinsert| is used which allocates inserts from the previously allocated float lists once the classical register allocation has run -out. This allows an extra 52 (or in \hologo{LuaTeX}, 64 thousand) +out. This allows an extra 52 (or in \hologo{LuaTeX}, 64~thousand) insert allocations which is more than enough for practical documents (by default, \LaTeX\ only uses two insert allocations). @@ -215,7 +215,7 @@ insert allocations which is more than enough for practical documents The file \textsf{unicode-letters.def} recording catcodes, upper and lower case mappings and other properties for Unicode characters has -been regenerated using the data files from Unicode~8. +been regenerated using the data files from Unicode~8.0.0. \section{Support for Comma Accent} The command \verb|\textcommabelow| has been added to the format. diff --git a/Master/texmf-dist/source/latex/base/ltplain.dtx b/Master/texmf-dist/source/latex/base/ltplain.dtx index 7f1f5a8eaee..7eb822544dc 100644 --- a/Master/texmf-dist/source/latex/base/ltplain.dtx +++ b/Master/texmf-dist/source/latex/base/ltplain.dtx @@ -32,7 +32,7 @@ %<*driver> % \fi \ProvidesFile{ltplain.dtx} - [2015/08/30 v2.1a LaTeX Kernel (Plain TeX)] + [2015/10/27 v2.1b LaTeX Kernel (Plain TeX)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltplain.dtx} @@ -50,7 +50,7 @@ %</driver> % \fi % -% \CheckSum{1343} +% \CheckSum{1345} % % \changes{v1.0a}{1994/03/08} % {Remove need for a driver file.} @@ -545,10 +545,12 @@ % If we've reached the classical top limit, bump to 256 % or 266 for counts (count 256--265 are reserved by the allocation % system). +% \changes{v2.1b}{2015/10/27} +% {Use global assignment when switching to extended range} % \begin{macrocode} \ifnum#1=#2\relax - #1\@cclvi - \ifx\count#4\advance#1 10 \fi + \global#1\@cclvi + \ifx\count#4\global\advance#1 10 \fi \fi % \end{macrocode} % Check we are below the extended limit. diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx index 44409f1465b..e17d1951026 100644 --- a/Master/texmf-dist/source/latex/base/ltvers.dtx +++ b/Master/texmf-dist/source/latex/base/ltvers.dtx @@ -85,7 +85,7 @@ % % \begin{macro}{\fmtname} % \begin{macro}{\fmtversion} -% \begin{macro}{\patcj@level} +% \begin{macro}{\patch@level} % \begin{macrocode} %<*2ekernel> \def\fmtname{LaTeX2e} @@ -96,7 +96,7 @@ {2015/10/01} %</2ekernel|latexrelease> %<*2ekernel> -\def\patch@level{1} +\def\patch@level{2} % \end{macrocode} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx index cb359043336..2689404ea65 100644 --- a/Master/texmf-dist/tex/latex/base/latex.ltx +++ b/Master/texmf-dist/tex/latex/base/latex.ltx @@ -364,8 +364,8 @@ \gdef\e@ch@ck#1#2#3#4{% \ifnum#1<#2\else \ifnum#1=#2\relax - #1\@cclvi - \ifx\count#4\advance#1 10 \fi + \global#1\@cclvi + \ifx\count#4\global\advance#1 10 \fi \fi \ifnum#1<#3\relax \else @@ -695,7 +695,7 @@ \def\fmtname{LaTeX2e} \edef\fmtversion {2015/10/01} -\def\patch@level{1} +\def\patch@level{2} \iffalse \def\reserved@a#1/#2/#3\@nil{% \count@\year diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty index 574c4706497..6daa5e56346 100644 --- a/Master/texmf-dist/tex/latex/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty @@ -1397,8 +1397,8 @@ of this package available from CTAN} \gdef\e@ch@ck#1#2#3#4{% \ifnum#1<#2\else \ifnum#1=#2\relax - #1\@cclvi - \ifx\count#4\advance#1 10 \fi + \global#1\@cclvi + \ifx\count#4\global\advance#1 10 \fi \fi \ifnum#1<#3\relax \else diff --git a/Master/texmf-dist/tex/latex/base/ltluatex.lua b/Master/texmf-dist/tex/latex/base/ltluatex.lua index e91286d71f2..98e14c7e658 100644 --- a/Master/texmf-dist/tex/latex/base/ltluatex.lua +++ b/Master/texmf-dist/tex/latex/base/ltluatex.lua @@ -49,6 +49,9 @@ local tex_setattribute = tex.setattribute local tex_setcount = tex.setcount local texio_write_nl = texio.write_nl local modules = modules or { } +local function luatexbase_log(text) + texio_write_nl("log", text) +end local function provides_module(info) if not (info and info.name) then luatexbase_error("Missing module name for provides_modules") @@ -57,8 +60,7 @@ local function provides_module(info) local function spaced(text) return text and (" " .. text) or "" end - texio_write_nl( - "log", + luatexbase_log( "Lua module: " .. info.name .. spaced(info.date) .. spaced(info.version) @@ -174,7 +176,7 @@ local function new_attribute(name) return -1 end attributes[name]= tex_count["e@alloc@attribute@count"] - texio_write_nl("Lua-only attribute " .. name .. " = " .. + luatexbase_log("Lua-only attribute " .. name .. " = " .. tex_count["e@alloc@attribute@count"]) return tex_count["e@alloc@attribute@count"] end @@ -186,7 +188,7 @@ local function new_whatsit(name) luatexbase_error("No room for a new custom whatsit") return -1 end - texio_write_nl("Custom whatsit " .. (name or "") .. " = " .. + luatexbase_log("Custom whatsit " .. (name or "") .. " = " .. tex_count["e@alloc@whatsit@count"]) return tex_count["e@alloc@whatsit@count"] end @@ -198,7 +200,7 @@ local function new_bytecode(name) luatexbase_error("No room for a new bytecode register") return -1 end - texio_write_nl("Lua bytecode " .. (name or "") .. " = " .. + luatexbase_log("Lua bytecode " .. (name or "") .. " = " .. tex_count["e@alloc@bytecode@count"]) return tex_count["e@alloc@bytecode@count"] end @@ -213,7 +215,7 @@ local function new_chunkname(name) return -1 end lua.name[chunkname_count]=name - texio_write_nl("Lua chunkname " .. (name or "") .. " = " .. + luatexbase_log("Lua chunkname " .. (name or "") .. " = " .. chunkname_count .. "\n") return chunkname_count end @@ -408,7 +410,7 @@ local function add_to_callback(name, func, description) end end table.insert(l, priority, f) - texio_write_nl( + luatexbase_log( "Inserting `" .. description .. "' at position " .. priority .. " in `" .. name .. "'." ) @@ -450,7 +452,7 @@ local function remove_from_callback(name, description) end cb = l[index] table.remove(l, index) - texio_write_nl( + luatexbase_log( "Removing `" .. description .. "' from `" .. name .. "'." ) if #l == 0 then diff --git a/Master/texmf-dist/tex/latex/base/ltluatex.tex b/Master/texmf-dist/tex/latex/base/ltluatex.tex index ca413f4a61b..cefa26e5f1a 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} -[2015/10/02 v1.0e +[2015/10/03 v1.0f LuaTeX support for plain TeX (core) ] \edef\etatcatcode{\the\catcode`\@} diff --git a/Master/texmf-dist/tex/latex/base/ltpatch.ltx b/Master/texmf-dist/tex/latex/base/ltpatch.ltx deleted file mode 100644 index da585758031..00000000000 --- a/Master/texmf-dist/tex/latex/base/ltpatch.ltx +++ /dev/null @@ -1,38 +0,0 @@ - -%%%% -%%%% Patch file for the LaTeX2e kernel dated 2015/01/01 -%%%% - -\def\fmtversion@topatch{2015/06/01} % This patch will not work with - % any other release. - -\def\patch@level{0} - - - - -%%%%%%%%%%%%%%% -\iffalse - -\typeout{% -^^J% -*********************************************^^J% -ltpatch.ltx has fixed certain problems with the `kernel' of LaTeX.^^J% -Certain other files in the LaTeX distribution have also been updated^^J% -since the last release (list correct as of 2015/01/01):^^J% -base/xxxxxxx.dtx..............(patch 1)^^J% -unpacked/yyyyyyy.cls..........(patch 1)^^J% -^^J% -See the file patches.txt for more details.^^J% -*********************************************} - -\fi - -\endinput - - - - - - - |