Merge pull request #10 from eroux/texlive2011

Texlive2011

3 files changed, 25 insertions, 12 deletions

diff --git a/NEWS b/NEWS
index 0f7184a..5292317 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,13 @@
 Change History
 --------------
 
+2013/04/11, luaotfload v1.29:
+    * 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
     * Fix small documentation issues in mkluatexfontdb
diff --git a/luaotfload.dtx b/luaotfload.dtx
index fa6d709..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",
@@ -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.
diff --git a/otfl-font-nms.lua b/otfl-font-nms.lua
index 84cdf6e..e653d13 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
                 end
                 if name == fullname
@@ -505,12 +510,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)
@@ -649,9 +654,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