luaotfload update (24jun10)

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

8 files changed, 14 insertions, 30 deletions

diff --git a/Master/texmf-dist/doc/luatex/luaotfload/NEWS b/Master/texmf-dist/doc/luatex/luaotfload/NEWS
index a1e1e7e8db3..e9a3263a54e 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/NEWS
+++ b/Master/texmf-dist/doc/luatex/luaotfload/NEWS
@@ -1,6 +1,9 @@
 Change History
 --------------
 
+2010/06/24, luaotfload v1.13:
+    * fix typo in font cache path
+
 2010/06/18, luaotfload v1.12:
     * populate MathConstants table for OpenType math fonts, now such fonts
       can be really used in math mode.
diff --git a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf
index 22f245e9d05..81195b4b10f 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf
+++ b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf
diff --git a/Master/texmf-dist/scripts/luaotfload/mkluatexfontdb.lua b/Master/texmf-dist/scripts/luaotfload/mkluatexfontdb.lua
index a2d208de1da..455edecaa91 100755
--- a/Master/texmf-dist/scripts/luaotfload/mkluatexfontdb.lua
+++ b/Master/texmf-dist/scripts/luaotfload/mkluatexfontdb.lua
@@ -61,7 +61,7 @@ the list. For example (using a bash shell),
    export OSFONTDIR='/path/to/other/fonts:/Users/will/Library/Fonts:...'
 
 The output database file is named otfl-fonts.lua. By default it is placed
-in $TEXMFVAR/luatex/generic/luaotfload/names.
+in $TEXMFVAR/luatex-cache/generic/names."
 ]], name))
 end
 
diff --git a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx
index ca3e2e88926..e191b4cf8fb 100644
--- a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx
+++ b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx
@@ -35,7 +35,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: luaotfload 2010/06/14 v1.12 ConTeXt font loading system}
+\Msg{* Package: luaotfload 2010/06/24 v1.13 ConTeXt font loading system}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -102,7 +102,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{luaotfload.drv}%
-  [2010/06/14 v1.12 ConTeXt font loading system]%
+  [2010/06/24 v1.13 ConTeXt font loading system]%
 \documentclass{ltxdoc}
 \usepackage{metalogo,multicol,mdwlist,fancyvrb}
 \usepackage[colorlinks=true]{hyperref}
@@ -140,7 +140,7 @@ and the derived files
 % \GetFileInfo{luaotfload.drv}
 %
 % \title{The \textsf{luaotfload} package}
-% \date{2010/06/14 v1.12}
+% \date{2010/06/24 v1.13}
 % \author{     Elie Roux\footnote{\texttt{elie.roux@telecom-bretagne.eu}}
 %         \and Khaled Hosny\footnote{\texttt{khaledhosny@eglug.org}}}
 %
@@ -409,8 +409,8 @@ module('luaotfload', package.seeall)
 
 luaotfload.module = {
     name          = "luaotfload",
-    version       = 1.12,
-    date          = "2010/06/14",
+    version       = 1.13,
+    date          = "2010/06/24",
     description   = "ConTeXt font loading system.",
     author        = "Elie Roux & Hans Hagen",
     copyright     = "Elie Roux",
@@ -676,7 +676,7 @@ end
 \else
   \NeedsTeXFormat{LaTeX2e}
   \ProvidesPackage{luaotfload}%
-    [2010/06/14 v1.12 ConTeXt font loading system]
+    [2010/06/24 v1.13 ConTeXt font loading system]
   \RequirePackage{luatextra}
 \fi
 
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua
index 57c83ed91aa..5a38735c0ee 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua
@@ -20,8 +20,8 @@ module('luaotfload', package.seeall)
 
 luaotfload.module = {
     name          = "luaotfload",
-    version       = 1.12,
-    date          = "2010/06/14",
+    version       = 1.13,
+    date          = "2010/06/24",
     description   = "ConTeXt font loading system.",
     author        = "Elie Roux & Hans Hagen",
     copyright     = "Elie Roux",
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty
index 5908f0ffa29..2681141bfd1 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty
@@ -24,7 +24,7 @@
 \else
   \NeedsTeXFormat{LaTeX2e}
   \ProvidesPackage{luaotfload}%
-    [2010/06/14 v1.12 ConTeXt font loading system]
+    [2010/06/24 v1.13 ConTeXt font loading system]
   \RequirePackage{luatextra}
 \fi
 
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua b/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua
index 9ba4f52ec9f..5aadd7b4aaa 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua
@@ -46,18 +46,6 @@ local trace_progress = true  --trackers.register("names.progress", function(v) t
 local trace_search   = false --trackers.register("names.search",   function(v) trace_search   = v end)
 local trace_loading  = false --trackers.register("names.loading",  function(v) trace_loading  = v end)
 
-
--- Basic function from <http://stackoverflow.com/questions/2282444/how-to-check-if-a-table-contains-an-element-in-lua>
-function table.contains(table, element)
-  for _, value in pairs(table) do
-    if value == element then
-      return true
-    end
-  end
-  return false
-end
-
-
 local function sanitize(str)
     if str then
         return utfgsub(lower(str), "[^%a%d]", "")
@@ -285,17 +273,10 @@ end
 
 local lastislog = 0
 
-function log(fmt, ...)
-    lastislog = 1
-    texio.write_nl(format("luaotfload | %s", format(fmt,...)))
-end
-
 logs        = logs or { }
 logs.report = logs.report or log
 logs.info   = logs.info or log
 
-local log = names.log
-
 -- The progress bar
 local function progress(current, total)
     if trace_progress then
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/otfl-luat-dum.lua b/Master/texmf-dist/tex/luatex/luaotfload/otfl-luat-dum.lua
index 0737762f4f1..e8e267a651e 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/otfl-luat-dum.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/otfl-luat-dum.lua
@@ -95,7 +95,7 @@ do
     local cachepaths = kpse.expand_path('$TEXMFCACHE') or ""
 
     if cachepaths == "" then
-        cachepaths = kpse.expand_path('$VARTEXMF')
+        cachepaths = kpse.expand_path('$TEXMFVAR')
     end
 
     if cachepaths == "" then