summaryrefslogtreecommitdiff
path: root/tex/generic
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2013-10-13 22:46:00 +0200
committerHans Hagen <pragma@wxs.nl>2013-10-13 22:46:00 +0200
commit8104826384ace46d171bb57d2ce5ae72b96d59cf (patch)
treeae01b0075e4ede4a822eba474f1195bc7b6eba04 /tex/generic
parent2c4b105b9cce4df9d56f752d230b3fbb2a0190d5 (diff)
downloadcontext-8104826384ace46d171bb57d2ce5ae72b96d59cf.tar.gz
beta 2013.10.13 22:46
Diffstat (limited to 'tex/generic')
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua9
-rw-r--r--tex/generic/context/luatex/luatex-fonts-syn.lua4
2 files changed, 10 insertions, 3 deletions
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