From 99d4818b7624c508133699fee43e6fd9a1ed7a44 Mon Sep 17 00:00:00 2001 From: Marius Date: Mon, 14 Oct 2013 00:00:38 +0300 Subject: beta 2013.10.13 22:46 --- tex/generic/context/luatex/luatex-fonts-merged.lua | 9 ++++++--- tex/generic/context/luatex/luatex-fonts-syn.lua | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'tex/generic') diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index d3eee2087..1556b4495 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 10/10/13 17:47:59 +-- merge date : 10/13/13 22:46:23 do -- begin closure to overcome local limits and interference @@ -5074,6 +5074,9 @@ fonts.names.resolvespec=fonts.names.resolve function fonts.names.getfilename(askedname,suffix) return "" end +function fonts.names.ignoredfile(filename) + return true +end end -- closure @@ -5428,7 +5431,7 @@ end local addkerns,addligatures,addtexligatures,unify,normalize function afm.load(filename) filename=resolvers.findfile(filename,'afm') or "" - if filename~="" then + if filename~="" and not fonts.names.ignoredfile(filename) then local name=file.removesuffix(file.basename(filename)) local data=containers.read(afm.cache,name) local attr=lfs.attributes(filename) @@ -8168,7 +8171,7 @@ local function check_otf(forced,specification,suffix) if fullname=="" then fullname=fonts.names.getfilename(name,suffix) or "" end - if fullname~="" then + if fullname~="" and not fonts.names.ignoredfile(fullname) then specification.filename=fullname return read_from_otf(specification) end diff --git a/tex/generic/context/luatex/luatex-fonts-syn.lua b/tex/generic/context/luatex/luatex-fonts-syn.lua index ea6e3cab5..60dd2c063 100644 --- a/tex/generic/context/luatex/luatex-fonts-syn.lua +++ b/tex/generic/context/luatex/luatex-fonts-syn.lua @@ -100,3 +100,7 @@ fonts.names.resolvespec = fonts.names.resolve -- only supported in mkiv function fonts.names.getfilename(askedname,suffix) -- only supported in mkiv return "" end + +function fonts.names.ignoredfile(filename) -- only supported in mkiv + return true -- will be overloaded +end -- cgit v1.2.3