summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-27 22:19:17 +0000
committerKarl Berry <karl@freefriends.org>2013-04-27 22:19:17 +0000
commit9447dcd6a625a98babb4f5316df81110d7a6eb4c (patch)
tree3008e5a40df78d659148c36f63519ccda5e72cb1 /Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua
parent22833d9fc6fc9e4cca075fcdee718b0792db7958 (diff)
luaotfload (27apr13)
git-svn-id: svn://tug.org/texlive/trunk@30137 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua')
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua45
1 files changed, 19 insertions, 26 deletions
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua b/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua
index 50febabc219..fa9edcaef66 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua
@@ -155,23 +155,22 @@ function names.resolve(specification)
table.contains(synonyms.regular, subfamily) then
found.fallback = face
end
- else
- if name == fullname
- or name == pfullname
- or name == fontname
- or name == psname then
- if optsize then
- if dsnsize == size
- or (size > minsize and size <= maxsize) then
- found[1] = face
- break
- else
- found[#found+1] = face
- end
- else
+ end
+ if name == fullname
+ or name == pfullname
+ or name == fontname
+ or name == psname then
+ if optsize then
+ if dsnsize == size
+ or (size > minsize and size <= maxsize) then
found[1] = face
break
+ else
+ found[#found+1] = face
end
+ else
+ found[1] = face
+ break
end
end
end
@@ -357,9 +356,7 @@ local function load_font(filename, fontnames, newfontnames, texmf)
return
end
local index = newstatus[basefile].index[i]
- if newstatus[basefile].index[i] then
- index = newstatus[basefile].index[i]
- else
+ if not index then
index = #newmappings+1
end
newmappings[index] = fullinfo
@@ -370,10 +367,8 @@ local function load_font(filename, fontnames, newfontnames, texmf)
if not fullinfo then
return
end
- local index
- if newstatus[basefile].index[1] then
- index = newstatus[basefile].index[1]
- else
+ local index = newstatus[basefile].index[1]
+ if not index then
index = #newmappings+1
end
newmappings[index] = fullinfo
@@ -510,12 +505,12 @@ end
- if OSFONTDIR is set (which is the case under windows by default but
not on the other OSs), it scans it at the same time as the texmf tree,
in the scan_texmf_fonts.
- - if not:
+ - in addition:
- under Windows and Mac OSX, we take a look at some hardcoded directories
- under Unix, we read /etc/fonts/fonts.conf and read the directories in it
This means that if you have fonts in fancy directories, you need to set them
- in OSFONTDIR.
+ in OSFONTDIR if they cannot be found by fontconfig.
]]
local function read_fonts_conf(path, results, passed_paths)
@@ -654,9 +649,7 @@ local function update_names(fontnames, force)
local newfontnames = fontnames_init()
read_blacklist()
scan_texmf_fonts(fontnames, newfontnames)
- if expandpath("$OSFONTDIR"):is_empty() then
- scan_os_fonts(fontnames, newfontnames)
- end
+ scan_os_fonts(fontnames, newfontnames)
return newfontnames
end