summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2012-03-28 18:39:00 +0200
committerHans Hagen <pragma@wxs.nl>2012-03-28 18:39:00 +0200
commite0dc2cc7b007422f721b8d5b0448879b8abc9262 (patch)
treefc1da14f5c14924342d92c00a081fabaf883a84e
parent85a09ca4d2e60bdc819b780c390c75f16d0e2121 (diff)
downloadcontext-e0dc2cc7b007422f721b8d5b0448879b8abc9262.tar.gz
beta 2012.03.28 18:39
-rw-r--r--tex/context/base/cont-new.mkii2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4071 -> 4075 bytes
-rw-r--r--tex/context/base/context-version.pngbin104736 -> 105858 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/file-job.lua26
-rw-r--r--tex/context/base/status-files.pdfbin24316 -> 24313 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin172377 -> 172395 bytes
-rw-r--r--tex/context/base/strc-ref.lua20
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
11 files changed, 47 insertions, 9 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index d1d15ae1d..fbe0c0399 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2012.03.28 15:03}
+\newcontextversion{2012.03.28 18:39}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index b47131749..826303060 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{2012.03.28 15:03}
+\newcontextversion{2012.03.28 18:39}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index b386b2a52..8f8559e04 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 cfe0d0e30..199b31e71 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.mkii b/tex/context/base/context.mkii
index 3f032abea..161552c08 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2012.03.28 15:03}
+\edef\contextversion{2012.03.28 18:39}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 0c1aff0ee..e35bdb41e 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -23,7 +23,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2012.03.28 15:03}
+\edef\contextversion{2012.03.28 18:39}
%D For those who want to use this:
diff --git a/tex/context/base/file-job.lua b/tex/context/base/file-job.lua
index d43efa232..992e4b7ec 100644
--- a/tex/context/base/file-job.lua
+++ b/tex/context/base/file-job.lua
@@ -402,11 +402,29 @@ end
luatex.registerstopactions(logtree)
-job.structure = job.structure or { }
-job.structure.collected = job.structure.collected or { }
-job.structure.tobesaved = root
+job.structure = job.structure or { }
+job.structure.collected = job.structure.collected or { }
+job.structure.tobesaved = root
+job.structure.components = { }
+
+local function initialize()
+ local function collect(root,result)
+ local branches = root.branches
+ if branches then
+ for i=1,#branches do
+ local branch = branches[i]
+ if branch.type == "component" then
+ result[#result+1] = branch.name
+ end
+ collect(branch,result)
+ end
+ end
+ return result
+ end
+ job.structure.components = collect(job.structure.collected,{})
+end
-job.register('job.structure.collected',root)
+job.register('job.structure.collected',root,initialize)
-- component: small unit, either or not components itself
-- product : combination of components
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index d0c786e4d..9ce7732f4 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 2a73bc2ec..6de73ec84 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/strc-ref.lua b/tex/context/base/strc-ref.lua
index 413e245bd..19a190cbb 100644
--- a/tex/context/base/strc-ref.lua
+++ b/tex/context/base/strc-ref.lua
@@ -1292,6 +1292,26 @@ local function identify_inner_or_outer(set,var,i)
end
return v
end
+
+local components = job.structure.components
+if components then
+ for i=1,#components do
+ local component = components[i]
+ local data = collected[component]
+ local vi = data and data[inner]
+ if vi then
+ var.outer = component
+ var.i = vi
+ var.kind = "outer with inner"
+ set.external = true
+ if trace_identifying then
+ report_identify_outer(set,var,i,"4x")
+ end
+ return var
+ end
+ end
+end
+
local componentreferences = productdata.componentreferences
local productreferences = productdata.productreferences
local components = productdata.components
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index fb3c156e1..bcbdfdfec 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 : 03/28/12 15:03:10
+-- merge date : 03/28/12 18:39:15
do -- begin closure to overcome local limits and interference