Merge pull request #304 from phi-gamma/master

v2.6

15 files changed, 43 insertions, 34 deletions

diff --git a/Makefile b/Makefile
index bda7fbc..f23c6b8 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ DOCSRCDIR	= ./doc
 SCRIPTSRCDIR	= ./scripts
 SRCSRCDIR	= ./src
 FONTLOADERDIR	= $(SRCSRCDIR)/fontloader/runtime
+FONTLOADERSRCDIR= $(SRCSRCDIR)/fontloader/misc
 PACKAGEDIR	= $(SRCSRCDIR)/fontloader
 BUILDDIR	= ./build
 MISCDIR		= ./misc
@@ -22,10 +23,12 @@ GLYPHSCRIPT	= $(SCRIPTSRCDIR)/mkglyphlist
 CHARSCRIPT	= $(SCRIPTSRCDIR)/mkcharacters
 STATUSSCRIPT	= $(SCRIPTSRCDIR)/mkstatus
 IMPORTSCRIPT	= $(SCRIPTSRCDIR)/mkimport
+TESTSCRIPT	= $(SCRIPTSRCDIR)/mktests
 
 GLYPHSOURCE	= $(BUILDDIR)/glyphlist.txt
 
 RESOURCESCRIPTS = $(GLYPHSCRIPT) $(CHARSCRIPT) $(STATUSSCRIPT)
+RESOURCESCRIPTS+= $(IMPORTSCRIPT) $(TESTSCRIPT)
 
 TOOLNAME	= luaotfload-tool
 TOOL		= $(SRCSRCDIR)/$(TOOLNAME).lua
@@ -34,6 +37,9 @@ CONFNAME	= luaotfload.conf
 
 GRAPH		= filegraph
 DOCSRC		= $(addprefix $(DOCSRCDIR)/$(NAME), -main.tex -latex.tex)
+LOADERSRC	= $(wildcard $(FONTLOADERSRCDIR)/*.lua)
+LOADERSRC	+= $(wildcard $(FONTLOADERSRCDIR)/*.tex)
+LOADERSRC	+= $(PACKAGEDIR)/luaotfload-package.lua
 GRAPHSRC	= $(DOCSRCDIR)/$(GRAPH).dot
 MANSRC		= $(DOCSRCDIR)/$(TOOLNAME).rst $(DOCSRCDIR)/$(CONFNAME).rst
 
@@ -51,7 +57,8 @@ CHARS		= $(BUILDDIR)/$(NAME)-characters.lua
 STATUS		= $(BUILDDIR)/$(NAME)-status.lua
 LOADER		= $(BUILDDIR)/fontloader-$(shell date +%F).lua
 RESOURCES	= $(GLYPHS) $(CHARS) $(LOADER) $(STATUS)
-SOURCE		= $(DOCSRC) $(MANSRC) $(SRC) README COPYING Makefile NEWS $(RESOURCESCRIPTS)
+SOURCE		= $(DOCSRC) $(LOADERSRC) $(MANSRC)
+SOURCE		+= $(SRC) README COPYING Makefile NEWS $(RESOURCESCRIPTS)
 
 # Files grouped by installation location
 SCRIPTSTATUS	= $(TOOL) $(RESOURCESCRIPTS)
@@ -162,7 +169,7 @@ $(CTAN_ZIP): $(DOCS) $(SOURCE) $(TDS_ZIP)
 	@echo "Making $@ for CTAN upload."
 	@$(RM) -- $@
 	$(make-ctandir)
-	cd $(BUILDDIR) && zip -r -9 $(CTAN_ZIPFILE) $(TDS_ZIPFILE) $(NAME) >/dev/null
+	@cd $(BUILDDIR) && zip -r -9 $(CTAN_ZIPFILE) $(TDS_ZIPFILE) $(NAME) >/dev/null
 
 $(CTAN_ZIPSIG): $(CTAN_ZIP)
 	@echo "Signing package $(CTAN_ZIP)"
@@ -170,8 +177,8 @@ $(CTAN_ZIPSIG): $(CTAN_ZIP)
 	@gpg --batch --armor --detach-sign "$(CTAN_ZIP)"
 
 define run-install-doc
-@mkdir -p $(DOCDIR) && cp -- $(DOCSTATUS) $(VGND) $(CONFDEMO) $(DOCDIR)
-@mkdir -p $(SRCDIR) && cp -- $(SRCSTATUS) $(SRCDIR)
+@mkdir -p $(DOCDIR)  && cp -- $(DOCSTATUS) $(VGND) $(CONFDEMO) $(DOCDIR)
+@mkdir -p $(SRCDIR)  && cp -- $(SRCSTATUS) $(SRCDIR)
 @mkdir -p $(MAN1DIR) && cp -- $(TOOLMAN) $(MAN1DIR)
 @mkdir -p $(MAN5DIR) && cp -- $(CONFMAN) $(MAN5DIR)
 endef
@@ -179,6 +186,7 @@ endef
 define run-install
 @mkdir -p $(SCRIPTDIR) && cp -- $(SCRIPTSTATUS) $(SCRIPTDIR)
 @mkdir -p $(RUNDIR)    && cp -- $(RESOURCES) $(RUNSTATUS) $(RUNDIR)
+@mkdir -p $(RUNDIR)    && cp -- $(LOADERSRC) $(RUNDIR)
 endef
 
 $(TDS_ZIP): TEXMFROOT=./tmp-texmf
diff --git a/NEWS b/NEWS
index 4ed320a..c1e5000 100644
--- a/NEWS
+++ b/NEWS
@@ -1,23 +1,24 @@
 Change History
 --------------
 
-2015/0X/XX, luaotfload v2.6
-    * Add ``sign`` target to makefile for automated package signing
+2015/12/09, luaotfload v2.6
+    * Add ``sign`` target to makefile for automated package signing.
     * Add ``--dumpconf`` option to luaotfload-tool for generating configuration
-      files
-    * Move fontloader files to subtree src/fontloader
+      files.
+    * Move fontloader files to subtree src/fontloader.
     * New script ``mkimport`` facilitates maintainance of code imported from
-      Context
-    * Revised letterspacing, now utilizing the ``node.direct`` interface
-    * Revized colorization of fonts, utilizing ``node.direct`` (Dohyun Kim)
-    * Colorization was moved to the ``post_linebreak_filter`` stage
+      Context.
+    * Revised letterspacing, now utilizing the ``node.direct`` interface.
+    * Revized colorization of fonts, utilizing ``node.direct`` (Dohyun Kim).
+    * Colorization was moved to the ``post_linebreak_filter`` stage.
     * Move remaining functionality from ``luaotfload-override`` into
-      initialization
-    * Write names index if fonts were removed
-    * Separate module loading from initialization
-    * Custom fontloader package with the files from Lualibs removed
-    * Lualibs are now a dependency when used in a TeX run as well
-    * Respect interword spaces when letterspacing
+      initialization.
+    * Write names index if fonts were removed.
+    * Separate module loading from initialization.
+    * Custom fontloader package with the files from Lualibs removed.
+    * Swappable fontloader via configuration option.
+    * Lualibs are now a dependency when used in a TeX run as well.
+    * Respect interword spaces when letterspacing.
 
 2014/07/13, luaotfload v2.5
     * Remove legacy code.
diff --git a/doc/Makefile b/doc/Makefile
index 0355a0e..d6b576c 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -29,7 +29,7 @@ all: manuals doc
 graph: $(DOTPDF)
 manuals: $(TOOLMAN) $(CONFMAN)
 
-$(DOCPDF): $(DOCSRC)
+$(DOCPDF): $(DOCSRC) graph
 	@echo "creating PDF documentation ($@)"
 	$(DO_LATEX)
 	$(DO_LATEX)
diff --git a/doc/luaotfload-latex.tex b/doc/luaotfload-latex.tex
index e3541c5..bdcf45f 100644
--- a/doc/luaotfload-latex.tex
+++ b/doc/luaotfload-latex.tex
@@ -1,5 +1,5 @@
 \suppresslongerror1%% sigh ...
-%% Copyright (C) 2009-2014
+%% Copyright (C) 2009-2015
 %%
 %%      by  Elie Roux      <elie.roux@telecom-bretagne.eu>
 %%      and Khaled Hosny   <khaledhosny@eglug.org>
@@ -206,6 +206,7 @@
 %% one that we could map directly onto Latex’s \verb|…|.
 
 \usepackage {listings}
+\usepackage {luatexbase}
 \lstset {
   basicstyle=\ttfamily,
 }
diff --git a/doc/luaotfload-main.tex b/doc/luaotfload-main.tex
index 26d7314..967f5a2 100644
--- a/doc/luaotfload-main.tex
+++ b/doc/luaotfload-main.tex
@@ -32,7 +32,7 @@
 \beginfrontmatter
 
   \setdocumenttitle  {The \identifier{luaotfload} package}
-  \setdocumentdate   {2015/11/05 v2.6}
+  \setdocumentdate   {2015/12/09 v2.6}
   \setdocumentauthor {Elie Roux · Khaled Hosny · Philipp Gesang\\
                       Home:    \hyperlink {https://github.com/lualatex/luaotfload}\\
                       Support: \email     {lualatex-dev@tug.org}}
diff --git a/doc/luaotfload-tool.rst b/doc/luaotfload-tool.rst
index 99e3fb2..4c05c44 100644
--- a/doc/luaotfload-tool.rst
+++ b/doc/luaotfload-tool.rst
@@ -6,9 +6,9 @@
          generate and query the Luaotfload font names database
 -----------------------------------------------------------------------
 
-:Date:                  2014-07-24
+:Date:                  2015-12-09
 :Copyright:             GPL v2.0
-:Version:               2.5
+:Version:               2.6
 :Manual section:        1
 :Manual group:          text processing
 
diff --git a/doc/luaotfload.conf.rst b/doc/luaotfload.conf.rst
index 958ecee..d624e00 100644
--- a/doc/luaotfload.conf.rst
+++ b/doc/luaotfload.conf.rst
@@ -6,7 +6,7 @@
                      Luaotfload configuration file
 -----------------------------------------------------------------------
 
-:Date:                  2015-04-20
+:Date:                  2015-12-09
 :Copyright:             GPL v2.0
 :Version:               2.6
 :Manual section:        5
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')