From f80559dee34d3e2c01f5793541e1c6fb4b6b641b Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaledhosny@eglug.org>
Date: Tue, 27 Apr 2010 12:42:43 +0200
Subject: Change the default cache path

Per Manuel's suggestion, we now use TEXMVAR/luatex/generic/luaotfload/
instead of TEXMVAR/luatex-cache/latex/.
---
 mkluatexfontdb.lua | 2 +-
 otfl-font-nms.lua  | 5 +++--
 otfl-luat-dum.lua  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mkluatexfontdb.lua b/mkluatexfontdb.lua
index ad9a362..ce9c410 100755
--- a/mkluatexfontdb.lua
+++ b/mkluatexfontdb.lua
@@ -44,7 +44,7 @@ Valid options:
   -h --help                    print this message
 
 The output database file is named otfl-fonts.lua. By default it is placed
-in $TEXMFVAR/luatex-cache/latex/names/.
+in $TEXMFVAR/luatex/generic/luaotfload/names.
 ]], name))
 end
 
diff --git a/otfl-font-nms.lua b/otfl-font-nms.lua
index dc8179b..27de2e7 100644
--- a/otfl-font-nms.lua
+++ b/otfl-font-nms.lua
@@ -10,12 +10,13 @@ fonts                = fonts       or { }
 fonts.names          = fonts.names or { }
 
 local names          = fonts.names
+local names_dir      = "/luatex/generic/luaotfload/names"
 names.version        = 2.007 -- not the same as in context
 names.data           = nil
 names.path           = {
     basename  = "otfl-names.lua",
-    localdir  = kpse.expand_var("$TEXMFVAR")    .. "/luatex-cache/latex/names/",
-    systemdir = kpse.expand_var("$TEXMFSYSVAR") .. "/luatex-cache/latex/names/",
+    localdir  = kpse.expand_var("$TEXMFVAR")    .. names_dir,
+    systemdir = kpse.expand_var("$TEXMFSYSVAR") .. names_dir,
 }
 
 
diff --git a/otfl-luat-dum.lua b/otfl-luat-dum.lua
index 6e2e1c6..3946b6f 100644
--- a/otfl-luat-dum.lua
+++ b/otfl-luat-dum.lua
@@ -90,7 +90,7 @@ function caches.setpath(category,subcategory)
 --      root = kpse.var_value("VARTEXMF") or ""
 --  end
     local var  = kpse.var_value("TEXMFVAR")
-    local root = var and (var .. "/luatex-cache/latex") or ""
+    local root = var and (var .. "/luatex/generic/luaotfload/") or ""
     if root ~= "" then
         root = file.join(root,category)
         lfs.mkdir(root)
-- 
cgit v1.2.3