beta 2013.11.14 18:02

11 files changed, 75 insertions, 69 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 6f32d508d..d640990de 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.11.14 13:34}
+\newcontextversion{2013.11.14 18:02}
 
 %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 6e701ac85..12fea7628 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 e32ae7d2a..3dce8baed 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.11.14 13:34}
+\edef\contextversion{2013.11.14 18:02}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/math-del.mkiv b/tex/context/base/math-del.mkiv
index 646572818..1245d31de 100644
--- a/tex/context/base/math-del.mkiv
+++ b/tex/context/base/math-del.mkiv
@@ -61,7 +61,10 @@
 \unexpanded\def\enablefiller    {\let\normalorfiller\secondoftwoarguments}
 \unexpanded\def\disablefiller   {\let\normalorfiller\firstoftwoarguments}
 
-\def\mathopnolimits#1{\mathop{\mr#1}\nolimits} % was \rm, which follows text fonts (used in mml parser)
-\def\mathopdolimits#1{\mathop{\mr#1}}          % was \rm, which follows text fonts (used in mml parser)
+% \def\mathopnolimits#1{\mathop{\mr\mathrm#1}\nolimits} % was \rm, which follows text fonts (used in mml parser)
+% \def\mathopdolimits#1{\mathop{\mr\mathrm#1}}          % was \rm, which follows text fonts (used in mml parser)
+
+\def\mathopnolimits#1{\mathop{\mathrm#1}\nolimits} % was \rm, which follows text fonts (used in mml parser, check!)
+\def\mathopdolimits#1{\mathop{\mathrm#1}}          % was \rm, which follows text fonts (used in mml parser, check!)
 
 \protect \endinput
diff --git a/tex/context/base/s-youless.mkiv b/tex/context/base/s-youless.mkiv
index 5fc6933e9..4f63a681f 100644
--- a/tex/context/base/s-youless.mkiv
+++ b/tex/context/base/s-youless.mkiv
@@ -74,10 +74,10 @@
                             local wd = os.weekday(d,m,y)
                             local weekend = wd == 1 or wd == 7
                             if weekend then
-                                context("draw (%s,%s) -- (%s,%s); ",xoffset,-12,xoffset,weekend and -30)
-                                context("draw (%s,%s) -- (%s,%s); ",xoffset+24,-12,xoffset+24,weekend and -30)
+                                context("draw (%s,%s) -- (%s,%s); ",xoffset,-17,xoffset,weekend and -35)
+                                context("draw (%s,%s) -- (%s,%s); ",xoffset+24,-17,xoffset+24,weekend and -35)
                             end
-                            context([[draw textext("%s") shifted (%s,%s) ; ]],d,xoffset + 12,-20)
+                            context([[draw textext("%s") shifted (%s,%s) ; ]],d,xoffset + 12,-25)
                             if day then
                                 for h=0,23 do
                                     local hours = day.hours
@@ -94,13 +94,15 @@
                                 end
                             end
                         end
-                        for d=1,31 do
+                        for d=0,30 do
                             local xoffset = d * 24
                             context("draw (%s,%s) -- (%s,%s) withcolor darkgray ; ",xoffset+ 0,0,xoffset+ 0,-10)
                             context("draw (%s,%s) -- (%s,%s) withcolor darkgray ; ",xoffset+ 6,0,xoffset+ 6,-2.5)
                             context("draw (%s,%s) -- (%s,%s) withcolor darkgray ; ",xoffset+12,0,xoffset+12,-5)
                             context("draw (%s,%s) -- (%s,%s) withcolor darkgray ; ",xoffset+18,0,xoffset+18,-2.5)
                         end
+                        local xoffset = 31 * 24
+                        context("draw (%s,%s) -- (%s,%s) withcolor darkgray ; ",xoffset,0,xoffset,-10)
                     end
 
                     local max = (math.div(year.maxwatt,1000)+1)
@@ -111,7 +113,7 @@
                     end
 
                     context([[draw textext("\strut\month{%s}\enspace%s") shifted (%s,%s) ; ]],m, y, 31 * 24 / 2, -50)
-                    context([[draw textext.lft("watt") shifted (%s,%s) ; ]],-10,-20)
+                    context([[draw textext.lft("watt") shifted (%s,%s) ; ]],-10,-25)
 
                     context.stopMPpage()
                 else
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index d38779180..99960fc0d 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 2743331e9..9fdb605e6 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/util-you.lua b/tex/context/base/util-you.lua
index 0f6a69da5..0eb87732f 100644
--- a/tex/context/base/util-you.lua
+++ b/tex/context/base/util-you.lua
@@ -119,7 +119,9 @@ function youless.collect(specification)
     if host == "" then
         return
     end
-    if filename ~= "" then
+    if filename == "" then
+        return
+    else
         data = table.load(filename) or data
     end
     if variant == "kwh" then
@@ -130,8 +132,7 @@ function youless.collect(specification)
         if detail then
             get(host,"h",1,data)
         end
-    end
-    if filename == "" then
+    else
         return
     end
     local path = file.dirname(filename)
diff --git a/tex/context/base/x-mathml.lua b/tex/context/base/x-mathml.lua
index d19e1eebf..cd60e756d 100644
--- a/tex/context/base/x-mathml.lua
+++ b/tex/context/base/x-mathml.lua
@@ -91,62 +91,62 @@ local simpleoperatorremapper = utf.remapper(o_replacements)
 --~ languages.data.labels.functions
 
 local i_replacements = {
-    ["sin"]         = "\\mathopnolimits{sin}",
-    ["cos"]         = "\\mathopnolimits{cos}",
-    ["abs"]         = "\\mathopnolimits{abs}",
-    ["arg"]         = "\\mathopnolimits{arg}",
-    ["codomain"]    = "\\mathopnolimits{codomain}",
-    ["curl"]        = "\\mathopnolimits{curl}",
-    ["determinant"] = "\\mathopnolimits{det}",
-    ["divergence"]  = "\\mathopnolimits{div}",
-    ["domain"]      = "\\mathopnolimits{domain}",
-    ["gcd"]         = "\\mathopnolimits{gcd}",
-    ["grad"]        = "\\mathopnolimits{grad}",
-    ["identity"]    = "\\mathopnolimits{id}",
-    ["image"]       = "\\mathopnolimits{image}",
-    ["lcm"]         = "\\mathopnolimits{lcm}",
-    ["lim"]         = "\\mathopnolimits{lim}",
-    ["max"]         = "\\mathopnolimits{max}",
-    ["median"]      = "\\mathopnolimits{median}",
-    ["min"]         = "\\mathopnolimits{min}",
-    ["mode"]        = "\\mathopnolimits{mode}",
-    ["mod"]         = "\\mathopnolimits{mod}",
-    ["polar"]       = "\\mathopnolimits{Polar}",
-    ["exp"]         = "\\mathopnolimits{exp}",
-    ["ln"]          = "\\mathopnolimits{ln}",
-    ["log"]         = "\\mathopnolimits{log}",
-    ["sin"]         = "\\mathopnolimits{sin}",
-    ["arcsin"]      = "\\mathopnolimits{arcsin}",
-    ["sinh"]        = "\\mathopnolimits{sinh}",
-    ["arcsinh"]     = "\\mathopnolimits{arcsinh}",
-    ["cos"]         = "\\mathopnolimits{cos}",
-    ["arccos"]      = "\\mathopnolimits{arccos}",
-    ["cosh"]        = "\\mathopnolimits{cosh}",
-    ["arccosh"]     = "\\mathopnolimits{arccosh}",
-    ["tan"]         = "\\mathopnolimits{tan}",
-    ["arctan"]      = "\\mathopnolimits{arctan}",
-    ["tanh"]        = "\\mathopnolimits{tanh}",
-    ["arctanh"]     = "\\mathopnolimits{arctanh}",
-    ["cot"]         = "\\mathopnolimits{cot}",
-    ["arccot"]      = "\\mathopnolimits{arccot}",
-    ["coth"]        = "\\mathopnolimits{coth}",
-    ["arccoth"]     = "\\mathopnolimits{arccoth}",
-    ["csc"]         = "\\mathopnolimits{csc}",
-    ["arccsc"]      = "\\mathopnolimits{arccsc}",
-    ["csch"]        = "\\mathopnolimits{csch}",
-    ["arccsch"]     = "\\mathopnolimits{arccsch}",
-    ["sec"]         = "\\mathopnolimits{sec}",
-    ["arcsec"]      = "\\mathopnolimits{arcsec}",
-    ["sech"]        = "\\mathopnolimits{sech}",
-    ["arcsech"]     = "\\mathopnolimits{arcsech}",
+    ["sin"]         = "\\sin",
+    ["cos"]         = "\\cos",
+    ["abs"]         = "\\abs",
+    ["arg"]         = "\\arg",
+    ["codomain"]    = "\\codomain",
+    ["curl"]        = "\\curl",
+    ["determinant"] = "\\det",
+    ["divergence"]  = "\\div",
+    ["domain"]      = "\\domain",
+    ["gcd"]         = "\\gcd",
+    ["grad"]        = "\\grad",
+    ["identity"]    = "\\id",
+    ["image"]       = "\\image",
+    ["lcm"]         = "\\lcm",
+    ["lim"]         = "\\lim",
+    ["max"]         = "\\max",
+    ["median"]      = "\\median",
+    ["min"]         = "\\min",
+    ["mode"]        = "\\mode",
+    ["mod"]         = "\\mod",
+    ["polar"]       = "\\Polar",
+    ["exp"]         = "\\exp",
+    ["ln"]          = "\\ln",
+    ["log"]         = "\\log",
+    ["sin"]         = "\\sin",
+    ["arcsin"]      = "\\arcsin",
+    ["sinh"]        = "\\sinh",
+    ["arcsinh"]     = "\\arcsinh",
+    ["cos"]         = "\\cos",
+    ["arccos"]      = "\\arccos",
+    ["cosh"]        = "\\cosh",
+    ["arccosh"]     = "\\arccosh",
+    ["tan"]         = "\\tan",
+    ["arctan"]      = "\\arctan",
+    ["tanh"]        = "\\tanh",
+    ["arctanh"]     = "\\arctanh",
+    ["cot"]         = "\\cot",
+    ["arccot"]      = "\\arccot",
+    ["coth"]        = "\\coth",
+    ["arccoth"]     = "\\arccoth",
+    ["csc"]         = "\\csc",
+    ["arccsc"]      = "\\arccsc",
+    ["csch"]        = "\\csch",
+    ["arccsch"]     = "\\arccsch",
+    ["sec"]         = "\\sec",
+    ["arcsec"]      = "\\arcsec",
+    ["sech"]        = "\\sech",
+    ["arcsech"]     = "\\arcsech",
     [" "]           = "",
 
-    ["false"]       = "{\\mr false}",
-    ["notanumber"]  = "{\\mr NaN}",
-    ["otherwise"]   = "{\\mr otherwise}",
-    ["true"]        = "{\\mr true}",
-    ["declare"]     = "{\\mr declare}",
-    ["as"]          = "{\\mr as}",
+    ["false"]       = "{\\mathrm false}",
+    ["notanumber"]  = "{\\mathrm NaN}",
+    ["otherwise"]   = "{\\mathrm otherwise}",
+    ["true"]        = "{\\mathrm true}",
+    ["declare"]     = "{\\mathrm declare}",
+    ["as"]          = "{\\mathrm as}",
 }
 
 -- we could use a metatable or when accessing fallback on the
@@ -486,7 +486,7 @@ function mathml.mi(id)
     -- we need to strip comments etc .. todo when reading in tree
     local e = getid(id)
     local str = e.dt
-    if type(str) == "string" then
+    if type(str) == "table" then
         local n = #str
         if n == 0 then
             -- nothing to do
diff --git a/tex/context/base/x-mathml.mkiv b/tex/context/base/x-mathml.mkiv
index 1a2099805..ec8fd74e4 100644
--- a/tex/context/base/x-mathml.mkiv
+++ b/tex/context/base/x-mathml.mkiv
@@ -2361,7 +2361,7 @@
         \edef\mmlbasecommand {\utfmathfiller\mmlbasetoken}
         \edef\mmlundercommand{\utfmathfiller\mmlundertoken}
         \edef\mmlovercommand {\utfmathfiller\mmlovertoken}
-        \mmldoubletriplet{\mmlunderoverbf{#1}}{\mmlunderoverus{#1}}{\mmlunderoverot{#1}}\relax
+        \mmldoubletriplet{\mmlunderoverbf{#1}}{\mmlunderoverot{#1}}{\mmlunderoverus{#1}}\relax
     }
 \stopxmlsetups
 
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index babbeb948..895ca7242 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/14/13 13:34:23
+-- merge date  : 11/14/13 18:02:28
 
 do -- begin closure to overcome local limits and interference