summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luaotfload
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-06-24 23:49:01 +0000
committerKarl Berry <karl@freefriends.org>2010-06-24 23:49:01 +0000
commit018597a4aaabadae55541f0dd5a3328e59910b31 (patch)
tree846ef14f44a67b6501730f17ad0e9eb03909005d /Master/texmf-dist/tex/luatex/luaotfload
parentc1d986475da20fdfc69663acecaf49b270d5aadd (diff)
luaotfload update (24jun10)
git-svn-id: svn://tug.org/texlive/trunk@19146 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luaotfload')
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua4
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua19
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/otfl-luat-dum.lua2
4 files changed, 4 insertions, 23 deletions
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