diff options
author | Karl Berry <karl@freefriends.org> | 2010-07-10 00:14:41 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-07-10 00:14:41 +0000 |
commit | 1046dadf55dc14a285c03628230c033a16a4d0f2 (patch) | |
tree | 795748736701c68d567047308ceed2286177b405 /Master/texmf-dist/source/luatex | |
parent | 7f4ad5e1fe8b4a36113dfa1677a989bbd2610c1e (diff) |
luaotfload update (28jun10)
git-svn-id: svn://tug.org/texlive/trunk@19327 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/luatex')
-rw-r--r-- | Master/texmf-dist/source/luatex/luaotfload/Makefile | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx | 64 |
2 files changed, 46 insertions, 20 deletions
diff --git a/Master/texmf-dist/source/luatex/luaotfload/Makefile b/Master/texmf-dist/source/luatex/luaotfload/Makefile index 0dbcb178512..ddf2f45ff81 100644 --- a/Master/texmf-dist/source/luatex/luaotfload/Makefile +++ b/Master/texmf-dist/source/luatex/luaotfload/Makefile @@ -3,7 +3,7 @@ NAME = luaotfload DOC = $(NAME).pdf DTX = $(NAME).dtx -OTFL = $(wildcard otfl-*.lua) +OTFL = $(wildcard otfl-*.lua) otfl-blacklist.cnf SCRIPT = mkluatexfontdb.lua # Files grouped by generation mode diff --git a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx index e191b4cf8fb..eb94174f964 100644 --- a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx +++ b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx @@ -35,7 +35,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: luaotfload 2010/06/24 v1.13 ConTeXt font loading system} +\Msg{* Package: luaotfload 2010/06/28 v1.15 ConTeXt font loading system} \Msg{************************************************************************} \keepsilent @@ -102,7 +102,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{luaotfload.drv}% - [2010/06/24 v1.13 ConTeXt font loading system]% + [2010/06/28 v1.15 ConTeXt font loading system]% \documentclass{ltxdoc} \usepackage{metalogo,multicol,mdwlist,fancyvrb} \usepackage[colorlinks=true]{hyperref} @@ -140,7 +140,7 @@ and the derived files % \GetFileInfo{luaotfload.drv} % % \title{The \textsf{luaotfload} package} -% \date{2010/06/24 v1.13} +% \date{2010/06/28 v1.15} % \author{ Elie Roux\footnote{\texttt{elie.roux@telecom-bretagne.eu}} % \and Khaled Hosny\footnote{\texttt{khaledhosny@eglug.org}}} % @@ -197,8 +197,8 @@ and the derived files % with square brackets is synonymous to using the \texttt{file:} prefix. % % Accessing fonts by fontname allows loading system installed fonts as well as -% \textsc{texmf} ones, and requires a font names database that must be -% pre-generated; see Section~\ref{sec:fontdb} for more information. +% \textsc{texmf} ones, and requires a font names database; see +% Section~\ref{sec:fontdb} for more information. % % \paragraph{Font name} % @@ -304,35 +304,61 @@ and the derived files % \texttt{mapping=text-tex} using \XeTeX's input remapping feature.) % % -% \section{Maintaining the font database} +% \section{Font names database} % \label{sec:fontdb} % % As introduced in the previous section, \textsf{luaotfload} uses a database % to keep track of fonts available to \LuaTeX. Using this database, fonts can % be loaded by font name as well as filename. % -% This font database is maintained automatically as you add and remove fonts -% to/from your system. To update the database manually, run the script -% |mkluatexfontdb| that is included with this package. If you have not run it -% before, it may take quite some time to process every font on your computer. +% When \textsf{luaotfload} is asked to load a font by font name, it will check +% if font names database exists and load it, or generate a new database if non +% exists. This is all done automatically without user intervention. When the +% asked font is missing from the database, it will attempt to update the +% database and try to find the font again, so that the user can install new +% fonts without worrying about manually updating the database. +% +% However, it is sometimes desirable to update the database manually, so +% \textsf{luaotfload} provides a |mkluatexfontdb| utility to manually update +% the database. |mkluatexfontdb| is a lua script that can be either run +% directly or as an argument to |texlua|, depending on your system\footnote{ +% On MS Windows it can be run either by calling the wrapper application +% |mkluatexfontdb.exe| or with |texlua.exe mkluatexfontdb.lua|}. +% +% The first time the database is generated may take quite some time to process +% every font on your computer. % This is particularly noticeable if it occurs during a typesetting run. % Subsequent runs to update the database will be quite fast, however. % -% The script will parse standard places for fonts in your system to build the -% font database. Linux, it will use |fontconfig| to find the font locations; +% \textsf{luaotfload} will parse standard places for fonts in your system to +% build the font database. On Linux, it will read |fontconfig| configuration +% files to find the font locations; % on Windows and Mac~OS~X, it will search in the standard font locations, % |%WINDIR%\Fonts| in Windows and |~/Library/Fonts|, |/Library/Fonts|, % |/System/Library/Fonts|, and |/Network/Library/Fonts| in Mac~OS~X. % -% If you do not wish the script to search the standard font locations by -% default but would rather specify the exact locations in which to find your -% fonts, set the |OSFONTDIR| environment variable instead. When this variable -% is set, the script will only search in those directories. +% If you do not wish the standard font locations be searched by default but +% would rather specify the exact locations in which to find your fonts, set +% the |OSFONTDIR| environment variable instead. When this variable is set, +% only the specified directories will be searched. % % |mkluatexfontdb.lua --help| provides a brief summary of the functionality of % the script and includes some advanced options that we have not mentioned % here. % +% \subsection{Blacklisting fonts} +% +% Some fonts are problematic in \LuaTeX, if you found that your document takes +% too long to compile, or eats all the free memory, you can find the culprit +% file by running |mkluatexfontdb| utility with |-v| option to see which font +% file it is stuck with. You can then instruct \textsf{luaotfload} to ignore +% this font by adding it to the blacklist configuration file. +% +% 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. +% % \section{Required \ConTeXt\ files} % % This package is a wrapper for several files taken from the \ConTeXt\ macro @@ -409,8 +435,8 @@ module('luaotfload', package.seeall) luaotfload.module = { name = "luaotfload", - version = 1.13, - date = "2010/06/24", + version = 1.15, + date = "2010/06/28", description = "ConTeXt font loading system.", author = "Elie Roux & Hans Hagen", copyright = "Elie Roux", @@ -676,7 +702,7 @@ end \else \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luaotfload}% - [2010/06/24 v1.13 ConTeXt font loading system] + [2010/06/28 v1.15 ConTeXt font loading system] \RequirePackage{luatextra} \fi |