diff options
author | Norbert Preining <preining@logic.at> | 2013-05-27 01:27:54 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2013-05-27 01:27:54 +0000 |
commit | 482b8f1300719b9a7e3cfecd1bcf745229f7a77c (patch) | |
tree | 9571c3e8ec3abbd175695095313c3a03cd766943 /Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua | |
parent | 04a64779a0d27806141d9b0f6363b27807fba240 (diff) |
luaotfload update 5/27
git-svn-id: svn://tug.org/texlive/trunk@30701 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua index 0e4687493c6..60e321f1be2 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua @@ -568,9 +568,11 @@ resolve = function (_,_,specification) -- the 1st two parameters are used by Con subfamily = facenames.subfamily fullname = facenames.fullname psname = facenames.psname + fontname = facenames.fontname + pfullname = facenames.pfullname end - fontname = facenames.fontname or sanitize_string(face.fontname) - pfullname = facenames.pfullname or sanitize_string(face.fullname) + fontname = fontname or sanitize_string(face.fontname) + pfullname = pfullname or sanitize_string(face.fullname) local optsize, dsnsize, maxsize, minsize if #face.size > 0 then @@ -988,29 +990,14 @@ do path_normalize = function (path) path = stringgsub(path, '\\', '/') path = stringlower(path) - path = stringgsub(path, '^/cygdrive/(%a)/', '%1:/') - path = filecollapsepath(path) - return path - end - - elseif os_name == "cygwin" then -- union of ms + unix - path_normalize = function (path) - path = stringgsub(path, '\\', '/') - path = stringlower(path) - path = stringgsub(path, '^/cygdrive/(%a)/', '%1:/') - local dest = lfsreadlink(path) - if dest then - if kpsereadable_file(dest) then - path = dest - elseif kpsereadable_file(filejoin(filedirname(path), dest)) then - path = filejoin(file.dirname(path), dest) - else - -- broken symlink? - end - end path = filecollapsepath(path) return path end +--[[doc-- + Cygwin used to be treated different from windows and dos. This + special treatment was removed with a patch submitted by Ken Brown. + Reference: http://cygwin.com/ml/cygwin/2013-05/msg00006.html +--doc]]-- else -- posix path_normalize = function (path) @@ -1377,7 +1364,7 @@ local function get_os_dirs() "/System/Library/Fonts", "/Network/Library/Fonts", } - elseif os.type == "windows" or os.type == "msdos" or os.name == "cygwin" then + elseif os.type == "windows" or os.type == "msdos" then local windir = os.getenv("WINDIR") return { filejoin(windir, 'Fonts') } else |