From bfd31432fa7c95ab364bf41ef873316bcb7fd110 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 10 Sep 2009 23:47:12 +0000 Subject: luaotfload 1.04 (10sep09) git-svn-id: svn://tug.org/texlive/trunk@15216 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua | 18 +++++++++++++++--- Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist/tex/luatex') diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua index 2b2c9a49997..fb25e2ce051 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua @@ -19,8 +19,8 @@ luaotfload = { } luaotfload.module = { name = "luaotfload", - version = 1.03, - date = "2009/08/10", + version = 1.04, + date = "2009/09/10", description = "ConTeXt font loading system.", author = "Elie Roux & Hans Hagen", copyright = "Elie Roux", @@ -154,17 +154,29 @@ luaotfload.loadmodule('font-dum.lua') fonts.enc.known = {} +function luaotfload.find_vf_file(name) + name = file.removesuffix(file.basename(name)) + local result = kpse.find_file(name, "vf") or "" + if result == "" then + result = kpse.find_file(name, "ovf") or "" + end + return result +end + + function luaotfload.register_callbacks() callback.add('pre_linebreak_filter', nodes.simple_font_handler, 'luaotfload.pre_linebreak_filter') callback.add('hpack_filter', nodes.simple_font_handler, 'luaotfload.hpack_filter') callback.reset('define_font') - callback.add('define_font' , fonts.define.read, 'luaotfload.define_font', 1) + callback.add('define_font', fonts.define.read, 'luaotfload.define_font', 1) + callback.add('find_vf_file', luaotfload.find_vf_file, 'luaotfload.find_vf_file') end function luaotfload.unregister_callbacks() callback.remove('pre_linebreak_filter', 'luaotfload.pre_linebreak_filter') callback.remove('hpack_filter', 'luaotfload.hpack_filter') callback.remove('define_font', 'luaotfload.define_font') + callback.remove('find_vf_file', 'luaotfload.find_vf_file') end -- -- End of File `luaotfload.lua'. diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty index 052a1426941..9ae4c8e2678 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty @@ -23,7 +23,7 @@ \else \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luaotfload}% - [2009/08/10 v1.03 ConTeXt font loading system] + [2009/09/10 v1.04 ConTeXt font loading system] \RequirePackage{luatextra} \fi -- cgit v1.2.3