summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2013-05-22 22:01:32 +0200
committerPhilipp Gesang <phg42.2a@gmail.com>2013-05-22 22:01:32 +0200
commit635541532080e2b86d9cc28b85ad96d88e57b413 (patch)
tree45d674b821c9c54e1b2da5eca9ec9c57fd5f0743
parentbd84183e5fb0e97e974b4a9c5fdfac776fdf369a (diff)
downloadluaotfload-635541532080e2b86d9cc28b85ad96d88e57b413.tar.gz
apply patch by Ken Brown to preserve case of paths on cygwin
-rw-r--r--luaotfload-database.lua27
-rw-r--r--luaotfload-legacy-database.lua4
2 files changed, 8 insertions, 23 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
diff --git a/luaotfload-legacy-database.lua b/luaotfload-legacy-database.lua
index 4af05f5..b31fe88 100644
--- a/luaotfload-legacy-database.lua
+++ b/luaotfload-legacy-database.lua
@@ -425,7 +425,7 @@ local function path_normalize(path)
- reading symlinks under non-Win32
- using kpse.readable_file on Win32
]]
- if os.type == "windows" or os.type == "msdos" or os.name == "cygwin" then
+ if os.type == "windows" or os.type == "msdos" then
path = path:gsub('\\', '/')
path = path:lower()
path = path:gsub('^/cygdrive/(%a)/', '%1:/')
@@ -635,7 +635,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 { file.join(windir, 'Fonts') }
else