summaryrefslogtreecommitdiff
path: root/src/luaotfload-fontloader.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2014-05-31 13:32:46 +0200
committerPhilipp Gesang <phg42.2a@gmail.com>2014-05-31 13:32:46 +0200
commit84619758adf39e49553662b4a5af806c1527001e (patch)
treecb607db40c4a7d5979f7ec0060cb985a3775f0b9 /src/luaotfload-fontloader.lua
parent0e06af55b50b2314c5d99db4843c1881dd89a88b (diff)
downloadluaotfload-84619758adf39e49553662b4a5af806c1527001e.tar.gz
[fontloader] sync with Context as of 2014-05-31
Diffstat (limited to 'src/luaotfload-fontloader.lua')
-rw-r--r--src/luaotfload-fontloader.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/luaotfload-fontloader.lua b/src/luaotfload-fontloader.lua
index 4dfefd6..1732a23 100644
--- a/src/luaotfload-fontloader.lua
+++ b/src/luaotfload-fontloader.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 05/18/14 15:57:13
+-- merge date : 05/30/14 23:26:41
do -- begin closure to overcome local limits and interference
@@ -2851,12 +2851,12 @@ local format_f=function(f)
n=n+1
return format("format('%%%sf',a%s)",f,n)
end
-local format_F=function(f)
+local format_F=function()
n=n+1
if not f or f=="" then
- return format("(((a%s > -0.0000000005 and a%s < 0.0000000005) and '0') or (a%s == 1 and '1') or format('%%.9f',a%s))",n,n,n,n)
+ return format("(((a%s > -0.0000000005 and a%s < 0.0000000005) and '0') or format((a%s %% 1 == 0) and '%%i' or '%%.9f',a%s))",n,n,n,n)
else
- return format("((a%s == 0 and '0') or (a%s == 1 and '1') or format('%%%sf',a%s))",n,n,f,n)
+ return format("format((a%s %% 1 == 0) and '%%i' or '%%%sf',a%s)",n,f,n)
end
end
local format_g=function(f)