summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/luaotfload-main.tex4
-rw-r--r--doc/luaotfload-tool.rst13
-rw-r--r--doc/luaotfload.conf.rst13
-rw-r--r--misc/luaotfload.conf.example2
-rw-r--r--src/luaotfload-configuration.lua4
-rw-r--r--src/luaotfload-database.lua8
-rw-r--r--src/luaotfload-loaders.lua1
7 files changed, 19 insertions, 26 deletions
diff --git a/doc/luaotfload-main.tex b/doc/luaotfload-main.tex
index 92a4c01..0d2d7eb 100644
--- a/doc/luaotfload-main.tex
+++ b/doc/luaotfload-main.tex
@@ -1334,8 +1334,8 @@ files not contained in the merge. Some of these have no equivalent in
overrides the \CONTEXT logging functionality.
\endaltitem
\beginaltitem {luaotfload-loaders.lua}
- registers the \OpenType font reader as handler for Postscript
- fonts (\abbrev{pfa}, \abbrev{pfb}).
+ registers readers in the fontloader for various kinds of
+ font formats
\endaltitem
\beginaltitem {luaotfload-parsers.lua}
various \abbrev{lpeg}-based parsers.
diff --git a/doc/luaotfload-tool.rst b/doc/luaotfload-tool.rst
index 5b834b4..c8bd8ec 100644
--- a/doc/luaotfload-tool.rst
+++ b/doc/luaotfload-tool.rst
@@ -80,22 +80,19 @@ update mode
system fonts if they are installed in both.
--formats=EXTENSIONS Extensions of the font files to index.
Where *EXTENSIONS* is a comma-separated list of
- supported file extensions (otf, ttf, ttc,
- dfont, pfa, and pfb). If the list is prefixed
+ supported file extensions (otf, ttf, ttc).
+ If the list is prefixed
with a ``+`` sign, the given list is added to
the currently active one; ``-`` subtracts.
- Default: *otf,ttf,ttc,dfont*.
+ Default: *otf,ttf,ttc*.
Examples:
1) ``--formats=-ttc,ttf`` would skip
TrueType fonts and font collections;
2) ``--formats=otf`` would scan only OpenType
files;
- 3) ``--formats=+pfb`` includes binary
- Postscript files. **Warning**: with a
- standard TeX Live installation this will
- grow the database considerably and slow down
- font indexing.
+ 3) ``--formats=+afm`` includes binary
+ Postscript files accompanied by an AFM file.
query mode
-----------------------------------------------------------------------
diff --git a/doc/luaotfload.conf.rst b/doc/luaotfload.conf.rst
index 25f5a5c..eb4c491 100644
--- a/doc/luaotfload.conf.rst
+++ b/doc/luaotfload.conf.rst
@@ -33,7 +33,7 @@ A small Luaotfload configuration file with few customizations could
look as follows: ::
[db]
- formats = afm, pfa, pfb
+ formats = afm,ttf
compress = false
[misc]
@@ -43,10 +43,9 @@ look as follows: ::
log-level = 6
This will make Luaotfload ignore all font files except for PostScript
-formats. NB: With a default Tex Live install the PS fonts will take
-much longer to index than OpenType or TrueType ones. Also, an
+binary fonts with a matching AFM file, and Truetype fonts. Also, an
uncompressed index file will be dumped which is going to be much larger
-due to the huge amount of PostScript fonts indexed. The terminal width
+than the default gzip’ed index. The terminal width
is truncated to 60 characters which influences the verbose output
during indexing. Finally, the verbosity is increased greatly: each font
file being processed will be printed to the stdout on a separate line,
@@ -131,7 +130,7 @@ Section ``db``
+-----------------+--------+---------------------------+
| compress | b | ``true`` |
+-----------------+--------+---------------------------+
-| formats | s | ``"otf,ttf,ttc,dfont"`` |
+| formats | s | ``"otf,ttf,ttc"`` |
+-----------------+--------+---------------------------+
| max-fonts | n | ``2^51`` |
+-----------------+--------+---------------------------+
@@ -158,14 +157,12 @@ containing one or more of these elements:
* ``otf`` (OpenType format),
* ``ttf`` and ``ttc`` (TrueType format),
-* ``dfont`` (Macintosh TrueType format),
* ``afm`` (Adobe Font Metrics),
-* ``pfb`` and ``pfa`` (PostScript format).
It corresponds loosely to the ``--formats`` option to
**luaotfload-tool**. Invalid or duplicate members are ignored; if the
list does not contain any useful identifiers, the default list
-``"otf,ttf,ttc,dfont"`` will be used.
+``"otf,ttf,ttc"`` will be used.
The variable ``max-fonts`` determines after processing how many font
files the font scanner will terminate the search. This is useful for
diff --git a/misc/luaotfload.conf.example b/misc/luaotfload.conf.example
index 2756d62..b0323af 100644
--- a/misc/luaotfload.conf.example
+++ b/misc/luaotfload.conf.example
@@ -3,7 +3,7 @@
[db]
compress = true
- formats = otf, ttf, ttc, dfont
+ formats = otf, ttf, ttc
max-fonts = 2.2517998136852e15
scan-local = false
skip-read = false
diff --git a/src/luaotfload-configuration.lua b/src/luaotfload-configuration.lua
index 701f7b2..8faf3d1 100644
--- a/src/luaotfload-configuration.lua
+++ b/src/luaotfload-configuration.lua
@@ -89,7 +89,7 @@ local config_paths = {
}
local valid_formats = tabletohash {
- "otf", "ttc", "ttf", "dfont", "afm", --"pfb", "pfa",
+ "otf", "ttc", "ttf", "afm", --"pfb", "pfa",
}
local feature_presets = {
@@ -188,7 +188,7 @@ local permissible_color_callbacks = {
local default_config = {
db = {
- formats = "otf,ttf,ttc,dfont",
+ formats = "otf,ttf,ttc",
scan_local = false,
skip_read = false,
strip = true,
diff --git a/src/luaotfload-database.lua b/src/luaotfload-database.lua
index 6fe01ba..135ab0e 100644
--- a/src/luaotfload-database.lua
+++ b/src/luaotfload-database.lua
@@ -207,8 +207,7 @@ local make_luanames = function (path)
end
local format_precedence = {
- "otf", "ttc", "ttf",
- "dfont", "afm",
+ "otf", "ttc", "ttf", "afm",
--- "pfb", "pfa",
}
@@ -336,7 +335,7 @@ This is a sketch of the luaotfload db:
}
and metadata = {
created : string // creation time
- formats : string list; // { "otf", "ttf", "ttc", "dfont" }
+ formats : string list; // { "otf", "ttf", "ttc" }
local : bool; (* set if local fonts were added to the db *)
modified : string // modification time
statistics : TODO; // created when built with "--stats"
@@ -360,7 +359,7 @@ This is a sketch of the luaotfload db:
conflicts : { barename : int; basename : int }; // filename conflict with font at index; happens with subfonts
familyname : string; // sanitized name of the font family the font belongs to, usually from the names table
fontname : string; // sanitized name of the font
- format : string; // "otf" | "ttf" | "dfont" | "afm"
+ format : string; // "otf" | "ttf" | "afm"
fullname : string; // sanitized full name of the font including style modifiers
fullpath : string; // path to font in filesystem
index : int; // index in the mappings table
@@ -1619,7 +1618,6 @@ ot_fullinfo = function (filename,
end
local loaders = {
- dfont = ot_fullinfo,
otf = ot_fullinfo,
ttc = ot_fullinfo,
ttf = ot_fullinfo,
diff --git a/src/luaotfload-loaders.lua b/src/luaotfload-loaders.lua
index d3828aa..f0c1913 100644
--- a/src/luaotfload-loaders.lua
+++ b/src/luaotfload-loaders.lua
@@ -83,6 +83,7 @@ local install_formats = function ()
and aux ("pfa", unsupported_reader "pfa")
and aux ("pfb", unsupported_reader "pfb")
and aux ("ofm", readers.tfm)
+ and aux ("dfont", unsupported_reader "dfont")
end
--[[doc--