beta 2013.08.02 21:57

12 files changed, 273 insertions, 67 deletions

diff --git a/tex/context/base/back-pdf.lua b/tex/context/base/back-pdf.lua
index f9115375c..a4c0d4b00 100644
--- a/tex/context/base/back-pdf.lua
+++ b/tex/context/base/back-pdf.lua
@@ -26,23 +26,13 @@ local context = context
 local sind, cosd = math.sind, math.cosd
 local insert, remove = table.insert, table.remove
 
--- function commands.pdfrotation(a) -- somewhat weird here
---     local s, c = sind(a), cosd(a)
---     context("%0.6f %0.6f %0.6f %0.6f",c,s,-s,c)
--- end
-
-local stack       = { }
-local f_rotation  = string.formatters["%0.8f %0.8f %0.8f %0.8f"]
-local f_scaling   = string.formatters["%0.8f 0 0 %0.8f"]
-local s_mirroring = "-1 0 0 1"
-local f_matrix    = string.formatters["%0.8f %0.8f %0.8f %0.8f"]
-
 local pdfsetmatrix = nodes.pool.pdfsetmatrix
+local stack        = { }
 
-local function pop()
+local function popmatrix()
     local top = remove(stack)
     if top then
-        context(pdfsetmatrix(top))
+        context(pdfsetmatrix(unpack(top)))
     end
 end
 
@@ -52,7 +42,7 @@ function commands.pdfstartrotation(a)
     else
         local s, c = sind(a), cosd(a)
         context(pdfsetmatrix(f_rotation(c,s,-s,c)))
-        insert(stack,f_rotation(-c,-s,s,-c))
+        insert(stack,{ -c, -s, s, -c })
     end
 end
 
@@ -60,30 +50,31 @@ function commands.pdfstartscaling(sx,sy)
     if sx == 1 and sy == 1 then
         insert(stack,false)
     else
-        if sx == 0 then sx = 0.0001 end -- prevent acrobat crash
-        if sy == 0 then sy = 0.0001 end -- prevent acrobat crash
-        context(pdfsetmatrix(f_scaling(sx,sy)))
-        insert(stack,f_scaling(1/sx,1/sy))
+        if sx == 0 then
+            sx = 0.0001
+        end
+        if sy == 0 then
+            sy = 0.0001
+        end
+        context(pdfsetmatrix(sx,0,0,sy))
+        insert(stack,{ 1/sx, 0, 0, 1/sy })
     end
 end
 
-function commands.pdfstartmirroring(sx,sy)
-    context(pdfsetmatrix(s_mirroring))
-    insert(stack,s_mirroring)
+function commands.pdfstartmirroring()
+    context(pdfsetmatrix(-1,0,0,1))
 end
 
 function commands.pdfstartmatrix(sx,rx,ry,sy)
-    if sx ==1 and rx == 0 and ry == 0 and sy == 1 then
+    if sx == 1 and rx == 0 and ry == 0 and sy == 1 then
         insert(stack,false)
     else
-        if sx == 0 then sx = 0.0001 end -- prevent acrobat crash
-        if sy == 0 then sy = 0.0001 end -- prevent acrobat crash
         context(pdfsetmatrix(f_matrix(rx,sx,sy,ry)))
         insert(stack,f_matrix(-rx,-sx,-sy,-ry))
     end
 end
 
-commands.pdfstoprotation  = pop
-commands.pdfstopscaling   = pop
-commands.pdfstopmirroring = pop
-commands.pdfstopmatrix    = pop
+commands.pdfstoprotation  = popmatrix
+commands.pdfstopscaling   = popmatrix
+commands.pdfstopmirroring = commands.pdfstartmirroring
+commands.pdfstopmatrix    = popmatrix
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 62db62acc..451732c8b 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.08.01 01:31}
+\newcontextversion{2013.08.02 21:57}
 
 %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 040863fbb..08b7045c3 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 62a65a81c..ef8083896 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.08.01 01:31}
+\edef\contextversion{2013.08.02 21:57}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/font-mis.lua b/tex/context/base/font-mis.lua
index 83df65341..87dea321b 100644
--- a/tex/context/base/font-mis.lua
+++ b/tex/context/base/font-mis.lua
@@ -22,7 +22,7 @@ local handlers = fonts.handlers
 handlers.otf   = handlers.otf or { }
 local otf      = handlers.otf
 
-otf.version    = otf.version or 2.743
+otf.version    = otf.version or 2.744
 otf.cache      = otf.cache   or containers.define("fonts", "otf", otf.version, true)
 
 function otf.loadcached(filename,format,sub)
diff --git a/tex/context/base/font-otf.lua b/tex/context/base/font-otf.lua
index 401de4bda..6cb5ee9b9 100644
--- a/tex/context/base/font-otf.lua
+++ b/tex/context/base/font-otf.lua
@@ -48,7 +48,7 @@ local otf                = fonts.handlers.otf
 
 otf.glists               = { "gsub", "gpos" }
 
-otf.version              = 2.743 -- beware: also sync font-mis.lua
+otf.version              = 2.744 -- beware: also sync font-mis.lua
 otf.cache                = containers.define("fonts", "otf", otf.version, true)
 
 local fontdata           = fonts.hashes.identifiers
diff --git a/tex/context/base/lpdf-nod.lua b/tex/context/base/lpdf-nod.lua
index d90ca1612..e820cd820 100644
--- a/tex/context/base/lpdf-nod.lua
+++ b/tex/context/base/lpdf-nod.lua
@@ -63,6 +63,26 @@ function nodepool.pdfsetmatrix(rx,sx,sy,ry,tx,ty)
     return t
 end
 
+function nodepool.pdfsetmatrix(rx,sx,sy,ry,tx,ty)
+    local t = copy_node(pdfsetmatrix)
+    if type(rx) == "string" then
+        t.data = rx
+    else
+        if not rx then
+            rx = 1
+        elseif rx == 0 then
+            rx = 0.0001
+        end
+        if not ry then
+            ry = 1
+        elseif ry == 0 then
+            ry = 0.0001
+        end
+        t.data = formatters["%s %s %s %s"](rx,sx or 0,sy or 0,ry) -- todo: tx ty
+    end
+    return t
+end
+
 nodeinjections.save      = nodepool.pdfsave
 nodeinjections.restore   = nodepool.pdfrestore
 nodeinjections.transform = nodepool.pdfsetmatrix
@@ -127,11 +147,11 @@ function nodepool.pdfdestination(w,h,d,name,view,n)
         local m = copy_node(pdfsetmatrix)
         local r = copy_node(pdfrestore)
         m.data = "1 0 0 1"
-        s.next = m  
-        m.next = t  
+        s.next = m
+        m.next = t
         t.next = r
-        m.prev = s  
-        t.prev = m  
+        m.prev = s
+        t.prev = m
         r.prev = t
         return s -- a list
     else
diff --git a/tex/context/base/s-inf-03.pdf b/tex/context/base/s-inf-03.pdf
index d4a4816b9..8a631462b 100644
--- a/tex/context/base/s-inf-03.pdf
+++ b/tex/context/base/s-inf-03.pdf
diff --git a/tex/context/base/spac-ver.mkiv b/tex/context/base/spac-ver.mkiv
index 05e4336bc..8434e2a31 100644
--- a/tex/context/base/spac-ver.mkiv
+++ b/tex/context/base/spac-ver.mkiv
@@ -2090,13 +2090,13 @@
 % \writestatus{6}{\the\prevdepth} \null\vskip4cm      { \writestatus{6}{\the\prevdepth} \baselineskip1cm xxxxxxxxx \par } \page
 
 \appendtoks
-    \prevdepth\zeropoint % consistent, else first page -1000pt .. needed for fixed,3*big first/successive pages consistency
+    \ifvmode\prevdepth\zeropoint\fi % consistent, else first page -1000pt .. needed for fixed,3*big first/successive pages consistency
 \to \everystarttext
 
 \prevdepth\zeropoint
 
 \appendtoks
-    \ctxcommand{resetprevdepth()}%
+    \ifvmode\ctxcommand{resetprevdepth()}\fi
 \to \everyafteroutput
 
 \protect \endinput
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 92672c688..3123eda67 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 f1172b533..b753c7dc1 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.08.01 01:31 MKIV beta  fmt: 2013.8.1  int: english/english
+ConTeXt  ver: 2013.08.02 21:57 MKIV beta  fmt: 2013.8.2  int: english/english
 
 system          > 'cont-new.mkiv' loaded
 (cont-new.mkiv)
@@ -13,7 +13,226 @@ interface       > macros > processed mkvi file 'c:/data/develop/context/sources/
 system          > files > jobname 's-inf-03', input './s-inf-03.mkiv', result 'status-lua.pdf'
 fonts           > latin modern fonts are not preloaded
 languages       > language 'en' is active
-(c:/data/develop/context/texmf/tex/context/base/s-inf-03.mkiv (c:/data/develop/context/sources/type-loc.mkiv) (type-imp-dejavu.mkiv) (type-imp-xits.mkiv (type-imp-texgyre.mkiv)){c:/data/develop/tex-context/tex/texmf-context/fonts/map/pdftex/context/mkiv-base.map} (virtual://buffer.noname.1
+(c:/data/develop/context/texmf/tex/context/base/s-inf-03.mkiv (c:/data/develop/context/sources/type-loc.mkiv) (type-imp-dejavu.mkiv) (type-imp-xits.mkiv (type-imp-texgyre.mkiv))
+fonts           > otf loading > loading 'c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSerif.ttf', hash 'dejavuserif'
+fonts           > otf loading > loading done
+fonts           > otf loading > file size: 363200
+fonts           > encoding > loading (extended) adobe glyph list
+fonts           > otf loading > saving 'c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSerif.ttf' in cache
+system          > lua > compiling 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavuserif.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavuserif.tmc'
+system          > lua > dumping 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavuserif.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavuserif.tmc' stripped
+fonts           > otf loading > preprocessing and caching time 0.247, packtime 0.034
+fonts           > otf loading > loading 'c:/data/develop/tex-context/tex/texmf/fonts/opentype/public/xits/xits-math.otf', hash 'xits-math'
+fonts           > otf loading > loading done
+fonts           > otf loading > file size: 506752
+fonts           > otf loading > skipping cyclic reference U+00028 in math variant U+00028
+fonts           > otf loading > skipping cyclic reference U+00029 in math variant U+00029
+fonts           > otf loading > skipping cyclic reference U+0002F in math variant U+0002F
+fonts           > otf loading > skipping cyclic reference U+0005B in math variant U+0005B
+fonts           > otf loading > skipping cyclic reference U+0005C in math variant U+0005C
+fonts           > otf loading > skipping cyclic reference U+0005D in math variant U+0005D
+fonts           > otf loading > skipping cyclic reference U+0007B in math variant U+0007B
+fonts           > otf loading > skipping cyclic reference U+0007C in math variant U+0007C
+fonts           > otf loading > skipping cyclic reference U+0007D in math variant U+0007D
+fonts           > otf loading > skipping cyclic reference U+00302 in math variant U+00302
+fonts           > otf loading > skipping cyclic reference U+00303 in math variant U+00303
+fonts           > otf loading > skipping cyclic reference U+00305 in math variant U+00305
+fonts           > otf loading > skipping cyclic reference U+0030C in math variant U+0030C
+fonts           > otf loading > skipping cyclic reference U+00330 in math variant U+00330
+fonts           > otf loading > skipping cyclic reference U+00332 in math variant U+00332
+fonts           > otf loading > skipping cyclic reference U+00338 in math variant U+00338
+fonts           > otf loading > skipping cyclic reference U+0034D in math variant U+0034D
+fonts           > otf loading > skipping cyclic reference U+027E6 in math variant U+027E6
+fonts           > otf loading > skipping cyclic reference U+02986 in math variant U+02986
+fonts           > otf loading > skipping cyclic reference U+02A06 in math variant U+02A06
+fonts           > otf loading > skipping cyclic reference U+027E7 in math variant U+027E7
+fonts           > otf loading > skipping cyclic reference U+02A07 in math variant U+02A07
+fonts           > otf loading > skipping cyclic reference U+02308 in math variant U+02308
+fonts           > otf loading > skipping cyclic reference U+027E8 in math variant U+027E8
+fonts           > otf loading > skipping cyclic reference U+02A08 in math variant U+02A08
+fonts           > otf loading > skipping cyclic reference U+020E9 in math variant U+020E9
+fonts           > otf loading > skipping cyclic reference U+02309 in math variant U+02309
+fonts           > otf loading > skipping cyclic reference U+027E9 in math variant U+027E9
+fonts           > otf loading > skipping cyclic reference U+02A09 in math variant U+02A09
+fonts           > otf loading > skipping cyclic reference U+027EA in math variant U+027EA
+fonts           > otf loading > skipping cyclic reference U+02A0A in math variant U+02A0A
+fonts           > otf loading > skipping cyclic reference U+0222B in math variant U+0222B
+fonts           > otf loading > skipping cyclic reference U+0230B in math variant U+0230B
+fonts           > otf loading > skipping cyclic reference U+027EB in math variant U+027EB
+fonts           > otf loading > skipping cyclic reference U+02A0B in math variant U+02A0B
+fonts           > otf loading > skipping cyclic reference U+020EC in math variant U+020EC
+fonts           > otf loading > skipping cyclic reference U+0222C in math variant U+0222C
+fonts           > otf loading > skipping cyclic reference U+02A0C in math variant U+02A0C
+fonts           > otf loading > skipping cyclic reference U+020ED in math variant U+020ED
+fonts           > otf loading > skipping cyclic reference U+0222D in math variant U+0222D
+fonts           > otf loading > skipping cyclic reference U+02A0D in math variant U+02A0D
+fonts           > otf loading > skipping cyclic reference U+020EE in math variant U+020EE
+fonts           > otf loading > skipping cyclic reference U+0222E in math variant U+0222E
+fonts           > otf loading > skipping cyclic reference U+027EE in math variant U+027EE
+fonts           > otf loading > skipping cyclic reference U+02A0E in math variant U+02A0E
+fonts           > otf loading > skipping cyclic reference U+020EF in math variant U+020EF
+fonts           > otf loading > skipping cyclic reference U+0220F in math variant U+0220F
+fonts           > otf loading > skipping cyclic reference U+0222F in math variant U+0222F
+fonts           > otf loading > skipping cyclic reference U+027EF in math variant U+027EF
+fonts           > otf loading > skipping cyclic reference U+02A0F in math variant U+02A0F
+fonts           > otf loading > skipping cyclic reference U+020D0 in math variant U+020D0
+fonts           > otf loading > skipping cyclic reference U+02210 in math variant U+02210
+fonts           > otf loading > skipping cyclic reference U+02230 in math variant U+02230
+fonts           > otf loading > skipping cyclic reference U+023B0 in math variant U+023B0
+fonts           > otf loading > skipping cyclic reference U+02A10 in math variant U+02A10
+fonts           > otf loading > skipping cyclic reference U+02211 in math variant U+02211
+fonts           > otf loading > skipping cyclic reference U+023B1 in math variant U+023B1
+fonts           > otf loading > skipping cyclic reference U+02A11 in math variant U+02A11
+fonts           > otf loading > skipping cyclic reference U+00606 in math variant U+00606
+fonts           > otf loading > skipping cyclic reference U+020D2 in math variant U+020D2
+fonts           > otf loading > skipping cyclic reference U+02232 in math variant U+02232
+fonts           > otf loading > skipping cyclic reference U+02772 in math variant U+02772
+fonts           > otf loading > skipping cyclic reference U+02A12 in math variant U+02A12
+fonts           > otf loading > skipping cyclic reference U+02233 in math variant U+02233
+fonts           > otf loading > skipping cyclic reference U+02773 in math variant U+02773
+fonts           > otf loading > skipping cyclic reference U+02A13 in math variant U+02A13
+fonts           > otf loading > skipping cyclic reference U+023B4 in math variant U+023B4
+fonts           > otf loading > skipping cyclic reference U+02A14 in math variant U+02A14
+fonts           > otf loading > skipping cyclic reference U+023B5 in math variant U+023B5
+fonts           > otf loading > skipping cyclic reference U+02A15 in math variant U+02A15
+fonts           > otf loading > skipping cyclic reference U+02016 in math variant U+02016
+fonts           > otf loading > skipping cyclic reference U+020D6 in math variant U+020D6
+fonts           > otf loading > skipping cyclic reference U+02A16 in math variant U+02A16
+fonts           > otf loading > skipping cyclic reference U+F02B5 in math variant U+F02B5
+fonts           > otf loading > skipping cyclic reference U+F02B4 in math variant U+F02B4
+fonts           > otf loading > skipping cyclic reference U+F02B3 in math variant U+F02B3
+fonts           > otf loading > skipping cyclic reference U+F02B2 in math variant U+F02B2
+fonts           > otf loading > skipping cyclic reference U+F02B1 in math variant U+F02B1
+fonts           > otf loading > skipping cyclic reference U+020D7 in math variant U+020D7
+fonts           > otf loading > skipping cyclic reference U+F029C in math variant U+F029C
+fonts           > otf loading > skipping cyclic reference U+F02AE in math variant U+F02AE
+fonts           > otf loading > skipping cyclic reference U+F029D in math variant U+F029D
+fonts           > otf loading > skipping cyclic reference U+F029E in math variant U+F029E
+fonts           > otf loading > skipping cyclic reference U+F029F in math variant U+F029F
+fonts           > otf loading > skipping cyclic reference U+F029B in math variant U+F029B
+fonts           > otf loading > skipping cyclic reference U+F02A0 in math variant U+F02A0
+fonts           > otf loading > skipping cyclic reference U+F02A2 in math variant U+F02A2
+fonts           > otf loading > skipping cyclic reference U+F02A3 in math variant U+F02A3
+fonts           > otf loading > skipping cyclic reference U+F02AA in math variant U+F02AA
+fonts           > otf loading > skipping cyclic reference U+F02A9 in math variant U+F02A9
+fonts           > otf loading > skipping cyclic reference U+F02A5 in math variant U+F02A5
+fonts           > otf loading > skipping cyclic reference U+F02A7 in math variant U+F02A7
+fonts           > otf loading > skipping cyclic reference U+F02A6 in math variant U+F02A6
+fonts           > otf loading > skipping cyclic reference U+F02A8 in math variant U+F02A8
+fonts           > otf loading > skipping cyclic reference U+F02A4 in math variant U+F02A4
+fonts           > otf loading > skipping cyclic reference U+F02AB in math variant U+F02AB
+fonts           > otf loading > skipping cyclic reference U+F02A1 in math variant U+F02A1
+fonts           > otf loading > skipping cyclic reference U+F02AC in math variant U+F02AC
+fonts           > otf loading > skipping cyclic reference U+F02AD in math variant U+F02AD
+fonts           > otf loading > skipping cyclic reference U+F02AF in math variant U+F02AF
+fonts           > otf loading > skipping cyclic reference U+F02B0 in math variant U+F02B0
+fonts           > otf loading > skipping cyclic reference U+02A17 in math variant U+02A17
+fonts           > otf loading > skipping cyclic reference U+029F8 in math variant U+029F8
+fonts           > otf loading > skipping cyclic reference U+02A18 in math variant U+02A18
+fonts           > otf loading > skipping cyclic reference U+029F9 in math variant U+029F9
+fonts           > otf loading > skipping cyclic reference U+02A19 in math variant U+02A19
+fonts           > otf loading > skipping cyclic reference U+0221A in math variant U+0221A
+fonts           > otf loading > skipping cyclic reference U+02A1A in math variant U+02A1A
+fonts           > otf loading > skipping cyclic reference U+0221B in math variant U+0221B
+fonts           > otf loading > skipping cyclic reference U+02A1B in math variant U+02A1B
+fonts           > otf loading > skipping cyclic reference U+0221C in math variant U+0221C
+fonts           > otf loading > skipping cyclic reference U+023DC in math variant U+023DC
+fonts           > otf loading > skipping cyclic reference U+02A1C in math variant U+02A1C
+fonts           > otf loading > skipping cyclic reference U+02AFC in math variant U+02AFC
+fonts           > otf loading > skipping cyclic reference U+023DD in math variant U+023DD
+fonts           > otf loading > skipping cyclic reference U+02A00 in math variant U+02A00
+fonts           > otf loading > skipping cyclic reference U+0203E in math variant U+0203E
+fonts           > otf loading > skipping cyclic reference U+023DE in math variant U+023DE
+fonts           > otf loading > skipping cyclic reference U+023DF in math variant U+023DF
+fonts           > otf loading > skipping cyclic reference U+02AFF in math variant U+02AFF
+fonts           > otf loading > skipping cyclic reference U+02140 in math variant U+02140
+fonts           > otf loading > skipping cyclic reference U+022C0 in math variant U+022C0
+fonts           > otf loading > skipping cyclic reference U+023E0 in math variant U+023E0
+fonts           > otf loading > skipping cyclic reference U+02980 in math variant U+02980
+fonts           > otf loading > skipping cyclic reference U+023E1 in math variant U+023E1
+fonts           > otf loading > skipping cyclic reference U+02A01 in math variant U+02A01
+fonts           > otf loading > skipping cyclic reference U+022C2 in math variant U+022C2
+fonts           > otf loading > skipping cyclic reference U+02A02 in math variant U+02A02
+fonts           > otf loading > skipping cyclic reference U+022C3 in math variant U+022C3
+fonts           > otf loading > skipping cyclic reference U+02983 in math variant U+02983
+fonts           > otf loading > skipping cyclic reference U+02A03 in math variant U+02A03
+fonts           > otf loading > skipping cyclic reference U+02044 in math variant U+02044
+fonts           > otf loading > skipping cyclic reference U+02984 in math variant U+02984
+fonts           > otf loading > skipping cyclic reference U+02A04 in math variant U+02A04
+fonts           > otf loading > skipping cyclic reference U+020D1 in math variant U+020D1
+fonts           > otf loading > skipping cyclic reference U+020E1 in math variant U+020E1
+fonts           > otf loading > skipping cyclic reference U+02231 in math variant U+02231
+fonts           > otf loading > skipping cyclic reference U+022C1 in math variant U+022C1
+fonts           > otf loading > skipping cyclic reference U+02985 in math variant U+02985
+fonts           > otf loading > skipping cyclic reference U+02A05 in math variant U+02A05
+fonts           > otf loading > skipping cyclic reference U+00607 in math variant U+00607
+fonts           > otf loading > skipping cyclic reference U+0230A in math variant U+0230A
+fonts           > otf loading > saving 'c:/data/develop/tex-context/tex/texmf/fonts/opentype/public/xits/xits-math.otf' in cache
+system          > lua > compiling 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-math.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-math.tmc'
+system          > lua > dumping 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-math.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-math.tmc' stripped
+fonts           > otf loading > preprocessing and caching time 0.319, packtime 0.031
+fonts           > otf loading > loading 'c:/data/develop/tex-context/tex/texmf/fonts/opentype/public/xits/xits-mathbold.otf', hash 'xits-mathbold'
+fonts           > otf loading > loading done
+fonts           > otf loading > file size: 248944
+fonts           > otf loading > skipping cyclic reference U+00028 in math variant U+00028
+fonts           > otf loading > skipping cyclic reference U+00029 in math variant U+00029
+fonts           > otf loading > skipping cyclic reference U+0002F in math variant U+0002F
+fonts           > otf loading > skipping cyclic reference U+0005B in math variant U+0005B
+fonts           > otf loading > skipping cyclic reference U+0005C in math variant U+0005C
+fonts           > otf loading > skipping cyclic reference U+0005D in math variant U+0005D
+fonts           > otf loading > skipping cyclic reference U+0007B in math variant U+0007B
+fonts           > otf loading > skipping cyclic reference U+0007D in math variant U+0007D
+fonts           > otf loading > skipping cyclic reference U+02A0C in math variant U+02A0C
+fonts           > otf loading > skipping cyclic reference U+0222D in math variant U+0222D
+fonts           > otf loading > skipping cyclic reference U+0222E in math variant U+0222E
+fonts           > otf loading > skipping cyclic reference U+02A0E in math variant U+02A0E
+fonts           > otf loading > skipping cyclic reference U+0222F in math variant U+0222F
+fonts           > otf loading > skipping cyclic reference U+02140 in math variant U+02140
+fonts           > otf loading > skipping cyclic reference U+02A0F in math variant U+02A0F
+fonts           > otf loading > skipping cyclic reference U+02230 in math variant U+02230
+fonts           > otf loading > skipping cyclic reference U+02A10 in math variant U+02A10
+fonts           > otf loading > skipping cyclic reference U+02A11 in math variant U+02A11
+fonts           > otf loading > skipping cyclic reference U+02233 in math variant U+02233
+fonts           > otf loading > skipping cyclic reference U+02A1A in math variant U+02A1A
+fonts           > otf loading > skipping cyclic reference U+02A0D in math variant U+02A0D
+fonts           > otf loading > skipping cyclic reference U+0222B in math variant U+0222B
+fonts           > otf loading > skipping cyclic reference U+02A13 in math variant U+02A13
+fonts           > otf loading > skipping cyclic reference U+02A15 in math variant U+02A15
+fonts           > otf loading > skipping cyclic reference U+02A16 in math variant U+02A16
+fonts           > otf loading > skipping cyclic reference U+0220F in math variant U+0220F
+fonts           > otf loading > skipping cyclic reference U+02A17 in math variant U+02A17
+fonts           > otf loading > skipping cyclic reference U+02231 in math variant U+02231
+fonts           > otf loading > skipping cyclic reference U+02A19 in math variant U+02A19
+fonts           > otf loading > skipping cyclic reference U+02210 in math variant U+02210
+fonts           > otf loading > skipping cyclic reference U+02A18 in math variant U+02A18
+fonts           > otf loading > skipping cyclic reference U+02211 in math variant U+02211
+fonts           > otf loading > skipping cyclic reference U+02232 in math variant U+02232
+fonts           > otf loading > skipping cyclic reference U+02A1B in math variant U+02A1B
+fonts           > otf loading > skipping cyclic reference U+0222C in math variant U+0222C
+fonts           > otf loading > skipping cyclic reference U+02A1C in math variant U+02A1C
+fonts           > otf loading > skipping cyclic reference U+02A14 in math variant U+02A14
+fonts           > otf loading > skipping cyclic reference U+02A12 in math variant U+02A12
+fonts           > otf loading > skipping cyclic reference U+02A0B in math variant U+02A0B
+fonts           > otf loading > saving 'c:/data/develop/tex-context/tex/texmf/fonts/opentype/public/xits/xits-mathbold.otf' in cache
+system          > lua > compiling 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-mathbold.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-mathbold.tmc'
+system          > lua > dumping 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-mathbold.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/xits-mathbold.tmc' stripped
+fonts           > otf loading > preprocessing and caching time 0.181, packtime 0.018
+fonts           > otf loading > loading 'c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSansMono.ttf', hash 'dejavusansmono'
+fonts           > otf loading > loading done
+fonts           > otf loading > file size: 333636
+fonts           > otf loading > saving 'c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSansMono.ttf' in cache
+system          > lua > compiling 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono.tmc'
+system          > lua > dumping 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono.tmc' stripped
+fonts           > otf loading > preprocessing and caching time 0.219, packtime 0.033
+{c:/data/develop/tex-context/tex/texmf-context/fonts/map/pdftex/context/mkiv-base.map}
+fonts           > otf loading > loading 'c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSansMono-Bold.ttf', hash 'dejavusansmono-bold'
+fonts           > otf loading > loading done
+fonts           > otf loading > file size: 313856
+fonts           > otf loading > saving 'c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSansMono-Bold.ttf' in cache
+system          > lua > compiling 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono-bold.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono-bold.tmc'
+system          > lua > dumping 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono-bold.tma' into 'c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a/fonts/otf/dejavusansmono-bold.tmc' stripped
+fonts           > otf loading > preprocessing and caching time 0.187, packtime 0.026
+(virtual://buffer.noname.1
 references      > unknown reference '[][]'
 references      > unknown reference '[][attributes]'
 references      > unknown reference '[][backends]'
@@ -51,28 +270,4 @@ references      > unknown reference '[][fontloader]'
 references      > unknown reference '[][fonts]'
 references      > unknown reference '[][functions]'
 references      > unknown reference '[][graphics]'
-references      > unknown reference '[][gzip]'
-references      > unknown reference '[][img]'
-references      > unknown reference '[][interactions]'
-references      > unknown reference '[][interfaces]'
-references      > unknown reference '[][io]'
-references      > unknown reference '[][job]'
-references      > unknown reference '[][lang]'
-references      > unknown reference '[][languages]'
-references      > unknown reference '[][layouts]'
-references      > unknown reference '[][lfs]'
-references      > unknown reference '[][libraries]'
-references      > unknown reference '[][lmx]'
-references      > unknown reference '[][logs]'
-references      > unknown reference '[][lpdf]'
-references      > unknown reference '[][lpeg]'
-references      > unknown reference '[][ltn12]'
-references      > unknown reference '[][lua]'
-references      > unknown reference '[][luatex]'
-references      > unknown reference '[][lxml]'
-references      > unknown reference '[][math]'
-references      > unknown reference '[][mathematics]'
-references      > unknown reference '[][mbox]'
-references      > unknown reference '[][md5]'
-references      > unknown reference '[][metapost]'
-references      > unknown reference '[][mime]'
+references      > unknown re
\ 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 146ba3655..ab25796d2 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  : 08/01/13 01:31:02
+-- merge date  : 08/02/13 21:57:31
 
 do -- begin closure to overcome local limits and interference
 
@@ -5184,7 +5184,7 @@ local report_otf=logs.reporter("fonts","otf loading")
 local fonts=fonts
 local otf=fonts.handlers.otf
 otf.glists={ "gsub","gpos" }
-otf.version=2.743 
+otf.version=2.744 
 otf.cache=containers.define("fonts","otf",otf.version,true)
 local fontdata=fonts.hashes.identifiers
 local chardata=characters and characters.data