luaotfload (24dec15)

git-svn-id: svn://tug.org/texlive/trunk@39193 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 122 insertions, 99 deletions

diff --git a/Master/texmf-dist/tex/luatex/luaotfload/fontloader-2015-12-22.lua b/Master/texmf-dist/tex/luatex/luaotfload/fontloader-2015-12-23.lua
index 6e8879eab12..de754361554 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/fontloader-2015-12-22.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/fontloader-2015-12-23.lua
@@ -1,6 +1,6 @@
 --[[info-----------------------------------------------------------------------
   Luaotfload fontloader package
-  build 2015-12-22 23:59:34 by phg@phlegethon
+  build 2015-12-23 22:45:42 by phg@phlegethon
 -------------------------------------------------------------------------------
 
   © 2015 PRAGMA ADE / ConTeXt Development Team
@@ -47,7 +47,7 @@
 --info]]-----------------------------------------------------------------------
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “data-con” 675f5a0af45ffb3e0d2e2ab5d6c2e47b] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “data-con” 675f5a0af45ffb3e0d2e2ab5d6c2e47b] ---
 
 if not modules then modules={} end modules ['data-con']={
   version=1.100,
@@ -159,10 +159,10 @@ function containers.cleanname(name)
   return (gsub(lower(name),"[^%w\128-\255]+","-")) 
 end
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “data-con”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “data-con”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “basics-nod” af682899d202229c0c1b859a07384b8c] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “basics-nod” af682899d202229c0c1b859a07384b8c] ---
 
 if not modules then modules={} end modules ['luatex-fonts-nod']={
   version=1.001,
@@ -376,10 +376,10 @@ end
 nodes.setprop=nodes.setproperty
 nodes.getprop=nodes.getproperty
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “basics-nod”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “basics-nod”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “font-ini” 179f0a75cda26696c1b1cd6d7fe0d8ae] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “font-ini” 179f0a75cda26696c1b1cd6d7fe0d8ae] ---
 
 if not modules then modules={} end modules ['font-ini']={
   version=1.001,
@@ -403,10 +403,10 @@ fonts.definers={ methods={} }
 fonts.loggers={ register=function() end }
 fontloader.totable=fontloader.to_table 
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “font-ini”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “font-ini”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “font-con” 99aacd19adce25fa35a9a30d43e8ac79] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “font-con” 99aacd19adce25fa35a9a30d43e8ac79] ---
 
 if not modules then modules={} end modules ['font-con']={
   version=1.001,
@@ -1558,10 +1558,10 @@ function constructors.addcoreunicodes(unicodes)
   return unicodes
 end
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “font-con”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “font-con”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “fonts-enc” b224fe179312d924ffaf8334cf5ef15b] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “fonts-enc” b224fe179312d924ffaf8334cf5ef15b] ---
 
 if not modules then modules={} end modules ['luatex-font-enc']={
   version=1.001,
@@ -1589,10 +1589,10 @@ setmetatable(fonts.encodings.agl,{ __index=function(t,k)
   end
 end })
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “fonts-enc”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “fonts-enc”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “font-cid” 52421d1fdaa07ec4b1d936c6ff5079be] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “font-cid” 52421d1fdaa07ec4b1d936c6ff5079be] ---
 
 if not modules then modules={} end modules ['font-cid']={
   version=1.001,
@@ -1743,10 +1743,10 @@ function cid.getmap(specification)
   return found
 end
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “font-cid”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “font-cid”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “font-map” a20a454f933095d78faf1d5f8200d025] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “font-map” a20a454f933095d78faf1d5f8200d025] ---
 
 if not modules then modules={} end modules ['font-map']={
   version=1.001,
@@ -2060,10 +2060,10 @@ function mappings.addtounicode(data,filename,checklookups)
   end
 end
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “font-map”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “font-map”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “fonts-syn” 9729d0e49b770f78e88dab86739e0297] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “fonts-syn” 9729d0e49b770f78e88dab86739e0297] ---
 
 if not modules then modules={} end modules ['luatex-fonts-syn']={
   version=1.001,
@@ -2139,10 +2139,10 @@ function fonts.names.ignoredfile(filename)
   return false 
 end
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “fonts-syn”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “fonts-syn”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “font-tfm” bbee5eddb11211fb0a8d993db678bf3c] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “font-tfm” bbee5eddb11211fb0a8d993db678bf3c] ---
 
 if not modules then modules={} end modules ['font-tfm']={
   version=1.001,
@@ -2297,10 +2297,10 @@ function readers.tfm(specification)
   return check_tfm(specification,fullname)
 end
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “font-tfm”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “font-tfm”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “font-afm” ece4863414d6b38c2e577110c9b55bd3] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “font-afm” ece4863414d6b38c2e577110c9b55bd3] ---
 
 if not modules then modules={} end modules ['font-afm']={
   version=1.001,
@@ -3152,10 +3152,10 @@ function readers.pfb(specification,method)
   return readers.afm(specification,method)
 end
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “font-afm”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “font-afm”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “font-afk” b36a76ceb835f41f8c05b471000ddc14] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “font-afk” b36a76ceb835f41f8c05b471000ddc14] ---
 
 if not modules then modules={} end modules ['font-afk']={
   version=1.001,
@@ -3322,10 +3322,10 @@ fonts.handlers.afm.helpdata={
   }
 }
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “font-afk”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “font-afk”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “fonts-tfm” 8fd3865240e4e87e99e0739abeda2322] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “fonts-tfm” 8fd3865240e4e87e99e0739abeda2322] ---
 
 if not modules then modules={} end modules ['luatex-fonts-tfm']={
   version=1.001,
@@ -3363,10 +3363,10 @@ function fonts.readers.tfm(specification)
   end
 end
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “fonts-tfm”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “fonts-tfm”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “font-oti” b6d493035cec2d748f2f9ec510c860ef] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “font-oti” b6d493035cec2d748f2f9ec510c860ef] ---
 
 if not modules then modules={} end modules ['font-oti']={
   version=1.001,
@@ -3505,10 +3505,10 @@ function otffeatures.checkeddefaultlanguage(featuretype,autolanguage,languages)
   end
 end
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “font-oti”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “font-oti”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “font-otf” b14a46a7fec8b5cb4c909f4c4c299453] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “font-otf” b14a46a7fec8b5cb4c909f4c4c299453] ---
 
 if not modules then modules={} end modules ['font-otf']={
   version=1.001,
@@ -5965,10 +5965,10 @@ function otf.getkern(tfmdata,left,right,kind)
   return 0
 end
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “font-otf”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “font-otf”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “font-otb” 93461f2f412a9b33b35a273c09b64291] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “font-otb” 93461f2f412a9b33b35a273c09b64291] ---
 
 if not modules then modules={} end modules ['font-otb']={
   version=1.001,
@@ -6553,10 +6553,10 @@ directives.register("fonts.otf.loader.basemethod",function(v)
   end
 end)
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “font-otb”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “font-otb”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “font-inj” 593642f0a6fe4a7fef5ed63034276e6f] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “font-inj” 593642f0a6fe4a7fef5ed63034276e6f] ---
 
 if not modules then modules={} end modules ['font-inj']={
   version=1.001,
@@ -7583,10 +7583,10 @@ function injections.handler(head,where)
   end
 end
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “font-inj”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “font-inj”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “fonts-ota” 67a1fc4c6508526fa54041d22bcb6eab] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “fonts-ota” 67a1fc4c6508526fa54041d22bcb6eab] ---
 
 if not modules then modules={} end modules ['luatex-fonts-ota']={
   version=1.001,
@@ -7964,10 +7964,10 @@ directives.register("otf.analyze.useunicodemarks",function(v)
   analyzers.useunicodemarks=v
 end)
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “fonts-ota”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “fonts-ota”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “font-otn” e8a1f33bbba52eda6aec4e6d6a9662dc] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “font-otn” e8a1f33bbba52eda6aec4e6d6a9662dc] ---
 
 if not modules then modules={} end modules ['font-otn']={
   version=1.001,
@@ -11259,10 +11259,10 @@ registerotffeature {
 }
 otf.handlers=handlers
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “font-otn”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “font-otn”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “font-otp” 18b4375155925ee1809150f4f6c3973b] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “font-otp” 18b4375155925ee1809150f4f6c3973b] ---
 
 if not modules then modules={} end modules ['font-otp']={
   version=1.001,
@@ -12097,10 +12097,10 @@ end
 otf.enhancers.unpack=unpackdata 
 otf.enhancers.pack=packdata  
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “font-otp”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “font-otp”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “fonts-lua” 50b8edb1db7009b6c661ab71ff24a466] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “fonts-lua” 50b8edb1db7009b6c661ab71ff24a466] ---
 
 if not modules then modules={} end modules ['luatex-fonts-lua']={
   version=1.001,
@@ -12133,10 +12133,10 @@ function fonts.readers.lua(specification)
   end
 end
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “fonts-lua”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “fonts-lua”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “font-def” 3c71c27300a8cb5c29f5d278d2049fb6] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “font-def” 3c71c27300a8cb5c29f5d278d2049fb6] ---
 
 if not modules then modules={} end modules ['font-def']={
   version=1.001,
@@ -12467,10 +12467,10 @@ function font.getfont(id)
 end
 callbacks.register('define_font',definers.read,"definition of fonts (tfmdata preparation)")
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “font-def”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “font-def”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “fonts-def” e758c9faca4d44382b88bbea892e8bbf] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “fonts-def” e758c9faca4d44382b88bbea892e8bbf] ---
 
 if not modules then modules={} end modules ['luatex-fonts-def']={
   version=1.001,
@@ -12550,10 +12550,10 @@ function fonts.definers.applypostprocessors(tfmdata)
   return tfmdata
 end
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “fonts-def”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “fonts-def”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “fonts-ext” 0eee87fb26b7d135da88ac0a43a8037a] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “fonts-ext” 0eee87fb26b7d135da88ac0a43a8037a] ---
 
 if not modules then modules={} end modules ['luatex-fonts-ext']={
   version=1.001,
@@ -12770,10 +12770,10 @@ otffeatures.register {
   }
 }
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “fonts-ext”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “fonts-ext”] ---
 
 
-do  --- [luaotfload, fontloader-2015-12-22.lua scope for “fonts-cbk” 3e86c6a492ca8d792f6b06149ba0dd57] ---
+do  --- [luaotfload, fontloader-2015-12-23.lua scope for “fonts-cbk” 3e86c6a492ca8d792f6b06149ba0dd57] ---
 
 if not modules then modules={} end modules ['luatex-fonts-cbk']={
   version=1.001,
@@ -12975,7 +12975,7 @@ function nodes.simple_font_handler(head)
   end
 end
 
-end --- [luaotfload, fontloader-2015-12-22.lua scope for “fonts-cbk”] ---
+end --- [luaotfload, fontloader-2015-12-23.lua scope for “fonts-cbk”] ---
 
 
 --- vim:ft=lua:sw=2:ts=8:et:tw=79
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/fontloader-reference.lua b/Master/texmf-dist/tex/luatex/luaotfload/fontloader-reference.lua
index 46de1d0c070..9208e5286ba 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/fontloader-reference.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/fontloader-reference.lua
@@ -1,6 +1,6 @@
 -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 12/21/15 16:29:15
+-- merge date  : 12/22/15 10:50:54
 
 do -- begin closure to overcome local limits and interference
 
@@ -7418,6 +7418,7 @@ local ordered_enhancers={
   "check encoding",
   "add duplicates",
   "expand lookups",
+  "check extra features",
   "cleanup tables",
   "compact lookups",
   "purge names",
@@ -7688,7 +7689,6 @@ function otf.load(filename,sub,featurefile)
       applyruntimefixes(filename,data)
     end
     enhance("add dimensions",data,filename,nil,false)
-enhance("check extra features",data,filename)
     if trace_sequences then
       showfeatureorder(data,filename)
     end
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua
index 11d3101b7e4..8292ddd33e4 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua
@@ -10,10 +10,7 @@
 --- this file addresses issue #24
 --- https://github.com/lualatex/luaotfload/issues/24#
 
-luaotfload                  = luaotfload or {}
-luaotfload.aux              = luaotfload.aux or { }
-
-local aux                   = luaotfload.aux
+luaotfload                  = luaotfload or { }
 local log                   = luaotfload.log
 local logreport             = log.report
 local fonthashes            = fonts.hashes
@@ -35,6 +32,9 @@ local stringbyte            = string.byte
 local stringfind            = string.find
 local tablecopy             = table.copy
 
+local aux                   = { }
+local luaotfload_callbacks  = { }
+
 -----------------------------------------------------------------------
 ---                          font patches
 -----------------------------------------------------------------------
@@ -89,10 +89,9 @@ local set_sscale_dimens = function (fontdata)
   return fontdata
 end
 
-luatexbase.add_to_callback(
-  "luaotfload.patch_font",
-  set_sscale_dimens,
-  "luaotfload.aux.set_sscale_dimens")
+luaotfload_callbacks [#luaotfload_callbacks + 1] = {
+  "patch_font", set_sscale_dimens, "set_sscale_dimens",
+}
 
 --- fontobj -> int
 local lookup_units = function (fontdata)
@@ -124,11 +123,10 @@ local patch_cambria_domh = function (fontdata)
   end
 end
 
-luatexbase.add_to_callback(
-  "luaotfload.patch_font",
-  patch_cambria_domh,
-  "luaotfload.aux.patch_cambria_domh")
-  
+luaotfload_callbacks [#luaotfload_callbacks + 1] = {
+  "patch_font", patch_cambria_domh, "patch_cambria_domh",
+}
+
 
 --[[doc--
 
@@ -152,11 +150,10 @@ local fixup_fontdata = function (data)
 
 end
 
-luatexbase.add_to_callback(
-  "luaotfload.patch_font_unsafe",
-  fixup_fontdata,
-  "luaotfload.aux.fixup_fontdata")
-  
+luaotfload_callbacks [#luaotfload_callbacks + 1] = {
+  "patch_font_unsafe", fixup_fontdata, "fixup_fontdata",
+}
+
 
 --[[doc--
 
@@ -204,10 +201,9 @@ local set_capheight = function (fontdata)
     end
 end
 
-luatexbase.add_to_callback(
-  "luaotfload.patch_font",
-  set_capheight,
-  "luaotfload.aux.set_capheight")
+luaotfload_callbacks [#luaotfload_callbacks + 1] = {
+  "patch_font", set_capheight, "set_capheight",
+}
 
 -----------------------------------------------------------------------
 ---                      glyphs and characters
@@ -843,4 +839,43 @@ end
 
 aux.get_quad = get_quad
 
--- vim:tw=71:sw=2:ts=2:expandtab
+
+-----------------------------------------------------------------------
+---                         initialization
+-----------------------------------------------------------------------
+
+local inject_callbacks = function (lst)
+  if not lst and next (lst) then return false end
+
+  local inject = function (def)
+    local cb, fn, id = unpack (def)
+    cb = tostring (cb)
+    id = tostring (id)
+    if not cb or not fn or not id or not type (fn) == "function" then
+      logreport ("both", 0, "aux", "Invalid callback requested (%q, %s, %q).",
+                 cb, tostring (fn), id)
+      return false
+    end
+    cb = stringformat ("luaotfload.%s",     cb)
+    id = stringformat ("luaotfload.aux.%s", id)
+    logreport ("log", 5, "aux", "Installing callback %q->%q.", cb, id)
+    luatexbase.add_to_callback (cb, fn, id)
+    return true
+  end
+
+  local ret = true
+  for i = 1, #lst do ret = inject (lst [i]) end
+  return ret
+end
+
+return {
+  init = function ()
+    local ret = true
+    luaotfload.aux = aux
+    ret = inject_callbacks (luaotfload_callbacks)
+    return ret
+  end
+}
+
+-- vim:tw=79:sw=2:ts=8:et
+
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-features.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-features.lua
index 8ffc030d15d..39228821fb8 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-features.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-features.lua
@@ -1405,19 +1405,6 @@ local tlig_specification = {
     },
 }
 
-local tlig_specification = {
-    type      = "substitution",
-    features  = everywhere,
-    data      = {
-        [0x0022] = 0x201D,                   -- quotedblright
-        [0x0027] = 0x2019,                   -- quoteleft
-        [0x0060] = 0x2018,                   -- quoteright
-    },
-    flags     = noflags,
-    order     = { "tlig" },
-    prepend   = true,
-}
-
 local anum_arabic = { --- these are the same as in font-otc
     [0x0030] = 0x0660,
     [0x0031] = 0x0661,
@@ -1515,7 +1502,7 @@ function add_otf_feature (name, specification)
     end
 end
 
-otf.addfeature = add_otf_feature
+otf.addfeature           = add_otf_feature
 
 local install_extra_features = function (data, filename, raw)
     for feature, specification in next, extrafeatures do
@@ -1550,6 +1537,7 @@ return {
 
         otf.enhancers.register ("check extra features",
                                 install_extra_features)
+
         return true
     end
 }
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua
index 9525ca4b9d4..c843f26b99c 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua
@@ -254,7 +254,7 @@ luaotfload.main = function ()
 
     initialize "features"     --- font request and feature handling
     loadmodule "letterspace"  --- extra character kerning
-    loadmodule "auxiliary"    --- additional high-level functionality
+    initialize "auxiliary"    --- additional high-level functionality
 
     luaotfload.aux.start_rewrite_fontname () --- to be migrated to fontspec
 
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua
index e1cedd13bf1..d2b513049f1 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua
@@ -1,6 +1,6 @@
 return {
  ["hashes"]={
-  { "fontloader-2015-12-22.lua", "c0cee8ffb486d88193aa78c32416a474" },
+  { "fontloader-2015-12-23.lua", "0092f8be42a96eff9a6fdf31ef3151d5" },
   { "fontloader-util-str.lua", "cc6f38cc53aff51d60e2223bf922bb0d" },
   { "fontloader-swiglib-test.lua", "c1cdeff07e5b8896f7aa98ce50c31618" },
   { "fontloader-swiglib.lua", "3a350d89416637073b7f09e281dc7c11" },
@@ -44,10 +44,10 @@ return {
   { "fontloader-data-con.lua", "675f5a0af45ffb3e0d2e2ab5d6c2e47b" },
   { "fontloader-basics-nod.lua", "af682899d202229c0c1b859a07384b8c" },
   { "fontloader-tl2014.lua", "5bce3c40d6841694d6be5ad3680d5b10" },
-  { "fontloader-reference.lua", "0d04f2ef8be3ad63f760b461fc5c1bb4" },
+  { "fontloader-reference.lua", "76f0ecc5232ab340103668f4c103e69a" },
   { "fontloader-basics-gen.lua", "aa7229a3a0ae35d19bbe46e71d65bd2c" },
   { "mktests", "918cb50be9ee8bd645ac1a27dc501e8c" },
-  { "mkstatus", "31abf1d5bf7c35f3856155601dfcea4a" },
+  { "mkstatus", "97dbb3537f8e65922d1e1606c4a031e5" },
   { "mkimport", "3077a499e7735444d582b741b1960b98" },
   { "mkglyphlist", "0acaf0fbc9dce6fda4e717a7ddcfdef6" },
   { "mkcharacters", "5274a32b25f2dc1f55e75546c551035e" },
@@ -56,23 +56,23 @@ return {
   { "luaotfload-tool.lua", "75e1f5bf8acf87a63f732083851b3c75" },
   { "luaotfload-resolvers.lua", "11846a9f9f4f292911f053d07ab09771" },
   { "luaotfload-parsers.lua", "bcbf9be9a8ef5dc77025dff46a79007c" },
-  { "luaotfload-main.lua", "98456048a0ebb8040c6b46de529398ec" },
+  { "luaotfload-main.lua", "fc8da63b610c808478a2a4a096c0fa9e" },
   { "luaotfload-log.lua", "767adc12efe986322d16dd85f05b3e75" },
   { "luaotfload-loaders.lua", "40e9e162b84e22db29cd79afb8a34761" },
   { "luaotfload-letterspace.lua", "b01dd0cd37deb2dbad97adbf738e9dd2" },
   { "luaotfload-init.lua", "e31c728f5e86c858909c491b39ba0fbd" },
-  { "luaotfload-features.lua", "812cefbc82f612e889842d56e421cca7" },
+  { "luaotfload-features.lua", "7c6bbba82e2d91ea63b5cf9ae41af3f5" },
   { "luaotfload-diagnostics.lua", "7b35c9f91e3e73fc5a61dbfe1f0e7ad9" },
   { "luaotfload-database.lua", "ffb5c6497be2c518eb28fcefaa3175c1" },
   { "luaotfload-configuration.lua", "04eb776c853a22fc49dcf0e52da85dda" },
   { "luaotfload-colors.lua", "b68a52ce0b046343cb689d981d0c5a7a" },
-  { "luaotfload-auxiliary.lua", "b0b7624c793d96ae5e6fbb45e67f1310" },
+  { "luaotfload-auxiliary.lua", "b63913f1027fdd60b89afc90c2ca9713" },
  },
  ["notes"]={
   ["committer"]="Philipp Gesang <phg@phi-gamma.net>",
-  ["description"]="v2.6-fix-3",
-  ["loader"]="fontloader-2015-12-22.lua",
-  ["revision"]="c7e64e04f85ab6386fcbc0bc631db808d0d6109f",
-  ["timestamp"]="2015-12-22 23:32:39 +0100",
+  ["description"]="v2.6-fix-4",
+  ["loader"]="fontloader-2015-12-23.lua",
+  ["revision"]="9320186751b6c6a1113f41331716d3b68d73af7a",
+  ["timestamp"]="2015-12-23 22:41:05 +0100",
  },
 }
\ No newline at end of file