[*] substitute new fontloader file name

4 files changed, 10 insertions, 8 deletions

diff --git a/NEWS b/NEWS
index 399ed97..64f18e5 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ Change History
     * Test runner (script mktests)
     * New luaotfload-tool option: ``--no-reload``
     * ``luaotfload-tool --find`` now understands request syntax
+    * rename ``luaotfload-merged.lua`` (the fontloader package from Context)
+      to ``luaotfload-fontloader.lua``
 
 2013/07/10, luaotfload v2.3a
     * Detect LuaJIT interpreter (LuaJITTeX)
diff --git a/filegraph.dot b/filegraph.dot
index 92506e5..f70ef87 100644
--- a/filegraph.dot
+++ b/filegraph.dot
@@ -30,7 +30,7 @@ strict digraph luaotfload_files { //looks weird with circo ...
     fontdbutil  -> font_names   [label="--update",
                                  style=dashed]
 
-    luaotfload -> otfl_fonts_merged [label="merged"]
+    luaotfload -> otfl_fonts_merged   [label="merged"]
     luaotfload -> merged_lua_libs     [label="unmerged", style=solid]
     luaotfload -> merged_luatex_fonts [label="unmerged", style=solid]
     luaotfload -> merged_context_libs [label="unmerged", style=solid]
@@ -139,7 +139,7 @@ strict digraph luaotfload_files { //looks weird with circo ...
      *                   style  = "filled,rounded",
      *                   penwidth=2]
      */
-    otfl_fonts_merged [label = "luaotfload-merged.lua",
+    otfl_fonts_merged [label = "luaotfload-fontloader.lua",
                        shape = rect,
                        width  = "3.2cm",
                        height = "1.2cm",
diff --git a/luaotfload.dtx b/luaotfload.dtx
index bf75d1b..b0fb17d 100644
--- a/luaotfload.dtx
+++ b/luaotfload.dtx
@@ -1095,7 +1095,7 @@ and the derived files
 % See figure \ref{file-graph} on page \pageref{file-graph} for a
 % graphical representation of the dependencies.
 % From \LUATEX-Fonts, only the file \fileent{luatex-fonts-merged.lua}
-% has been imported as \fileent{luaotfload-merged.lua}.
+% has been imported as \fileent{luaotfload-fontloader.lua}.
 % It is generated by \fileent{mtx-package}, a \LUA source code merging
 % too developed by Hans Hagen.\footnote{%
 %   \fileent{mtx-package} is
@@ -1174,7 +1174,7 @@ and the derived files
 % \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.
+% \fileent{luaotfload-fontloader.lua} from the search path.
 %
 % Also, the merged file at some point
 % loads the Adobe Glyph List from a \LUA table that is contained in
@@ -1667,7 +1667,7 @@ end
 % How this is executed depends on the presence on the \emphasis{merged
 % font loader code}.
 % In \identifier{luaotfload} this is contained in the file
-% \fileent{luaotfload-merged.lua}.
+% \fileent{luaotfload-fontloader.lua}.
 % If this file cannot be found, the original libraries from \CONTEXT of
 % which the merged code was composed are loaded instead.
 % The imported font loader will call \luafunction{callback.register} once
@@ -1781,7 +1781,7 @@ tex.attribute[0] = 0
 %
 %    \begin{macrocode}
 
-loadmodule"merged.lua"
+loadmodule"fontloader.lua"
 ---loadmodule"font-odv.lua" --- <= Devanagari support from Context
 
 if fonts then
@@ -1790,7 +1790,7 @@ if fonts then
         log [["I am using the merged version of 'luaotfload.lua' here.]]
         log [[ If you run into problems or experience unexpected]]
         log [[ behaviour, and if you have ConTeXt installed you can try]]
-        log [[ to delete the file 'luaotfload-merged.lua' as I might]]
+        log [[ to delete the file 'luaotfload-fontloader.lua' as I might]]
         log [[ then use the possibly updated libraries. The merged]]
         log [[ version is not supported as it is a frozen instance.]]
         log [[ Problems can be reported to the ConTeXt mailing list."]]
diff --git a/mkstatus b/mkstatus
index 16d0b5d..a8d9233 100755
--- a/mkstatus
+++ b/mkstatus
@@ -52,7 +52,7 @@ local names = {
   "luaotfload-letterspace.lua",
   "luaotfload-loaders.lua",
   "luaotfload.lua",
-  "luaotfload-merged.lua",
+  "luaotfload-fontloader.lua",
   "luaotfload-override.lua",
   "luaotfload-tool.lua",
   "luaotfload-typo-krn.lua",