summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4130 -> 4127 bytes
-rw-r--r--tex/context/base/context-version.pngbin40489 -> 39797 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/font-def.lua5
-rw-r--r--tex/context/base/l-package.lua20
-rw-r--r--tex/context/base/page-set.mkiv8
-rw-r--r--tex/context/base/status-files.pdfbin24755 -> 24730 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin211441 -> 211559 bytes
-rw-r--r--tex/context/base/trac-log.lua4
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua6
11 files changed, 18 insertions, 29 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index e8571ea21..4838c5219 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2013.04.19 16:29}
+\newcontextversion{2013.04.20 01:08}
%D This file is loaded at runtime, thereby providing an excellent place for
%D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index a7f052cf0..a91d22aaa 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 16b951ff1..d3ced9ec1 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 45b0bc69d..144f265ae 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2013.04.19 16:29}
+\edef\contextversion{2013.04.20 01:08}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/font-def.lua b/tex/context/base/font-def.lua
index da31beac9..cb056ff1b 100644
--- a/tex/context/base/font-def.lua
+++ b/tex/context/base/font-def.lua
@@ -43,6 +43,7 @@ specifiers.variants = variants
definers.methods = definers.methods or { }
local internalized = allocate() -- internal tex numbers (private)
+local lastdefined = nil -- we don't want this one to end up in s-tra-02
local loadedfonts = constructors.loadedfonts
local designsizes = constructors.designsizes
@@ -344,6 +345,7 @@ function constructors.readanddefine(name,size) -- no id -- maybe a dummy first
if not id then
local tfmdata = definers.loadfont(specification)
if tfmdata then
+ tfmdata.properties.hash = hash
constructors.checkvirtualids(tfmdata) -- experiment, will become obsolete when slots can selfreference
id = font.define(tfmdata)
definers.register(tfmdata,id)
@@ -366,9 +368,6 @@ not gain much. By the way, passing id's back to in the callback was
introduced later in the development.</p>
--ldx]]--
-local lastdefined = nil -- we don't want this one to end up in s-tra-02
-local internalized = { }
-
function definers.current() -- or maybe current
return lastdefined
end
diff --git a/tex/context/base/l-package.lua b/tex/context/base/l-package.lua
index 303e727d8..09e65f9c8 100644
--- a/tex/context/base/l-package.lua
+++ b/tex/context/base/l-package.lua
@@ -271,27 +271,16 @@ methods["all in one fallback"] = function(name)
return builtin["all in one fallback"](name)
end
-local nomore = function() return nil, "no more loaders" end
-
methods["not loaded"] = function(name)
if helpers.trace then
- helpers.report("unable to locate '%s'",name)
+ helpers.report("unable to locate '%s'",name or "?")
end
- return nomore
+ return nil
end
local level = 0
-local dummy = function() return nil end
function helpers.loaded(name)
- -- if searchers[1] ~= helpers.loaded then
- -- -- just in case another loader is pushed in front ... in principle we could
- -- -- shuffle that one but let's forget about it for now
- -- if helpers.trace then
- -- helpers.report("disabled")
- -- end
- -- return dummy
- -- end
local sequence = helpers.sequence
level = level + 1
for i=1,#sequence do
@@ -308,12 +297,9 @@ function helpers.loaded(name)
return result, rest
end
end
- if helpers.trace then
- helpers.report("%s, level '%s', method '%s', name '%s'","not found",level,method,name)
- end
-- safeguard, we never come here
level = level - 1
- return nomore
+ return nil
end
function helpers.unload(name)
diff --git a/tex/context/base/page-set.mkiv b/tex/context/base/page-set.mkiv
index b7c26035e..9c232f535 100644
--- a/tex/context/base/page-set.mkiv
+++ b/tex/context/base/page-set.mkiv
@@ -327,7 +327,9 @@
{\bgroup
\global\columnfirstcell\ifnum#2=0 1\else#2\fi\relax
\OTRSETsetcorrectnofcells\currentcolumnmaxcells % sets \scratchcounter
- \edef\columnmaxcells{\the\scratchcounter}%
+ \ifnum\scratchcounter<\columnmaxcells\relax
+ \edef\columnmaxcells{\the\scratchcounter}% added 2013.04.19
+ \fi
\ifnum\columnfirstcell>\columnmaxcells
\global\columnfreecells\zerocount
\global\columnfirstcell\plusone
@@ -361,9 +363,7 @@
\ifnum\columnlastcell>\columnmaxcells
\global\columnlastcell\columnmaxcells
\fi
- \global\columnfreecells\columnlastcell
- \global\advance\columnfreecells -\columnfirstcell
- \global\advance\columnfreecells \plusone
+ \global\columnfreecells\numexpr\columnlastcell-\columnfirstcell+\plusone\relax
\global\somefreecolumncellstrue
%\message{\number\columnfirstcell-\number\columnlastcell=\number\columnfreecells}%
\fi
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 740de0373..c946b365c 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 9cb8402ad..0a20f8d03 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/trac-log.lua b/tex/context/base/trac-log.lua
index 0dadb855e..be2a954e3 100644
--- a/tex/context/base/trac-log.lua
+++ b/tex/context/base/trac-log.lua
@@ -810,3 +810,7 @@ io.stderr:setvbuf('no')
-- windows: > nul 2>&1
-- unix : > null 2>&1
+
+if package.helpers.report then
+ package.helpers.report = logs.reporter("package loader") -- when used outside mtxrun
+end
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index e8eb49c9c..c5ce7b5ce 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 04/19/13 16:29:24
+-- merge date : 04/20/13 01:08:47
do -- begin closure to overcome local limits and interference
@@ -10376,6 +10376,7 @@ local variants=allocate()
specifiers.variants=variants
definers.methods=definers.methods or {}
local internalized=allocate()
+local lastdefined=nil
local loadedfonts=constructors.loadedfonts
local designsizes=constructors.designsizes
local resolvefile=fontgoodies and fontgoodies.filenames and fontgoodies.filenames.resolve or function(s) return s end
@@ -10590,6 +10591,7 @@ function constructors.readanddefine(name,size)
if not id then
local tfmdata=definers.loadfont(specification)
if tfmdata then
+ tfmdata.properties.hash=hash
constructors.checkvirtualids(tfmdata)
id=font.define(tfmdata)
definers.register(tfmdata,id)
@@ -10599,8 +10601,6 @@ function constructors.readanddefine(name,size)
end
return fontdata[id],id
end
-local lastdefined=nil
-local internalized={}
function definers.current()
return lastdefined
end