summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/base
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-10-02 22:15:45 +0000
committerKarl Berry <karl@freefriends.org>2015-10-02 22:15:45 +0000
commitabbefcd9fbfcd8e487162ec28f349e3143914449 (patch)
tree289cbdb698c3dc477252484424234fa14da2b014 /Master/texmf-dist/source/latex/base
parent8a03ef16f0821bc20895c680b246ead3eafa0d44 (diff)
latex (2oct15)
git-svn-id: svn://tug.org/texlive/trunk@38531 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/base')
-rw-r--r--Master/texmf-dist/source/latex/base/ltdirchk.dtx24
-rw-r--r--Master/texmf-dist/source/latex/base/ltluatex.dtx28
-rw-r--r--Master/texmf-dist/source/latex/base/ltvers.dtx2
3 files changed, 48 insertions, 6 deletions
diff --git a/Master/texmf-dist/source/latex/base/ltdirchk.dtx b/Master/texmf-dist/source/latex/base/ltdirchk.dtx
index 96727458b88..a041fd18ae2 100644
--- a/Master/texmf-dist/source/latex/base/ltdirchk.dtx
+++ b/Master/texmf-dist/source/latex/base/ltdirchk.dtx
@@ -39,7 +39,7 @@
%<*driver>
% \fi
\ProvidesFile{ltdirchk.dtx}
- [2015/01/03 v1.1 LaTeX Kernel (System Dependent Parts)]
+ [2015/10/02 v1.2a LaTeX Kernel (System Dependent Parts)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltdirchk.dtx}
@@ -82,7 +82,7 @@
% {documentation improvements mainly from internal/2520}
% \changes{v1.0w}{1998/08/17}{(RmS) Documentation improvements.}
%
-% \CheckSum{618}
+% \CheckSum{627}
%
% \section{\LaTeX\ System Dependent Initialisations}
%
@@ -226,6 +226,7 @@
% \end{macrocode}
% \changes{v1.1}{2015/01/03}{Enable extra primitives when Lua\TeX{} is used}
% \changes{v1.2}{2015/08/23}{Do not use luatex prefix}
+% \changes{v1.2a}{2015/10/02}{Allow backing out of unprefixed names}
% If Lua\TeX{} is in use the extensions and other new primitives
% have to be activated: this is done as early as possible. Older
% versions of Lua\TeX{} do not hide the primitives: a version check is
@@ -262,6 +263,25 @@
%<latexrelease> "luatex",
%<latexrelease> tex.extraprimitives("core","omega", "aleph", "luatex")
%<latexrelease> )
+%<latexrelease> local i
+%<latexrelease> local t = { }
+%<latexrelease> for _,i in pairs(tex.extraprimitives("luatex")) do
+%<latexrelease> if not string.match(i,"^U") then
+%<latexrelease> if not string.match(i, "^luatex") then
+%<latexrelease> table.insert(t,i)
+%<latexrelease> end
+%<latexrelease> else
+%<latexrelease> if string.match(i,"^Uchar$") then
+%<latexrelease> table.insert(t,i)
+%<latexrelease> end
+%<latexrelease> end
+%<latexrelease> end
+%<latexrelease> for _,i in pairs(t) do
+%<latexrelease> tex.print(
+%<latexrelease> "\noexpand\\let\noexpand\\" .. i
+%<latexrelease> .. "\noexpand\\undefined"
+%<latexrelease> )
+%<latexrelease> end
%<latexrelease>}
%<latexrelease>\EndIncludeInRelease
%<latexrelease>\fi
diff --git a/Master/texmf-dist/source/latex/base/ltluatex.dtx b/Master/texmf-dist/source/latex/base/ltluatex.dtx
index 8a19d74af39..950b756133d 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/09/24 v1.0a
+[2015/10/02 v1.0e
%</tex>
%<plain> LuaTeX support for plain TeX (core)
%<*tex>
@@ -351,7 +351,7 @@
%
% \endgroup
%
-% \CheckSum{484}
+% \CheckSum{488}
% \StopEventually{}
%
% \section{Implementation}
@@ -737,7 +737,9 @@
% \end{macrocode}
%
% \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2015/09/24}
+% \changes{v1.0b}{2015/10/02}{Fix backing out of \TeX{} code}
+% \changes{v1.0c}{2015/10/02}{Allow backing out of Lua code}
+%<latexrelease>\IncludeInRelease{0000/00/00}
%<latexrelease> {\newluafunction}{LuaTeX}%
%<latexrelease>\let\e@alloc@attribute@count\@undefined
%<latexrelease>\let\newattribute\@undefined
@@ -758,6 +760,7 @@
%<latexrelease>\let\e@alloc@bytecode@count\@undefined
%<latexrelease>\let\newluachunkname\@undefined
%<latexrelease>\let\e@alloc@luachunk@count\@undefined
+%<latexrelease>\directlua{luatexbase.uninstall()}
%<latexrelease>\EndIncludeInRelease
% \end{macrocode}
%
@@ -1537,6 +1540,25 @@ end
luatexbase.callback_descriptions =callback_descriptions
% \end{macrocode}
% \end{macro}
+%
+% \begin{macro}{uninstall}
+% \changes{v1.0e}{2015/10/02}{Function added}
+% Unlike at the \TeX{} level, we have to provide a back-out mechanism here
+% at the same time as the rest of the code. This is not meant for use by
+% anything other than \textsf{latexrelease}: as such this is
+% \emph{deliberately} not documented for users!
+% \begin{macrocode}
+local function uninstall()
+ module_info(
+ "luatexbase",
+ "Uninstalling kernel luatexbase code"
+ )
+ callback.register = callback_register
+ luatexbase = nil
+end
+luatexbase.uninstall = uninstall
+% \end{macrocode}
+% \end{macro}
% \endgroup
%
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx
index b27ebed2e97..44409f1465b 100644
--- a/Master/texmf-dist/source/latex/base/ltvers.dtx
+++ b/Master/texmf-dist/source/latex/base/ltvers.dtx
@@ -96,7 +96,7 @@
{2015/10/01}
%</2ekernel|latexrelease>
%<*2ekernel>
-\def\patch@level{0}
+\def\patch@level{1}
% \end{macrocode}
% \end{macro}
% \end{macro}