summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--luaotfload-colors.lua2
-rw-r--r--luaotfload-database.lua2
-rw-r--r--luaotfload-features.lua2
-rw-r--r--luaotfload-fontloader.lua2
-rw-r--r--luaotfload-letterspace.lua2
-rw-r--r--luaotfload-loaders.lua2
-rw-r--r--luaotfload-parsers.lua2
-rw-r--r--luaotfload.dtx8
-rwxr-xr-xmkstatus2
9 files changed, 12 insertions, 12 deletions
diff --git a/luaotfload-colors.lua b/luaotfload-colors.lua
index 86e493f..d999df6 100644
--- a/luaotfload-colors.lua
+++ b/luaotfload-colors.lua
@@ -1,6 +1,6 @@
if not modules then modules = { } end modules ['luaotfload-colors'] = {
version = "2.5",
- comment = "companion to luaotfload.lua (font color)",
+ comment = "companion to luaotfload-main.lua (font color)",
author = "Khaled Hosny, Elie Roux, Philipp Gesang",
copyright = "Luaotfload Development Team",
license = "GNU GPL v2.0"
diff --git a/luaotfload-database.lua b/luaotfload-database.lua
index 3f321d2..98c5d3f 100644
--- a/luaotfload-database.lua
+++ b/luaotfload-database.lua
@@ -1,6 +1,6 @@
if not modules then modules = { } end modules ['luaotfload-database'] = {
version = "2.5",
- comment = "companion to luaotfload.lua",
+ comment = "companion to luaotfload-main.lua",
author = "Khaled Hosny, Elie Roux, Philipp Gesang",
copyright = "Luaotfload Development Team",
license = "GNU GPL v2.0"
diff --git a/luaotfload-features.lua b/luaotfload-features.lua
index d786549..5172f4b 100644
--- a/luaotfload-features.lua
+++ b/luaotfload-features.lua
@@ -1,6 +1,6 @@
if not modules then modules = { } end modules ["features"] = {
version = "2.5",
- comment = "companion to luaotfload.lua",
+ comment = "companion to luaotfload-main.lua",
author = "Hans Hagen, Khaled Hosny, Elie Roux, Philipp Gesang",
copyright = "PRAGMA ADE / ConTeXt Development Team",
license = "see context related readme files"
diff --git a/luaotfload-fontloader.lua b/luaotfload-fontloader.lua
index a3a2de5..9f21df8 100644
--- a/luaotfload-fontloader.lua
+++ b/luaotfload-fontloader.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 01/07/14 17:03:56
+-- merge date : 01/14/14 16:21:00
do -- begin closure to overcome local limits and interference
diff --git a/luaotfload-letterspace.lua b/luaotfload-letterspace.lua
index d17aedf..1957f9a 100644
--- a/luaotfload-letterspace.lua
+++ b/luaotfload-letterspace.lua
@@ -1,6 +1,6 @@
if not modules then modules = { } end modules ['letterspace'] = {
version = "2.5",
- comment = "companion to luaotfload.lua",
+ comment = "companion to luaotfload-main.lua",
author = "Hans Hagen, PRAGMA-ADE, Hasselt NL; adapted by Philipp Gesang",
copyright = "PRAGMA ADE / ConTeXt Development Team",
license = "see context related readme files"
diff --git a/luaotfload-loaders.lua b/luaotfload-loaders.lua
index fa00633..2aa8c7c 100644
--- a/luaotfload-loaders.lua
+++ b/luaotfload-loaders.lua
@@ -1,6 +1,6 @@
if not modules then modules = { } end modules ["loaders"] = {
version = "2.5",
- comment = "companion to luaotfload.lua",
+ comment = "companion to luaotfload-main.lua",
author = "Hans Hagen, Khaled Hosny, Elie Roux, Philipp Gesang",
copyright = "PRAGMA ADE / ConTeXt Development Team",
license = "see context related readme files"
diff --git a/luaotfload-parsers.lua b/luaotfload-parsers.lua
index e6db21f..42a43aa 100644
--- a/luaotfload-parsers.lua
+++ b/luaotfload-parsers.lua
@@ -11,7 +11,7 @@
if not modules then modules = { } end modules ['luaotfload-parsers'] = {
version = "2.5",
- comment = "companion to luaotfload.lua",
+ comment = "companion to luaotfload-main.lua",
author = "Philipp Gesang",
copyright = "Luaotfload Development Team",
license = "GNU GPL v2.0"
diff --git a/luaotfload.dtx b/luaotfload.dtx
index 8d59a65..6274c03 100644
--- a/luaotfload.dtx
+++ b/luaotfload.dtx
@@ -80,7 +80,7 @@ and the derived files
\Msg{* To finish the installation you have to move the following}
\Msg{* files into a directory searched by TeX:}
\Msg{*}
-\Msg{* luaotfload.sty, luaotfload.lua}
+\Msg{* luaotfload.sty}
\Msg{*}
\Msg{* Happy TeXing!}
\Msg{*}
@@ -1210,7 +1210,7 @@ and the derived files
% 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}.
+% \fileent{luatex-fonts.lua} unmodified into \fileent{luaotfload-main.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.
@@ -1552,7 +1552,7 @@ and the derived files
% As of version 2.5, the file \fileent{luaotfload.lua} is no longer
% generated from the \abbrev{dtx}.
% Instead, it is maintained separately as a plain \identifier{Lua} file
-% in the Luaotfload \identifier{git} tree.
+% \fileent{luaotfload-main.lua} in the Luaotfload \identifier{git} tree.
% The file documentation which used to be found in this section has
% been preserved in the comments.
%
@@ -1576,7 +1576,7 @@ and the derived files
[2014/**/** v2.5 OpenType layout system]
\RequirePackage{luatexbase}
\fi
-\RequireLuaModule{luaotfload}
+\RequireLuaModule{luaotfload-main}
\endinput
% \end{macrocode}
% \iffalse
diff --git a/mkstatus b/mkstatus
index 649d26b..28b80ff 100755
--- a/mkstatus
+++ b/mkstatus
@@ -50,7 +50,7 @@ local names = {
"luaotfload-glyphlist.lua",
"luaotfload-letterspace.lua",
"luaotfload-loaders.lua",
- "luaotfload.lua",
+ "luaotfload-main.lua",
"luaotfload-fontloader.lua",
"luaotfload-override.lua",
"luaotfload-parsers.lua",