beta 2012.05.25 18:21

24 files changed, 59 insertions, 38 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 94e836e1d..0fbfda73e 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.05.24 19:36}
+\newcontextversion{2012.05.25 18:21}
 
 %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 d13423741..a521479b5 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.05.24 19:36}
+\newcontextversion{2012.05.25 18:21}
 
 %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-version.pdf b/tex/context/base/context-version.pdf
index dc456136f..078cdfb31 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 bc31e8a30..2ee0c710d 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 1e8d73c4c..55b4110f1 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.05.24 19:36}
+\edef\contextversion{2012.05.25 18:21}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 98898765f..ccbc64c21 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -23,7 +23,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.05.24 19:36}
+\edef\contextversion{2012.05.25 18:21}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/data-exp.lua b/tex/context/base/data-exp.lua
index 8040e5963..66bbb56cb 100644
--- a/tex/context/base/data-exp.lua
+++ b/tex/context/base/data-exp.lua
@@ -42,6 +42,9 @@ local function f_second(a,b)
     return concat(t,",")
 end
 
+-- kpsewhich --expand-braces '{a,b}{c,d}'
+-- ac:bc:ad:bd
+
 -- old  {a,b}{c,d} => ac ad bc bd
 --
 -- local function f_both(a,b)
diff --git a/tex/context/base/data-res.lua b/tex/context/base/data-res.lua
index 01b5f2525..7206c0d78 100644
--- a/tex/context/base/data-res.lua
+++ b/tex/context/base/data-res.lua
@@ -805,7 +805,10 @@ function resolvers.expandpathfromvariable(str)
 end
 
 function resolvers.expandbraces(str) -- output variable and brace expansion of STRING
-    local ori = resolvers.variable(str)
+--     local ori = resolvers.variable(str)
+--     if ori == "" then
+        local ori = str
+--     end
     local pth = expandedpathfromlist(resolvers.splitpath(ori))
     return joinpath(pth)
 end
diff --git a/tex/context/base/data-zip.lua b/tex/context/base/data-zip.lua
index 1d2f2d4f6..676a2df96 100644
--- a/tex/context/base/data-zip.lua
+++ b/tex/context/base/data-zip.lua
@@ -209,16 +209,17 @@ function resolvers.usezipfile(archive)
     if archive and not registeredfiles[archive] then
         local z = zip.openarchive(archive)
         if z then
+            local instance = resolvers.instance
             local tree = url.query(specification.query).tree or ""
             if trace_locating then
                 report_zip("registering, registering archive '%s'",archive)
             end
-            statistics.starttiming(resolvers.instance)
+            statistics.starttiming(instance)
             resolvers.prependhash('zip',archive)
             resolvers.extendtexmfvariable(archive) -- resets hashes too
             registeredfiles[archive] = z
             instance.files[archive] = resolvers.registerzipfile(z,tree)
-            statistics.stoptiming(resolvers.instance)
+            statistics.stoptiming(instance)
         elseif trace_locating then
             report_zip("registering, unknown archive '%s'",archive)
         end
diff --git a/tex/context/base/file-job.mkvi b/tex/context/base/file-job.mkvi
index 83d9c78ba..112400cbd 100644
--- a/tex/context/base/file-job.mkvi
+++ b/tex/context/base/file-job.mkvi
@@ -110,6 +110,12 @@
 \unexpanded\def\autostarttext{\ctxcommand{autostarttext()}}
 \unexpanded\def\autostoptext {\ctxcommand{autostoptext()}}
 
+\newtoks\everystartnotext
+\newtoks\everystopnotext
+
+\unexpanded\def\startnotext  {\the\everystartnotext}
+\unexpanded\def\stopnotext   {\the\everystopnotext \normalend}
+
 % protect structure
 
 \unexpanded\def\processfilemany#name{\ctxcommand{processfilemany("#name")}}
diff --git a/tex/context/base/font-mis.lua b/tex/context/base/font-mis.lua
index e5971e524..9ca357751 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.736
+otf.version    = otf.version or 2.737
 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 27a64e917..e1339aec9 100644
--- a/tex/context/base/font-otf.lua
+++ b/tex/context/base/font-otf.lua
@@ -49,7 +49,7 @@ local otf                = fonts.handlers.otf
 
 otf.glists               = { "gsub", "gpos" }
 
-otf.version              = 2.736 -- beware: also sync font-mis.lua
+otf.version              = 2.737 -- beware: also sync font-mis.lua
 otf.cache                = containers.define("fonts", "otf", otf.version, true)
 
 local fontdata           = fonts.hashes.identifiers
@@ -1338,12 +1338,15 @@ local function check_variants(unicode,the_variants,splitter,unicodes)
             local g = glyphs[i]
             if done[g] then
                 report_otf("skipping cyclic reference U+%05X in math variant U+%05X",g,unicode)
-            elseif n == 0 then
-                n = 1
-                variants = { g }
             else
-                n = n + 1
-                variants[n] = g
+                if n == 0 then
+                    n = 1
+                    variants = { g }
+                else
+                    n = n + 1
+                    variants[n] = g
+                end
+                done[g] = true
             end
         end
         if n == 0 then
diff --git a/tex/context/base/font-set.mkvi b/tex/context/base/font-set.mkvi
index d692c6cc8..8e4044267 100644
--- a/tex/context/base/font-set.mkvi
+++ b/tex/context/base/font-set.mkvi
@@ -72,6 +72,10 @@
    \global\everyvbox\emptytoks
    \font_preloads_reset_nullfont}
 
+\appendtoks
+    \font_preloads_reset
+\to \everystartnotext
+
 \def\font_preloads_reset_checked
   {\glet\font_preload_default_fonts_tt\relax
    \glet\font_preload_default_fonts_mm\relax
diff --git a/tex/context/base/font-tra.mkiv b/tex/context/base/font-tra.mkiv
index 353d9e7a5..06b861378 100644
--- a/tex/context/base/font-tra.mkiv
+++ b/tex/context/base/font-tra.mkiv
@@ -82,8 +82,8 @@
 \fetchruntimecommand \showcharratio      {\f!fontprefix\s!run}
 \fetchruntimecommand \showfontparameters {\f!fontprefix\s!run}
 
-\unexpanded\def\checkcharactersinfont  {\ctxcommand{checkcharactersinfont  }}
-\unexpanded\def\removemissingcharacters{\ctxcommand{removemissingcharacters}}
+\unexpanded\def\checkcharactersinfont  {\ctxcommand{checkcharactersinfont()}}
+\unexpanded\def\removemissingcharacters{\ctxcommand{removemissingcharacters()}}
 \unexpanded\def\showchardata         #1{\ctxcommand{showchardata("#1")}}
 \unexpanded\def\showfontdata           {\ctxcommand{showfontparameters()}}
 
diff --git a/tex/context/base/meta-ini.mkiv b/tex/context/base/meta-ini.mkiv
index d2f5cd6cb..a62b81ccf 100644
--- a/tex/context/base/meta-ini.mkiv
+++ b/tex/context/base/meta-ini.mkiv
@@ -886,14 +886,9 @@
 
 % A dirty trick, ** in colo-ini.lua (mpcolor).
 
-% \def\m_meta_colo_initializations{%
-%     OverlayLineColor:=\MPcolor{\overlaylinecolor};
-%     OverlayColor:=\MPcolor{\overlaycolor};
-% }
-
-\def\m_meta_colo_initializations{%
-    vardef OverlayLineColor=\MPcolor{\overlaylinecolor} enddef;
-    vardef OverlayColor=\MPcolor{\overlaycolor} enddef;
+\def\m_meta_colo_initializations{% no vardef, goes wrong with spot colors
+    def OverlayLineColor=\MPcolor{\overlaylinecolor} enddef;
+    def OverlayColor=\MPcolor{\overlaycolor} enddef;
 }
 
 \startMPextensions
diff --git a/tex/context/base/mult-low.lua b/tex/context/base/mult-low.lua
index 743f851c4..7d61d0427 100644
--- a/tex/context/base/mult-low.lua
+++ b/tex/context/base/mult-low.lua
@@ -94,7 +94,7 @@ return {
         "startcomponent", "stopcomponent", "component",
         "startproduct", "stopproduct", "product",
         "startproject", "stopproject", "project",
-        "starttext", "stoptext", "startdocument", "stopdocument", "documentvariable",
+        "starttext", "stoptext", "startnotext", "stopnotext","startdocument", "stopdocument", "documentvariable",
         "startmodule", "stopmodule", "usemodule",
         --
         "startTEXpage", "stopTEXpage",
diff --git a/tex/context/base/page-sid.mkiv b/tex/context/base/page-sid.mkiv
index 4a24794eb..f4d42a41c 100644
--- a/tex/context/base/page-sid.mkiv
+++ b/tex/context/base/page-sid.mkiv
@@ -51,7 +51,7 @@
 \newcount       \c_page_sides_n_of_hang
 \newconstant    \c_page_sides_float_type
 
-\newconditional \c_page_sides_short
+\newconditional \c_page_sides_short        % needs checking .. best write this from scratch
 \newconditional \c_page_sides_flag
 
 \newconditional \c_page_sides_r_eq         % messy, needs checking anyway
diff --git a/tex/context/base/s-mod-01.mkii b/tex/context/base/s-mod-01.mkii
index 7e32a5b87..5b83cd121 100644
--- a/tex/context/base/s-mod-01.mkii
+++ b/tex/context/base/s-mod-01.mkii
@@ -37,7 +37,7 @@
   [\v!big]
 
 \setuptolerance
-  [\v!verytolerant,\v!!stretch]
+  [\v!verytolerant,\v!stretch]
 
 \setuplayout
   [\c!backspace=3.5cm,
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index a1fb1c9c8..1bb5ecfc7 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index dcdf423f2..ca099cd41 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/tabl-tbl.mkiv b/tex/context/base/tabl-tbl.mkiv
index ab4005fb7..20ddac461 100644
--- a/tex/context/base/tabl-tbl.mkiv
+++ b/tex/context/base/tabl-tbl.mkiv
@@ -1896,6 +1896,10 @@
 \let\tabl_tabulate_flush_collected       \empty
 \let\tabl_tabulate_flush_collected_indeed\empty
 
+\def\tabl_tabulate_set_local_hsize
+  {\setlocalhsize
+   \hsize\localhsize}
+
 \def\tabl_tabulate_process
   {\c_tabl_tabulate_pass\plusone
    \tabl_tabulate_check_full_content
@@ -1978,8 +1982,7 @@
    \ifinsidefloat
      \d_tabl_tabulate_indent\zeropoint
    \else
-     \setlocalhsize
-     \hsize\localhsize
+     \tabl_tabulate_set_local_hsize
    \fi
    \dontcomplain
    \forgetall % hm, interference with preceding \forgetparindent probably bug, to be solved
diff --git a/tex/context/fonts/asana-math.lfg b/tex/context/fonts/asana-math.lfg
index 2c13600c1..5b47b3ff8 100644
--- a/tex/context/fonts/asana-math.lfg
+++ b/tex/context/fonts/asana-math.lfg
@@ -39,7 +39,7 @@ return {
     copyright = "ConTeXt development team",
     mathematics = {
         parameters = {
-            DisplayOperatorMinHeight         = more,
+         -- DisplayOperatorMinHeight         = 0, -- more
          -- StackBottomDisplayStyleShiftDown = 0,
          -- StackBottomShiftDown             = 0,
          -- StackDisplayStyleGapMin          = 0,
diff --git a/tex/context/fonts/px-math.lfg b/tex/context/fonts/px-math.lfg
index afb0270a2..2996a55e5 100644
--- a/tex/context/fonts/px-math.lfg
+++ b/tex/context/fonts/px-math.lfg
@@ -19,7 +19,7 @@ return {
                 { name = "pxex.tfm", vector = "tex-ex", extension = true } ,
                 { name = "pxsya.tfm", vector = "tex-ma" },
                 { name = "pxsyb.tfm", vector = "tex-mb" },
-                { name = "texgyrepagella-bold.otf", vector = "tex-bf" } ,
+                { name = "texgyrepagella-bold.otf", vector = "tex-bf", skewchar=0x7F } ,
                 { name = "texgyrepagella-bolditalic.otf", vector = "tex-bi" } ,
                 { name = "lmsans10-regular.otf", vector = "tex-ss", optional=true },
                 { name = "lmmono10-regular.otf", vector = "tex-tt", optional=true },
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 32f7365f0..ad962eb88 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  : 05/24/12 19:36:52
+-- merge date  : 05/25/12 18:21:28
 
 do -- begin closure to overcome local limits and interference
 
@@ -5397,7 +5397,7 @@ local otf                = fonts.handlers.otf
 
 otf.glists               = { "gsub", "gpos" }
 
-otf.version              = 2.736 -- beware: also sync font-mis.lua
+otf.version              = 2.737 -- beware: also sync font-mis.lua
 otf.cache                = containers.define("fonts", "otf", otf.version, true)
 
 local fontdata           = fonts.hashes.identifiers
@@ -6686,12 +6686,15 @@ local function check_variants(unicode,the_variants,splitter,unicodes)
             local g = glyphs[i]
             if done[g] then
                 report_otf("skipping cyclic reference U+%05X in math variant U+%05X",g,unicode)
-            elseif n == 0 then
-                n = 1
-                variants = { g }
             else
-                n = n + 1
-                variants[n] = g
+                if n == 0 then
+                    n = 1
+                    variants = { g }
+                else
+                    n = n + 1
+                    variants[n] = g
+                end
+                done[g] = true
             end
         end
         if n == 0 then