summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--luaotfload.dtx26
-rwxr-xr-xmkluatexfontdb.lua15
2 files changed, 20 insertions, 21 deletions
diff --git a/luaotfload.dtx b/luaotfload.dtx
index 975680b..33bda27 100644
--- a/luaotfload.dtx
+++ b/luaotfload.dtx
@@ -311,25 +311,23 @@ and the derived files
% 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 must be maintained as you add (and remove) fonts to your
-% system. To update the database, run the script |mkluatexfontdb.lua| 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. Subsequent runs to update
-% the database will be quite fast, however.
-%
-% In \TeX~Live~2010, there will be a button in the \TeX~Live package manager
-% to run |mkluatexfontdb.lua|.
+% 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.
+% 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. On Windows and Linus, it will use |fc-list| to find the
-% fonts; on Mac~OS~X, it will search in the standard font locations
+% font database. On Windows and Linus, it will use |fontconfig| to find the
+% font locations; on Mac~OS~X, it will search in the standard font locations
% |~/Library/Fonts|, |/Library/Fonts|, |/System/Library/Fonts|, and
% |/Network/Library/Fonts|,
%
-% If you do not wish the script to locate fonts automatically 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 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.
%
% |mkluatexfontdb.lua --help| provides a brief summary of the functionality of
% the script and includes some advanced options that we have not mentioned
diff --git a/mkluatexfontdb.lua b/mkluatexfontdb.lua
index 5eac9ae..0c71a27 100755
--- a/mkluatexfontdb.lua
+++ b/mkluatexfontdb.lua
@@ -42,7 +42,8 @@ Valid options:
-V --version print version and exit
-h --help print this message
-Fonts are found on Windows or Linux with fontconfig (i.e., using fc-list).
+Fonts are searched in directories on Windows or Linux that have been
+searched with fontconfig.
On Mac OS X, only fonts located in the following standard font locations are
included in the font database:
@@ -51,12 +52,12 @@ included in the font database:
In particular, fonts installed in other locations with "Font Book" will not
be available.
-Rather than using fontconfig or, in Mac OS X, searching the default font
-locations, you may specify where fonts are located by setting the OSFONTDIR
-environment variable. Doing so will override the use of fontconfig or
-scanning the system font locations. If you wish to continue to include them
-while also including other font locations, simply include them in the list.
-For example (using a bash shell),
+Rather than using the fontconfig locations or, in Mac OS X, searching the
+default system font locations, you may specify where fonts are located by
+setting the OSFONTDIR environment variable. Doing so will override the use of
+fontconfig or scanning the system font locations. If you wish to continue to
+include them while also including other font locations, simply include them in
+the list. For example (using a bash shell),
export OSFONTDIR='/path/to/other/fonts:/Users/will/Library/Fonts:...'