summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/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/tex/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/tex/latex/base')
-rw-r--r--Master/texmf-dist/tex/latex/base/latex.ltx6
-rw-r--r--Master/texmf-dist/tex/latex/base/latexrelease.sty4
-rw-r--r--Master/texmf-dist/tex/latex/base/ltluatex.lua18
-rw-r--r--Master/texmf-dist/tex/latex/base/ltluatex.tex2
-rw-r--r--Master/texmf-dist/tex/latex/base/ltpatch.ltx38
5 files changed, 16 insertions, 52 deletions
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
-
-
-
-
-
-
-