Merge pull request #304 from phi-gamma/master

v2.6

8 files changed, 9 insertions, 10 deletions

diff --git a/src/fontloader/luaotfload-package.lua b/src/fontloader/luaotfload-package.lua
index 725c498..524dbcb 100644
--- a/src/fontloader/luaotfload-package.lua
+++ b/src/fontloader/luaotfload-package.lua
@@ -2,10 +2,9 @@
 -----------------------------------------------------------------------
 --         FILE:  luaotfload-package.lua
 --  DESCRIPTION:  Luatex fontloader packaging
--- REQUIREMENTS:  luatex
+-- REQUIREMENTS:  luatex, mtx-package
 --       AUTHOR:  Philipp Gesang
 --      LICENSE:  GNU GPL v2.0
---      CREATED:  2015-03-29 12:07:33+0200
 -----------------------------------------------------------------------
 --
 
diff --git a/src/luaotfload-database.lua b/src/luaotfload-database.lua
index 881cfe8..367723b 100644
--- a/src/luaotfload-database.lua
+++ b/src/luaotfload-database.lua
@@ -1,5 +1,5 @@
 if not modules then modules = { } end modules ['luaotfload-database'] = {
-    version   = "2.5",
+    version   = "2.6",
     comment   = "companion to luaotfload-main.lua",
     author    = "Khaled Hosny, Elie Roux, Philipp Gesang",
     copyright = "Luaotfload Development Team",
@@ -3529,7 +3529,7 @@ return {
         fonts.definers  = fonts.definers or { resolvers = { } }
 
         names.blacklist = blacklist
-        names.version   = 2.51
+        names.version   = 2.6
         names.data      = nil      --- contains the loaded database
         names.lookups   = nil      --- contains the lookup cache
 
diff --git a/src/luaotfload-features.lua b/src/luaotfload-features.lua
index 6fb2114..962806c 100644
--- a/src/luaotfload-features.lua
+++ b/src/luaotfload-features.lua
@@ -1,5 +1,5 @@
 if not modules then modules = { } end modules ["features"] = {
-    version   = "2.5",
+    version   = "2.6",
     comment   = "companion to luaotfload-main.lua",
     author    = "Hans Hagen, Khaled Hosny, Elie Roux, Philipp Gesang",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua
index b07dda1..895e32e 100644
--- a/src/luaotfload-init.lua
+++ b/src/luaotfload-init.lua
@@ -391,7 +391,7 @@ local init_main = function ()
 
   ---load_fontloader_module "font-odv.lua" --- <= Devanagari support from Context
 
-  logreport ("both", 0, "init",
+  logreport ("log", 0, "init",
              "Context OpenType loader version “%s”",
              fonts.handlers.otf.version)
 end --- [init_main]
diff --git a/src/luaotfload-log.lua b/src/luaotfload-log.lua
index e5db310..5c678a5 100644
--- a/src/luaotfload-log.lua
+++ b/src/luaotfload-log.lua
@@ -1,5 +1,5 @@
 if not modules then modules = { } end modules ["luaotfload-log"] = {
-    version   = "2.5",
+    version   = "2.6",
     comment   = "companion to Luaotfload",
     author    = "Khaled Hosny, Elie Roux, Philipp Gesang",
     copyright = "Luaotfload Development Team",
diff --git a/src/luaotfload-main.lua b/src/luaotfload-main.lua
index b8050e4..9525ca4 100644
--- a/src/luaotfload-main.lua
+++ b/src/luaotfload-main.lua
@@ -30,7 +30,7 @@ local authors = "\z
 luaotfload.module = {
     name          = "luaotfload-main",
     version       = 2.60001,
-    date          = "2015/11/05",
+    date          = "2015/12/09",
     description   = "OpenType layout system.",
     author        = authors,
     copyright     = authors,
diff --git a/src/luaotfload-tool.lua b/src/luaotfload-tool.lua
index ab495a9..69b6c97 100755
--- a/src/luaotfload-tool.lua
+++ b/src/luaotfload-tool.lua
@@ -296,7 +296,7 @@ local help_msg = function (version)
                          luaotfload.self,
                          names_gzip,
                          names_bin,
-                         caches.getwritablepath (config.luaotfload.cache_dir)))
+                         caches.getwritablepath (config.luaotfload.paths.cache_dir, "")))
 end
 
 local about = [[
diff --git a/src/luaotfload.sty b/src/luaotfload.sty
index c674ab0..836d819 100644
--- a/src/luaotfload.sty
+++ b/src/luaotfload.sty
@@ -41,7 +41,7 @@
   \ProvidesPackage{luaotfload}%
     %% FIXME  The date is meaningless, we need to find a way to
     %%        use the git revision instead.
-    [2015/03/29 v2.6  OpenType layout system]
+    [2015/12/09 v2.6  OpenType layout system]
 \fi
 \directlua{
 require('luaotfload-main')