summaryrefslogtreecommitdiff
path: root/src/fontloader/misc/fontloader-fonts.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2016-07-14 07:36:01 +0200
committerGitHub <noreply@github.com>2016-07-14 07:36:01 +0200
commit8bb332a20022d100dcbd64fc416a35673a0ba879 (patch)
treef972c96ccf326053729544d32fda11fc14de2115 /src/fontloader/misc/fontloader-fonts.lua
parent2b26f1507fb78927be50bea4ff5b13c5d897cc53 (diff)
parent6ae6f2dec61a216b584e59b6953f0576f51c3902 (diff)
downloadluaotfload-8bb332a20022d100dcbd64fc416a35673a0ba879.tar.gz
Merge pull request #369 from phi-gamma/master
New TFM code
Diffstat (limited to 'src/fontloader/misc/fontloader-fonts.lua')
-rw-r--r--src/fontloader/misc/fontloader-fonts.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/fontloader/misc/fontloader-fonts.lua b/src/fontloader/misc/fontloader-fonts.lua
index 83d52d9..41b95d9 100644
--- a/src/fontloader/misc/fontloader-fonts.lua
+++ b/src/fontloader/misc/fontloader-fonts.lua
@@ -230,7 +230,6 @@ if non_generic_context.luatex_fonts.skip_loading ~= true then
loadmodule('luatex-fonts-syn.lua')
- loadmodule('font-tfm.lua')
loadmodule('font-oti.lua')
-- These are the old loader and processing modules. These use the built-in font loader and
@@ -266,6 +265,10 @@ if non_generic_context.luatex_fonts.skip_loading ~= true then
loadmodule('font-one.lua') -- was font-afm.lua
loadmodule('font-afk.lua')
+ -- traditional code
+
+ loadmodule('font-tfm.lua')
+
-- common code
loadmodule('font-lua.lua')