summaryrefslogtreecommitdiff
path: root/src/luaotfload-fontloader.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2014-03-22 21:42:58 +0100
committerPhilipp Gesang <phg42.2a@gmail.com>2014-03-22 21:42:58 +0100
commit8e9e1d02df416400bd3454f8f0aee279c3898f0e (patch)
tree83e388a48768806a0814f6a425995efaac7f5138 /src/luaotfload-fontloader.lua
parent95cdecde2d3415604cd8194eacd11544fe985aeb (diff)
downloadluaotfload-8e9e1d02df416400bd3454f8f0aee279c3898f0e.tar.gz
[fontloader] sync with Context as of 2014-03-22
Diffstat (limited to 'src/luaotfload-fontloader.lua')
-rw-r--r--src/luaotfload-fontloader.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/luaotfload-fontloader.lua b/src/luaotfload-fontloader.lua
index 196fc61..655aedf 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 : 03/16/14 11:40:51
+-- merge date : 03/22/14 15:31:38
do -- begin closure to overcome local limits and interference
@@ -2574,9 +2574,11 @@ end
if not number then number={} end
local stripper=patterns.stripzeros
local function points(n)
+ n=tonumber(n)
return (not n or n==0) and "0pt" or lpegmatch(stripper,format("%.5fpt",n/65536))
end
local function basepoints(n)
+ n=tonumber(n)
return (not n or n==0) and "0bp" or lpegmatch(stripper,format("%.5fbp",n*(7200/7227)/65536))
end
number.points=points
@@ -6569,7 +6571,7 @@ local report_otf=logs.reporter("fonts","otf loading")
local fonts=fonts
local otf=fonts.handlers.otf
otf.glists={ "gsub","gpos" }
-otf.version=2.754
+otf.version=2.755
otf.cache=containers.define("fonts","otf",otf.version,true)
local fontdata=fonts.hashes.identifiers
local chardata=characters and characters.data