summaryrefslogtreecommitdiff
path: root/src/fontloader
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2015-07-22 23:12:04 +0200
committerPhilipp Gesang <phg@phi-gamma.net>2015-07-22 23:12:04 +0200
commit548fd5b0934425247e1c4e2a9aa52955813625ff (patch)
tree3cb0dd107d8c0b8878c87bf9c8d74657d04d2798 /src/fontloader
parent6f273e157c650d396cbad8e09e059b8b7c359818 (diff)
parentff022fd5de42d55aef94ce7cd7e221055f1d0c6a (diff)
downloadluaotfload-548fd5b0934425247e1c4e2a9aa52955813625ff.tar.gz
Merge pull request #279 from phi-gamma/master
Restructure initialization
Diffstat (limited to 'src/fontloader')
-rw-r--r--src/fontloader/luaotfload-package.lua6
-rw-r--r--src/fontloader/runtime/fontloader-reference.lua (renamed from src/fontloader/runtime/fontloader-fontloader.lua)0
2 files changed, 5 insertions, 1 deletions
diff --git a/src/fontloader/luaotfload-package.lua b/src/fontloader/luaotfload-package.lua
index b60ae17..725c498 100644
--- a/src/fontloader/luaotfload-package.lua
+++ b/src/fontloader/luaotfload-package.lua
@@ -63,12 +63,16 @@ loadmodule "l-boolean.lua"
loadmodule "l-math.lua"
loadmodule "util-str.lua"
+--- Another file containing auxiliary definitions must be present
+--- prior to initialization of the configuration.
+
+loadmodule "luatex-basics-gen.lua"
+
--- The files below constitute the “fontloader proper”. Some of the
--- functionality like file resolvers is overloaded later by
--- Luaotfload. Consequently, the resulting package is pretty
--- bare-bones and not usable independently.
-loadmodule("luatex-basics-gen.lua")
loadmodule("data-con.lua")
loadmodule("luatex-basics-nod.lua")
loadmodule("font-ini.lua")
diff --git a/src/fontloader/runtime/fontloader-fontloader.lua b/src/fontloader/runtime/fontloader-reference.lua
index d8095a2..d8095a2 100644
--- a/src/fontloader/runtime/fontloader-fontloader.lua
+++ b/src/fontloader/runtime/fontloader-reference.lua