From fcab1a4ff78087e1ae77c2524bd51d7e26a55b9d Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 29 Apr 2013 23:30:07 +0000
Subject: luaotfload (29apr13)

git-svn-id: svn://tug.org/texlive/trunk@30170 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/doc/luatex/luaotfload/NEWS       |   5 +++++
 .../doc/luatex/luaotfload/luaotfload.pdf           | Bin 98233 -> 98639 bytes
 .../source/luatex/luaotfload/luaotfload.dtx        |   9 ++++++++
 .../tex/luatex/luaotfload/luaotfload.lua           |   3 +++
 .../tex/luatex/luaotfload/otfl-blacklist.cnf       |  23 +++------------------
 5 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'Master')

diff --git a/Master/texmf-dist/doc/luatex/luaotfload/NEWS b/Master/texmf-dist/doc/luatex/luaotfload/NEWS
index 5137c2c60ec..7af6c9d5f9e 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/NEWS
+++ b/Master/texmf-dist/doc/luatex/luaotfload/NEWS
@@ -1,6 +1,11 @@
 Change History
 --------------
 
+2013/04/27, luaotfload v1.3:
+    *  blacklisting lingoes.ttf (segfaults)
+    *  unblacklisting ttc fonts (warning: may break LuaTeX < 0.65)
+    *  fixing font cache file name with non-ascii characters
+
 2013/04/25, luaotfload v1.29:
     * Reverting the unified resolver, as the database was rebuilt too often
       which made the compilation longer. This will come back improved
diff --git a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf
index cf05f026a14..f2a5174705c 100644
Binary files a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf and b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf differ
diff --git a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx
index 3f312802ad4..c0489e342f1 100644
--- a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx
+++ b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx
@@ -645,6 +645,15 @@ end
 --fonts.define.resolvers.file = fonts.define.resolvers.name
 %    \end{macrocode}
 %
+%    We override the cleanname function as it outputs garbage for exotic font
+%    names
+%
+%    \begin{macrocode}
+containers.cleanname = function (name)
+    return (string.gsub(string.lower(name),"[^%w%d\128\255]+","-"))
+end 
+%    \end{macrocode}
+%
 %    Overriding some defaults set in \context code.
 %
 %    \begin{macrocode}
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
-- 
cgit v1.2.3