From 773ad91399a0e4c8c1c9525f2454ee7c8e99b03e Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 18 May 2014 19:28:55 +0200 Subject: [fontloader] sync with Context as of 2014-05-18 --- src/luaotfload-fontloader.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/luaotfload-fontloader.lua b/src/luaotfload-fontloader.lua index f7801ea..4dfefd6 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/17/14 23:46:22 +-- merge date : 05/18/14 15:57:13 do -- begin closure to overcome local limits and interference @@ -2853,7 +2853,11 @@ local format_f=function(f) end local format_F=function(f) n=n+1 - return format("((a%s == 0 and '0') or (a%s == 1 and '1') or format('%%%sf',a%s))",n,n,f,n) + 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) + else + return format("((a%s == 0 and '0') or (a%s == 1 and '1') or format('%%%sf',a%s))",n,n,f,n) + end end local format_g=function(f) n=n+1 -- cgit v1.2.3