Merge pull request #91 from phi-gamma/master

v2.2d; ctan upload

4 files changed, 13 insertions, 74 deletions

diff --git a/luaotfload-auxiliary.lua b/luaotfload-auxiliary.lua
index 2bfcbf0..bb1e8f9 100644
--- a/luaotfload-auxiliary.lua
+++ b/luaotfload-auxiliary.lua
@@ -75,7 +75,7 @@ local add_fontdata_fallbacks = function (fontdata)
       fontdata.size    = fontdata.size or fontparameters.size
       local resources  = fontdata.resources
       --- for legacy fontspec.lua and unicode-math.lua
-      fontdata.shared.otfdata          = {
+      fontdata.shared.otfdata = {
         pfminfo   = { os2_capheight = metadata.pfminfo.os2_capheight },
         metadata  = { ascent = metadata.ascent },
       }
diff --git a/luaotfload-features.lua b/luaotfload-features.lua
index a4d495e..a68eb04 100644
--- a/luaotfload-features.lua
+++ b/luaotfload-features.lua
@@ -1015,7 +1015,9 @@ local field             = field_char^1
 --- switches    are “+key” | “-key”
 local normal_option     = C(field) * ws * equals * ws * C(field) * ws
 local xetex_option      = P"+" * ws * normal_option
-local ignore_option     = (1 - equals)^1 * equals * (1 - featuresep)^1
+local ignore_option     = (1 - equals - featuresep)^1
+                        * equals
+                        * (1 - featuresep)^1
 local assignment        = xetex_option  / handle_xetex_option
                         + normal_option / handle_normal_option
                         + ignore_option / handle_invalid_option
diff --git a/luaotfload-merged.lua b/luaotfload-merged.lua
index 310febe..5789db6 100644
--- a/luaotfload-merged.lua
+++ b/luaotfload-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 05/21/13 16:14:48
+-- merge date  : 05/22/13 19:28:51
 
 do -- begin closure to overcome local limits and interference
 
@@ -2310,16 +2310,10 @@ function file.strip(name,dir)
   end
 end
 function lfs.mkdirs(path)
-  local full
-  for sub in gmatch(path,"([^\\/]+)") do
-    if full then
-      full=full.."/"..sub
-    else
-      full=sub
-    end
-    if not lfs.isdir(full) then
-      lfs.mkdir(full)
-    end
+  local full=""
+  for sub in gmatch(path,"(/*[^\\/]+)") do 
+    full=full..sub
+    lfs.mkdir(full)
   end
 end
 
diff --git a/luaotfload.dtx b/luaotfload.dtx
index 8042a6f..4abe063 100644
--- a/luaotfload.dtx
+++ b/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,7 +1444,7 @@ 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",
@@ -1453,21 +1453,11 @@ luaotfload.module = {
 
 local luatexbase       = luatexbase
 
-local getmetatable     = getmetatable
-local rawset           = rawset
 local setmetatable     = setmetatable
 local type, next       = type, next
 
-
-local kpseexpand_path  = kpse.expand_path
-local kpseexpand_var   = kpse.expand_var
 local kpsefind_file    = kpse.find_file
-local lfsisdir         = lfs.isdir
 local lfsisfile        = lfs.isfile
-local lfsmkdir         = lfs.mkdir
-local stringexplode    = string.explode
-local stringgmatch     = string.gmatch
-local stringsub        = string.sub
 
 local add_to_callback, create_callback =
       luatexbase.add_to_callback, luatexbase.create_callback
@@ -1516,53 +1506,6 @@ if tex.luatexversion < luatex_version then
 end
 
 %    \end{macrocode}
-%     Create \verb+$TEXMFCACHE+ if not present. This is necessary due to a bug
-%     in Luatex-Fonts that surfaces if none of the possible cache
-%     directories exists. We add a fixed version of \luafunction{lfs.mkdirs} first
-%     that will be installed as soon as \fileent{l-file.lua} tries to insert its
-%     buggy version.
-%
-%    \begin{macrocode}
-
-local ostype      = os.type
-local mkdirs = function (path)
-  local full
-  if ostype ~= "windows" and stringsub(path, 1, 1) == "/" then
-    --- absolute path, force initial backslash
-    full = ""
-  end
-  for sub in stringgmatch(path,"([^\\/]+)") do
-    if full then
-      full = full .. "/" .. sub
-    else
-      full = sub
-    end
-    if not lfsisdir(full) then
-      lfsmkdir(full)
-    end
-  end
-end
-
---- <hack version="2">
-
-local backup_mkdirs -- just in case
-
-local lfs_mt = getmetatable(lfs) or { } --- should be empty
-
-lfs_mt.__newindex = function (t, k, v)
-  if k == "mkdirs" then
-    backup_mkdirs = v               --> backup
-    rawset(t, "mkdirs", mkdirs)     --> ours
-  else -- insert normally
-    t[k] = v
-  end
-end
-
-setmetatable(lfs, lfs_mt)
-
---- </hack>
-
-%    \end{macrocode}
 % \subsection{Module loading}
 % We load the files imported from \CONTEXT with this function.
 % It automatically prepends the prefix \fileent{luaotfload-} to its
@@ -2065,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