From 075b79fe9875c1973805b9b3d03e87a55263a253 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Mon, 4 Nov 2013 15:44:33 +0100
Subject: [*] substitute new fontloader file name

---
 luaotfload.dtx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'luaotfload.dtx')

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."]]
-- 
cgit v1.2.3

