summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2016-04-21 07:59:47 +0200
committerPhilipp Gesang <phg@phi-gamma.net>2016-04-21 07:59:47 +0200
commite739376d6f7f55a74ecd215f2bd3b54a30367875 (patch)
tree17a8cc6b3ad337602ff21986c14ff924cd23f723 /doc
parent1c93f97f4bce1b399e90f65657e95ef13434128c (diff)
parentb1a1ee5d1ec8002acee2702e6dd070073e0ee0ee (diff)
downloadluaotfload-e739376d6f7f55a74ecd215f2bd3b54a30367875.tar.gz
Merge pull request #336 from phi-gamma/master
2.7
Diffstat (limited to 'doc')
-rw-r--r--doc/luaotfload-main.tex40
-rw-r--r--doc/luaotfload-tool.rst15
-rw-r--r--doc/luaotfload.conf.rst15
3 files changed, 43 insertions, 27 deletions
diff --git a/doc/luaotfload-main.tex b/doc/luaotfload-main.tex
index c418991..c243f03 100644
--- a/doc/luaotfload-main.tex
+++ b/doc/luaotfload-main.tex
@@ -32,7 +32,7 @@
\beginfrontmatter
\setdocumenttitle {The \identifier{luaotfload} package}
- \setdocumentdate {2016/04/07 v2.7}
+ \setdocumentdate {2016/04/21 v2.7}
\setdocumentauthor {Elie Roux · Khaled Hosny · Philipp Gesang\\
Home: \hyperlink {https://github.com/lualatex/luaotfload}\\
Support: \email {lualatex-dev@tug.org}}
@@ -188,9 +188,30 @@ for a more formal description see figure \ref{font-syntax}.
<specification> ::= <prefixed spec>, [ <subfont no> ], \{ <modifier> \}
\alt <anon lookup>, \{ <modifier> \} ;
- <prefixed spec> ::= `file:', <file lookup>
+ <prefixed spec> ::= `combo:', <combo list>
+ \alt `file:', <file lookup>
\alt `name:', <name lookup> ;
+ <combo list> ::= <combo def 1>, \{ `;', <combo def> \} ;
+
+ <combo def 1> ::= <combo id>, `->', <combo id> ;
+
+ <combo def> ::= <combo id>, `->', <combo id chars> ;
+
+ <combo id> ::= (`(', \{ {\sc digit} \}, `)' | \{ {\sc digit} \} ) ;
+
+ <combo id chars> ::= (`(', \{ {\sc digit} \}, `,', <combo chars>, `)'
+ \alt \{ {\sc digit} \} ) ;
+
+ <combo chars> ::= `fallback'
+ \alt \{ <combo range>, \{ `*', <combo range> \} \} ;
+
+ <combo range> ::= <combo num>, [ `-', <combo num> ] ;
+
+ <combo num> ::= `0x', \{ {\sc hexdigit} \}
+ \alt `U+', \{ {\sc digit} \}
+ \alt \{ {\sc digit} \} ;
+
<file lookup> ::= \{ <name character> \} ;
<name lookup> ::= \{ <name character> \} ;
@@ -227,12 +248,11 @@ requires a \emphasis{prefix}:
\endnarrower
%
where \meta{prefix} is either \inlinecode{file:} or \inlinecode {name:}.\footnote{%
- The development version also knows two further prefixes,
- \inlinecode {kpse:} and \inlinecode {my:}.
+ \identifier{Luaotfload} also knows two further prefixes, \inlinecode {kpse:}
+ and \inlinecode {my:}.
%
A \inlinecode {kpse} lookup is restricted to files that can be found by
- \identifier{kpathsea} and
- will not attempt to locate system fonts.
+ \identifier{kpathsea} and will not attempt to locate system fonts.
%
This behavior can be of value when an extra degree of encapsulation is
needed, for instance when supplying a customized tex distribution.
@@ -373,7 +393,7 @@ have no meaning in \LUATEX.
\beginsubsubsection{Loading by File Name}
-For example, conventional \abbrev{type1} font can be loaded with a
+For example, conventional \TeX\ font can be loaded with a
\inlinecode {file:} request like so:
\beginlisting
@@ -784,6 +804,8 @@ advance as well as a special \emphasis{request syntax}. Furthermore, this
allows to define \emphasis{fallback fonts} to supplement fonts that may lack
certain required glyphs.
+Combinations are created by defining a font using the \luaident{combo:} prefix.
+
\beginsubsection {Fallbacks}
For example, the \identifier{Latin Modern} family of fonts does, as indicated
@@ -1312,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..b5cbe96 100644
--- a/doc/luaotfload-tool.rst
+++ b/doc/luaotfload-tool.rst
@@ -6,7 +6,7 @@
generate and query the Luaotfload font names database
-----------------------------------------------------------------------
-:Date: 2016-04-18
+:Date: 2016-04-21
:Copyright: GPL v2.0
:Version: 2.7
:Manual section: 1
@@ -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..e7cbccb 100644
--- a/doc/luaotfload.conf.rst
+++ b/doc/luaotfload.conf.rst
@@ -6,7 +6,7 @@
Luaotfload configuration file
-----------------------------------------------------------------------
-:Date: 2016-04-18
+:Date: 2016-04-21
:Copyright: GPL v2.0
:Version: 2.7
:Manual section: 5
@@ -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