Move code around

Move code that does not belong to otfl-font-nms.lua to luaotfload.dtx.

Please test.

2 files changed, 25 insertions, 14 deletions

diff --git a/luaotfload.dtx b/luaotfload.dtx
index a6e90c0..1fa1e7c 100644
--- a/luaotfload.dtx
+++ b/luaotfload.dtx
@@ -449,6 +449,18 @@ luatexbase.provides_module(luaotfload.module)
 
 %    \end{macrocode}
 %
+%    This is a necessary initalization in order not to rebuild an existing font.
+%    Maybe 600 should be replaced by |\pdfpkresolution| or |texconfig.pk_dpi|
+%    (and it should be replaced dynamically), but we don't have access (yet) to
+%    the |texconfig| table, so we let it be 600. Anyway, it does still work
+%    fine even if |\pdfpkresolution| is changed.
+%
+%    \begin{macrocode}
+
+kpse.init_prog('', 600, '/')
+
+%    \end{macrocode}
+%
 %    Some helper functions.
 %
 %    \begin{macrocode}
@@ -575,6 +587,19 @@ luaotfload.loadmodule('font-dum.lua')
 
 %    \end{macrocode}
 %
+%    This is a patch for |otfl-font-def.lua|, that defines a reader for ofm
+%    fonts, this is necessary if we set the forced field of the specification
+%    to |ofm|, we use it only when using \textsf{luaotfload}, not
+%    |mkluatexfontdb|.
+%
+%    \begin{macrocode}
+
+if fonts and fonts.tfm and fonts.tfm.readers then
+    fonts.tfm.readers.ofm = fonts.tfm.readers.tfm
+end
+
+%    \end{macrocode}
+%
 %    \textsf{luaotfload} specific modules.
 %
 %    \begin{macrocode}
diff --git a/otfl-font-nms.lua b/otfl-font-nms.lua
index a653223..1f37d16 100644
--- a/otfl-font-nms.lua
+++ b/otfl-font-nms.lua
@@ -6,20 +6,6 @@ if not modules then modules = { } end modules ['font-nms'] = {
     license   = "GNU GPL v2"
 }
 
--- This is a patch for otfl-font-def.lua, that defines a reader for ofm fonts,
--- this is necessary if we set the forced field of the specification to 'ofm'
--- we use it only when using luaotfload, not mkluatexfontdb.
-if fonts and fonts.tfm and fonts.tfm.readers then
-    fonts.tfm.readers.ofm = fonts.tfm.readers.tfm
-end
-
--- This is a necessary initalization in order not to rebuild an existing font.
--- Maybe 600 should be replaced by \pdfpkresolution
--- or texconfig.pk_dpi (and it should be replaced dynamically), but we don't
--- have access (yet) to the texconfig table, so we let it be 600. Anyway, it
--- does still work fine even if \pdfpkresolution is changed.
-kpse.init_prog('', 600, '/')
-
 fonts                = fonts       or { }
 fonts.names          = fonts.names or { }