diff options
| -rwxr-xr-x | fontdbutil.lua | 4 | ||||
| -rw-r--r-- | luaotfload-colors.lua (renamed from luaotfload-font-clr.lua) | 4 | ||||
| -rw-r--r-- | luaotfload-database.lua (renamed from luaotfload-font-nms.lua) | 2 | ||||
| -rw-r--r-- | luaotfload-loaders.lua (renamed from luaotfload-font-pfb.lua) | 0 | ||||
| -rw-r--r-- | luaotfload-override.lua (renamed from luaotfload-luat-ovr.lua) | 0 | ||||
| -rw-r--r-- | luaotfload.dtx | 14 |
6 files changed, 12 insertions, 12 deletions
diff --git a/fontdbutil.lua b/fontdbutil.lua index 464cc62..31c7dfa 100755 --- a/fontdbutil.lua +++ b/fontdbutil.lua @@ -74,8 +74,8 @@ config.lualibs.load_extended = false require"lualibs" require"luaotfload-basics-gen.lua" -require"luaotfload-luat-ovr.lua" --- this populates the logs.* namespace -require"luaotfload-font-nms" +require"luaotfload-override.lua" --- this populates the logs.* namespace +require"luaotfload-database" require"alt_getopt" local version = "2.2" -- same version number as luaotfload diff --git a/luaotfload-font-clr.lua b/luaotfload-colors.lua index 439fd7c..3d8bfab 100644 --- a/luaotfload-font-clr.lua +++ b/luaotfload-colors.lua @@ -1,6 +1,6 @@ -if not modules then modules = { } end modules ['font-clr'] = { +if not modules then modules = { } end modules ['luaotfload-colors'] = { version = 1.001, - comment = "companion to font-otf.lua (font color)", + comment = "companion to luaotfload.lua (font color)", author = "Khaled Hosny and Elie Roux", copyright = "Luaotfload Development Team", license = "GPL" diff --git a/luaotfload-font-nms.lua b/luaotfload-database.lua index 67619be..19b04db 100644 --- a/luaotfload-font-nms.lua +++ b/luaotfload-database.lua @@ -1,4 +1,4 @@ -if not modules then modules = { } end modules ['font-nms'] = { +if not modules then modules = { } end modules ['luaotfload-database'] = { version = 2.2, comment = "companion to luaotfload.lua", author = "Khaled Hosny and Elie Roux", diff --git a/luaotfload-font-pfb.lua b/luaotfload-loaders.lua index 8ab6b29..8ab6b29 100644 --- a/luaotfload-font-pfb.lua +++ b/luaotfload-loaders.lua diff --git a/luaotfload-luat-ovr.lua b/luaotfload-override.lua index 94f2376..94f2376 100644 --- a/luaotfload-luat-ovr.lua +++ b/luaotfload-override.lua diff --git a/luaotfload.dtx b/luaotfload.dtx index ddbf228..a22eb3f 100644 --- a/luaotfload.dtx +++ b/luaotfload.dtx @@ -1314,9 +1314,9 @@ add_to_callback("hpack_filter", add_to_callback("find_vf_file", find_vf_file, "luaotfload.find_vf_file") -loadmodule"font-otc.lua" -- TODO check what we can drop from luaotfload-features -loadmodule"lib-dir.lua" -- required by font-nms -loadmodule"luat-ovr.lua" +loadmodule"font-otc.lua" --- TODO check what we can drop from luaotfload-features +loadmodule"lib-dir.lua" --- required by luaofload-database.lua +loadmodule"override.lua" --- “luat-ovr” % \end{macrocode} % \CONTEXT does not support ofm, these lines were added in order to make it @@ -1333,10 +1333,10 @@ loadmodule"luat-ovr.lua" % Now we load the modules written for \identifier{luaotfload}. % % \begin{macrocode} -loadmodule"font-pfb.lua" --- new in 2.0, added 2011 -loadmodule"font-nms.lua" -loadmodule"font-clr.lua" -loadmodule"font-ltx.lua" --- new in 2.0, added 2011 +loadmodule"loaders.lua" --- “font-pfb” new in 2.0, added 2011 +loadmodule"database.lua" --- “font-nms” +loadmodule"colors.lua" --- “font-clr” +loadmodule"font-ltx.lua" --- new in 2.0, added 2011 % \end{macrocode} % This hack makes fonts called with file method found by fonts.names.resolve |