From 2968454d4a684d1c83dc6d01c6a5391d708ab6c6 Mon Sep 17 00:00:00 2001 From: Elie Roux Date: Thu, 25 Apr 2013 11:08:56 +0200 Subject: Coming back to old version of resolvers.file with kpse Everyone seems unhappy with the file resolver rebuilding the database too often. --- luaotfload.dtx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/luaotfload.dtx b/luaotfload.dtx index fa6d709..acec607 100644 --- a/luaotfload.dtx +++ b/luaotfload.dtx @@ -636,10 +636,13 @@ end % % \subsection{\context override} % -% We have a unified function for both file and name resolver. +% We have a unified function for both file and name resolver. This line is +% commented as it makes database reload too often. This means that in some +% cases, a font in the database will not be found if it's not in the texmf +% tree. A similar thing will reappear in next version. % % \begin{macrocode} -fonts.define.resolvers.file = fonts.define.resolvers.name +--fonts.define.resolvers.file = fonts.define.resolvers.name % \end{macrocode} % % Overriding some defaults set in \context code. -- cgit v1.2.3 From 5478d8cf8911be06c5ab25ba6a07c85119da953b Mon Sep 17 00:00:00 2001 From: Elie Roux Date: Thu, 25 Apr 2013 11:09:50 +0200 Subject: Fixing a bug with Libertine Mono (phi-gamma) See tex.stackexchange.com/questions/110566/libertine-mono-and-lualatex --- otfl-font-nms.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/otfl-font-nms.lua b/otfl-font-nms.lua index 50febab..a75e4e6 100644 --- a/otfl-font-nms.lua +++ b/otfl-font-nms.lua @@ -154,6 +154,11 @@ function names.resolve(specification) elseif subfamily == "regular" or table.contains(synonyms.regular, subfamily) then found.fallback = face + elseif name == fullname then + --- guard for Libertine Mono which has + --- subtype == “mono” + found[1] = face + break end else if name == fullname -- cgit v1.2.3 From 6e65f027e185854a18375892bea2c76a84fa42ca Mon Sep 17 00:00:00 2001 From: Elie Roux Date: Thu, 25 Apr 2013 11:14:47 +0200 Subject: Bumping version --- NEWS | 6 ++++++ luaotfload.dtx | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 0f7184a..5e25fe2 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,12 @@ Change History -------------- +2013/04/11, luaotfload v1.29: + * Revertng the unified resolver, as the database was rebuilt too often + which made the compilation longer. This will come back improved + in the next version, hopefully for TeXLive 2013. + * Fix resolving of Libertine Mono + 2013/04/11, luaotfload v1.28: * Adapting to LuaTeX 0.75 * Fix small documentation issues in mkluatexfontdb diff --git a/luaotfload.dtx b/luaotfload.dtx index acec607..3f31280 100644 --- a/luaotfload.dtx +++ b/luaotfload.dtx @@ -36,7 +36,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: luaotfload v1.28 OpenType layout system} +\Msg{* Package: luaotfload v1.29 OpenType layout system} \Msg{************************************************************************} \keepsilent @@ -104,7 +104,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{luaotfload.drv}% - [2013/04/11 v1.28 OpenType layout system]% + [2013/04/25 v1.29 OpenType layout system]% \documentclass{ltxdoc} \usepackage{metalogo,multicol,mdwlist,fancyvrb,xcolor,xspace} \usepackage[ @@ -166,7 +166,7 @@ and the derived files % \GetFileInfo{luaotfload.drv} % % \title{The \textsf{luaotfload} package} -% \date{2013/04/11 v1.28} +% \date{2013/04/25 v1.29} % \author{Elie Roux and Khaled Hosny\\ % Support: \email{lualatex-dev@tug.org}} % @@ -453,8 +453,8 @@ module("luaotfload", package.seeall) luaotfload.module = { name = "luaotfload", - version = 1.28, - date = "2013/04/11", + version = 1.29, + date = "2013/04/25", description = "OpenType layout system.", author = "Elie Roux & Hans Hagen", copyright = "Elie Roux", -- cgit v1.2.3 From 2f972d63cd1b1671076aa1fdfba05aadd6b67f5c Mon Sep 17 00:00:00 2001 From: Elie Roux Date: Thu, 25 Apr 2013 18:08:58 +0200 Subject: Closing Issue #11 --- otfl-font-nms.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/otfl-font-nms.lua b/otfl-font-nms.lua index a75e4e6..a5cdbb1 100644 --- a/otfl-font-nms.lua +++ b/otfl-font-nms.lua @@ -515,12 +515,12 @@ end - if OSFONTDIR is set (which is the case under windows by default but not on the other OSs), it scans it at the same time as the texmf tree, in the scan_texmf_fonts. - - if not: + - in addition: - under Windows and Mac OSX, we take a look at some hardcoded directories - under Unix, we read /etc/fonts/fonts.conf and read the directories in it This means that if you have fonts in fancy directories, you need to set them - in OSFONTDIR. + in OSFONTDIR if they cannot be found by fontconfig. ]] local function read_fonts_conf(path, results, passed_paths) @@ -659,9 +659,7 @@ local function update_names(fontnames, force) local newfontnames = fontnames_init() read_blacklist() scan_texmf_fonts(fontnames, newfontnames) - if expandpath("$OSFONTDIR"):is_empty() then - scan_os_fonts(fontnames, newfontnames) - end + scan_os_fonts(fontnames, newfontnames) return newfontnames end -- cgit v1.2.3 From 8e0167cb44f0b6551720c9c24ac34891b3fc9042 Mon Sep 17 00:00:00 2001 From: Elie Roux Date: Thu, 25 Apr 2013 18:15:09 +0200 Subject: Updating NEWS --- NEWS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 5e25fe2..5292317 100644 --- a/NEWS +++ b/NEWS @@ -2,10 +2,11 @@ Change History -------------- 2013/04/11, luaotfload v1.29: - * Revertng the unified resolver, as the database was rebuilt too often + * Reverting the unified resolver, as the database was rebuilt too often which made the compilation longer. This will come back improved in the next version, hopefully for TeXLive 2013. * Fix resolving of Libertine Mono + * Fix a bug that made fontconfig files not parsed when OSFONTDIR is set 2013/04/11, luaotfload v1.28: * Adapting to LuaTeX 0.75 -- cgit v1.2.3