Merge branch 'master' into unstable

1 files changed, 18 insertions, 7 deletions

diff --git a/luaotfload.dtx b/luaotfload.dtx
index c6386f0..36f403f 100644
--- a/luaotfload.dtx
+++ b/luaotfload.dtx
@@ -36,7 +36,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: luaotfload v1.24 OpenType layout system}
+\Msg{* Package: luaotfload v1.25 OpenType layout system}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -104,7 +104,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{luaotfload.drv}%
-  [2011/02/16 v1.24 OpenType layout system]%
+  [2011/04/21 v1.25 OpenType layout system]%
 \documentclass{ltxdoc}
 \usepackage{metalogo,multicol,mdwlist,fancyvrb,xcolor,xspace}
 \usepackage[
@@ -166,7 +166,7 @@ and the derived files
 % \GetFileInfo{luaotfload.drv}
 %
 % \title{The \textsf{luaotfload} package}
-% \date{2011/02/16 v1.24}
+% \date{2011/04/21 v1.25}
 % \author{Elie Roux and Khaled Hosny\\
 %         Support: \email{lualatex-dev@tug.org}}
 %
@@ -379,7 +379,18 @@ and the derived files
 % Simply, create a file named |otfl-blacklist.cnf| and added the to be
 % blacklisted files, one per line. Then put the file some where \textsf{kpse}
 % can find. You can either use the base name or the full path. Any thing after
-% a |%| sign is ignored.
+% a |%| sign is ignored. \textsf{luaotfload} reads all files named named
+% |otfl-blacklist.cnf|, so you can add your own fonts to the global blacklist
+% by creating a local file |otfl-blacklist.cnf| with the entries you need.
+% You can also remove a font from this blacklist by prepending the name with
+% a dash (|-|).
+%
+% \begin{verbatim}
+% % example otf-blacklist.cnf
+% /Library/Fonts/GillSans.ttc  % luaotfload ignores this font
+% -/Library/Fonts/Optima.ttc   % it is usable again, even if it
+%                              % is blacklisted somewhere else
+% \end{verbatim}
 %
 % \section{Required \context files}
 %
@@ -452,8 +463,8 @@ module("luaotfload", package.seeall)
 
 luaotfload.module = {
     name          = "luaotfload",
-    version       = 1.24,
-    date          = "2011/02/16",
+    version       = 1.25,
+    date          = "2011/04/21",
     description   = "OpenType layout system.",
     author        = "Elie Roux & Hans Hagen",
     copyright     = "Elie Roux",
@@ -700,7 +711,7 @@ luatexbase.add_to_callback("find_vf_file",
 \else
   \NeedsTeXFormat{LaTeX2e}
   \ProvidesPackage{luaotfload}%
-    [2011/02/16 v1.24 OpenType layout system]
+    [2011/04/21 v1.25 OpenType layout system]
   \RequirePackage{luatexbase}
 \fi