luaotfload (21apr16)

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

9 files changed, 39 insertions, 33 deletions

diff --git a/Master/texmf-dist/doc/luatex/luaotfload/NEWS b/Master/texmf-dist/doc/luatex/luaotfload/NEWS
index c1e5000a01f..13c288e0992 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/NEWS
+++ b/Master/texmf-dist/doc/luatex/luaotfload/NEWS
@@ -1,5 +1,13 @@
 Change History
 --------------
+2016/04/21, luaotfload v2.7:
+    * Rework lookup chaining.
+    * Combining glyphs from different fonts (``combo: ...`` requests).
+    * Glyph fallbacks.
+    * Latest fontloader code.
+    * Adapt packaging to changed upstream file layout.
+    * Remove support for builtin Fontforge libraries (this includes the PFA,
+      PFB, DFONT, and feature file readers).
 
 2015/12/09, luaotfload v2.6
     * Add ``sign`` target to makefile for automated package signing.
diff --git a/Master/texmf-dist/doc/luatex/luaotfload/README b/Master/texmf-dist/doc/luatex/luaotfload/README
index 71490b81763..01e1fc6025e 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/README
+++ b/Master/texmf-dist/doc/luatex/luaotfload/README
@@ -30,7 +30,7 @@ The following people have contributed to this package.
 Khaled Hosny             <khaledhosny@eglug.org>
 Elie Roux                <elie.roux@telecom-bretagne.eu>
 Will Robertson           <will.robertson@latex-project.org>
-Philipp Gesang           <philipp.gesang@alumni.uni-heidelberg.de>
+Philipp Gesang           <phg@phi-gamma.net>
 Dohyun Kim               <nomosnomos@gmail.com>
 Reuben Thomas            <https://github.com/rrthomas>
 Joseph Wright            <joseph.wright@morningstar2.co.uk>
diff --git a/Master/texmf-dist/doc/luatex/luaotfload/filegraph.pdf b/Master/texmf-dist/doc/luatex/luaotfload/filegraph.pdf
index 1163dc67cff..1b364368e2e 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/filegraph.pdf
+++ b/Master/texmf-dist/doc/luatex/luaotfload/filegraph.pdf
diff --git a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.conf.example b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.conf.example
index 2756d62126a..b0323afe513 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.conf.example
+++ b/Master/texmf-dist/doc/luatex/luaotfload/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/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf
index 8406dfe431a..e6eff82b96b 100644
--- a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf
+++ b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf
diff --git a/Master/texmf-dist/doc/man/man1/luaotfload-tool.1 b/Master/texmf-dist/doc/man/man1/luaotfload-tool.1
index ae67fce3b10..afed4c14321 100644
--- a/Master/texmf-dist/doc/man/man1/luaotfload-tool.1
+++ b/Master/texmf-dist/doc/man/man1/luaotfload-tool.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH LUAOTFLOAD-TOOL 1 "2015-12-09" "2.6" "text processing"
+.TH LUAOTFLOAD-TOOL 1 "2016-04-21" "2.7" "text processing"
 .SH NAME
 luaotfload-tool \- generate and query the Luaotfload font names database
 .
@@ -110,11 +110,11 @@ system fonts if they are installed in both.
 .BI \-\-formats\fB= EXTENSIONS
 Extensions of the font files to index.
 Where \fIEXTENSIONS\fP 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 \fB+\fP sign, the given list is added to
 the currently active one; \fB\-\fP subtracts.
-Default: \fIotf,ttf,ttc,dfont\fP\&.
+Default: \fIotf,ttf,ttc\fP\&.
 Examples:
 .INDENT 7.0
 .IP 1. 3
@@ -124,11 +124,8 @@ TrueType fonts and font collections;
 \fB\-\-formats=otf\fP would scan only OpenType
 files;
 .IP 3. 3
-\fB\-\-formats=+pfb\fP includes binary
-Postscript files. \fBWarning\fP: with a
-standard TeX Live installation this will
-grow the database considerably and slow down
-font indexing.
+\fB\-\-formats=+afm\fP includes binary
+Postscript files accompanied by an AFM file.
 .UNINDENT
 .UNINDENT
 .SS query mode
@@ -158,11 +155,6 @@ For the meaning of the returned fields see
 the LuaTeX documentation.
 (requires \fB\-\-find\fP).
 .TP
-.B \-\-warnings\fP,\fB  \-w
-Print the warnings generated by the fontloader
-library (assumes \fB\-I\fP). Automatically enabled
-if the verbosity level exceeds 2.
-.TP
 .BI \-\-list\fB= CRITERION
 Show entries, where \fICRITERION\fP is one of the
 following:
@@ -442,8 +434,7 @@ Tons, probably.
 The fontloader code is provided by Hans Hagen of Pragma ADE, Hasselt
 NL (\fI\%http://pragma\-ade.com/\fP).
 .sp
-This manual page was written by Philipp Gesang
-<\fI\%philipp.gesang@alumni.uni\-heidelberg.de\fP>.
+This manual page was written by Philipp Gesang <\fI\%phg@phi\-gamma.net\fP>.
 .SH COPYRIGHT
 GPL v2.0
 .\" Generated by docutils manpage writer.
diff --git a/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf b/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf
index e3229f4041c..8cb64b3daaa 100644
--- a/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man5/luaotfload.conf.5 b/Master/texmf-dist/doc/man/man5/luaotfload.conf.5
index 89c8fbb5f46..810ab68224e 100644
--- a/Master/texmf-dist/doc/man/man5/luaotfload.conf.5
+++ b/Master/texmf-dist/doc/man/man5/luaotfload.conf.5
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH LUAOTFLOAD.CONF 5 "2015-12-09" "2.6" "text processing"
+.TH LUAOTFLOAD.CONF 5 "2016-04-21" "2.7" "text processing"
 .SH NAME
 luaotfload.conf \- Luaotfload configuration file
 .
@@ -53,7 +53,7 @@ look as follows:
 .nf
 .ft C
 [db]
-    formats = afm, pfa, pfb
+    formats = afm,ttf
     compress = false
 
 [misc]
@@ -67,10 +67,9 @@ look as follows:
 .UNINDENT
 .sp
 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,
@@ -205,7 +204,7 @@ formats
 T}	T{
 s
 T}	T{
-\fB"otf,ttf,ttc,dfont"\fP
+\fB"otf,ttf,ttc"\fP
 T}
 _
 T{
@@ -248,6 +247,14 @@ T}	T{
 \fBtrue\fP
 T}
 _
+T{
+use\-fontforge
+T}	T{
+b
+T}	T{
+\fBfalse\fP
+T}
+_
 .TE
 .sp
 The flag \fBcompress\fP determines whether the font index (usually
@@ -263,19 +270,15 @@ containing one or more of these elements:
 .IP \(bu 2
 \fBotf\fP               (OpenType format),
 .IP \(bu 2
-\fBttf\fP and \fBttc\fP   (TrueType format),
-.IP \(bu 2
-\fBdfont\fP             (Macintosh TrueType format),
+\fBttf\fP and \fBttc\fP       (TrueType format),
 .IP \(bu 2
 \fBafm\fP               (Adobe Font Metrics),
-.IP \(bu 2
-\fBpfb\fP and \fBpfa\fP   (PostScript format).
 .UNINDENT
 .sp
 It corresponds loosely to the \fB\-\-formats\fP option to
 \fBluaotfload\-tool\fP\&. Invalid or duplicate members are ignored; if the
 list does not contain any useful identifiers, the default list
-\fB"otf,ttf,ttc,dfont"\fP will be used.
+\fB"otf,ttf,ttc"\fP will be used.
 .sp
 The variable \fBmax\-fonts\fP determines after processing how many font
 files the font scanner will terminate the search. This is useful for
@@ -300,6 +303,11 @@ effect on the runtime behavior.
 If \fBupdate\-live\fP is set, Luaotfload will reload the database if it
 cannot find a requested font. Those who prefer to update manually using
 \fBluaotfload\-tool\fP should unset this flag.
+.sp
+The option \fBuse\-fontforge\fP switches name scanning back to the old
+method that relies on the builtin \fBfontloader\fP library. This is
+interesting for reference until the Fontforge code will be removed
+eventually.
 .SS Section \fBdefault\-features\fP
 .sp
 By default Luaotfload enables \fBnode\fP mode and picks the default font
@@ -500,7 +508,7 @@ restore the previous behavior if necessary.
 The \fBdefiner\fP allows for switching the \fBdefine_font\fP callback.
 Apart from the default \fBpatch\fP one may also choose the \fBgeneric\fP
 one that comes with the vanilla fontloader. Beware that this might
-break tools like Fontspect that rely on the \fBpatch_font\fP callback
+break tools like Fontspec that rely on the \fBpatch_font\fP callback
 provided by Luaotfload to perform important corrections on font data.
 .sp
 The fontloader backend can be selected by setting the value of
@@ -590,8 +598,7 @@ The XDG base specification
 \fILuaotfload\fP is maintained by the LuaLaTeX dev team
 (\fI\%https://github.com/lualatex/\fP).
 .sp
-This manual page was written by Philipp Gesang
-<\fI\%philipp.gesang@alumni.uni\-heidelberg.de\fP>.
+This manual page was written by Philipp Gesang <\fI\%phg@phi\-gamma.net\fP>.
 .SH COPYRIGHT
 GPL v2.0
 .\" Generated by docutils manpage writer.
diff --git a/Master/texmf-dist/doc/man/man5/luaotfload.conf.man5.pdf b/Master/texmf-dist/doc/man/man5/luaotfload.conf.man5.pdf
index 547afed7a1c..6a97bc0a3d2 100644
--- a/Master/texmf-dist/doc/man/man5/luaotfload.conf.man5.pdf
+++ b/Master/texmf-dist/doc/man/man5/luaotfload.conf.man5.pdf