summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luaotfload
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-06-09 22:21:10 +0000
committerKarl Berry <karl@freefriends.org>2010-06-09 22:21:10 +0000
commite9af386fb56d5c52290aacd1d4cfa55b41f814b8 (patch)
tree2620ff167a8d5680ab2a6ca05680b5d6a8507e66 /Master/texmf-dist/tex/luatex/luaotfload
parentade959d5f7adbbef896062a4245725f1369e1b1f (diff)
luaotfload update (9jun10)
git-svn-id: svn://tug.org/texlive/trunk@18851 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luaotfload')
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua4
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua5
3 files changed, 8 insertions, 3 deletions
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