beta 2013.09.10 13:58

9 files changed, 38 insertions, 21 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 9d98dc719..869a9987b 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{2013.09.09 19:45}
+\newcontextversion{2013.09.10 13:58}
 
 %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 c8dc4504a..d53ad1639 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 b6169ae7a..0d72af759 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2013.09.09 19:45}
+\edef\contextversion{2013.09.10 13:58}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/font-odv.lua b/tex/context/base/font-odv.lua
index 0abb3be4c..e0bd6400f 100644
--- a/tex/context/base/font-odv.lua
+++ b/tex/context/base/font-odv.lua
@@ -101,7 +101,20 @@ local methods            = fonts.analyzers.methods
 local otffeatures        = fonts.constructors.newfeatures("otf")
 local registerotffeature = otffeatures.register
 
-local processcharacters  = nodes.handlers.characters
+local fontprocesses      = fonts.hashes.processes
+local xprocesscharacters = nodes.handlers.characters
+
+local function processcharacters(head,font)
+    return xprocesscharacters(head)
+end
+
+-- function processcharacters(head,font)
+--     local processors = fontprocesses[font]
+--     for i=1,#processors do
+--         head = processors[i](head,font,0)
+--     end
+--     return head, true
+-- end
 
 local insert_node_after  = node.insert_after
 local copy_node          = node.copy
@@ -575,7 +588,7 @@ local function deva_reorder(head,start,stop,font,attr)
                             tempcurrent.next = nextcurrent
                             nextcurrent.prev = tempcurrent
                             tempcurrent[a_state] = s_blwf
-                            tempcurrent = processcharacters(tempcurrent)
+                            tempcurrent = processcharacters(tempcurrent,font)
                             tempcurrent[a_state] = unsetvalue
                             if next.char == tempcurrent.char then
                                 flush_list(tempcurrent)
@@ -654,7 +667,8 @@ local function deva_reorder(head,start,stop,font,attr)
     end
 
     n = start.next
-    if start.char == c_ra and halant[n.char] and not (n ~= stop and zw_char[n.next.char]) then
+ -- if start.char == c_ra and halant[n.char] and not (n ~= stop and zw_char[n.next.char]) then
+    if n ~= stop and start.char == c_ra and halant[n.char] and not zw_char[n.next.char] then
         -- if syllable starts with Ra + H then move this combination so that it follows either:
         -- the post-base 'matra' (if any) or the base consonant
         local matra = base
@@ -1366,11 +1380,11 @@ local function dev2_reorder(head,start,stop,font,attr) -- maybe do a pass over (
                         local changestop = next == stop
                         next.next = nil
                         current[a_state] = s_pref
-                        current = processcharacters(current)
+                        current = processcharacters(current,font)
                         current[a_state] = s_blwf
-                        current = processcharacters(current)
+                        current = processcharacters(current,font)
                         current[a_state] = s_pstf
-                        current = processcharacters(current)
+                        current = processcharacters(current,font)
                         current[a_state] = unsetvalue
                         if halant[current.char] then
                             current.next.next = tmp
diff --git a/tex/context/base/m-punk.mkiv b/tex/context/base/m-punk.mkiv
index 23b477cb6..6bf92e4c0 100644
--- a/tex/context/base/m-punk.mkiv
+++ b/tex/context/base/m-punk.mkiv
@@ -110,7 +110,10 @@ function metapost.characters.process(mpxformat, name, instances, scalefactor)
                     data
                 },
                 false,
-                flusher
+                flusher,
+                false,
+                false,
+                "all"
             )
             lists[i] = {
                 characters   = characters,
diff --git a/tex/context/base/math-fbk.lua b/tex/context/base/math-fbk.lua
index d8eacfb4e..68cab22d3 100644
--- a/tex/context/base/math-fbk.lua
+++ b/tex/context/base/math-fbk.lua
@@ -6,20 +6,20 @@ if not modules then modules = { } end modules ['math-fbk'] = {
     license   = "see context related readme files"
 }
 
-local trace_fallbacks = false  trackers.register("math.fallbacks", function(v) trace_fallbacks = v end)
+local trace_fallbacks   = false  trackers.register("math.fallbacks", function(v) trace_fallbacks = v end)
 
-local report_fallbacks = logs.reporter("math","fallbacks")
+local report_fallbacks  = logs.reporter("math","fallbacks")
 
-local formatters = string.formatters
-local fastcopy = table.fastcopy
+local formatters        = string.formatters
+local fastcopy          = table.fastcopy
 
-local fallbacks       = { }
-mathematics.fallbacks = fallbacks
+local fallbacks         = { }
+mathematics.fallbacks   = fallbacks
 
 local virtualcharacters = { }
 
-local identifiers = fonts.hashes.identifiers
-local lastmathids = fonts.hashes.lastmathids
+local identifiers       = fonts.hashes.identifiers
+local lastmathids       = fonts.hashes.lastmathids
 
 -- we need a trick (todo): if we define scriptscript, script and text in
 -- that order we could use their id's .. i.e. we could always add a font
@@ -118,7 +118,7 @@ function fallbacks.apply(target,original)
                 end
                 if trace_fallbacks then
                     if characters[k] then
-                        report_fallbacks("extending font %a with %U",target.properties.fullname,k)
+                        report_fallbacks("extending math font %a with %U",target.properties.fullname,k)
                     end
                 end
             end
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index fb4728e60..cf5faa092 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.log b/tex/context/base/status-lua.log
index 4ee7dd4b7..d46d55954 100644
--- a/tex/context/base/status-lua.log
+++ b/tex/context/base/status-lua.log
@@ -1,6 +1,6 @@
 (cont-yes.mkiv
 
-ConTeXt  ver: 2013.09.09 19:45 MKIV beta  fmt: 2013.9.9  int: english/english
+ConTeXt  ver: 2013.09.10 13:58 MKIV beta  fmt: 2013.9.10  int: english/english
 
 system          > 'cont-new.mkiv' loaded
 (cont-new.mkiv)
@@ -76,4 +76,4 @@ references      > unknown reference '[][math]'
 references      > unknown reference '[][mathematics]'
 references      > unknown reference '[][mbox]'
 references      > unknown reference '[][md5]'
-references      > unknown reference '[][metapost]
\ No newline at end of file
+references      > unknown reference '[][metapost
\ No newline at end of file
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 1ecfcd41b..e0d09e7e6 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  : 09/09/13 19:45:46
+-- merge date  : 09/10/13 13:58:23
 
 do -- begin closure to overcome local limits and interference