Merge pull request #331 from phi-gamma/master

current progress on 2.7

5 files changed, 109 insertions, 56 deletions

diff --git a/doc/filegraph.dot b/doc/filegraph.dot
index de60823..b274461 100644
--- a/doc/filegraph.dot
+++ b/doc/filegraph.dot
@@ -309,7 +309,7 @@ strict digraph luaotfload_files { //looks weird with circo ...
                 <tr> <td>l-lua.lua</td>     <td>l-lpeg.lua</td>    <td>l-function.lua</td>  </tr>
                 <tr> <td>l-string.lua</td>  <td>l-table.lua</td>   <td>l-io.lua</td>        </tr>
                 <tr> <td>l-file.lua</td>    <td>l-boolean.lua</td> <td>l-math.lua</td>      </tr>
-                <tr> <td>util-str.lua</td>                                                  </tr>
+                <tr> <td>util-str.lua</td>  <td>util-fil.lua</td>                           </tr>
             </table>
         >,
     ]
@@ -322,13 +322,17 @@ strict digraph luaotfload_files { //looks weird with circo ...
         label      = <
             <table border="0">
                 <th> <td colspan="2"> <font point-size="12" face="Iwona Italic">Font Loader (LuaTeX-Fonts)</font> </td> </th>
-                <tr> <td>luatex-fonts-cbk.lua</td>  <td>luatex-basics-nod.lua</td> </tr>
-                <tr> <td>luatex-fonts-enc.lua</td>  <td>luatex-fonts-syn.lua</td>  </tr>
-                <tr> <td>luatex-font-tfm.lua</td>   <td>luatex-font-afm.lua</td>   </tr>
-                <tr> <td>luatex-font-afk.lua</td>   <td>luatex-fonts-tfm.lua</td>  </tr>
-                <tr> <td>luatex-fonts-chr.lua</td>  <td>luatex-fonts-lua.lua</td>  </tr>
-                <tr> <td>luatex-fonts-inj.lua</td>  <td>luatex-fonts-otn.lua</td>  </tr>
-                <tr> <td>luatex-fonts-def.lua</td>  <td>luatex-fonts-ext.lua</td>  </tr>
+                <tr>
+                    <td>luatex-basics-nod.lua</td>
+                    <td>luatex-basics-chr.lua</td>
+                </tr>
+                <tr>
+                    <td>luatex-fonts-enc.lua</td>
+                    <td>luatex-fonts-syn.lua</td>
+                </tr>
+                <tr>
+                    <td>luatex-fonts-ext.lua</td>
+                </tr>
             </table>
         >,
     ]
@@ -341,10 +345,46 @@ strict digraph luaotfload_files { //looks weird with circo ...
         label      = <
             <table border="0">
                 <th> <td colspan="3"> <font point-size="12" face="Iwona Italic"> Font and Node Libraries from Context </font> </td> </th>
-                <tr> <td>data-con.lua</td> <td>font-ini.lua</td> <td>font-con.lua</td> </tr>
-                <tr> <td>font-cid.lua</td> <td>font-map.lua</td> <td>font-oti.lua</td> </tr>
-                <tr> <td>font-otf.lua</td> <td>font-otb.lua</td> <td>font-ota.lua</td> </tr>
-                <tr> <td>font-def.lua</td> </tr>
+                <tr>
+                    <td>data-con.lua</td>
+                    <td>font-ini.lua</td>
+                    <td>font-con.lua</td>
+                </tr>
+                <tr>
+                    <td>font-cid.lua</td>
+                    <td>font-map.lua</td>
+                    <td>font-tfm.lua</td>
+                </tr>
+                <tr>
+                    <td>font-afm.lua</td>
+                    <td>font-afk.lua</td>
+                    <td>font-oti.lua</td>
+                </tr>
+                <tr>
+                    <td>font-otr.lua</td>
+                    <td>font-cff.lua</td>
+                    <td>font-ttf.lua</td>
+                </tr>
+                <tr>
+                    <td>font-dsp.lua</td>
+                    <td>font-oup.lua</td>
+                    <td>font-otl.lua</td>
+                </tr>
+                <tr>
+                    <td>font-oto.lua</td>
+                    <td>font-otj.lua</td>
+                    <td>font-ota.lua</td>
+                </tr>
+                <tr>
+                    <td>font-ots.lua</td>
+                    <td>font-osd.lua</td>
+                    <td>font-lua.lua</td>
+                </tr>
+                <tr>
+                    <td>font-def.lua</td>
+                    <td>font-xtx.lua</td>
+                    <td>font-gbn.lua</td>
+                </tr>
             </table>
         >,
     ]
diff --git a/doc/luaotfload-latex.tex b/doc/luaotfload-latex.tex
index bdcf45f..b4cd3c3 100644
--- a/doc/luaotfload-latex.tex
+++ b/doc/luaotfload-latex.tex
@@ -3,7 +3,7 @@
 %%
 %%      by  Elie Roux      <elie.roux@telecom-bretagne.eu>
 %%      and Khaled Hosny   <khaledhosny@eglug.org>
-%%      and Philipp Gesang <philipp.gesang@alumni.uni-heidelberg.de>
+%%      and Philipp Gesang <phg@phi-gamma.net>
 %%
 %% This file is part of Luaotfload.
 %%
diff --git a/doc/luaotfload-main.tex b/doc/luaotfload-main.tex
index d19906e..7099f3d 100644
--- a/doc/luaotfload-main.tex
+++ b/doc/luaotfload-main.tex
@@ -2,7 +2,7 @@
 %%
 %%      by  Elie Roux      <elie.roux@telecom-bretagne.eu>
 %%      and Khaled Hosny   <khaledhosny@eglug.org>
-%%      and Philipp Gesang <philipp.gesang@alumni.uni-heidelberg.de>
+%%      and Philipp Gesang <phg@phi-gamma.net>
 %%
 %% This file is part of Luaotfload.
 %%
@@ -1160,6 +1160,7 @@ and have thus been omitted from the merge.\footnote{%
       \beginaltitem {l-boolean.lua}   \endaltitem
       \beginaltitem {l-math.lua}      \endaltitem
       \beginaltitem {util-str.lua}    \endaltitem
+      \beginaltitem {util-fil.lua}    \endaltitem
   \enddefinitions
 \enddoublecolumns
 
@@ -1169,30 +1170,28 @@ grouped twofold as below:
 \begindefinitions
   \beginnormalitem
     The \emphasis{font loader} itself.
-    These files have been written for
-    \LUATEX-Fonts and they are distributed along
-    with \identifier{luaotfload}.
+    These files have been written for \LUATEX-Fonts and they are
+    distributed along with \identifier{luaotfload} so as to resemble
+    the state of the code when it was imported. Their purpose is either
+    to give a slightly aged version of a file if upstream considers
+    latest developments for not yet ready for use outside Context; or,
+    to install placeholders or minimalist versions of APIs relied upon
+    but usually provided by parts of Context not included in the
+    fontloader.
     \begindoublecolumns
       \begindefinitions
         \beginaltitem{luatex-basics-nod.lua} \endaltitem
+        \beginaltitem{luatex-basics-chr.lua} \endaltitem
         \beginaltitem{luatex-fonts-enc.lua}  \endaltitem
         \beginaltitem{luatex-fonts-syn.lua}  \endaltitem
-        \beginaltitem{luatex-fonts-tfm.lua}  \endaltitem
-        \beginaltitem{luatex-fonts-chr.lua}  \endaltitem
-        \beginaltitem{luatex-fonts-lua.lua}  \endaltitem
-        \beginaltitem{luatex-fonts-inj.lua}  \endaltitem
-        \beginaltitem{luatex-fonts-otn.lua}  \endaltitem
-        \beginaltitem{luatex-fonts-def.lua}  \endaltitem
         \beginaltitem{luatex-fonts-ext.lua}  \endaltitem
-        \beginaltitem{luatex-fonts-cbk.lua}  \endaltitem
       \enddefinitions
     \enddoublecolumns
   \endnormalitem
 
   \beginnormalitem
-    Code related to \emphasis{font handling and
-    node processing}, taken directly from
-    \CONTEXT.
+    Code related to \emphasis{font handling and node processing}, taken
+    directly from \CONTEXT.
     \begindoublecolumns
       \begindefinitions
         \beginaltitem{data-con.lua} \endaltitem
@@ -1200,12 +1199,25 @@ grouped twofold as below:
         \beginaltitem{font-con.lua} \endaltitem
         \beginaltitem{font-cid.lua} \endaltitem
         \beginaltitem{font-map.lua} \endaltitem
+        \beginaltitem{font-tfm.lua} \endaltitem
+        \beginaltitem{font-afm.lua} \endaltitem
+        \beginaltitem{font-afk.lua} \endaltitem
         \beginaltitem{font-oti.lua} \endaltitem
-        \beginaltitem{font-otf.lua} \endaltitem
-        \beginaltitem{font-otb.lua} \endaltitem
+        \beginaltitem{font-otr.lua} \endaltitem
+        \beginaltitem{font-cff.lua} \endaltitem
+        \beginaltitem{font-ttf.lua} \endaltitem
+        \beginaltitem{font-dsp.lua} \endaltitem
+        \beginaltitem{font-oup.lua} \endaltitem
+        \beginaltitem{font-otl.lua} \endaltitem
+        \beginaltitem{font-oto.lua} \endaltitem
+        \beginaltitem{font-otj.lua} \endaltitem
         \beginaltitem{font-ota.lua} \endaltitem
+        \beginaltitem{font-ots.lua} \endaltitem
+        \beginaltitem{font-osd.lua} \endaltitem
+        \beginaltitem{font-lua.lua} \endaltitem
         \beginaltitem{font-def.lua} \endaltitem
-        \beginaltitem{font-otp.lua} \endaltitem
+        \beginaltitem{font-xtx.lua} \endaltitem
+        \beginaltitem{font-gbn.lua} \endaltitem
       \enddefinitions
     \enddoublecolumns
   \endnormalitem
diff --git a/doc/luaotfload-tool.rst b/doc/luaotfload-tool.rst
index 2e3b897..5b834b4 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-07
+:Date:                  2016-04-18
 :Copyright:             GPL v2.0
 :Version:               2.7
 :Manual section:        1
@@ -116,9 +116,6 @@ query mode
                         For the meaning of the returned fields see
                         the LuaTeX documentation.
                         (requires ``--find``).
---warnings, -w          Print the warnings generated by the fontloader
-                        library (assumes ``-I``). Automatically enabled
-                        if the verbosity level exceeds 2.
 
 --list=CRITERION        Show entries, where *CRITERION* is one of the
                         following:
@@ -329,6 +326,5 @@ AUTHORS
 The fontloader code is provided by Hans Hagen of Pragma ADE, Hasselt
 NL (`<http://pragma-ade.com/>`__).
 
-This manual page was written by Philipp Gesang
-<philipp.gesang@alumni.uni-heidelberg.de>.
+This manual page was written by Philipp Gesang <phg@phi-gamma.net>.
 
diff --git a/doc/luaotfload.conf.rst b/doc/luaotfload.conf.rst
index 5cb74f0..25f5a5c 100644
--- a/doc/luaotfload.conf.rst
+++ b/doc/luaotfload.conf.rst
@@ -6,7 +6,7 @@
                      Luaotfload configuration file
 -----------------------------------------------------------------------
 
-:Date:                  2016-04-07
+:Date:                  2016-04-18
 :Copyright:             GPL v2.0
 :Version:               2.7
 :Manual section:        5
@@ -126,23 +126,25 @@ the variable is unset.
 Section ``db``
 -----------------------------------------------------------------------
 
-+---------------+--------+---------------------------+
-|  variable     |  type  |  default                  |
-+---------------+--------+---------------------------+
-|  compress     |   b    |  ``true``                 |
-+---------------+--------+---------------------------+
-|  formats      |   s    |  ``"otf,ttf,ttc,dfont"``  |
-+---------------+--------+---------------------------+
-|  max-fonts    |   n    |  ``2^51``                 |
-+---------------+--------+---------------------------+
-|  scan-local   |   b    |  ``false``                |
-+---------------+--------+---------------------------+
-|  skip-read    |   b    |  ``false``                |
-+---------------+--------+---------------------------+
-|  strip        |   b    |  ``true``                 |
-+---------------+--------+---------------------------+
-|  update-live  |   b    |  ``true``                 |
-+---------------+--------+---------------------------+
++-----------------+--------+---------------------------+
+|  variable       |  type  |  default                  |
++-----------------+--------+---------------------------+
+|  compress       |   b    |  ``true``                 |
++-----------------+--------+---------------------------+
+|  formats        |   s    |  ``"otf,ttf,ttc,dfont"``  |
++-----------------+--------+---------------------------+
+|  max-fonts      |   n    |  ``2^51``                 |
++-----------------+--------+---------------------------+
+|  scan-local     |   b    |  ``false``                |
++-----------------+--------+---------------------------+
+|  skip-read      |   b    |  ``false``                |
++-----------------+--------+---------------------------+
+|  strip          |   b    |  ``true``                 |
++-----------------+--------+---------------------------+
+|  update-live    |   b    |  ``true``                 |
++-----------------+--------+---------------------------+
+|  use-fontforge  |   b    |  ``false``                |
++-----------------+--------+---------------------------+
 
 The flag ``compress`` determines whether the font index (usually
 ``luaotfload-names.lua[.gz]`` will be stored in compressed forms.
@@ -189,6 +191,10 @@ If ``update-live`` is set, Luaotfload will reload the database if it
 cannot find a requested font. Those who prefer to update manually using
 **luaotfload-tool** should unset this flag.
 
+The option ``use-fontforge`` switches name scanning back to the old
+method that relies on the builtin ``fontloader`` library. This is
+interesting for reference until the Fontforge code will be removed
+eventually.
 
 Section ``default-features``
 -----------------------------------------------------------------------
@@ -381,6 +387,5 @@ AUTHORS
 *Luaotfload* is maintained by the LuaLaTeX dev team
 (`<https://github.com/lualatex/>`_).
 
-This manual page was written by Philipp Gesang
-<philipp.gesang@alumni.uni-heidelberg.de>.
+This manual page was written by Philipp Gesang <phg@phi-gamma.net>.