summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/base
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-10-28 21:52:54 +0000
committerKarl Berry <karl@freefriends.org>2015-10-28 21:52:54 +0000
commit01e5c00bb581b8eed8b6cc2b08a9147fb759ce07 (patch)
treea1bd9795c6c9c237ced7f461ea4c890b701af333 /Master/texmf-dist/source/latex/base
parent4957862cf064bc3a65f91f9935028b9214e8fd48 (diff)
latex (28oct15)
git-svn-id: svn://tug.org/texlive/trunk@38732 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/base')
-rw-r--r--Master/texmf-dist/source/latex/base/ltluatex.dtx27
-rw-r--r--Master/texmf-dist/source/latex/base/ltnews22.tex16
-rw-r--r--Master/texmf-dist/source/latex/base/ltnews23.tex38
-rw-r--r--Master/texmf-dist/source/latex/base/ltplain.dtx10
-rw-r--r--Master/texmf-dist/source/latex/base/ltvers.dtx4
5 files changed, 52 insertions, 43 deletions
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}