summaryrefslogtreecommitdiff
path: root/src/fontloader/misc/fontloader-fonts.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2016-05-09 07:15:44 +0200
committerPhilipp Gesang <phg@phi-gamma.net>2016-05-09 07:16:58 +0200
commit195d57dba1533a03204aa8b7ff26ed2bb28d3405 (patch)
treebd50f6d0ee01cc4417349eaa82dbfc08b271341b /src/fontloader/misc/fontloader-fonts.lua
parent0ba71246a7445204a457602806f9cc80c0cbe354 (diff)
downloadluaotfload-195d57dba1533a03204aa8b7ff26ed2bb28d3405.tar.gz
[fontloader] sync with Context as of 2016-05-09
Fixes #349 and #357. Also the new AFM code is due, let’s see what else we need to use it.
Diffstat (limited to 'src/fontloader/misc/fontloader-fonts.lua')
-rw-r--r--src/fontloader/misc/fontloader-fonts.lua7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/fontloader/misc/fontloader-fonts.lua b/src/fontloader/misc/fontloader-fonts.lua
index e1ec376..1d2f203 100644
--- a/src/fontloader/misc/fontloader-fonts.lua
+++ b/src/fontloader/misc/fontloader-fonts.lua
@@ -230,8 +230,6 @@ if non_generic_context.luatex_fonts.skip_loading ~= true then
loadmodule('luatex-fonts-syn.lua')
loadmodule('font-tfm.lua')
- loadmodule('font-afm.lua')
- loadmodule('font-afk.lua')
loadmodule('font-oti.lua')
-- These are the old loader and processing modules. These use the built-in font loader and
@@ -260,6 +258,11 @@ if non_generic_context.luatex_fonts.skip_loading ~= true then
loadmodule('font-ots.lua')
loadmodule('font-osd.lua')
+ -- type one code
+
+ loadmodule('font-one.lua') -- was font-afm.lua
+ loadmodule('font-afk.lua')
+
-- common code
loadmodule('font-lua.lua')