summaryrefslogtreecommitdiff
path: root/src/fontloader/misc/fontloader-fonts.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2014-12-22 17:24:25 +0100
committerPhilipp Gesang <phg42.2a@gmail.com>2014-12-22 17:24:25 +0100
commitb966e35c9df3cca2a25baaf68574d0b8d94eef39 (patch)
tree299468068c249d5e8edf663687b3d17c35bc342c /src/fontloader/misc/fontloader-fonts.lua
parent747e6fb2c41045add6a799498026ff0d2ddf115b (diff)
parent3a5009d6feedc1a4c4e5a8d61c7e67b9c35399fa (diff)
downloadluaotfload-b966e35c9df3cca2a25baaf68574d0b8d94eef39.tar.gz
Merge pull request #262 from phi-gamma/master
[fontloader] sync with Context as of 2014-12-22
Diffstat (limited to 'src/fontloader/misc/fontloader-fonts.lua')
-rw-r--r--src/fontloader/misc/fontloader-fonts.lua9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/fontloader/misc/fontloader-fonts.lua b/src/fontloader/misc/fontloader-fonts.lua
index 678a283..c81e8cd 100644
--- a/src/fontloader/misc/fontloader-fonts.lua
+++ b/src/fontloader/misc/fontloader-fonts.lua
@@ -29,11 +29,12 @@ if not modules then modules = { } end modules ['luatex-fonts'] = {
texio.write_nl("")
texio.write_nl("--------------------------------------------------------------------------------")
-texio.write_nl("The font code has been brought in sync with the context version of 2014.12.01 so")
+texio.write_nl("The font code has been brought in sync with the context version of 2014.12.21 so")
texio.write_nl("if things don't work out as expected the interfacing needs to be checked. When")
texio.write_nl("this works as expected a second upgrade will happen that gives a more complete")
texio.write_nl("support and another sync with the context code (that new code is currently being")
-texio.write_nl("tested. The base pass is now integrated in the main pass.")
+texio.write_nl("tested. The base pass is now integrated in the main pass. The results can differ")
+texio.write_nl("from those in context because there we integrate some mechanisms differently.")
texio.write_nl("--------------------------------------------------------------------------------")
texio.write_nl("")
@@ -260,8 +261,8 @@ generic_context.callback_define_font = fonts.definers.read
if not generic_context.no_callbacks_yet then
- -- callback.register('ligaturing', generic_context.callback_ligaturing)
- -- callback.register('kerning', generic_context.callback_kerning)
+ callback.register('ligaturing', generic_context.callback_ligaturing)
+ callback.register('kerning', generic_context.callback_kerning)
callback.register('pre_linebreak_filter', generic_context.callback_pre_linebreak_filter)
callback.register('hpack_filter', generic_context.callback_hpack_filter)
callback.register('define_font' , generic_context.callback_define_font)