2017-11-01 16:04:00

11 files changed, 14 insertions, 17 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 188ed8a6e..797258b20 100644
--- a/tex/context/base/mkii/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2017.11.01 11:55}
+\newcontextversion{2017.11.01 15:58}
 
 %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/mkii/context.mkii b/tex/context/base/mkii/context.mkii
index 063737437..67e3956b8 100644
--- a/tex/context/base/mkii/context.mkii
+++ b/tex/context/base/mkii/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2017.11.01 11:55}
+\edef\contextversion{2017.11.01 15:58}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 9bf6dc266..a9e11c3e3 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2017.11.01 11:55}
+\newcontextversion{2017.11.01 15: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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 6bbd3c88d..f9a74be28 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -41,7 +41,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2017.11.01 11:55}
+\edef\contextversion{2017.11.01 15:58}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/l-macro-imp-optimize.lua b/tex/context/base/mkiv/l-macro-imp-optimize.lua
index b2515af74..e04b37eab 100644
--- a/tex/context/base/mkiv/l-macro-imp-optimize.lua
+++ b/tex/context/base/mkiv/l-macro-imp-optimize.lua
@@ -13,12 +13,11 @@ if not modules then modules = { } end modules ['l-macro-imp-optimize'] = {
 -- There is no real gain as we hardly use these:
 --
 -- lua.macros.resolvestring [[
---     #define round(a)       ((a+0.5)//1)
---     #define div(a,b)       floor(a/b)
---     #define mod(a,b)       (a % b)
---     #define odd(a)         (a % 2 ~= 0)
---     #define even(a)        (a % 2 == 0)
---     #define pow(x,y)       (x^y)
+--     #define div(a,b) floor(a/b)
+--     #define mod(a,b) (a % b)
+--     #define odd(a)   (a % 2 ~= 0)
+--     #define even(a)  (a % 2 == 0)
+--     #define pow(x,y) (x^y)
 -- ]]
 
 if LUAVERSION >= 5.3 and lua.macros then
diff --git a/tex/context/base/mkiv/l-math.lua b/tex/context/base/mkiv/l-math.lua
index b764ab206..e5668a5db 100644
--- a/tex/context/base/mkiv/l-math.lua
+++ b/tex/context/base/mkiv/l-math.lua
@@ -107,11 +107,10 @@ end
 
 if not math.log10 then
 
-    local ln = math.ln
-    local lt = ln(10)
+    local log = math.log
 
     function math.log10(x)
-        return ln(x) / lt
+        return log(x,10)
     end
 
 end
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index b8453d9ce..fbcb8cc63 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index f11fba9d4..7ef4d1822 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index d4b789c4c..492576d86 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 67e5997ce..e903a632a 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 23a87b4ff..a04b47d3c 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 11/01/17 11:55:46
+-- merge date  : 11/01/17 15:59:00
 
 do -- begin closure to overcome local limits and interference
 
@@ -2976,10 +2976,9 @@ if not math.ldexp then
   end
 end
 if not math.log10 then
-  local ln=math.ln
-  local lt=ln(10)
+  local log=math.log
   function math.log10(x)
-    return ln(x)/lt
+    return log(x,10)
   end
 end
 if not math.type then