summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2014-04-05 14:33:02 +0200
committerPhilipp Gesang <phg42.2a@gmail.com>2014-04-05 14:33:02 +0200
commite6a3a269577fb715079fa185e4d96f1a04b5e1ae (patch)
treeca3e3a9a23c8e9f76ee9542a58e978c9a4281c68 /src
parent6a6075b138019c1d8a48a1a063cd8f89aabe6de9 (diff)
downloadluaotfload-e6a3a269577fb715079fa185e4d96f1a04b5e1ae.tar.gz
[fontloader] sync with Context as of 2014-04-05
Diffstat (limited to 'src')
-rw-r--r--src/luaotfload-fontloader.lua14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/luaotfload-fontloader.lua b/src/luaotfload-fontloader.lua
index ca538df..fa61668 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/25/14 02:17:04
+-- merge date : 04/04/14 00:08:59
do -- begin closure to overcome local limits and interference
@@ -3394,6 +3394,17 @@ function caches.loaddata(paths,name)
for i=1,#paths do
local data=false
local luaname,lucname=makefullname(paths[i],name)
+ if lucname and not lfs.isfile(lucname) and type(caches.compile)=="function" then
+ texio.write(string.format("(compiling luc: %s)",lucname))
+ data=loadfile(luaname)
+ if data then
+ data=data()
+ end
+ if data then
+ caches.compile(data,luaname,lucname)
+ return data
+ end
+ end
if lucname and lfs.isfile(lucname) then
texio.write(string.format("(load luc: %s)",lucname))
data=loadfile(lucname)
@@ -5764,7 +5775,6 @@ unify=function(data,filename)
if unicode then
krn[unicode]=kern
else
- print(unicode,name)
end
end
description.kerns=krn