update documentation to reflect current state of files

1 files changed, 73 insertions, 88 deletions

diff --git a/luaotfload.dtx b/luaotfload.dtx
index 3998859..6f2c323 100644
--- a/luaotfload.dtx
+++ b/luaotfload.dtx
@@ -801,102 +801,87 @@ and the derived files
 % \identifier{luaotfload} in one way or the other.
 % See figure \ref{file-graph} on page \pageref{file-graph} for a
 % graphical representation of the dependencies.
-% From \LUATEX-Fonts the following files have been imported:
+% From \LUATEX-Fonts, only the file \fileent{luatex-fonts-merged.lua}
+% has been imported as \fileent{luaotfload-merged.lua}.
+% It is generated by \fileent{mtx-package}, a \LUA source code merging
+% too developed by Hans Hagen.\footnote{%
+%   \fileent{mtx-package} is
+%   \href
+%     {http://repo.or.cz/w/context.git/blob_plain/refs/heads/origin:/scripts/context/lua/mtx-package.lua}
+%     {part of \CONTEXT}
+%   and requires \fileent{mtxrun}.
+%   Run
+%   \verb|mtxrun --script package --help|
+%   to display further information.
+%   For the actual merging code see the file
+%   \fileent{util-mrg.lua} that is part of \CONTEXT.
+% }
+% It houses several \LUA files that can be classed in three
+% categories.
 %
 %   \begin{itemize}
 %     \let\normalitem=\item
-%     \def\fileitem#1#2{%
-%       \normalitem{\fileent{#1}}%
-%       \hfill
-%       (as \fileent{\itshape#2})%
-%       \break
-%     }
 %     \def\incitem#1{%
 %       \normalitem{\fileent{#1}}
 %     }
-%     \fileitem{luatex-fonts.lua}{luaotfload-fonts.lua}
-%           The wrapper that loads the font loader code.
-%
-%     \fileitem{luatex-fonts-merged.lua}{luaotfload-fonts-merged.lua}
-%           The font loader package.
-%           It is generated by \fileent{mtx-package}, a \LUA
-%           source code merging tool developed by Hans
-%           Hagen.\footnote{%
-%             \fileent{mtx-package} is
-%             \href
-%               {http://repo.or.cz/w/context.git/blob_plain/refs/heads/origin:/scripts/context/lua/mtx-package.lua}
-%               {part of \CONTEXT}
-%             and requires \fileent{mtxrun}.
-%             Run
-%             \verb|mtxrun --script package --help|
-%             to display further information.
-%             For the actual merging code see the file
-%             \fileent{util-mrg.lua} that is part of \CONTEXT.
-%           }
-%
-%           Included are several Lua files that can be classed in three
-%           categories.
-%           \begin{itemize}
-%             \normalitem \emphasis{\LUA utility libraries}, a subset
-%                         of what is provided by the \identifier{lualibs}
-%                         package.
-%
-%                         \begin{multicols}{2}
-%                           \begin{itemize}
-%                             \incitem{l-lua.lua}       \incitem{l-lpeg.lua}
-%                             \incitem{l-function.lua}  \incitem{l-string.lua}
-%                             \incitem{l-table.lua}     \incitem{l-io.lua}
-%                             \incitem{l-file.lua}      \incitem{l-boolean.lua}
-%                             \incitem{l-math.lua}      \incitem{util-str.lua}
-%                           \end{itemize}
-%                         \end{multicols}
-%
-%             \normalitem The \emphasis{font loader} itself.
-%                         These files have been written for
-%                         \LUATEX-Fonts and they are distributed along
-%                         with \identifier{luaotfload}.
-%                         \begin{multicols}{2}
-%                           \begin{itemize}
-%                             \incitem{luatex-basics-gen.lua}
-%                             \incitem{luatex-basics-nod.lua}
-%                             \incitem{luatex-fonts-enc.lua}
-%                             \incitem{luatex-fonts-syn.lua}
-%                             \incitem{luatex-fonts-tfm.lua}
-%                             \incitem{luatex-fonts-chr.lua}
-%                             \incitem{luatex-fonts-lua.lua}
-%                             \incitem{luatex-fonts-def.lua}
-%                             \incitem{luatex-fonts-ext.lua}
-%                             \incitem{luatex-fonts-cbk.lua}
-%                           \end{itemize}
-%                         \end{multicols}
-%
-%             \normalitem Code related to \emphasis{font handling and
-%                         node processing}, taken directly from
-%                         \CONTEXT.
-%                         \begin{multicols}{2}
-%                           \begin{itemize}
-%                             \incitem{data-con.lua} \incitem{font-ini.lua}
-%                             \incitem{font-con.lua} \incitem{font-cid.lua}
-%                             \incitem{font-map.lua} \incitem{font-oti.lua}
-%                             \incitem{font-otf.lua} \incitem{font-otb.lua}
-%                             \incitem{node-inj.lua} \incitem{font-ota.lua}
-%                             \incitem{font-otn.lua} \incitem{font-def.lua}
-%                           \end{itemize}
-%                         \end{multicols}
-%           \end{itemize}
-%
-%           Note that if \identifier{luaotfload} cannot locate the
-%           merged file, it will load the individual \LUA libraries
-%           instead.
-%           Their names remain the same as in \CONTEXT (without the
-%           \verb|otfl|-prefix) since they are hard-coded in
-%           \fileent{luaotfload-fonts.lua}.
-%           Thus if you prefer running bleeding edge code from the
-%           \CONTEXT beta, all you have to do is remove
-%           \fileent{luaotfload-fonts-merged.lua} from the search path.
-%
+%     \normalitem \emphasis{\LUA utility libraries}, a subset
+%                 of what is provided by the \identifier{lualibs}
+%                 package.
+%
+%                 \begin{multicols}{2}
+%                   \begin{itemize}
+%                     \incitem{l-lua.lua}       \incitem{l-lpeg.lua}
+%                     \incitem{l-function.lua}  \incitem{l-string.lua}
+%                     \incitem{l-table.lua}     \incitem{l-io.lua}
+%                     \incitem{l-file.lua}      \incitem{l-boolean.lua}
+%                     \incitem{l-math.lua}      \incitem{util-str.lua}
+%                   \end{itemize}
+%                 \end{multicols}
+%
+%     \normalitem The \emphasis{font loader} itself.
+%                 These files have been written for
+%                 \LUATEX-Fonts and they are distributed along
+%                 with \identifier{luaotfload}.
+%                 \begin{multicols}{2}
+%                   \begin{itemize}
+%                     \incitem{luatex-basics-gen.lua}
+%                     \incitem{luatex-basics-nod.lua}
+%                     \incitem{luatex-fonts-enc.lua}
+%                     \incitem{luatex-fonts-syn.lua}
+%                     \incitem{luatex-fonts-tfm.lua}
+%                     \incitem{luatex-fonts-chr.lua}
+%                     \incitem{luatex-fonts-lua.lua}
+%                     \incitem{luatex-fonts-def.lua}
+%                     \incitem{luatex-fonts-ext.lua}
+%                     \incitem{luatex-fonts-cbk.lua}
+%                   \end{itemize}
+%                 \end{multicols}
+%
+%     \normalitem Code related to \emphasis{font handling and
+%                 node processing}, taken directly from
+%                 \CONTEXT.
+%                 \begin{multicols}{2}
+%                   \begin{itemize}
+%                     \incitem{data-con.lua} \incitem{font-ini.lua}
+%                     \incitem{font-con.lua} \incitem{font-cid.lua}
+%                     \incitem{font-map.lua} \incitem{font-oti.lua}
+%                     \incitem{font-otf.lua} \incitem{font-otb.lua}
+%                     \incitem{node-inj.lua} \incitem{font-ota.lua}
+%                     \incitem{font-otn.lua} \incitem{font-def.lua}
+%                   \end{itemize}
+%                 \end{multicols}
 %   \end{itemize}
 %
+% Note that if \identifier{luaotfload} cannot locate the
+% merged file, it will load the individual \LUA libraries
+% instead.
+% Their names remain the same as in \CONTEXT (without the
+% \verb|otfl|-prefix) since we imported the relevant section of
+% \fileent{luatex-fonts.lua} unmodified into \fileent{luaotfload.lua}.
+% Thus if you prefer running bleeding edge code from the
+% \CONTEXT beta, all you have to do is remove
+% \fileent{luaotfload-merged.lua} from the search path.
+%
 % In addition to these, \identifier{luaotfload} requires a number of
 % files not contained in the merge. Some of these have no equivalent in
 % \LUATEX-Fonts or \CONTEXT, some were taken unmodified from the