beta 2011.01.14 14:32

10 files changed, 80 insertions, 65 deletions

diff --git a/tex/context/base/buff-ver.lua b/tex/context/base/buff-ver.lua
index 958021374..070224751 100644
--- a/tex/context/base/buff-ver.lua
+++ b/tex/context/base/buff-ver.lua
@@ -10,7 +10,7 @@ if not modules then modules = { } end modules ['buff-ver'] = {
 -- supposed to use different names for their own variants.
 
 local type, next, rawset, rawget, setmetatable, getmetatable = type, next, rawset, rawget, setmetatable, getmetatable
-local format, lower, match, find, sub = string.format, string.lower, string.match, string.find, string.sub
+local format, lower, upper,match, find, sub = string.format, string.lower, string.upper, string.match, string.find, string.sub
 local splitlines = string.splitlines
 local concat = table.concat
 local C, P, R, V, Carg, Cc, Cs = lpeg.C, lpeg.P, lpeg.R, lpeg.V, lpeg.Carg, lpeg.Cc, lpeg.Cs
@@ -20,6 +20,10 @@ local tabtospace = utilities.strings.tabtospace
 local variables = interfaces.variables
 local settings_to_array = utilities.parsers.settings_to_array
 
+local trace_visualize = false  trackers.register("buffers.visualize", function(v) trace_visualize = v end)
+
+local report_buffers = logs.new("buffers")
+
 visualizers = visualizers or { }
 
 local specifications = { }  visualizers.specifications = specifications
@@ -150,10 +154,14 @@ function visualizers.newhandler(name,data)
 end
 
 function visualizers.newgrammar(name,t)
+    name = lower(name)
     t = t or { }
     local g = visualizers.specifications[name]
     g = g and g.grammar
     if g then
+        if trace_visualize then
+            report_buffers("cloning grammar '%s'",name)
+        end
         for k,v in next, g do
             if not t[k] then
                 t[k] = v
@@ -167,10 +175,17 @@ function visualizers.newgrammar(name,t)
 end
 
 local function getvisualizer(method,nature)
+    method = lower(method)
     local m = specifications[method] or specifications.default
     if nature then
+        if trace_visualize then
+            report_buffers("getting visualizer '%s' with nature '%s'",method,nature)
+        end
         return m and (m[nature] or m.parser) or nil
     else
+        if trace_visualize then
+            report_buffers("getting visualizer '%s'",method)
+        end
         return m and m.parser or nil
     end
 end
@@ -206,6 +221,7 @@ visualizers.makepattern = makepattern
 visualizers.makenested  = makenested
 
 function visualizers.load(name)
+    name = lower(name)
     if rawget(specifications,name) == nil then
         name = lower(name)
         local texname = findfile(format("v-%s.mkiv",name))
@@ -216,8 +232,13 @@ function visualizers.load(name)
             texname = findfile(addsuffix(name,"lua" ))
         end
         if texname == "" or luaname == "" then
-            -- error message
+            if trace_visualize then
+                report_buffers("unknown visualizer '%s'",name)
+            end
         else
+            if trace_visualize then
+                report_buffers("loading visualizer '%s'",name)
+            end
             lua.registercode(luaname)
             context.input(texname)
         end
@@ -232,6 +253,10 @@ function commands.doifelsevisualizer(name)
 end
 
 function visualizers.register(name,specification)
+    name = lower(name)
+    if trace_visualize then
+        report_buffers("registering visualizer '%s'",name)
+    end
     specifications[name] = specification
     local parser, handler = specification.parser, specification.handler
     local displayparser = specification.display or parser
@@ -301,7 +326,7 @@ local function texcommand(s)
 end
 
 local function defaultmethod(s,settings)
-    lpegmatch(getvisualizer("default"),s,1,settings)
+    lpegmatch(getvisualizer("default"),lower(s),1,settings)
 end
 
 -- we can consider using a nested instead
@@ -316,6 +341,9 @@ end
 function visualizers.registerescapepattern(name,before,after,normalmethod,escapemethod)
     local escapepattern = escapepatterns[name]
     if not escapepattern then
+        if trace_visualize then
+            report_buffers("registering escape pattern, name: '%s', before: '%s', after: '%s'",name,before,after)
+        end
         before, after = P(before) * space_pattern, space_pattern * P(after)
         escapepattern = (
             (before / "")
@@ -331,6 +359,9 @@ end
 function visualizers.registerescapecommand(name,token,normalmethod,escapecommand)
     local escapepattern = escapepatterns[name]
     if not escapepattern then
+        if trace_visualize then
+            report_buffers("registering escape token, name: '%s', token: '%s'",name,token)
+        end
         token = P(token)
         local notoken = hack((1 - token)^1)
         local cstoken = name_pattern * space_pattern
@@ -348,7 +379,7 @@ local escapedvisualizers = { }
 
 local function visualize(content,settings) -- maybe also method in settings
     if content and content ~= "" then
-        local method = settings.method or "default"
+        local method = lower(settings.method or "default")
         local m
         local e = settings.escape
         if e and e ~= "" then
@@ -382,8 +413,14 @@ local function visualize(content,settings) -- maybe also method in settings
         local nature = settings.nature or "display"
         local n = m and m[nature]
         if n then
+            if trace_visualize then
+                report_buffers("visualize using method '%s' and nature '%s'",method,nature)
+            end
             n(content,settings)
         else
+            if trace_visualize then
+                report_buffers("visualize using method '%s'",method)
+            end
             fallback(content,1,settings)
         end
     end
@@ -417,11 +454,11 @@ end
 
 -- --
 
-local space     = C(patterns.space)         * CargOne / f_space
-local newline   = C(patterns.newline)       * CargOne / f_newline
-local emptyline = C(patterns.emptyline)     * CargOne / f_emptyline
-local beginline = C(patterns.beginline)     * CargOne / f_beginline
-local anything  = C(patterns.somecontent^1) * CargOne / f_default
+local space     = C(patterns.space)       * CargOne / f_space
+local newline   = C(patterns.newline)     * CargOne / f_newline
+local emptyline = C(patterns.emptyline)   * CargOne / f_emptyline
+local beginline = C(patterns.beginline)   * CargOne / f_beginline
+local anything  = C(patterns.somecontent) * CargOne / f_default
 
 local verbosed  = (space + newline * (emptyline^0) * beginline + anything)^0
 
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 99bca8f23..032c56370 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2011.01.13 10:20}
+\newcontextversion{2011.01.14 14:32}
 
 %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.tex b/tex/context/base/context.tex
index 986e5122c..e50ba37f1 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.01.13 10:20}
+\edef\contextversion{2011.01.14 14:32}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/font-ini.mkiv b/tex/context/base/font-ini.mkiv
index 93e020d93..9be2feb10 100644
--- a/tex/context/base/font-ini.mkiv
+++ b/tex/context/base/font-ini.mkiv
@@ -2095,11 +2095,16 @@
 
 % \newconditional\fontsareloaded
 
+% \def\preloaddefaultfonts
+%   {\resetpreloadfonts
+%    \usetypescript[modern]%
+%    \setuptypeface[modern]%
+%   %\setupbodyfont[modern]%
+%    \showmessage\m!fonts6{\normalizedbodyfontsize\normalspace\fontstyle}}
+
 \def\preloaddefaultfonts
   {\resetpreloadfonts
-   \usetypescript[modern]%
-   \setuptypeface[modern]%
-  %\setupbodyfont[modern]%
+   \setupbodyfont[modern,\fontstyle,\fontbody]%
    \showmessage\m!fonts6{\normalizedbodyfontsize\normalspace\fontstyle}}
 
 \def\resetpreloadfonts
diff --git a/tex/context/base/l-lpeg.lua b/tex/context/base/l-lpeg.lua
index 6b611c2c8..9193bac9a 100644
--- a/tex/context/base/l-lpeg.lua
+++ b/tex/context/base/l-lpeg.lua
@@ -40,9 +40,6 @@ local squote           = P("'")
 local dquote           = P('"')
 local space            = P(" ")
 
-patterns.somecontent   = (anything - newline - space)^1
-patterns.beginline     = #(1-newline)
-
 local utfbom_32_be     = P('\000\000\254\255')
 local utfbom_32_le     = P('\255\254\000\000')
 local utfbom_16_be     = P('\255\254')
@@ -115,6 +112,9 @@ patterns.undouble      = (dquote/"") * patterns.nodquote * (dquote/"")
 patterns.unquoted      = patterns.undouble + patterns.unsingle -- more often undouble
 patterns.unspacer      = ((patterns.spacer^1)/"")^0
 
+patterns.somecontent   = (anything - newline - space)^1 -- (utf8char - newline - space)^1
+patterns.beginline     = #(1-newline)
+
 local unquoted = Cs(patterns.unquoted * endofstring) -- not C
 
 function string.unquoted(str)
diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/math-ini.mkiv
index c150ffdf2..d530f5937 100644
--- a/tex/context/base/math-ini.mkiv
+++ b/tex/context/base/math-ini.mkiv
@@ -441,6 +441,11 @@
     \stopextendcatcodetable
 \to \everydonknuthmode
 
+% \def\prefermathcatcodes
+%   {\catcode\underscoreasciicode\subscriptcatcode
+%    \catcode\caretasciicode     \superscriptcatcode
+%    \catcode\ampersandasciicode \alignmentcatcode}
+
 %D Even more drastic:
 
 \unexpanded\def\asciimode
diff --git a/tex/context/base/meta-pdf.lua b/tex/context/base/meta-pdf.lua
index ad4bcca81..929c2047e 100644
--- a/tex/context/base/meta-pdf.lua
+++ b/tex/context/base/meta-pdf.lua
@@ -24,7 +24,7 @@ local pdfgraycode               = lpdf.graycode
 local pdfspotcode               = lpdf.spotcode
 local pdftransparencycode       = lpdf.transparencycode
 local pdffinishtransparencycode = lpdf.finishtransparencycode
-local pdfliteral                = node.pdfliteral
+local pdfliteral                = nodes.pool.pdfliteral
 
 metapost.mptopdf = metapost.mptopdf or { }
 local mptopdf    = metapost.mptopdf
@@ -50,12 +50,14 @@ end
 
 resetall()
 
--- todo: collect and flush packed using pdfliteral node injection but we're
--- in no hurry as this kind of conversion does not happen that often in mkiv
+-- -- this does not work as expected (displacement of text)
+-- -- beware, needs another comment hack
+--
+-- local function pdfcode(str)
+--    context(pdfliteral(str))
+-- end
 
-local function pdfcode(str) -- could be a node.write instead
-    context(pdfliteral(str))
-end
+local pdfcode = context.pdfliteral
 
 local function mpscode(str)
     if ignore_path then
@@ -510,7 +512,6 @@ local verbose = (
 -- order matters in terms of speed / we could check for procset first
 
 local captures_old = ( space + verbose + preamble           )^0
---~ local captures_new = ( space + procset + preamble + verbose )^0
 local captures_new = ( space + verbose + procset + preamble )^0
 
 local function parse(m_data)
@@ -532,11 +533,13 @@ function mptopdf.convertmpstopdf(name)
         mps.colormodel = tex.attribute[a_colorspace]
         statistics.starttiming(mptopdf)
         mptopdf.nofconverted = mptopdf.nofconverted + 1
+     -- pdfcode(format("%% mptopdf begin: n=%s, file=%s",mptopdf.nofconverted,file.basename(name)))
         pdfcode(format("\\letterpercent\\space mptopdf begin: n=%s, file=%s",mptopdf.nofconverted,file.basename(name)))
         pdfcode("q 1 0 0 1 0 0 cm")
         parse(m_data)
         pdfcode(pdffinishtransparencycode())
         pdfcode("Q")
+     -- pdfcode("% mptopdf end")
         pdfcode("\\letterpercent\\space mptopdf end")
         resetall()
         statistics.stoptiming(mptopdf)
@@ -545,7 +548,6 @@ function mptopdf.convertmpstopdf(name)
     end
 end
 
-
 -- status info
 
 statistics.register("mps conversion time",function()
diff --git a/tex/context/base/v-default.lua b/tex/context/base/v-default.lua
index 5da94bf3c..2f5c44245 100644
--- a/tex/context/base/v-default.lua
+++ b/tex/context/base/v-default.lua
@@ -20,8 +20,8 @@ local grammar = { "visualizer",
     beginline  = makepattern(handler,"beginline",patterns.beginline),
     newline    = makepattern(handler,"newline",  patterns.newline),
     space      = makepattern(handler,"space",    patterns.space),
-    default    = makepattern(handler,"default",  patterns.anything),
-    content    = makepattern(handler,"default",  patterns.somecontent),
+    default    = makepattern(handler,"default",  patterns.utf8char),
+    content    = makepattern(handler,"default",  patterns.somecontent), -- not too efficient
 
     -- handy
 
diff --git a/tex/context/base/v-lua.lua b/tex/context/base/v-lua.lua
index 97d1b27df..a7ca42cf8 100644
--- a/tex/context/base/v-lua.lua
+++ b/tex/context/base/v-lua.lua
@@ -134,13 +134,6 @@ local handler = visualizers.newhandler {
     name_c       = visualizename_c,
 }
 
-local space       = patterns.space
-local anything    = patterns.anything
-local newline     = patterns.newline
-local emptyline   = patterns.emptyline
-local beginline   = patterns.beginline
-local somecontent = patterns.somecontent
-
 local comment     = P("--")
 local name        = (patterns.letter + patterns.underscore)
                   * (patterns.letter + patterns.underscore + patterns.digit)^0
@@ -156,14 +149,6 @@ local close       = P("]") * C(equals) * P("]")
 local closeeq     = Cmt(close * Cb("init"), function(s,i,a,b) return a == b end)
 local longstring  = open * Cs((P(1) - closeeq)^0) * close * Carg(1)
 
---~ local simple = P ( -- here we hook into the handler but it is default so we could use that
---~     makepattern(handler,"space",space)
---~   + makepattern(handler,"newline",newline)
---~   * makepattern(handler,"emptyline",emptyline)
---~   * makepattern(handler,"beginline",beginline)
---~   + makepattern(handler,"default",anything)
---~ )^0
-
 local function long(content,equals,settings)
     handler.boundary(format("[%s[",equals or ""))
     visualizers.write(content,settings) -- unhandled
@@ -171,25 +156,6 @@ local function long(content,equals,settings)
 end
 
 local grammar = visualizers.newgrammar("default", { "visualizer",
---~     emptyline =
---~         makepattern(handler,"emptyline",emptyline),
---~     beginline =
---~         makepattern(handler,"beginline",beginline),
---~     newline =
---~         makepattern(handler,"newline",newline),
---~     space =
---~         makepattern(handler,"space",space),
---~     default =
---~         makepattern(handler,"default",anything),
---~     line =
---~         V("newline") * V("emptyline")^0 * V("beginline"),
---~     whitespace =
---~         (V("space") + V("line"))^1,
---~     optionalwhitespace =
---~         (V("space") + V("line"))^0,
---~     content =
---~         makepattern(handler,"default",somecontent),
-
     sstring =
         makepattern(handler,"quote",patterns.dquote)
       * (V("whitespace") + makepattern(handler,"string",1-patterns.dquote))^0 -- patterns.nodquote
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index 65f20d760..71ebb60fb 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 01/13/11 10:20:58
+-- merge date  : 01/14/11 14:32:03
 
 do -- begin closure to overcome local limits and interference
 
@@ -173,9 +173,6 @@ local squote           = P("'")
 local dquote           = P('"')
 local space            = P(" ")
 
-patterns.somecontent   = (anything - newline - space)^1
-patterns.beginline     = #(1-newline)
-
 local utfbom_32_be     = P('\000\000\254\255')
 local utfbom_32_le     = P('\255\254\000\000')
 local utfbom_16_be     = P('\255\254')
@@ -248,6 +245,9 @@ patterns.undouble      = (dquote/"") * patterns.nodquote * (dquote/"")
 patterns.unquoted      = patterns.undouble + patterns.unsingle -- more often undouble
 patterns.unspacer      = ((patterns.spacer^1)/"")^0
 
+patterns.somecontent   = (anything - newline - space)^1 -- (utf8char - newline - space)^1
+patterns.beginline     = #(1-newline)
+
 local unquoted = Cs(patterns.unquoted * endofstring) -- not C
 
 function string.unquoted(str)