luaotfload (29apr13)

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

2 files changed, 6 insertions, 20 deletions

diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua
index 7365581a64f..9a5b769fff7 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua
@@ -108,6 +108,9 @@ local function def_font(...)
     return fontdata
 end
 --fonts.define.resolvers.file = fonts.define.resolvers.name
+containers.cleanname = function (name)
+    return (string.gsub(string.lower(name),"[^%w%d\128\255]+","-"))
+end
 fonts.mode = "node"
 local register_base_sub = fonts.otf.features.register_base_substitution
 local gsubs = {
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/otfl-blacklist.cnf b/Master/texmf-dist/tex/luatex/luaotfload/otfl-blacklist.cnf
index f77de5b214a..f207c49b29d 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/otfl-blacklist.cnf
+++ b/Master/texmf-dist/tex/luatex/luaotfload/otfl-blacklist.cnf
@@ -1,22 +1,5 @@
 % Tackes ages to load
-LastResort.ttf % a MacOSX font, but also available for free from unicode.org 
+LastResort.ttf % a MacOSX font, but also available for free from unicode.org
+% Segfaults with LuaTeX 0.76
+lingoes.ttf
 
-% Mac OS X TTC fonts, this list need to be filtered out
-/Library/Fonts/AmericanTypewriter.ttc
-/Library/Fonts/Baskerville.ttc
-/Library/Fonts/Chalkboard.ttc
-/Library/Fonts/Cochin.ttc
-/Library/Fonts/Copperplate.ttc
-/Library/Fonts/Didot.ttc
-/Library/Fonts/Futura.ttc
-/Library/Fonts/GillSans.ttc
-/Library/Fonts/Hoefler Text.ttc
-/Library/Fonts/MarkerFelt.ttc
-/Library/Fonts/Optima.ttc
-/Library/Fonts/Papyrus.ttc
-/Library/Fonts/STHeiti Medium.ttc
-/System/Library/Fonts/AquaKana.ttc
-/System/Library/Fonts/HelveticaNeue.ttc
-/System/Library/Fonts/LucidaGrande.ttc
-/System/Library/Fonts/Menlo.ttc
-/System/Library/Fonts/STHeiti Light.ttc