From e9af386fb56d5c52290aacd1d4cfa55b41f814b8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 9 Jun 2010 22:21:10 +0000 Subject: luaotfload update (9jun10) git-svn-id: svn://tug.org/texlive/trunk@18851 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua | 4 ++-- Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty | 2 +- Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'Master/texmf-dist/tex/luatex/luaotfload') diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua index 7396218ca4d..79b663ebbd6 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua @@ -20,8 +20,8 @@ module('luaotfload', package.seeall) luaotfload.module = { name = "luaotfload", - version = 1.10, - date = "2010/06/07", + version = 1.11, + date = "2010/06/09", description = "ConTeXt font loading system.", author = "Elie Roux & Hans Hagen", copyright = "Elie Roux", diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty index c2bccfdcb51..a5639362171 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty @@ -24,7 +24,7 @@ \else \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luaotfload}% - [2010/06/07 v1.10 ConTeXt font loading system] + [2010/06/09 v1.11 ConTeXt font loading system] \RequirePackage{luatextra} \fi diff --git a/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua b/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua index 73a45c9dbf0..54dcde886f0 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua @@ -189,6 +189,9 @@ function names.resolve(specification) found[1] = face break end + elseif subfamily == "regular" + or synonyms.regular[style] then + found.fallback = face end else if name == fullname @@ -237,6 +240,8 @@ function names.resolve(specification) name, style, closest.filename[1]) return closest.filename[1], closest.filename[2] end + elseif found.fallback then + return found.fallback.filename[1], found.fallback.filename[2] end -- no font found so far if not reloaded then -- cgit v1.2.3