summaryrefslogtreecommitdiff
path: root/luaotfload-database.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2013-05-22 14:10:51 -0700
committerPhilipp Gesang <phg42.2a@gmail.com>2013-05-22 14:10:51 -0700
commit00a2e2b6f095ba547dda795e263de9a5eb3f8f8f (patch)
treec08247d89db9980d05192f41d0843ea60843d75c /luaotfload-database.lua
parent1b1890c3b306e42a451465e64c5dbd8f0f094303 (diff)
parent6c1bb8b5c6de06598e28af43dd16e21b1741e56b (diff)
downloadluaotfload-00a2e2b6f095ba547dda795e263de9a5eb3f8f8f.tar.gz
Merge pull request #89 from phi-gamma/master
cygwin patch; import aux functions removed from fontspec into legacy codebase
Diffstat (limited to 'luaotfload-database.lua')
-rw-r--r--luaotfload-database.lua27
1 files changed, 6 insertions, 21 deletions
diff --git a/luaotfload-database.lua b/luaotfload-database.lua
index ee7701d..60e321f 100644
--- a/luaotfload-database.lua
+++ b/luaotfload-database.lua
@@ -990,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)
@@ -1379,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