luaotfload 1.10 (7jun10)

git-svn-id: svn://tug.org/texlive/trunk@18808 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 8 insertions, 32 deletions

diff --git a/Master/texmf-dist/scripts/luaotfload/mkluatexfontdb.lua b/Master/texmf-dist/scripts/luaotfload/mkluatexfontdb.lua
index 5eac9ae06af..a72478bda7f 100755
--- a/Master/texmf-dist/scripts/luaotfload/mkluatexfontdb.lua
+++ b/Master/texmf-dist/scripts/luaotfload/mkluatexfontdb.lua
@@ -36,13 +36,13 @@ Valid options:
   -v --verbose=LEVEL           be more verbose (print the searched directories)
   -vv                          print the loaded fonts
   -vvv                         print all steps of directory searching
-  --fc-cache                   run fc-cache before updating database
   --sys                        install the database system-wide
                                (default is only for the current user)
   -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 +51,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:...'
 
@@ -80,7 +80,6 @@ local long_opts = {
     force            = "f",
     quiet            = "q",
     help             = "h",
-    ['fc-cache']     = 0  ,
     sys              = 0  ,
     verbose          = 1  ,
     version          = "V",
@@ -88,26 +87,6 @@ local long_opts = {
 
 local short_opts = "d:fqpvVh"
 
-local function do_run_fc_cache(c)
-    --[[
-    Function running fc-cache if needed.
-    The argument is nil for default, 0 for no fc-cache and 1 for fc-cache.
-    Default behaviour is to run fc-cache if available.
-    --]]
-    if c == 0 then return end
-    if not c then
-      -- TODO: detect if fc-cache is available
-    end
-    local toexec = 'fc-cache'
-    if os.type == 'windows' then
-        toexec = 'fc-cache.exe' -- TODO: to test on a non-cygwin Windows
-    end
-    log('executing %s...\n', toexec)
-    os.execute(toexec)
-end
-
--- a temporary variable, containing the command line option concerning fc-cache
-local run_fc_cache = 0
 local force_reload = nil
 
 local function process_cmdline()
@@ -132,8 +111,6 @@ local function process_cmdline()
             output_directory = optarg [i]
         elseif v == "f" then
             force_reload = 1
-        elseif v == "fc-cache" then
-            run_fc_cache = 1
         elseif v == "sys" then
             output_directory = names.path.systemdir
         end
@@ -146,7 +123,6 @@ local function process_cmdline()
 end
 
 process_cmdline()
-do_run_fc_cache(run_fc_cache)
 
 local function generate(force)
     log("generating font names database.")