beta 2012.11.29 15:54

13 files changed, 7 insertions, 347 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 096f09649..fe0411123 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2012.11.29 15:40}
+\newcontextversion{2012.11.29 15:54}
 
 %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/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index bbcc09138..f265ea580 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{2012.11.29 15:40}
+\newcontextversion{2012.11.29 15:54}
 
 %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 4eb4e2f26..7eb7e0892 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 9775b0fef..275dbde32 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 579872eec..b24f95204 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.11.29 15:40}
+\edef\contextversion{2012.11.29 15:54}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 7b6493021..c327fecb9 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{2012.11.29 15:40}
+\edef\contextversion{2012.11.29 15:54}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/meta-ini.mkiv b/tex/context/base/meta-ini.mkiv
index d023193e9..e81206cd1 100644
--- a/tex/context/base/meta-ini.mkiv
+++ b/tex/context/base/meta-ini.mkiv
@@ -67,7 +67,7 @@
 \unexpanded\def\startMPinclusions
   {\dosingleempty\meta_start_inclusions}
 
-\def\meta_start_inclusions[#1]#2\ stopMPinclusions
+\def\meta_start_inclusions[#1]#2\stopMPinclusions
   {\edef\m_meta_option{#1}%
    \ifx\m_meta_option\!!plustoken \else
      \global\t_meta_userinclusions\emptytoks
diff --git a/tex/context/base/s-inf-03.mkiv b/tex/context/base/s-inf-03.mkiv
index e2428ce5e..0f4f82543 100644
--- a/tex/context/base/s-inf-03.mkiv
+++ b/tex/context/base/s-inf-03.mkiv
@@ -236,7 +236,7 @@ local function cleanup(s)
 end
 
 local function handler(k,t,depth)
-    k = gsub(k,"([~#$%%^&{}\\\|])",cleanup)
+    k = gsub(k,"([~#$%%^&{}\\|])",cleanup)
     NC() rlap("\\quad\\tx\\kern" .. (depth or 0).. "em" .. upper(sub(t,1,1)) .. " ".. k) NC() NC() NR()
 end
 
diff --git a/tex/context/base/s-inf-03.pdf b/tex/context/base/s-inf-03.pdf
deleted file mode 100644
index dbe3e7b4a..000000000
--- a/tex/context/base/s-inf-03.pdf
+++ /dev/null
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 56adaaf8b..34c56b3cb 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
deleted file mode 100644
index 748405629..000000000
--- a/tex/context/base/status-lua.log
+++ /dev/null
@@ -1,340 +0,0 @@
-(cont-yes.mkiv
-
-ConTeXt  ver: 2012.11.29 15:40 MKIV  fmt: 2012.11.29  int: english/english
-
-system          > cont-new.mkiv loaded
-(cont-new.mkiv
-system          > beware: some patches loaded from cont-new.mkiv
-)
-system          > cont-loc.mkiv loaded
-(c:/data/develop/context/sources/cont-loc.mkiv
-system          > beware: some patches loaded from cont-loc.mkiv
-)
-system          > cont-exp.mkiv loaded
-(c:/data/develop/context/sources/cont-exp.mkiv
-system          > beware: some patches loaded from cont-exp.mkiv
-)
-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
-(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}
-
-% begin of command line arguments
-%
-% no-parse-first-line  = true
-% basepath             = c:\\data\\develop\\context\\texmf/tex/context/base
-% script               = true
-% result               = status-lua.pdf
-% currentrun           = 1
-% kindofrun            = 1
-% fulljobname          = ./s-inf-03.mkiv
-% purgeall             = true
-% input                = ./s-inf-03.mkiv
-%
-% end of command line arguments
-
-% begin of command line files
-%
-% 1  ./s-inf-03.mkiv
-%
-% end of command line files
-
- (virtual://buffer.noname.1
-references      > unknown reference [][1]
-references      > unknown reference [][attributes]
-references      > unknown reference [][backends]
-references      > unknown reference [][bibtex]
-references      > unknown reference [][blobs]
-references      > unknown reference [][boolean]
-references      > unknown reference [][buffers]
-references      > unknown reference [][builders]
-references      > unknown reference [][caches]
-references      > unknown reference [][callback]
-references      > unknown reference [][callbacks]
-references      > unknown reference [][catcodes]
-references      > unknown reference [][characters]
-references      > unknown reference [][chemistry]
-references      > unknown reference [][commands]
-references      > unknown reference [][containers]
-references      > unknown reference [][context]
-references      > unknown reference [][converters]
-references      > unknown reference [][coroutine]
-references      > unknown reference [][ctxrunner]
-references      > unknown reference [][debug]
-references      > unknown reference [][dir]
-references      > unknown reference [][directives]
-references      > unknown reference [][document]
-references      > unknown reference [][documentdata]
-references      > unknown reference [][environment]
-references      > unknown reference [][epdf]
-references      > unknown reference [][experiments]
-references      > unknown reference [][figures]
-references      > unknown reference [][file]
-references      > unknown reference [][floats]
-references      > unknown reference [][font]
-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 [][jit]
-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 [][md5]
-references      > unknown reference [][metapost]
-references      > unknown reference [][mime]
-references      > unknown reference [][moduledata]
-references      > unknown reference [][modules]
-references      > unknown reference [][mplib]
-references      > unknown reference [][noads]
-references      > unknown reference [][node]
-references      > unknown reference [][nodes]
-references      > unknown reference [][number]
-references      > unknown reference [][os]
-references      > unknown reference [][package]
-references      > unknown reference [][pagebuilders]
-references      > unknown reference [][parametersets]
-references      > unknown reference [][pdf]
-references      > unknown reference [][physics]
-references      > unknown reference [][profiler]
-references      > unknown reference [][regimes]
-references      > unknown reference [][resolvers]
-references      > unknown reference [][scripts]
-references      > unknown reference [][set]
-references      > unknown reference [][socket]
-references      > unknown reference [][sorters]
-references      > unknown reference [][statistics]
-references      > unknown reference [][status]
-references      > unknown reference [][storage]
-references      > unknown reference [][streams]
-references      > unknown reference [][string]
-references      > unknown reference [][structures]
-references      > unknown reference [][table]
-references      > unknown reference [][tex]
-references      > unknown reference [][texconfig]
-references      > unknown reference [][texio]
-references      > unknown reference [][token]
-references      > unknown reference [][tokens]
-references      > unknown reference [][tracers]
-references      > unknown reference [][trackers]
-references      > unknown reference [][typesetters]
-references      > unknown reference [][unicode]
-references      > unknown reference [][url]
-references      > unknown reference [][utilities]
-references      > unknown reference [][vf]
-references      > unknown reference [][visualizers]
-references      > unknown reference [][xml]
-references      > unknown reference [][zip]
-references      > unknown reference [][zlib]
-)
-backend         > xmp > using file 'lpdf-pdx.xml'
-pages           > flushing realpage 1, userpage 1
-! LuaTeX error [string "\directlua "]:99: invalid escape sequence near '"([~#$%%^&{}\'.
-
-system          > tex > error on line 352 in file s-inf-03.mkiv: LuaTeX error  ...
-
-342         if not skipglobal[k] and not obsolete[k] and type(v) == "table" and not marked(v) then
-343             if     basiclua[k] then show(k,"basic lua",sameglobal[k],basiclua[k],v,builtin[k],"darkred",   false,false,true)
-344             elseif extralua[k] then show(k,"extra lua",sameglobal[k],extralua[k],v,builtin[k],"darkred",   false,false,true)
-345             elseif basictex[k] then show(k,"basic tex",sameglobal[k],basictex[k],v,builtin[k],"darkred",   false,false,true)
-346             elseif extratex[k] then show(k,"extra tex",sameglobal[k],extratex[k],v,builtin[k],"darkred",   false,false,true)
-347             else                    show(k,"context",  sameglobal[k],false,      v,builtin[k],"darkyellow",false,false,true)
-348             end
-349         end
-350     end
-351     
-352 >>  \stopluacode
-353     
-354     \stoptext
-355     
-
-<inserted text> ...rue)
        end
    end
end

}
-                                                  
-\luat_start_lua_code_indeed ...nd \directlua {#1}}
-                                                  
-l.352 \stopluacode
-                  
-? 
- ) )<c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSansMono-Bold.ttf>
-
-system          > files > start used files
-
-used files      >    1: filename=cont-yes.mkiv | foundname=cont-yes.mkiv | usedmethod=direct
-used files      >    2: filename=cont-new.mkiv | foundname=cont-new.mkiv | usedmethod=direct
-used files      >    3: filename=cont-loc.mkiv | filetype=tex | foundname=c:/data/develop/context/sources/cont-loc.mkiv | usedmethod=filesystem
-used files      >    4: filename=cont-exp.mkiv | filetype=tex | foundname=c:/data/develop/context/sources/cont-exp.mkiv | usedmethod=filesystem
-used files      >    5: filename=lang-us.lua | filetype=lua | foundname=c:/data/develop/tex-context/tex/texmf-context/tex/context/patterns/lang-us.lua | usedmethod=database
-used files      >    6: filename=s-inf-03.mkiv | foundname=s-inf-03.mkiv | usedmethod=direct
-used files      >    7: filename=type-loc.mkiv | filetype=tex | foundname=c:/data/develop/context/sources/type-loc.mkiv | usedmethod=filesystem
-used files      >    8: filename=type-imp-dejavu.mkiv | foundname=type-imp-dejavu.mkiv | usedmethod=direct
-used files      >    9: filename=type-imp-xits.mkiv | foundname=type-imp-xits.mkiv | usedmethod=direct
-used files      >   10: filename=type-imp-texgyre.mkiv | foundname=type-imp-texgyre.mkiv | usedmethod=direct
-used files      >   11: filename=xits-math.lfg | filetype=tex | foundname=c:/data/develop/context/sources/xits-math.lfg | usedmethod=filesystem
-used files      >   12: filename=DejaVuSerif.ttf | filetype=ttf | format=ttf | foundname=c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSerif.ttf | usedmethod=database
-used files      >   13: filename=xits-math.otf | filetype=otf | format=otf | foundname=c:/data/develop/tex-context/tex/texmf/fonts/opentype/public/xits/xits-math.otf | usedmethod=database
-used files      >   14: filename=DejaVuSansMono.ttf | filetype=ttf | format=ttf | foundname=c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSansMono.ttf | usedmethod=database
-used files      >   15: filename=mkiv-base.map | filetype=map | format=map | foundname=c:/data/develop/tex-context/tex/texmf-context/fonts/map/pdftex/context/mkiv-base.map | usedmethod=database
-used files      >   16: filename=DejaVuSansMono-Bold.ttf | filetype=ttf | format=ttf | foundname=c:/data/develop/tex-context/tex/texmf/fonts/truetype/public/dejavu/DejaVuSansMono-Bold.ttf | usedmethod=database
-used files      >   17: filename=lpdf-pdx.xml | foundname=lpdf-pdx.xml | usedmethod=direct
-
-system          > files > stop used files
-
-
-system          > structure > start used structure
-
-used structure  > text: s-inf-03
-
-system          > structure > stop used structure
-
-
-references      > start problematic references
-
-unknown         >    1: [][1]
-unknown         >    1: [][attributes]
-unknown         >    1: [][backends]
-unknown         >    1: [][bibtex]
-unknown         >    1: [][blobs]
-unknown         >    1: [][boolean]
-unknown         >    1: [][buffers]
-unknown         >    1: [][builders]
-unknown         >    1: [][caches]
-unknown         >    1: [][callback]
-unknown         >    1: [][callbacks]
-unknown         >    1: [][catcodes]
-unknown         >    1: [][characters]
-unknown         >    1: [][chemistry]
-unknown         >    1: [][commands]
-unknown         >    1: [][containers]
-unknown         >    1: [][context]
-unknown         >    1: [][converters]
-unknown         >    1: [][coroutine]
-unknown         >    1: [][ctxrunner]
-unknown         >    1: [][debug]
-unknown         >    1: [][dir]
-unknown         >    1: [][directives]
-unknown         >    1: [][document]
-unknown         >    1: [][documentdata]
-unknown         >    1: [][environment]
-unknown         >    1: [][epdf]
-unknown         >    1: [][experiments]
-unknown         >    1: [][figures]
-unknown         >    1: [][file]
-unknown         >    1: [][floats]
-unknown         >    1: [][font]
-unknown         >    1: [][fontloader]
-unknown         >    1: [][fonts]
-unknown         >    1: [][functions]
-unknown         >    1: [][graphics]
-unknown         >    1: [][gzip]
-unknown         >    1: [][img]
-unknown         >    1: [][interactions]
-unknown         >    1: [][interfaces]
-unknown         >    1: [][io]
-unknown         >    1: [][jit]
-unknown         >    1: [][job]
-unknown         >    1: [][lang]
-unknown         >    1: [][languages]
-unknown         >    1: [][layouts]
-unknown         >    1: [][lfs]
-unknown         >    1: [][libraries]
-unknown         >    1: [][lmx]
-unknown         >    1: [][logs]
-unknown         >    1: [][lpdf]
-unknown         >    1: [][lpeg]
-unknown         >    1: [][ltn12]
-unknown         >    1: [][lua]
-unknown         >    1: [][luatex]
-unknown         >    1: [][lxml]
-unknown         >    1: [][math]
-unknown         >    1: [][mathematics]
-unknown         >    1: [][md5]
-unknown         >    1: [][metapost]
-unknown         >    1: [][mime]
-unknown         >    1: [][moduledata]
-unknown         >    1: [][modules]
-unknown         >    1: [][mplib]
-unknown         >    1: [][noads]
-unknown         >    1: [][node]
-unknown         >    1: [][nodes]
-unknown         >    1: [][number]
-unknown         >    1: [][os]
-unknown         >    1: [][package]
-unknown         >    1: [][pagebuilders]
-unknown         >    1: [][parametersets]
-unknown         >    1: [][pdf]
-unknown         >    1: [][physics]
-unknown         >    1: [][profiler]
-unknown         >    1: [][regimes]
-unknown         >    1: [][resolvers]
-unknown         >    1: [][scripts]
-unknown         >    1: [][set]
-unknown         >    1: [][socket]
-unknown         >    1: [][sorters]
-unknown         >    1: [][statistics]
-unknown         >    1: [][status]
-unknown         >    1: [][storage]
-unknown         >    1: [][streams]
-unknown         >    1: [][string]
-unknown         >    1: [][structures]
-unknown         >    1: [][table]
-unknown         >    1: [][tex]
-unknown         >    1: [][texconfig]
-unknown         >    1: [][texio]
-unknown         >    1: [][token]
-unknown         >    1: [][tokens]
-unknown         >    1: [][tracers]
-unknown         >    1: [][trackers]
-unknown         >    1: [][typesetters]
-unknown         >    1: [][unicode]
-unknown         >    1: [][url]
-unknown         >    1: [][utilities]
-unknown         >    1: [][vf]
-unknown         >    1: [][visualizers]
-unknown         >    1: [][xml]
-unknown         >    1: [][zip]
-unknown         >    1: [][zlib]
-
-references      > stop problematic references
-
-
-mkiv lua stats  > used config file          - selfautoparent:/texmf-local/web2c/texmfcnf.lua;selfautoparent:/texmf/web2c/texmfcnf.lua
-mkiv lua stats  > used cache path           - c:/data/develop/tex-context/tex/texmf-cache/luatex-cache/context/764bd4e1ce0f004ab3cec90018f8b80a
-mkiv lua stats  > resource resolver         - loadtime 0.016 seconds, 0 scans with scantime 0.000 seconds, 0 shared scans, 17 found files, scanned paths: 
-mkiv lua stats  > stored bytecode data      - 314 modules (0.141 sec), 67 tables (0.000 sec), 381 chunks (0.141 sec)
-mkiv lua stats  > cleaned up reserved nodes - 55 nodes, 10 lists of 442
-mkiv lua stats  > node memory usage         - 4 glue, 4 penalty, 15 attribute, 31 glue_spec, 5 attribute_list
-mkiv lua stats  > node list callback tasks  - 6 unique task lists, 5 instances (re)created, 38 calls
-mkiv lua stats  > used backend              - pdf (backend for directly generating pdf output)
-mkiv lua stats  > loaded patterns           - en::2
-mkiv lua stats  > jobdata time              - 0.000 seconds saving, 0.000 seconds loading
-mkiv lua stats  > callbacks                 - 430 direct, 1339 indirect, 1769 total
-mkiv lua stats  > lxml preparation time     - 0.000 seconds, 0 nodes, 13 lpath calls, 0 cached calls
-mkiv lua stats  > interactive elements      - 1 references, 1 destinations
-mkiv lua stats  > result saved in file      - status-lua.pdf.pdf, compresslevel 3, objectcompreslevel 3
-mkiv lua stats  > loaded fonts              - 4 files: xits-math.otf dejavusansmono-bold.ttf dejavusansmono.ttf dejavuserif.ttf
-mkiv lua stats  > fonts load time           - 0.468 seconds 
-mkiv lua stats  > pdf annotations           - 1 embedded, 1 unique
-mkiv lua stats  > cross referencing         - 105 identified, 104 unknown
-mkiv lua stats  > luatex banner             - this is luatexjit, version beta-0.71.0-2012112719 (rev 4465)
-mkiv lua stats  > control sequences         - 36095 of 65536 + 100000
-mkiv lua stats  > current memory usage      - 30 MB (ctx: 0 MB)
-mkiv lua stats  > runtime                   - 140.887 seconds, 1 processed pages, 1 shipped pages, 0.007 pages/second
-
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
new file mode 100644
index 000000000..d796a36f7
--- /dev/null
+++ 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 02358414c..317ace25e 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  : 11/29/12 15:40:31
+-- merge date  : 11/29/12 15:54:01
 
 do -- begin closure to overcome local limits and interference