summaryrefslogtreecommitdiff
path: root/src/fontloader
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2015-04-20 08:04:16 +0200
committerPhilipp Gesang <phg@phi-gamma.net>2015-04-20 08:04:16 +0200
commitda74e7f4d597b566ad99c995f2dd49fb41e218e0 (patch)
tree70876c1b4462d20b67027d3428fc9a4e1235429b /src/fontloader
parentcf9acafee841175295d83b07d99420ac24b6e683 (diff)
downloadluaotfload-da74e7f4d597b566ad99c995f2dd49fb41e218e0.tar.gz
[fontloader] sync with Context as of 2015-04-20
Diffstat (limited to 'src/fontloader')
-rw-r--r--src/fontloader/misc/fontloader-l-math.lua4
-rw-r--r--src/fontloader/runtime/fontloader-fontloader.lua5
2 files changed, 8 insertions, 1 deletions
diff --git a/src/fontloader/misc/fontloader-l-math.lua b/src/fontloader/misc/fontloader-l-math.lua
index 43f60b5..ec62919 100644
--- a/src/fontloader/misc/fontloader-l-math.lua
+++ b/src/fontloader/misc/fontloader-l-math.lua
@@ -8,6 +8,10 @@ if not modules then modules = { } end modules ['l-math'] = {
local floor, sin, cos, tan = math.floor, math.sin, math.cos, math.tan
+if not math.ceiling then
+ math.ceiling = math.ceil
+end
+
if not math.round then
function math.round(x) return floor(x + 0.5) end
end
diff --git a/src/fontloader/runtime/fontloader-fontloader.lua b/src/fontloader/runtime/fontloader-fontloader.lua
index 7ab0c9b..1d6509a 100644
--- a/src/fontloader/runtime/fontloader-fontloader.lua
+++ b/src/fontloader/runtime/fontloader-fontloader.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 04/15/15 01:44:50
+-- merge date : 04/18/15 14:41:50
do -- begin closure to overcome local limits and interference
@@ -2713,6 +2713,9 @@ if not modules then modules={} end modules ['l-math']={
license="see context related readme files"
}
local floor,sin,cos,tan=math.floor,math.sin,math.cos,math.tan
+if not math.ceiling then
+ math.ceiling=math.ceil
+end
if not math.round then
function math.round(x) return floor(x+0.5) end
end