summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElie Roux <elie.roux@telecom-bretagne.eu>2013-04-28 08:41:40 -0700
committerElie Roux <elie.roux@telecom-bretagne.eu>2013-04-28 08:41:40 -0700
commit9e9de013edb9c5e9eba3903d374263dc8223668d (patch)
tree74bb4677af32002b364c9c192e9ac25d6ef18906
parent2ebaa29db6309416a358fef692d5d35c48e9377c (diff)
parent8d98cfd5c26880df501ce68e599feb35081f245d (diff)
downloadluaotfload-9e9de013edb9c5e9eba3903d374263dc8223668d.tar.gz
Merge pull request #15 from eroux/texlive2011v1.3
Should we release this 1.3?
-rw-r--r--NEWS5
-rw-r--r--luaotfload.dtx9
-rw-r--r--otfl-blacklist.cnf23
3 files changed, 17 insertions, 20 deletions
diff --git a/NEWS b/NEWS
index 5137c2c..7af6c9d 100644
--- a/NEWS
+++ b/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/luaotfload.dtx b/luaotfload.dtx
index 3f31280..c0489e3 100644
--- a/luaotfload.dtx
+++ b/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/otfl-blacklist.cnf b/otfl-blacklist.cnf
index f77de5b..f207c49 100644
--- a/otfl-blacklist.cnf
+++ b/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