2015-05-13 23:54:00

10 files changed, 14 insertions, 9 deletions

diff --git a/tex/context/base/attr-ini.mkiv b/tex/context/base/attr-ini.mkiv
index f351a6800..c6b798d18 100644
--- a/tex/context/base/attr-ini.mkiv
+++ b/tex/context/base/attr-ini.mkiv
@@ -42,13 +42,14 @@
 
 \ifdefined \s!global    \else \def\s!global   {global}    \fi % for metatex % or hard check later
 \ifdefined \s!public    \else \def\s!public   {public}    \fi % for metatex % or hard check later
+\ifdefined \s!private   \else \def\s!private  {private}   \fi % for metatex % or hard check later
 \ifdefined \s!attribute \else \def\s!attribute{attribute} \fi % for metatex % or hard check later
 
 \unexpanded\def\defineattribute      {\dodoubleempty\attr_basics_define}
 \unexpanded\def\definesystemattribute{\dodoubleempty\attr_basics_define_system}
 
-\def\attr_basics_define       {\attr_basics_define_indeed{public}}
-\def\attr_basics_define_system{\attr_basics_define_indeed{private}}
+\def\attr_basics_define       {\attr_basics_define_indeed\s!public}
+\def\attr_basics_define_system{\attr_basics_define_indeed\s!private}
 
 \def\attr_basics_define_indeed#1[#2][#3]%
   {\scratchcounter\clf_defineattribute{#2}{#1}\relax
@@ -61,7 +62,9 @@
    % here public means 'visible' so it's not to be confused with 'public' at the lua end
    \doifinset   \s!public{#3}{\expandafter\let\csname#2\s!attribute\expandafter\endcsname\csname\??attributeid#2\endcsname}}
 
-\unexpanded\def\newattribute#1{\attr_basics_define_indeed{public}[\strippedcsname#1][]}
+\unexpanded\def\newattribute#1%
+  {\attr_basics_define_indeed\s!public[\strippedcsname#1][]%
+   \expandafter\let\expandafter#1\csname\??attributeid\strippedcsname#1\endcsname}
 
 % expandable so we can \edef them for speed
 
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index c6e42d6ce..cf38042b6 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{2015.05.13 19:24}
+\newcontextversion{2015.05.13 23:52}
 
 %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 55a2d3b1e..cd9ca783d 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 7b34a3707..a775cfa02 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -39,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2015.05.13 19:24}
+\edef\contextversion{2015.05.13 23:52}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/publ-dat.lua b/tex/context/base/publ-dat.lua
index 5d19003ce..36ba15000 100644
--- a/tex/context/base/publ-dat.lua
+++ b/tex/context/base/publ-dat.lua
@@ -817,7 +817,7 @@ do
         if not fullname then
             return
         end
-        local data = io.loaddata(filename) or ""
+        local data = io.loaddata(fullname) or ""
         if data == "" then
             report("empty file %a, nothing loaded",fullname)
             return
@@ -845,7 +845,7 @@ do
                 return
             end
             current = datasets[dataset]
-            data    = table.load(filename)
+            data    = table.load(fullname)
         end
         if data then
             local luadata = current.luadata
@@ -881,7 +881,7 @@ do
         end
         local current = datasets[dataset]
         local luadata = current.luadata
-        local root    = xml.load(filename)
+        local root    = xml.load(fullname)
         for bibentry in xmlcollected(root,"/bibtex/entry") do
             local attributes = bibentry.at
             local tag        = attributes.tag
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 77ffca6d6..78e8b3da7 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index cc66c5103..2db0c3406 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 446a41039..0e0e5ebba 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  : 05/13/15 19:24:50
+-- merge date  : 05/13/15 23:52:22
 
 do -- begin closure to overcome local limits and interference
 
diff --git a/tex/generic/context/luatex/luatex-mplib.tex b/tex/generic/context/luatex/luatex-mplib.tex
index 8af9f2d8a..09dd179f3 100644
--- a/tex/generic/context/luatex/luatex-mplib.tex
+++ b/tex/generic/context/luatex/luatex-mplib.tex
@@ -61,6 +61,7 @@
 %D Now load the needed \LUA\ code.
 
 \directlua{dofile(kpse.find_file('luatex-mplib.lua'))}
+% \directlua{dofile(resolvers.findfile('luatex-mplib.lua'))}
 
 %D The following code takes care of encapsulating the literals:
 
diff --git a/tex/generic/context/luatex/luatex-plain.tex b/tex/generic/context/luatex/luatex-plain.tex
index 1ea8558e9..c9a9e36cf 100644
--- a/tex/generic/context/luatex/luatex-plain.tex
+++ b/tex/generic/context/luatex/luatex-plain.tex
@@ -20,6 +20,7 @@
     \input {luatex-math}%
     \input {luatex-languages}%
     \input {luatex-mplib}%
+  % \input {luatex-gadgets}%
 }
 
 \edef\fmtversion{\fmtversion+luatex}