diff options
| -rw-r--r-- | Master/texmf-dist/doc/luatex/luaotfload/NEWS | 5 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf | bin | 318005 -> 317923 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx | 12 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/luatex/luaotfload/otfl-font-nms.lua | 5 |
6 files changed, 19 insertions, 9 deletions
diff --git a/Master/texmf-dist/doc/luatex/luaotfload/NEWS b/Master/texmf-dist/doc/luatex/luaotfload/NEWS index cdebd817372..68ef8cd0eaf 100644 --- a/Master/texmf-dist/doc/luatex/luaotfload/NEWS +++ b/Master/texmf-dist/doc/luatex/luaotfload/NEWS @@ -1,6 +1,10 @@ Change History -------------- +2010/06/09, luaotfload v1.11: + * when asking for a font with style that doesn't exist, we would return + nothing, now we fallback to the regular font + 2010/06/07, luaotfload v1.10: * provide a fonts.names.scan(dir) function that temporally loads fonts from the specified dir into the names database @@ -15,6 +19,7 @@ Change History font with a similar name instead * Remove --fc-cache option from mkluatexfontdb.lua, since we no longer use fontconfig tools + * misc. bug fixes 2010/05/30, luaotfload v1.09: * the last release didn't even load diff --git a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf Binary files differindex 606246b52d5..f2310b88170 100644 --- a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf +++ b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf diff --git a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx index 874843b62fc..12aae2acdd2 100644 --- a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx +++ b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx @@ -35,7 +35,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: luaotfload 2010/06/07 v1.10 ConTeXt font loading system} +\Msg{* Package: luaotfload 2010/06/09 v1.11 ConTeXt font loading system} \Msg{************************************************************************} \keepsilent @@ -102,7 +102,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{luaotfload.drv}% - [2010/06/07 v1.10 ConTeXt font loading system]% + [2010/06/09 v1.11 ConTeXt font loading system]% \documentclass{ltxdoc} \usepackage{metalogo,multicol,mdwlist,fancyvrb} \usepackage[colorlinks=true]{hyperref} @@ -140,7 +140,7 @@ and the derived files % \GetFileInfo{luaotfload.drv} % % \title{The \textsf{luaotfload} package} -% \date{2010/06/07 v1.10} +% \date{2010/06/09 v1.11} % \author{ Elie Roux\footnote{\texttt{elie.roux@telecom-bretagne.eu}} % \and Khaled Hosny\footnote{\texttt{khaledhosny@eglug.org}}} % @@ -411,8 +411,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", @@ -653,7 +653,7 @@ end \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/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 |