summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4348 -> 4348 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/node-nut.lua4
-rw-r--r--tex/context/base/publ-dat.lua6
-rw-r--r--tex/context/base/publ-ini.lua7
-rw-r--r--tex/context/base/publ-ini.mkiv4
-rw-r--r--tex/context/base/status-files.pdfbin24885 -> 24902 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin246860 -> 246856 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
10 files changed, 16 insertions, 11 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 63fe35cd1..cca80bc32 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{2014.06.11 15:52}
+\newcontextversion{2014.06.13 01:11}
%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 7ffefbcfc..d2dea43e7 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.mkiv b/tex/context/base/context.mkiv
index 8a91ce755..c8ebab07e 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2014.06.11 15:52}
+\edef\contextversion{2014.06.13 01:11}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/node-nut.lua b/tex/context/base/node-nut.lua
index 2b4e9968c..4c2883445 100644
--- a/tex/context/base/node-nut.lua
+++ b/tex/context/base/node-nut.lua
@@ -662,8 +662,8 @@ if propertydata then
data = propertydata,
}
- direct.set_properties_mode(true,false)
- -- direct.set_properties_mode(true,true)
+ -- direct.set_properties_mode(true,false) -- shallow copy ... problem: in fonts we then affect the originals too
+ direct.set_properties_mode(true,true) -- create metatable, slower but needed for font-inj.lua (unless we use an intermediate table)
-- experimental code with respect to copying attributes has been removed
-- as it doesn't pay of (most attributes are only accessed once anyway)
diff --git a/tex/context/base/publ-dat.lua b/tex/context/base/publ-dat.lua
index f3d8547fb..082b97c3c 100644
--- a/tex/context/base/publ-dat.lua
+++ b/tex/context/base/publ-dat.lua
@@ -326,13 +326,13 @@ function publications.loadbibdata(dataset,content,source,kind)
report("invalid source for dataset %a",dataset)
return
end
+ dataset = datasets[dataset]
local size = #content
if size == 0 then
- report("empty source %a for dataset %a",source,dataset)
+ report("empty source %a for dataset %a",source,dataset.name)
else
- report("adding bib data to set %a from source %a",dataset,source)
+ report("adding bib data to set %a from source %a",dataset.name,source)
end
- dataset = datasets[dataset]
statistics.starttiming(publications)
publicationsstats.nofbytes = publicationsstats.nofbytes + size
dataset.nofbytes = dataset.nofbytes + size
diff --git a/tex/context/base/publ-ini.lua b/tex/context/base/publ-ini.lua
index 1ec88521e..0cfda11a2 100644
--- a/tex/context/base/publ-ini.lua
+++ b/tex/context/base/publ-ini.lua
@@ -209,7 +209,8 @@ local function finalizer()
local used = { }
for i=1,#sources do
local source = sources[i]
- if loaded[source.filename] ~= "previous" then -- or loaded[source.filename] == "current"
+-- if loaded[source.filename] ~= "previous" then
+ if loaded[source.filename] ~= "previous" or loaded[source.filename] == "current" then
used[#used+1] = source
end
end
@@ -574,10 +575,12 @@ function commands.addbtxentry(name,settings,content)
end
end
-function commands.setbtxdataset(name)
+function commands.setbtxdataset(name,default)
local dataset = rawget(datasets,name)
if dataset then
context(name)
+ elseif default and default ~= "" then
+ context(name)
else
report("unknown dataset %a",name)
end
diff --git a/tex/context/base/publ-ini.mkiv b/tex/context/base/publ-ini.mkiv
index 04c8d4aea..107e23122 100644
--- a/tex/context/base/publ-ini.mkiv
+++ b/tex/context/base/publ-ini.mkiv
@@ -293,11 +293,13 @@
\let\currentbtxdataset\v!standard
\unexpanded\def\setbtxdataset[#1]%
- {\edef\currentbtxdataset{\ctxcommand{setbtxdataset("#1")}}}
+ {\edef\m_temp{\ctxcommand{setbtxdataset("#1","\currentbtxdataset")}}}
\unexpanded\def\setbtxentry[#1]%
{\edef\currentbtxtag{\ctxcommand{setbtxentry("\currentbtxdataset","#1")}}}
+\setbtxdataset[\v!standard]
+
% \let\btxsetdataset\setbtxdataset
% \let\btxsetentry \setbtxentry
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 7e431659c..90dcf1e59 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 2e9d791a6..ab35fb8a4 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 1330b0ab3..f31c800c7 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 : 06/11/14 15:52:46
+-- merge date : 06/13/14 01:11:28
do -- begin closure to overcome local limits and interference