diff options
Diffstat (limited to 'tex/context/base/java-ini.lua')
-rw-r--r-- | tex/context/base/java-ini.lua | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/tex/context/base/java-ini.lua b/tex/context/base/java-ini.lua index d69b5322c..7872031a8 100644 --- a/tex/context/base/java-ini.lua +++ b/tex/context/base/java-ini.lua @@ -17,7 +17,8 @@ local variables = interfaces.variables local trace_javascript = false trackers.register("backends.javascript", function(v) trace_javascript = v end) -local report_javascripts = logs.reporter("interactions","javascripts") +local report_javascripts = logs.reporter ("interactions","javascripts") +local status_javascripts = logs.messenger("interactions","javascripts") interactions.javascripts = interactions.javascripts or { } local javascripts = interactions.javascripts @@ -68,7 +69,7 @@ function javascripts.storepreamble(str) -- now later preambles[n] = { name, used, script } preambled[name] = n if trace_javascript then - report_javascripts("storing preamble '%s', state '%s', order '%s'",name,used,n) + report_javascripts("stored: preamble '%s', state '%s', order '%s'",name,used,n) end lpegmatch(parsefunctions,script,1,n) end @@ -80,7 +81,7 @@ function javascripts.setpreamble(name,script) -- now later preambles[n] = { name, "now", script } preambled[name] = n if trace_javascript then - report_javascripts("setting preamble '%s', state 'now', order '%s'",name,n) + report_javascripts("adapted: preamble '%s', state '%s', order '%s'",name,"now",n) end lpegmatch(parsefunctions,script,1,n) end @@ -92,14 +93,14 @@ function javascripts.addtopreamble(name,script) -- now later if p then preambles[p] = { "now", preambles[p] .. " ;\n" .. script } if trace_javascript then - report_javascripts("extending preamble '%s', state 'now'",name) + report_javascripts("extended: preamble '%s', state '%s', order '%s'",name,"now",p) end else local n = #preambles + 1 preambles[n] = { name, "now", script } preambled[name] = n if trace_javascript then - report_javascripts("storing preamble '%s', state 'now', order '%s'",name,n) + report_javascripts("stored: preamble '%s', state '%s', order '%s'",name,"now",n) end lpegmatch(parsefunctions,script,1,n) end @@ -114,7 +115,7 @@ function javascripts.usepreamblenow(name) -- now later if not preambled[somename] then preambles[preambled[somename]][2] = "now" if trace_javascript then - report_javascripts("using preamble '%s', state 'now'",somename) + report_javascripts("used: preamble '%s', state '%s', order '%s'",somename,"now","auto") end end end @@ -135,15 +136,15 @@ function javascripts.code(name,arguments) preambles[p][2] = "now" if trace_javascript and not reported[name] then reported[name] = true - report_javascripts("using code '%s', preamble '%s'",name,u) + report_javascripts("used: code '%s', preamble '%s'",name,u) end elseif trace_javascript and not reported[name] then reported[name] = true - report_javascripts("using code '%s'",name) + report_javascripts("used: code '%s'",name) end elseif trace_javascript and not reported[name] then reported[name] = true - report_javascripts("using code '%s'",name) + report_javascripts("used: code '%s'",name) end used = true return code @@ -153,9 +154,9 @@ function javascripts.code(name,arguments) used = true if trace_javascript and not reported[name] then reported[name] = true - report_javascripts("using function '%s'",name) + report_javascripts("used: function '%s'",name) end -preambles[f][2] = "now" -- automatically tag preambles that define the function (as later) + preambles[f][2] = "now" -- automatically tag preambles that define the function (as later) if arguments then local args = lpegmatch(splitter,arguments) for i=1,#args do -- can be a helper @@ -175,7 +176,7 @@ function javascripts.flushpreambles() local preamble = preambles[i] if preamble[2] == "now" then if trace_javascript then - report_javascripts("flushing preamble '%s'",preamble[1]) + report_javascripts("flushed: preamble '%s'",preamble[1]) end t[#t+1] = { preamble[1], preamble[3] } end @@ -187,14 +188,17 @@ end local patterns = { "java-imp-%s.mkiv", "java-imp-%s.tex", "java-%s.mkiv", "java-%s.tex" } function javascripts.usescripts(name) - if name ~= variables.reset then + -- this will become pure lua, no context + if name ~= variables.reset then -- reset is obsolete commands.uselibrary(name,patterns,function(name,foundname) context.startnointerference() context.startreadingfile() context.input(foundname) - context.showmessage("javascripts",1,name) + status_javascripts("loaded: library '%s'",name) context.stopreadingfile() context.stopnointerference() + end, function(name) + report_javascripts("unknown: library '%s'",name) end) end end |