From 9447dcd6a625a98babb4f5316df81110d7a6eb4c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 27 Apr 2013 22:19:17 +0000 Subject: luaotfload (27apr13) git-svn-id: svn://tug.org/texlive/trunk@30137 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/luatex/luaotfload/luaotfload.lua | 6 +-- .../tex/luatex/luaotfload/otfl-font-com.lua | 16 -------- .../tex/luatex/luaotfload/otfl-font-nms.lua | 45 +++++++++------------- 3 files changed, 22 insertions(+), 45 deletions(-) delete mode 100644 Master/texmf-dist/tex/luatex/luaotfload/otfl-font-com.lua (limited to 'Master/texmf-dist/tex/luatex') diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua index ab837536af3..7365581a64f 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua @@ -21,8 +21,8 @@ module("luaotfload", package.seeall) luaotfload.module = { name = "luaotfload", - version = 1.28, - date = "2013/04/11", + version = 1.29, + date = "2013/04/25", description = "OpenType layout system.", author = "Elie Roux & Hans Hagen", copyright = "Elie Roux", @@ -107,7 +107,7 @@ local function def_font(...) end return fontdata end -fonts.define.resolvers.file = fonts.define.resolvers.name +--fonts.define.resolvers.file = fonts.define.resolvers.name fonts.mode = "node" local register_base_sub = fonts.otf.features.register_base_substitution local gsubs = { diff --git a/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-com.lua b/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-com.lua deleted file mode 100644 index 4b6d8162f56..00000000000 --- a/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-com.lua +++ /dev/null @@ -1,16 +0,0 @@ -if not modules then modules = { } end modules ['font-com'] = { - version = 1.002, - comment = "Luaotfload backward compatibility module", - author = "Elie Roux", - copyright = "Luaotfload Development Team", - license = "GNU GPL v2" -} - -fonts = fonts or { } -local fonts = fonts - --- In new ConTeXt versions, fonts.identifiers is renamed in --- fonts.hashes.identifiers, this break fontspec from TeXLive 2012 -if not fonts.identifiers then - fonts.identifiers = fonts.hashes.identifiers -end 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 -- cgit v1.2.3