luaotfload update 5/27

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

1 files changed, 21 insertions, 14 deletions

diff --git a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx
index eabc24030ea..4abe0631867 100644
--- a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx
+++ b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx
@@ -111,7 +111,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{luaotfload.drv}%
-  [2013/05/20 v2.2c OpenType layout system]%
+  [2013/05/23 v2.2d OpenType layout system]%
 \documentclass{ltxdoc}
 \usepackage{metalogo,multicol,mdwlist,fancyvrb,xspace}
 \usepackage[x11names]{xcolor}
@@ -231,7 +231,7 @@ and the derived files
 % \GetFileInfo{luaotfload.drv}
 %
 % \title{The \identifier{luaotfload} package}
-% \date{2013/05/20 v2.2c}
+% \date{2013/05/23 v2.2d}
 % \author{Elie Roux · Khaled Hosny · Philipp Gesang\\
 %         Home:      \url{https://github.com/lualatex/luaotfload}\\
 %         Support:   \email{lualatex-dev@tug.org}}
@@ -1444,23 +1444,20 @@ config.luaotfload.color_callback  = config.luaotfload.color_callback   or "pre_l
 luaotfload.module = {
     name          = "luaotfload",
     version       = 2.2,
-    date          = "2013/05/20",
+    date          = "2013/05/23",
     description   = "OpenType layout system.",
     author        = "Elie Roux & Hans Hagen",
     copyright     = "Elie Roux",
     license       = "GPL v2.0"
 }
 
-local luatexbase = luatexbase
+local luatexbase       = luatexbase
 
-local type, next       = type, next
 local setmetatable     = setmetatable
-local find_file        = kpse.find_file
+local type, next       = type, next
+
+local kpsefind_file    = kpse.find_file
 local lfsisfile        = lfs.isfile
-local stringfind       = string.find
-local stringformat     = string.format
-local stringmatch      = string.match
-local stringsub        = string.sub
 
 local add_to_callback, create_callback =
       luatexbase.add_to_callback, luatexbase.create_callback
@@ -1537,10 +1534,10 @@ local p_suffix       = (p_dot * (1 - p_dot - p_slash)^1 * P(-1)) / ""
 local p_removesuffix = Cs((p_suffix + 1)^1)
 
 local find_vf_file = function (name)
-    local fullname = find_file(name, "ovf")
+    local fullname = kpsefind_file(name, "ovf")
     if not fullname then
-        --fullname = find_file(file.removesuffix(name), "ovf")
-        fullname = find_file(lpegmatch(p_removesuffix, name), "ovf")
+        --fullname = kpsefind_file(file.removesuffix(name), "ovf")
+        fullname = kpsefind_file(lpegmatch(p_removesuffix, name), "ovf")
     end
     if fullname then
         log("loading virtual font file %s.", fullname)
@@ -1746,6 +1743,16 @@ pop_namespaces(our_environment, false)-- true)
 log("fontloader loaded in %0.3f seconds", os.gettimeofday()-starttime)
 
 %    \end{macrocode}
+%     Restore original \luafunction{kpse.expand_path} function.
+%
+%    \begin{macrocode}
+
+if normal_expand_path ~= nil then
+    kpse.expand_path = normal_expand_path
+    phantom_kpse     = nil
+end
+
+%    \end{macrocode}
 % \subsection{Callbacks}
 % After the fontloader is ready we can restore the callback trap from
 % \identifier{luatexbase}.
@@ -2001,7 +2008,7 @@ loadmodule"auxiliary.lua"   --- additionaly high-level functionality (new)
 \else
   \NeedsTeXFormat{LaTeX2e}
   \ProvidesPackage{luaotfload}%
-    [2013/05/20 v2.2c OpenType layout system]
+    [2013/05/23 v2.2d OpenType layout system]
   \RequirePackage{luatexbase}
 \fi
 \ifnum\luatexversion<76